[arcane,accelerator] Ajoute récupération du UUID de l'accélérateur avec HIP.

Author: grospelliergilles

arcane/src/arcane/accelerator/core/AcceleratorCore.cc

@@ -288,7 +288,7 @@ getPointerAccessibility(eExecutionPolicy policy, const void* ptr, PointerAttribu
   return impl::RuntimeStaticInfo::getPointerAccessibility(policy, ptr, ptr_attr);
 }
 
-extern "C++" void impl::
+void impl::
 arcaneCheckPointerIsAccessible(eExecutionPolicy policy, const void* ptr,
                                const char* name, const TraceInfo& ti)
 {
@@ -298,6 +298,22 @@ arcaneCheckPointerIsAccessible(eExecutionPolicy policy, const void* ptr,
 /*---------------------------------------------------------------------------*/
 /*---------------------------------------------------------------------------*/
 
+void impl::
+printUUID(std::ostream& o, char bytes[16])
+{
+  static const char hexa_chars[16] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f' };
+
+  for (int i = 0; i < 16; ++i) {
+    o << hexa_chars[(bytes[i] >> 4) & 0xf];
+    o << hexa_chars[bytes[i] & 0xf];
+    if (i == 4 || i == 6 || i == 8 || i == 10)
+      o << '-';
+  }
+}
+
+/*---------------------------------------------------------------------------*/
+/*---------------------------------------------------------------------------*/
+
 std::ostream&
 operator<<(std::ostream& o, const PointerAttribute& a)
 {

arcane/src/arcane/accelerator/core/internal/AcceleratorCoreGlobalInternal.h

@@ -97,6 +97,13 @@ getThreadRunQueueRuntime();
 /*---------------------------------------------------------------------------*/
 /*---------------------------------------------------------------------------*/
 
+//! Affiche l'UUID d'un accélérateur
+extern "C++" ARCANE_ACCELERATOR_CORE_EXPORT void
+printUUID(std::ostream& o, char bytes[16]);
+
+/*---------------------------------------------------------------------------*/
+/*---------------------------------------------------------------------------*/
+
 //! Classe statique fournissant des fonctions internes à Arcane.
 class ARCANE_ACCELERATOR_CORE_EXPORT RuntimeStaticInfo
 {

arcane/src/arcane/accelerator/cuda/runtime/CudaAcceleratorRuntime.cc

@@ -80,21 +80,6 @@ void arcaneCheckCudaErrors(const TraceInfo& ti, CUresult e)
 /*---------------------------------------------------------------------------*/
 /*---------------------------------------------------------------------------*/
 
-void _printUUID(std::ostream& o, char bytes[16])
-{
-  static const char hexa_chars[16] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f' };
-
-  for (int i = 0; i < 16; ++i) {
-    o << hexa_chars[(bytes[i] >> 4) & 0xf];
-    o << hexa_chars[bytes[i] & 0xf];
-    if (i == 4 || i == 6 || i == 8 || i == 10)
-      o << '-';
-  }
-}
-
-/*---------------------------------------------------------------------------*/
-/*---------------------------------------------------------------------------*/
-
 class CudaRunQueueStream
 : public impl::IRunQueueStream
 {
@@ -473,7 +458,7 @@ fillDevices(bool is_verbose)
       CUuuid device_uuid;
       ARCANE_CHECK_CUDA(cuDeviceGetUuid(&device_uuid, device));
       o << " deviceUuid=";
-      _printUUID(o, device_uuid.bytes);
+      impl::printUUID(o, device_uuid.bytes);
       o << "\n";
     }
     String description(ostr.str());

arcane/src/arcane/accelerator/hip/runtime/HipAcceleratorRuntime.cc

@@ -394,6 +394,16 @@ fillDevices(bool is_verbose)
       << " " << dp.maxGridSize[2] << "\n";
     o << " hasManagedMemory = " << has_managed_memory << "\n";
 
+    {
+      hipDevice_t device;
+      ARCANE_CHECK_HIP(hipDeviceGet(&device, i));
+      hipUUID device_uuid;
+      ARCANE_CHECK_HIP(hipDeviceGetUuid(&device_uuid, device));
+      o << " deviceUuid=";
+      impl::printUUID(o, device_uuid.bytes);
+      o << "\n";
+    }
+
     String description(ostr.str());
     if (is_verbose)
       omain << description;
@@ -416,8 +426,8 @@ class HipMemoryCopier
             MutableMemoryView to, [[maybe_unused]] eMemoryRessource to_mem,
             const RunQueue* queue) override
   {
-    if (queue){
-      queue->copyMemory(MemoryCopyArgs(to.bytes(),from.bytes()).addAsync(queue->isAsync()));
+    if (queue) {
+      queue->copyMemory(MemoryCopyArgs(to.bytes(), from.bytes()).addAsync(queue->isAsync()));
       return;
     }
     // 'hipMemcpyDefault' sait automatiquement ce qu'il faut faire en tenant