P4 to Git Change 1312566 by lmoriche@lmoriche_opencl_dev on 2016/09/08 18:25:02

SWDEV-94610 - Make sure each kernarg segment sits on a different cache line (align the kernargs on cache lines at minimum). Minor misc cleanups.

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocdevice.cpp#13 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rockernel.cpp#14 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rockernel.hpp#8 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocprogram.cpp#27 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocvirtual.cpp#13 edit

rocclr/runtime/device/rocm/rocdevice.cpp

@@ -817,8 +817,18 @@ Device::populateOCLDeviceConstants()
     info_.maxSamplers_ = 16;
     info_.bufferFromImageSupport_ = CL_FALSE;
     info_.oclcVersion_ = "OpenCL C " OPENCL_VERSION_STR " ";
-    strcpy(info_.driverVersion_, "1.0 Provisional (hsa)");
-    info_.version_ = "OpenCL " OPENCL_VERSION_STR " ";
+
+    uint16_t major, minor;
+    if (hsa_agent_get_info(_bkendDevice, HSA_AGENT_INFO_VERSION_MAJOR, &major)
+            != HSA_STATUS_SUCCESS
+     || hsa_agent_get_info(_bkendDevice, HSA_AGENT_INFO_VERSION_MINOR, &minor)
+            != HSA_STATUS_SUCCESS) {
+        return false;
+    }
+    std::stringstream ss;
+    ss << major << "." << minor << " (hsa)";
+    strcpy(info_.driverVersion_, ss.str().c_str());
+    info_.version_ = "OpenCL " /*OPENCL_VERSION_STR*/"1.2" " ";
 
     info_.builtInKernels_ = "";
     info_.linkerAvailable_ = true;