P4 to Git Change 1092043 by xcui@merged_opencl_jxcwin on 2014/10/29 17:04:56

EPR #397491 - changed the CPU SVM capability availablility only for OpenCL 2.0, not for 1.2.

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/cpu/cpudevice.cpp#267 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/cpu/cpusettings.cpp#28 edit

rocclr/runtime/device/cpu/cpudevice.cpp

@@ -265,10 +265,13 @@ Device::init()
     info.linkerAvailable_ = CL_TRUE;
 
     info.executionCapabilities_ = CL_EXEC_KERNEL | CL_EXEC_NATIVE_KERNEL;
-    info.svmCapabilities_ = CL_DEVICE_SVM_COARSE_GRAIN_BUFFER |
+    // Enable SVM only for OpenCL 2.0
-            CL_DEVICE_SVM_FINE_GRAIN_BUFFER |
+    if ((OPENCL_MAJOR >= 2) && (CPU_OPENCL_VERSION >= 200)) {
-            CL_DEVICE_SVM_FINE_GRAIN_SYSTEM |
+        info.svmCapabilities_ = CL_DEVICE_SVM_COARSE_GRAIN_BUFFER |
-            CL_DEVICE_SVM_ATOMICS;
+                CL_DEVICE_SVM_FINE_GRAIN_BUFFER |
+                CL_DEVICE_SVM_FINE_GRAIN_SYSTEM |
+                CL_DEVICE_SVM_ATOMICS;
+    }
     info.preferredPlatformAtomicAlignment_ = 0;
     info.preferredGlobalAtomicAlignment_ = 0;
     info.preferredLocalAtomicAlignment_ = 0;

rocclr/runtime/device/cpu/cpusettings.cpp

@@ -54,6 +54,7 @@ Settings::create()
         enableExtension(ClKhrSubGroups);
         supportDepthsRGB_ = true;
         enableExtension(ClKhrDepthImages);
+        customSvmAllocator_ = true;
     }
 
     // Map CPUID feature bits to our own feature bits