P4 to Git Change 1400271 by weizhang@weizhang-lnx-opencl-lc on 2017/04/19 17:55:28

SWDEV-112857 - OpenCL Work to Support Unified ROCm / Orca Builds
	  1. Rename OCL runtime to libvega10ocl[64][32] for supporting vega10 with OCL/ROCR
	  2. Pre-vega10 devices won't be reported on OCL/ROCR.

Affected files ...

... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/build/Makefile.api#151 edit
... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_icd.cpp#28 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocdevice.cpp#49 edit
... //depot/stg/opencl/drivers/opencl/runtime/runtimedefs#40 edit
... //depot/stg/opencl/drivers/opencl/runtime/utils/flags.hpp#272 edit


[ROCm/clr commit: ac065c7279]

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

@@ -71,6 +71,10 @@ static HsaDeviceId getHsaDeviceId(hsa_agent_t device, uint32_t& pci_id) {
   }
 
   uint gfxipVersion = atoi(&agent_name[3]);
+  if (gfxipVersion < 900 && GPU_VEGA10_ONLY) {
+    return  HSA_INVALID_DEVICE_ID;
+  }
+
   switch (gfxipVersion) {
     case 701:
       return HSA_HAWAII_ID;

projects/clr/rocclr/runtime/utils/flags.hpp

@@ -207,6 +207,8 @@ release(bool, OCL_CODE_CACHE_ENABLE, false,                                   \
         "1 = Enable compiler code cache")                                     \
 release(bool, OCL_CODE_CACHE_RESET, false,                                    \
         "1 =  Reset the compiler code cache storage")                         \
+release(bool, GPU_VEGA10_ONLY, VEGA10_ONLY,                                   \
+        "1 = Report vega10 only on OCL/ROCR")                                 \
 
 namespace amd {