P4 to Git Change 1739455 by jatang@jatang_win_pal_lc on 2019/02/04 09:39:34

SWDEV-178313 - Enable OpenCL 2.0 on ROCm/LC path for Vega10+

	Doorbell self-ring doesn't work for Fiji, so we enable 2.0 only for Vega10+ for now.

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocdevice.cpp#114 edit

rocclr/runtime/device/rocm/rocdevice.cpp

@@ -1076,11 +1076,9 @@ bool Device::populateOCLDeviceConstants() {
 
   strcpy(info_.driverVersion_, ss.str().c_str());
 
-  // Allow testing OpenCL 2.1 features with the OPENCL_VERSION variable. We don't accept OPENCL_VERSION
-  // values other than 210, since the default value of OPENCL_VERSION is 200. Accepting 200 would report
-  // 'OpenCL 2.0' by default.
-  if (OPENCL_VERSION == 210) {
-    info_.version_ = "OpenCL " /*OPENCL_VERSION_STR*/"2.1" " ";
+  // Enable OpenCL 2.0 for Vega10+
+  if (deviceInfo_.gfxipVersion_ >= 900) {
+    info_.version_ = "OpenCL " OPENCL_VERSION_STR " ";
   } else {
     info_.version_ = "OpenCL " /*OPENCL_VERSION_STR*/"1.2" " ";
   }