From 96905d23a78dc15390fcf9cc7c3437e05e9dc271 Mon Sep 17 00:00:00 2001
From: foreman <dl.constructicon@amd.com>
Date: Wed, 16 Sep 2015 17:29:07 -0400
Subject: [PATCH] P4 to Git Change 1191432 by yaxunl@yaxunl_stg_win50 on
 2015/09/16 17:16:06

	ECR #354633 - SPIR-V: Rename clCreateProgramWithIL as clCreateProgramWithILKHR and define it as an extension API.
	Add API to OCL 1.2/2.1.
	Add cl_khr_il_program extension.
	Fix SPIR-V conformance and ocltst.

Affected files ...

... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/amdocl.def.in#15 edit
... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/amdocl.map.in#18 edit
... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_context.cpp#44 edit
... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_icd.cpp#24 edit
... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_icd_amd.h#17 edit
... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_program.cpp#37 edit
... //depot/stg/opencl/drivers/opencl/api/opencl/khronos/headers/opencl1.2/CL/cl_ext.h#9 edit
... //depot/stg/opencl/drivers/opencl/api/opencl/khronos/headers/opencl2.0/CL/cl.h#21 edit
... //depot/stg/opencl/drivers/opencl/api/opencl/khronos/headers/opencl2.0/CL/cl_ext.h#16 edit
... //depot/stg/opencl/drivers/opencl/api/opencl/khronos/headers/opencl2.1/CL/cl.h#3 edit
... //depot/stg/opencl/drivers/opencl/api/opencl/khronos/icd/OpenCL.def.in#12 edit
... //depot/stg/opencl/drivers/opencl/api/opencl/khronos/icd/icd_dispatch.c#28 edit
... //depot/stg/opencl/drivers/opencl/api/opencl/khronos/icd/icd_dispatch.h#23 edit
... //depot/stg/opencl/drivers/opencl/api/opencl/khronos/icd/icd_exports.map.in#8 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/cpu/cpusettings.cpp#30 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/device.hpp#252 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/hsa/hsasettings.cpp#37 edit
... //depot/stg/opencl/drivers/opencl/tests/conformance/devel/2.0/test_conformance/spirv/main.cpp#7 edit
... //depot/stg/opencl/drivers/opencl/tests/conformance/devel/2.0/test_conformance/spirv/run_services.cpp#3 edit
... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/spir/SPIRVBasic.cpp#3 edit


[ROCm/clr commit: b6c34a714cf3e3f86e7689ce410beb7fa0384240]
---
 projects/clr/rocclr/runtime/device/cpu/cpusettings.cpp | 1 +
 projects/clr/rocclr/runtime/device/device.hpp          | 2 ++
 projects/clr/rocclr/runtime/device/hsa/hsasettings.cpp | 1 +
 3 files changed, 4 insertions(+)

diff --git a/projects/clr/rocclr/runtime/device/cpu/cpusettings.cpp b/projects/clr/rocclr/runtime/device/cpu/cpusettings.cpp
index 2c407d1dad..14d43cdbe6 100644
--- a/projects/clr/rocclr/runtime/device/cpu/cpusettings.cpp
+++ b/projects/clr/rocclr/runtime/device/cpu/cpusettings.cpp
@@ -47,6 +47,7 @@ Settings::create()
     enableExtension(ClKhrD3d10Sharing);
 #endif // _WIN32
     enableExtension(ClKhrSpir);
+    enableExtension(ClKhrIlProgram);
 
     // Enable some OpenCL 2.0 extensions
     if ((OPENCL_MAJOR >= 2) && (CPU_OPENCL_VERSION >= 200)) {
diff --git a/projects/clr/rocclr/runtime/device/device.hpp b/projects/clr/rocclr/runtime/device/device.hpp
index feaf374ff7..bb9d16b368 100644
--- a/projects/clr/rocclr/runtime/device/device.hpp
+++ b/projects/clr/rocclr/runtime/device/device.hpp
@@ -110,6 +110,7 @@ enum OclExtensions {
     ClKhrDepthImages,
     ClKhrMipMapImage,
     ClKhrMipMapImageWrites,
+    ClKhrIlProgram,
     ClExtTotal
 };
 
@@ -151,6 +152,7 @@ OclExtensionsString[] = {
     "cl_khr_depth_images ",
     "cl_khr_mipmap_image ",
     "cl_khr_mipmap_image_writes ",
+    "",
     NULL
 };
 
diff --git a/projects/clr/rocclr/runtime/device/hsa/hsasettings.cpp b/projects/clr/rocclr/runtime/device/hsa/hsasettings.cpp
index a2cfe55a89..bef9ca26ae 100644
--- a/projects/clr/rocclr/runtime/device/hsa/hsasettings.cpp
+++ b/projects/clr/rocclr/runtime/device/hsa/hsasettings.cpp
@@ -63,6 +63,7 @@ Settings::create(bool doublePrecision)
         // Also enable AMD double precision extension?
         enableExtension(ClAmdFp64);
     }
+    enableExtension(ClKhrIlProgram);
 
     // Override current device settings
     override();