P4 to Git Change 1191805 by yaxunl@yaxunl_stg_win50 on 2015/09/17 15:04:12

ECR #354633 - SPIR-V: Disable cl_khr_il_program until conformance test is updated to allow it.

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/cpu/cpusettings.cpp#32 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/hsa/hsasettings.cpp#39 edit
... //depot/stg/opencl/drivers/opencl/tests/conformance/devel/2.0/test_conformance/spirv/main.cpp#8 edit


[ROCm/clr commit: 8af44388e9]

projects/clr/rocclr/runtime/device/cpu/cpusettings.cpp

@@ -45,7 +45,8 @@ Settings::create()
     enableExtension(ClKhrD3d10Sharing);
 #endif // _WIN32
     enableExtension(ClKhrSpir);
-    enableExtension(ClKhrIlProgram);
+    // ToDo: enable this after conformance test is updated to accept it
+    // enableExtension(ClKhrIlProgram);
 
     // Enable some OpenCL 2.0 extensions
     if ((OPENCL_MAJOR >= 2) && (CPU_OPENCL_VERSION >= 200)) {

projects/clr/rocclr/runtime/device/hsa/hsasettings.cpp

@@ -62,7 +62,8 @@ Settings::create(bool doublePrecision)
         // Also enable AMD double precision extension?
         enableExtension(ClAmdFp64);
     }
-    enableExtension(ClKhrIlProgram);
+    // ToDo: enable this after conformance test is updated to accept it
+    // enableExtension(ClKhrIlProgram);
 
     // Override current device settings
     override();