From 581d9ea9902c690db52a0982e39ae7f1771604c4 Mon Sep 17 00:00:00 2001
From: Jack Frankland <30410009+FranklandJack@users.noreply.github.com>
Date: Tue, 1 Sep 2020 00:14:10 +0200
Subject: [PATCH] Dynamically select `-cl-std` Build Option for
 `get_(global|local)_linear_id` (#876)

* Dynamically select the build option `-cl-std` for the
`get_(global|local)_linear_id()` builtin based on the device version
of the driver.
---
 test_conformance/basic/test_get_linear_ids.cpp   | 3 ++-
 test_conformance/basic/test_global_linear_id.cpp | 8 ++++++--
 test_conformance/basic/test_local_linear_id.cpp  | 8 ++++++--
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/test_conformance/basic/test_get_linear_ids.cpp b/test_conformance/basic/test_get_linear_ids.cpp
index fba200a2..3496fd0b 100644
--- a/test_conformance/basic/test_get_linear_ids.cpp
+++ b/test_conformance/basic/test_get_linear_ids.cpp
@@ -59,7 +59,8 @@ test_get_linear_ids(cl_device_id device, cl_context context, cl_command_queue qu
 
 
     // Create the kernel
-    error = create_single_kernel_helper_with_build_options(context, &program, &kernel, 1, linear_ids_source, "test_linear_ids", "-cl-std=CL2.0");
+    error = create_single_kernel_helper(context, &program, &kernel, 1,
+                                        linear_ids_source, "test_linear_ids");
     if (error)
         return error;
 
diff --git a/test_conformance/basic/test_global_linear_id.cpp b/test_conformance/basic/test_global_linear_id.cpp
index 7bed5b88..b14b3bbb 100644
--- a/test_conformance/basic/test_global_linear_id.cpp
+++ b/test_conformance/basic/test_global_linear_id.cpp
@@ -80,9 +80,13 @@ test_global_linear_id(cl_device_id device, cl_context context, cl_command_queue
     streams = clCreateBuffer(context, (cl_mem_flags)(CL_MEM_READ_WRITE), length*sizeof(int), NULL, &err);
     test_error( err, "clCreateBuffer failed.");
 
-    err = create_single_kernel_helper_with_build_options(context, &program[0], &kernel[0], 1, &global_linear_id_1d_code, "test_global_linear_id_1d", "-cl-std=CL2.0");
+    err = create_single_kernel_helper(context, &program[0], &kernel[0], 1,
+                                      &global_linear_id_1d_code,
+                                      "test_global_linear_id_1d");
     test_error( err, "create_single_kernel_helper failed");
-    err = create_single_kernel_helper_with_build_options(context, &program[1], &kernel[1], 1, &global_linear_id_2d_code, "test_global_linear_id_2d", "-cl-std=CL2.0");
+    err = create_single_kernel_helper(context, &program[1], &kernel[1], 1,
+                                      &global_linear_id_2d_code,
+                                      "test_global_linear_id_2d");
     test_error( err, "create_single_kernel_helper failed");
 
     err  = clSetKernelArg(kernel[0], 0, sizeof streams, &streams);
diff --git a/test_conformance/basic/test_local_linear_id.cpp b/test_conformance/basic/test_local_linear_id.cpp
index cdf5ee69..da6af0d7 100644
--- a/test_conformance/basic/test_local_linear_id.cpp
+++ b/test_conformance/basic/test_local_linear_id.cpp
@@ -81,9 +81,13 @@ test_local_linear_id(cl_device_id device, cl_context context, cl_command_queue q
     streams = clCreateBuffer(context, (cl_mem_flags)(CL_MEM_READ_WRITE), length*sizeof(int), NULL, &err);
     test_error( err, "clCreateBuffer failed.");
 
-    err = create_single_kernel_helper_with_build_options(context, &program[0], &kernel[0], 1, &local_linear_id_1d_code, "test_local_linear_id_1d", "-cl-std=CL2.0");
+    err = create_single_kernel_helper(context, &program[0], &kernel[0], 1,
+                                      &local_linear_id_1d_code,
+                                      "test_local_linear_id_1d");
     test_error( err, "create_single_kernel_helper failed");
-    err = create_single_kernel_helper_with_build_options(context, &program[1], &kernel[1], 1, &local_linear_id_2d_code, "test_local_linear_id_2d", "-cl-std=CL2.0");
+    err = create_single_kernel_helper(context, &program[1], &kernel[1], 1,
+                                      &local_linear_id_2d_code,
+                                      "test_local_linear_id_2d");
     test_error( err, "create_single_kernel_helper failed");
 
     err  = clSetKernelArg(kernel[0], 0, sizeof streams, &streams);