From c7bbeca0d584624d308aa6c935ea7703ff437bb9 Mon Sep 17 00:00:00 2001 From: foreman Date: Mon, 25 Jun 2018 13:16:30 -0400 Subject: [PATCH] P4 to Git Change 1572344 by jatang@jatang-opencl-hsa-stg5 on 2018/06/25 13:05:15 SWDEV-126897 - Enable 'OPENCL_VERSION=210' in LC/ROCm path. For testing purpose. Affected files ... ... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocdevice.cpp#91 edit ... //depot/stg/opencl/drivers/opencl/tests/conformance/devel/2.0/test_conformance/device_execution/main.c#10 edit --- rocclr/runtime/device/rocm/rocdevice.cpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/rocclr/runtime/device/rocm/rocdevice.cpp b/rocclr/runtime/device/rocm/rocdevice.cpp index 38f8394767..63c1989269 100644 --- a/rocclr/runtime/device/rocm/rocdevice.cpp +++ b/rocclr/runtime/device/rocm/rocdevice.cpp @@ -1032,7 +1032,15 @@ bool Device::populateOCLDeviceConstants() { ss << ")"; strcpy(info_.driverVersion_, ss.str().c_str()); - info_.version_ = "OpenCL " /*OPENCL_VERSION_STR*/"1.2" " "; + + // 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" " "; + } else { + info_.version_ = "OpenCL " /*OPENCL_VERSION_STR*/"1.2" " "; + } info_.builtInKernels_ = ""; info_.linkerAvailable_ = true;