Merge pull request #1198 from arcaneframework/ht-pagesize

grospelliergilles · web-flow · commit bce264adeb55 · 2024-02-21T14:28:27.000+01:00
Use the real page size instead of hardcoded 4096 bytes that can be false
diff --git a/arcane/src/arcane/accelerator/cuda/CudaAccelerator.cc b/arcane/src/arcane/accelerator/cuda/CudaAccelerator.cc
@@ -1,11 +1,11 @@
 ﻿// -*- tab-width: 2; indent-tabs-mode: nil; coding: utf-8-with-signature -*-
 //-----------------------------------------------------------------------------
-// Copyright 2000-2023 CEA (www.cea.fr) IFPEN (www.ifpenergiesnouvelles.com)
+// Copyright 2000-2024 CEA (www.cea.fr) IFPEN (www.ifpenergiesnouvelles.com)
 // See the top-level COPYRIGHT file for details.
 // SPDX-License-Identifier: Apache-2.0
 //-----------------------------------------------------------------------------
 /*---------------------------------------------------------------------------*/
-/* CudaAccelerator.cc                                          (C) 2000-2023 */
+/* CudaAccelerator.cc                                          (C) 2000-2024 */
 /*                                                                           */
 /* Backend 'CUDA' pour les accélérateurs.                                    */
 /*---------------------------------------------------------------------------*/
