P4 to Git Change 2028285 by axie@axie-hip-rocm on 2019/11/11 12:03:24

SWDEV-193973 - [OpenCL][NV21] Add support for Navi21
	Add #ifndef OPENCL_MAINLINE around Navi 21 source code. This is to facilitate Open Source preparation.

	Tests:
	http://ocltc.amd.com:8111/viewModification.html?modId=128639&personal=true&tab=vcsModificationBuilds

	ReviewBoard: http://ocltc.amd.com/reviews/r/18267/

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocdefs.hpp#26 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocdevice.cpp#140 edit


[ROCm/clr commit: 131437441e]

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

@@ -48,7 +48,6 @@ const HsaDeviceId HSA_NAVI10_ID = 15;
 const HsaDeviceId HSA_MI100_ID = 16;
 const HsaDeviceId HSA_NAVI12_ID = 17;
 const HsaDeviceId HSA_NAVI14_ID = 18;
-const HsaDeviceId HSA_NAVI21_ID = 19;
 const HsaDeviceId HSA_INVALID_DEVICE_ID = -1;
 
 static const AMDDeviceInfo DeviceInfo[] = {

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

@@ -103,8 +103,6 @@ static HsaDeviceId getHsaDeviceId(hsa_agent_t device, uint32_t& pci_id) {
       return HSA_NAVI12_ID;
     case 1012:
       return HSA_NAVI14_ID;
-    case 1030:
-      return HSA_NAVI21_ID;
     default:
       return HSA_INVALID_DEVICE_ID;
   }