Move property determination

Author: davschneller

interfaces/cuda/Control.cu

@@ -40,10 +40,6 @@ void ConcreteAPI::setDevice(int deviceId) {
   cudaFree(nullptr);
   CHECK_ERR;
 
-  int result;
-  cudaDeviceGetAttribute(&result, cudaDevAttrDirectManagedMemAccessFromHost, getDeviceId());
-  usmDefault = result != 0;
-
   status[StatusID::DeviceSelected] = true;
 }
 
@@ -64,6 +60,9 @@ void ConcreteAPI::initialize() {
     CHECK_ERR;
     allowedConcurrentManagedAccess = result != 0;
 
+    cudaDeviceGetAttribute(&result, cudaDevAttrDirectManagedMemAccessFromHost, getDeviceId());
+    usmDefault = result != 0;
+
     cudaDeviceGetStreamPriorityRange(&priorityMin, &priorityMax);
     CHECK_ERR;
 

interfaces/hip/Control.cpp

@@ -40,25 +40,6 @@ void ConcreteAPI::setDevice(int deviceId) {
   hipFree(nullptr);
   CHECK_ERR;
 
-  hipDeviceProp_t properties{};
-  hipGetDeviceProperties(&properties, deviceId);
-  CHECK_ERR;
-
-  // NOTE: hipDeviceGetAttribute internally calls hipGetDeviceProperties; hence it doesn't make sense to use it here
-
-  if constexpr (HIP_VERSION >= 60200000) {
-    // cf. https://rocm.docs.amd.com/en/docs-6.2.0/about/release-notes.html
-    // (before 6.2.0, the flag hipDeviceAttributePageableMemoryAccessUsesHostPageTables had effectively the same effect)
-    // (cf. https://github.com/ROCm/clr/commit/7d5b4a8f7a7d34f008d65277f8aae4c98a6da375#diff-596cd550f7fdef76b39f1b7b179b20128313dd9cc9ec662b2eae562efa2b7f33L405 )
-    usmDefault = properties.integrated != 0;
-  }
-  else {
-    usmDefault = properties.directManagedMemAccessFromHost != 0 && properties.pageableMemoryAccessUsesHostPageTables != 0;
-  }
-
-  hipDeviceGetStreamPriorityRange(&priorityMin, &priorityMax);
-  CHECK_ERR;
-
   status[StatusID::DeviceSelected] = true;
 }
 
@@ -74,6 +55,25 @@ void ConcreteAPI::initialize() {
   if (!status[StatusID::InterfaceInitialized]) {
     status[StatusID::InterfaceInitialized] = true;
     hipStreamCreateWithFlags(&defaultStream, hipStreamNonBlocking); CHECK_ERR;
+
+    hipDeviceProp_t properties{};
+    hipGetDeviceProperties(&properties, deviceId);
+    CHECK_ERR;
+
+    // NOTE: hipDeviceGetAttribute internally calls hipGetDeviceProperties; hence it doesn't make sense to use it here
+
+    if constexpr (HIP_VERSION >= 60200000) {
+      // cf. https://rocm.docs.amd.com/en/docs-6.2.0/about/release-notes.html
+      // (before 6.2.0, the flag hipDeviceAttributePageableMemoryAccessUsesHostPageTables had effectively the same effect)
+      // (cf. https://github.com/ROCm/clr/commit/7d5b4a8f7a7d34f008d65277f8aae4c98a6da375#diff-596cd550f7fdef76b39f1b7b179b20128313dd9cc9ec662b2eae562efa2b7f33L405 )
+      usmDefault = properties.integrated != 0;
+    }
+    else {
+      usmDefault = properties.directManagedMemAccessFromHost != 0 && properties.pageableMemoryAccessUsesHostPageTables != 0;
+    }
+
+    hipDeviceGetStreamPriorityRange(&priorityMin, &priorityMax);
+    CHECK_ERR;
   }
   else {
     logWarning() << "Device Interface has already been initialized";