P4 to Git Change 1422533 by wchau@wchau_OCL_boltzmann on 2017/06/14 17:14:23

SWDEV-124405 - Observed "Segmentation fault (core dumped()" while running clinfo.
	Add support of GFX901 for Vega10.

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocdefs.hpp#11 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocdevice.cpp#55 edit


[ROCm/clr commit: c95e8d22e7]

projects/clr/rocclr/runtime/device/rocm/rocdefs.hpp

@@ -35,6 +35,7 @@ const HsaDeviceId HSA_HAWAII_ID = 6;
 const HsaDeviceId HSA_ELLESMERE_ID = 7;
 const HsaDeviceId HSA_BAFFIN_ID = 8;
 const HsaDeviceId HSA_VEGA10_ID = 9;
+const HsaDeviceId HSA_VEGA10_HBCC_ID = 10;
 const HsaDeviceId HSA_INVALID_DEVICE_ID = -1;
 
 static const AMDDeviceInfo DeviceInfo[] = {
@@ -54,6 +55,7 @@ static const AMDDeviceInfo DeviceInfo[] = {
                             32, 0, 0},
     /* TARGET BAFFIN */ {HSA_BAFFIN_ID, "", "polaris11", "Baffin", 4, 16, 1, 256, 64 * Ki, 32, 0,
                          0},
-    /* TARGET VEGA10 */ {HSA_VEGA10_ID, "", "gfx900", "gfx900", 4, 16, 1, 256, 64 * Ki, 32, 0, 0}};
+    /* TARGET VEGA10 */ {HSA_VEGA10_ID, "", "gfx900", "gfx900", 4, 16, 1, 256, 64 * Ki, 32, 0, 0},
+    /* TARGET VEGA10_HBCC */ {HSA_VEGA10_HBCC_ID, "", "gfx901", "gfx901", 4, 16, 1, 256, 64 * Ki, 32, 0, 0}};
 }
 #endif

projects/clr/rocclr/runtime/device/rocm/rocdevice.cpp

@@ -86,6 +86,8 @@ static HsaDeviceId getHsaDeviceId(hsa_agent_t device, uint32_t& pci_id) {
       return HSA_FIJI_ID;
     case 900:
       return HSA_VEGA10_ID;
+    case 901:
+      return HSA_VEGA10_HBCC_ID;
     default:
       return HSA_INVALID_DEVICE_ID;
   }