Merge branch 'privatestaging' of https://github.com/AMDComputeLibraries/HIP-privatestaging into privatestaging

include/hip_runtime_api.h

@@ -98,6 +98,7 @@ typedef struct hipDeviceProp_t {
     int pciBusID;                               ///< PCI Bus ID.
     int pciDeviceID;                            ///< PCI Device ID.
     size_t maxSharedMemoryPerMultiProcessor;    ///< Maximum Shared Memory Per Multiprocessor.
+    int isMultiGpuBoard;                        ///< 1 if device is on a multi-GPU board, 0 if not.
  } hipDeviceProp_t;
 
 
@@ -188,6 +189,7 @@ typedef enum hipDeviceAttribute_t {
     hipDeviceAttributePciBusId,                             ///< PCI Bus ID.
     hipDeviceAttributePciDeviceId,                          ///< PCI Device ID.
     hipDeviceAttributeMaxSharedMemoryPerMultiprocessor,     ///< Maximum Shared Memory Per Multiprocessor.
+    hipDeviceAttributeIsMultiGpuBoard,                      ///< Multiple GPU devices.
 } hipDeviceAttribute_t;
 
 /**

include/nvcc_detail/hip_runtime_api.h

@@ -266,6 +266,8 @@ inline static hipError_t hipDeviceGetAttribute(int* pi, hipDeviceAttribute_t att
         cdattr = cudaDevAttrPciDeviceId; break;
     case hipDeviceAttributeMaxSharedMemoryPerMultiprocessor:
         cdattr = cudaDevAttrMaxSharedMemoryPerMultiprocessor; break;
+    case hipDeviceAttributeIsMultiGpuBoard:
+        cdattr = cudaDevAttrIsMultiGpuBoard; break;
     default:
         cerror = cudaErrorInvalidValue; break;
     }