Added corrections due to clean up harness helper functions for programs and kernels (#2626)

Related to #2597

test_conformance/api/test_kernel_arg_info.cpp

@@ -487,10 +487,10 @@ compare_kernel_with_expected(cl_context context, cl_device_id device,
     int failed_tests = 0;
     clKernelWrapper kernel;
     clProgramWrapper program;
-    cl_int err = create_single_kernel_helper_with_build_options(
-        context, &program, &kernel, 1, &kernel_src, "get_kernel_arg_info",
-        get_build_options(device).c_str());
-    test_error(err, "create_single_kernel_helper_with_build_options");
+    cl_int err = create_single_kernel_helper(context, &program, &kernel, 1,
+                                             &kernel_src, "get_kernel_arg_info",
+                                             get_build_options(device).c_str());
+    test_error(err, "create_single_kernel_helper");
     for (size_t i = 0; i < expected_args.size(); ++i)
     {
         KernelArgInfo actual;
@@ -874,11 +874,10 @@ static int test_null_param(cl_context context, cl_device_id device,
 {
     clProgramWrapper program;
     clKernelWrapper kernel;
-    cl_int err = create_single_kernel_helper_with_build_options(
-        context, &program, &kernel, 1, &kernel_src, "get_kernel_arg_info",
-        get_build_options(device).c_str());
-    test_error_ret(err, "create_single_kernel_helper_with_build_options",
-                   TEST_FAIL);
+    cl_int err = create_single_kernel_helper(context, &program, &kernel, 1,
+                                             &kernel_src, "get_kernel_arg_info",
+                                             get_build_options(device).c_str());
+    test_error_ret(err, "create_single_kernel_helper", TEST_FAIL);
 
     err = clGetKernelArgInfo(kernel, SINGLE_KERNEL_ARG_NUMBER,
                              CL_KERNEL_ARG_ADDRESS_QUALIFIER, 0, nullptr,
@@ -916,12 +915,11 @@ static int test_arg_name_size(cl_context context, cl_device_id device,
     char arg_return[sizeof(KERNEL_ARGUMENT_NAME) + 1];
     clProgramWrapper program;
     clKernelWrapper kernel;
-    cl_int err = create_single_kernel_helper_with_build_options(
-        context, &program, &kernel, 1, &kernel_src, "get_kernel_arg_info",
-        get_build_options(device).c_str());
+    cl_int err = create_single_kernel_helper(context, &program, &kernel, 1,
+                                             &kernel_src, "get_kernel_arg_info",
+                                             get_build_options(device).c_str());
 
-    test_error_ret(err, "create_single_kernel_helper_with_build_options",
-                   TEST_FAIL);
+    test_error_ret(err, "create_single_kernel_helper", TEST_FAIL);
 
     err =
         clGetKernelArgInfo(kernel, SINGLE_KERNEL_ARG_NUMBER, CL_KERNEL_ARG_NAME,

test_conformance/api/test_queue_hint.cpp

@@ -86,7 +86,8 @@ REGISTER_TEST(queue_hint)
     clProgramWrapper program;
     clKernelWrapper kernel;
 
-    err = create_single_kernel_helper_with_build_options(context, &program, &kernel, 1, queue_hint_test_kernel, "vec_cpy", NULL);
+    err = create_single_kernel_helper(context, &program, &kernel, 1,
+                                      queue_hint_test_kernel, "vec_cpy");
     if (err != 0)
     {
         return err;

test_conformance/basic/test_enqueued_local_size.cpp

@@ -103,11 +103,11 @@ REGISTER_TEST_VERSION(enqueued_local_size, Version(2, 0))
 
     std::string cl_std = "-cl-std=CL";
     cl_std += (get_device_cl_version(device) == Version(3, 0)) ? "3.0" : "2.0";
-    err = create_single_kernel_helper_with_build_options(
+    err = create_single_kernel_helper(
         context, &program[0], &kernel[0], 1, &enqueued_local_size_1d_code,
         "test_enqueued_local_size_1d", cl_std.c_str());
     test_error(err, "create_single_kernel_helper failed");
-    err = create_single_kernel_helper_with_build_options(
+    err = create_single_kernel_helper(
         context, &program[1], &kernel[1], 1, &enqueued_local_size_2d_code,
         "test_enqueued_local_size_2d", cl_std.c_str());
     test_error(err, "create_single_kernel_helper failed");

test_conformance/basic/test_sizeof.cpp

@@ -50,8 +50,8 @@ cl_int get_type_size( cl_context context, cl_command_queue queue, const char *ty
     {
         sizeof_kernel_code[0] = "#pragma OPENCL EXTENSION cl_khr_fp16 : enable\n";
     }
-    cl_int err = create_single_kernel_helper_with_build_options(
-        context, &p, &k, 4, sizeof_kernel_code, "test_sizeof", nullptr);
+    cl_int err = create_single_kernel_helper(context, &p, &k, 4,
+                                             sizeof_kernel_code, "test_sizeof");
     test_error(err, "Failed to build kernel/program.");
 
     m = clCreateBuffer( context, CL_MEM_WRITE_ONLY | CL_MEM_COPY_HOST_PTR, sizeof( cl_ulong ), size, &err );

test_conformance/c11_atomics/common.h

@@ -1245,9 +1245,8 @@ int CBasicTest<HostAtomicType, HostDataType>::ExecuteSingleTest(
             programSource = PragmaHeader(deviceID) + ProgramHeader(numDestItems)
                 + FunctionCode() + KernelCode(numDestItems);
             programLine = programSource.c_str();
-            if (create_single_kernel_helper_with_build_options(
-                    context, &program, &kernel, 1, &programLine,
-                    "test_atomic_kernel", gOldAPI ? "" : nullptr))
+            if (create_single_kernel_helper(context, &program, &kernel, 1,
+                                            &programLine, "test_atomic_kernel"))
             {
                 return -1;
             }

test_conformance/extensions/cl_ext_cxx_for_opencl/cxx_for_opencl_ext.cpp

@@ -42,8 +42,8 @@ int test_cxx_for_opencl(cl_device_id device, cl_context context,
             execute(*p, x);
         })";
 
-    error = create_single_kernel_helper_with_build_options(
-        context, &program, &kernel1, 1, &kernel_sstr, "k1", "-cl-std=CLC++");
+    error = create_single_kernel_helper(context, &program, &kernel1, 1,
+                                        &kernel_sstr, "k1", "-cl-std=CLC++");
     test_error(error, "Failed to create k1 kernel");
 
     kernel2 = clCreateKernel(program, "k2", &error);

test_conformance/gl/test_images_write_common.cpp

@@ -336,9 +336,8 @@ int test_cl_image_write(cl_context context, cl_command_queue queue,
             get_explicit_type_name(*outType), suffix, convert);
 
     programPtr = kernelSource;
-    if (create_single_kernel_helper_with_build_options(
-            context, &program, &kernel, 1, (const char **)&programPtr,
-            "sample_test", ""))
+    if (create_single_kernel_helper(context, &program, &kernel, 1,
+                                    (const char **)&programPtr, "sample_test"))
     {
         return -1;
     }

test_conformance/non_uniform_work_group/TestNonUniformWorkGroup.cpp

@@ -557,8 +557,9 @@ int TestNonUniformWorkGroup::prepareDevice () {
   if (_testRange & Range::BARRIERS)
     buildOptions += " -D TESTBARRIERS";
 
-  err = create_single_kernel_helper_with_build_options (_context, &_program, &_testKernel, 1,
-    &KERNEL_FUNCTION, "testKernel", buildOptions.c_str());
+  err = create_single_kernel_helper(_context, &_program, &_testKernel, 1,
+                                    &KERNEL_FUNCTION, "testKernel",
+                                    buildOptions.c_str());
   if (err)
   {
     log_error("Error %d in line: %d of file %s\n", err, __LINE__, __FILE__);
@@ -842,8 +843,9 @@ int SubTestExecutor::calculateWorkGroupSize(size_t &maxWgSize, int testRange) {
   if (testRange & Range::BARRIERS)
     buildOptions += " -D TESTBARRIERS";
 
-  err = create_single_kernel_helper_with_build_options (_context, &program, &testKernel, 1,
-    &KERNEL_FUNCTION, "testKernel", buildOptions.c_str());
+  err = create_single_kernel_helper(_context, &program, &testKernel, 1,
+                                    &KERNEL_FUNCTION, "testKernel",
+                                    buildOptions.c_str());
   if (err)
   {
     log_error("Error %d in line: %d of file %s\n", err, __LINE__, __FILE__);

test_conformance/pipes/test_pipe_info.cpp

@@ -63,9 +63,9 @@ REGISTER_TEST(pipe_info)
         log_info( " CL_PIPE_MAX_PACKETS passed.\n" );
     }
 
-    err = create_single_kernel_helper_with_build_options(
-        context, &program, &kernel, 1, &pipe_kernel_code, "pipe_kernel",
-        "-cl-std=CL2.0 -cl-kernel-arg-info");
+    err = create_single_kernel_helper(context, &program, &kernel, 1,
+                                      &pipe_kernel_code, "pipe_kernel",
+                                      "-cl-std=CL2.0 -cl-kernel-arg-info");
     test_error_fail(err, "Error creating program");
 
     cl_kernel_arg_type_qualifier arg_type_qualifier = 0;