@@ -100,7 +100,7 @@ class UnifiedMemoryCudaMemoryAllocator
 {
  public:
 
-  static constexpr Int64 page_size = 4096;
+  Int64 page_size = platform::getPageSize();
 
   void initialize()
   {
@@ -121,7 +121,7 @@ class UnifiedMemoryCudaMemoryAllocator
       _applyHint(ptr.baseAddress(), ptr.size(), new_args);
   }
 
-  Int64 adjustedCapacity(MemoryAllocationArgs args, Int64 wanted_capacity, Int64 element_size) const
+  Int64 adjustedCapacity(MemoryAllocationArgs args, Int64 wanted_capacity, Int64 element_size) const override
   {
     wanted_capacity = AlignedMemoryAllocator3::adjustedCapacity(args, wanted_capacity, element_size);
     const bool do_page = m_page_allocate_level > 0;
@@ -173,7 +173,7 @@ class UnifiedMemoryCudaMemoryAllocator
     return ::cudaFree(ptr);
   }
 
-  cudaError_t _allocate(void** ptr, size_t new_size, MemoryAllocationArgs args)
+  cudaError_t _allocate(void** ptr, size_t new_size, MemoryAllocationArgs args) override
   {
     auto r = ::cudaMallocManaged(ptr, new_size, cudaMemAttachGlobal);
     void* p = *ptr;
diff --git a/arcane/src/arcane/utils/PlatformUtils.cc b/arcane/src/arcane/utils/PlatformUtils.cc
@@ -1,11 +1,11 @@
 ﻿// -*- tab-width: 2; indent-tabs-mode: nil; coding: utf-8-with-signature -*-
 //-----------------------------------------------------------------------------
-// Copyright 2000-2022 CEA (www.cea.fr) IFPEN (www.ifpenergiesnouvelles.com)
+// Copyright 2000-2024 CEA (www.cea.fr) IFPEN (www.ifpenergiesnouvelles.com)
 // See the top-level COPYRIGHT file for details.
 // SPDX-License-Identifier: Apache-2.0
 //-----------------------------------------------------------------------------
 /*---------------------------------------------------------------------------*/
-/* PlatformUtils.cc                                            (C) 2000-2023 */
+/* PlatformUtils.cc                                            (C) 2000-2024 */
 /*                                                                           */
 /* Fonctions utilitaires dépendant de la plateforme.                         */
 /*---------------------------------------------------------------------------*/
@@ -525,6 +525,25 @@ getRealTimeNS()
 /*---------------------------------------------------------------------------*/
 /*---------------------------------------------------------------------------*/
 
+extern "C++" ARCANE_UTILS_EXPORT Int64 platform::
+getPageSize()
+{
+#if defined(ARCCORE_OS_WIN32)
+  SYSTEM_INFO si;
+  GetSystemInfo(&si);
+  return si.dwPageSize;
+#elif defined(ARCANE_OS_LINUX)
+  return ::sysconf(_SC_PAGESIZE);
+#else
+#warning "getPageSize() not implemented for your platform. Default is 4096"
+  Int64 page_size = 4096;
+  return page_size;
+#endif
+}
+
+/*---------------------------------------------------------------------------*/
+/*---------------------------------------------------------------------------*/
+
 namespace
 {
 void (*global_garbage_collector_delegate)() = nullptr;
diff --git a/arcane/src/arcane/utils/PlatformUtils.h b/arcane/src/arcane/utils/PlatformUtils.h
@@ -1,11 +1,11 @@
 ﻿// -*- tab-width: 2; indent-tabs-mode: nil; coding: utf-8-with-signature -*-
 //-----------------------------------------------------------------------------
-// Copyright 2000-2022 CEA (www.cea.fr) IFPEN (www.ifpenergiesnouvelles.com)
+// Copyright 2000-2024 CEA (www.cea.fr) IFPEN (www.ifpenergiesnouvelles.com)
 // See the top-level COPYRIGHT file for details.
 // SPDX-License-Identifier: Apache-2.0
 //-----------------------------------------------------------------------------
 /*---------------------------------------------------------------------------*/
-/* PlatformUtils.h                                             (C) 2000-2019 */
+/* PlatformUtils.h                                             (C) 2000-2024 */
 /*                                                                           */
 /* Fonctions utilitaires dépendant de la plateforme.                         */
 /*---------------------------------------------------------------------------*/
@@ -384,6 +384,14 @@ getLoadedSharedLibraryFullPath(const String& dll_name);
 extern "C++" ARCANE_UTILS_EXPORT void
 fillCommandLineArguments(StringList& arg_list);
 
+/*---------------------------------------------------------------------------*/
+/*---------------------------------------------------------------------------*/
+/*!
+ * \brief Taille des pages du système hôte en octets
+ */
+extern "C++" ARCANE_UTILS_EXPORT Int64
+getPageSize();
+
 /*---------------------------------------------------------------------------*/
 /*---------------------------------------------------------------------------*/
 
diff --git a/arcane/src/arcane/utils/tests/CMakeLists.txt b/arcane/src/arcane/utils/tests/CMakeLists.txt
@@ -7,6 +7,7 @@
   TestHash.cc
   TestHashTable.cc
   TestMemory.cc
+  TestPlatform.cc
   TestVector2.cc
   TestVector3.cc
 )
diff --git a/arcane/src/arcane/utils/tests/TestPlatform.cc b/arcane/src/arcane/utils/tests/TestPlatform.cc
@@ -0,0 +1,28 @@
+﻿// -*- tab-width: 2; indent-tabs-mode: nil; coding: utf-8-with-signature -*-
+//-----------------------------------------------------------------------------
+// Copyright 2000-2024 CEA (www.cea.fr) IFPEN (www.ifpenergiesnouvelles.com)
+// See the top-level COPYRIGHT file for details.
+// SPDX-License-Identifier: Apache-2.0
+//-----------------------------------------------------------------------------
+
+#include <gtest/gtest.h>
+
+#include "arcane/utils/HashTableMap.h"
+#include "arcane/utils/PlatformUtils.h"
+
+#include <iostream>
+
+/*---------------------------------------------------------------------------*/
+/*---------------------------------------------------------------------------*/
+
+using namespace Arcane;
+
+TEST(TestPlatform, Misc)
+{
+  Int64 page_size = platform::getPageSize();
+  std::cout << "PageSize=" << page_size << "\n";
+  ASSERT_TRUE(page_size>0);
+}
+
+/*---------------------------------------------------------------------------*/
+/*---------------------------------------------------------------------------*/

Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,11 @@`
`1`	`1`	`// -- tab-width: 2; indent-tabs-mode: nil; coding: utf-8-with-signature --`
`2`	`2`	`//-----------------------------------------------------------------------------`
`3`		`-// Copyright 2000-2023 CEA (www.cea.fr) IFPEN (www.ifpenergiesnouvelles.com)`
	`3`	`+// Copyright 2000-2024 CEA (www.cea.fr) IFPEN (www.ifpenergiesnouvelles.com)`
`4`	`4`	`// See the top-level COPYRIGHT file for details.`
`5`	`5`	`// SPDX-License-Identifier: Apache-2.0`
`6`	`6`	`//-----------------------------------------------------------------------------`
`7`	`7`	`/---------------------------------------------------------------------------/`
`8`		`-/* CudaAccelerator.cc (C) 2000-2023 */`
	`8`	`+/* CudaAccelerator.cc (C) 2000-2024 */`
`9`	`9`	`/* */`
`10`	`10`	`/* Backend 'CUDA' pour les accélérateurs. */`
`11`	`11`	`/---------------------------------------------------------------------------/`
`@@ -100,7 +100,7 @@ class UnifiedMemoryCudaMemoryAllocator`
`100`	`100`	`{`
`101`	`101`	`public:`
`102`	`102`
`103`		`- static constexpr Int64 page_size = 4096;`
	`103`	`+ Int64 page_size = platform::getPageSize();`
`104`	`104`
`105`	`105`	`void initialize()`
`106`	`106`	`{`
`@@ -121,7 +121,7 @@ class UnifiedMemoryCudaMemoryAllocator`
`121`	`121`	`_applyHint(ptr.baseAddress(), ptr.size(), new_args);`
`122`	`122`	`}`
`123`	`123`
`124`		`- Int64 adjustedCapacity(MemoryAllocationArgs args, Int64 wanted_capacity, Int64 element_size) const`
	`124`	`+ Int64 adjustedCapacity(MemoryAllocationArgs args, Int64 wanted_capacity, Int64 element_size) const override`
`125`	`125`	`{`
`126`	`126`	`wanted_capacity = AlignedMemoryAllocator3::adjustedCapacity(args, wanted_capacity, element_size);`
`127`	`127`	`const bool do_page = m_page_allocate_level > 0;`
`@@ -173,7 +173,7 @@ class UnifiedMemoryCudaMemoryAllocator`
`173`	`173`	`return ::cudaFree(ptr);`
`174`	`174`	`}`
`175`	`175`
`176`		`- cudaError_t _allocate(void** ptr, size_t new_size, MemoryAllocationArgs args)`
	`176`	`+ cudaError_t _allocate(void** ptr, size_t new_size, MemoryAllocationArgs args) override`
`177`	`177`	`{`
`178`	`178`	`auto r = ::cudaMallocManaged(ptr, new_size, cudaMemAttachGlobal);`
`179`	`179`	`void* p = *ptr;`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`	`TestHash.cc`
`8`	`8`	`TestHashTable.cc`
`9`	`9`	`TestMemory.cc`
	`10`	`+ TestPlatform.cc`
`10`	`11`	`TestVector2.cc`
`11`	`12`	`TestVector3.cc`
`12`	`13`	`)`