From 8e03195706da7189d2453e89f4ef51851e9da9c2 Mon Sep 17 00:00:00 2001
From: Jeremy Kemp <609015+Jeremy-Kemp@users.noreply.github.com>
Date: Tue, 16 Apr 2019 14:46:25 +0100
Subject: [PATCH] cl22: Compiler - updated extension list for
 compiler_defines_for_exensions (#176)

* cl12: Compiler - added missing extensions to compiler_defines_for_extensions.

Updated the list of known extensions to include all extensions referenced in the OpenCL Extension Specification 1.2 - Revision 25 and OpenCL Specification 1.2 - Revision 19 documents.

* Re-added the cl_khr_il_program extension.

This was this was erroneously removed in the previous commit.

* Compiler: Added all known extensions to compiler_defines_for_extensions.

After discussion on the pull request, it was decided to have this test test for all known khr extensions accross all API levels. Some vendors support 2.x extensions on 1.x implementations, so wanted to ensure that the test still covered those cases.

Re-ordered each sub-list so that the order in which each extension appears mirrors that of https://www.khronos.org/registry/OpenCL/specs/2.2/html/OpenCL_Ext.html.

For reference: https://github.com/KhronosGroup/OpenCL-CTS/pull/55.

* Compiler: Moved priority and throttle hints to the API-only section of the array in compiler_defines_for_extensions.
---
 .../test_compiler_defines_for_extensions.cpp  | 41 +++++++++++--------
 1 file changed, 23 insertions(+), 18 deletions(-)

diff --git a/test_conformance/compiler/test_compiler_defines_for_extensions.cpp b/test_conformance/compiler/test_compiler_defines_for_extensions.cpp
index a72b0d4c..ca89c70e 100644
--- a/test_conformance/compiler/test_compiler_defines_for_extensions.cpp
+++ b/test_conformance/compiler/test_compiler_defines_for_extensions.cpp
@@ -24,6 +24,9 @@
 
 
 const char *known_extensions[] = {
+    "cl_khr_byte_addressable_store",
+    "cl_khr_3d_image_writes",
+    "cl_khr_fp16",
     "cl_khr_fp64",
     "cl_khr_global_int32_base_atomics",
     "cl_khr_global_int32_extended_atomics",
@@ -31,37 +34,39 @@ const char *known_extensions[] = {
     "cl_khr_local_int32_extended_atomics",
     "cl_khr_int64_base_atomics",
     "cl_khr_int64_extended_atomics",
-    "cl_khr_3d_image_writes",
-    "cl_khr_byte_addressable_store",
-    "cl_khr_fp16",
+    "cl_khr_select_fprounding_mode",
+    "cl_khr_depth_images",
+    "cl_khr_gl_depth_images",
+    "cl_khr_gl_msaa_sharing",
+    "cl_khr_device_enqueue_local_arg_types",
+    "cl_khr_subgroups",
+    "cl_khr_mipmap_image",
+    "cl_khr_mipmap_image_writes",
+    "cl_khr_srgb_image_writes",
+    "cl_khr_subgroup_named_barrier",
+
+    //API-only extensions after this point.  If you add above here, modify first_API_extension below.
+    "cl_khr_icd",
     "cl_khr_gl_sharing",
     "cl_khr_gl_event",
     "cl_khr_d3d10_sharing",
     "cl_khr_d3d11_sharing",
-    "cl_khr_icd",
     "cl_khr_dx9_media_sharing",
-    "cl_khr_depth_images",
-    "cl_khr_gl_depth_images",
-    "cl_khr_gl_msaa_sharing",
+    "cl_khr_egl_event",
+    "cl_khr_egl_image",
     "cl_khr_image2d_from_buffer",
+    "cl_khr_spir",
+    "cl_khr_il_program",
+    "cl_khr_create_command_queue",
     "cl_khr_initialize_memory",
     "cl_khr_terminate_context",
-    "cl_khr_spir",
-    "cl_khr_srgb_image_writes",
-    "cl_khr_subgroups",
-    "cl_khr_mipmap_image",
-    "cl_khr_mipmap_image_writes",
-    "cl_khr_egl_image",
-    "cl_khr_egl_event",
-    "cl_khr_throttle_hints",
     "cl_khr_priority_hints",
-    "cl_khr_create_command_queue",
-    "cl_khr_il_program",
+    "cl_khr_throttle_hints",
     "cl_khr_spirv_no_integer_wrap_decoration",
 };
 
 size_t num_known_extensions = sizeof(known_extensions)/sizeof(char*);
-size_t first_API_extension = 10;
+size_t first_API_extension = 20;
 
 const char *known_embedded_extensions[] = {
     "cles_khr_int64",