From c859890f3cea8e8e96d2e6fdf5fc108382c701e2 Mon Sep 17 00:00:00 2001 From: foreman Date: Thu, 17 Sep 2015 15:13:16 -0400 Subject: [PATCH] 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: 8af44388e97d440742d6391a36e96434e4420b71] --- projects/clr/rocclr/runtime/device/cpu/cpusettings.cpp | 3 ++- projects/clr/rocclr/runtime/device/hsa/hsasettings.cpp | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/projects/clr/rocclr/runtime/device/cpu/cpusettings.cpp b/projects/clr/rocclr/runtime/device/cpu/cpusettings.cpp index b7dfdf57de..da4fb15344 100644 --- a/projects/clr/rocclr/runtime/device/cpu/cpusettings.cpp +++ b/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)) { diff --git a/projects/clr/rocclr/runtime/device/hsa/hsasettings.cpp b/projects/clr/rocclr/runtime/device/hsa/hsasettings.cpp index 5c5a2c2df1..9d478f7fa4 100644 --- a/projects/clr/rocclr/runtime/device/hsa/hsasettings.cpp +++ b/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();