Merge branch 'main' into cl_khr_unified_svm

Author: bashbaug

.github/workflows/presubmit.yml

@@ -73,7 +73,7 @@ jobs:
       - name: Install Vulkan SDK
         uses: humbletim/install-vulkan-sdk@main
         with:
-          version: 1.3.275.0
+          version: 1.4.309.0
           cache: true
       - name: Install Android NDK
         if: ${{ matrix.arch == 'android-arm' || matrix.arch == 'android-aarch64' }}

test_conformance/api/test_sub_group_dispatch.cpp

@@ -102,10 +102,13 @@ REGISTER_TEST_VERSION(sub_group_dispatch, Version(2, 1))
     out = clCreateBuffer(context, CL_MEM_READ_WRITE | CL_MEM_ALLOC_HOST_PTR, sizeof(size_t), NULL, &error);
     test_error(error, "clCreateBuffer failed");
 
-    error = clGetDeviceInfo(device, CL_DEVICE_MAX_WORK_GROUP_SIZE,
-                            sizeof(size_t), &max_local, NULL);
+    size_t max_work_item_sizes[3] = {};
+    error = clGetDeviceInfo(device, CL_DEVICE_MAX_WORK_ITEM_SIZES,
+                            sizeof(max_work_item_sizes), &max_work_item_sizes,
+                            nullptr);
     test_error(error, "clGetDeviceInfo failed");
 
+    max_local = max_work_item_sizes[0];
 
     error = clGetDeviceInfo(device, CL_DEVICE_PLATFORM, sizeof(platform),
                             (void *)&platform, NULL);

test_conformance/basic/main.cpp

@@ -14,151 +14,12 @@
 // limitations under the License.
 //
 #include "harness/compat.h"
-
-#if !defined(_WIN32)
-#include <unistd.h>
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <CL/cl_half.h>
-
+#include "harness/deviceInfo.h"
+#include "harness/kernelHelpers.h"
 #include "harness/testHarness.h"
-#include "procs.h"
-
-test_definition test_list[] = {
-    ADD_TEST(hostptr),
-    ADD_TEST(fpmath),
-    ADD_TEST(intmath_int),
-    ADD_TEST(intmath_int2),
-    ADD_TEST(intmath_int4),
-    ADD_TEST(intmath_long),
-    ADD_TEST(intmath_long2),
-    ADD_TEST(intmath_long4),
-    ADD_TEST(hiloeo),
-    ADD_TEST(if),
-    ADD_TEST(sizeof),
-    ADD_TEST(loop),
-    ADD_TEST(pointer_cast),
-    ADD_TEST(local_arg_def),
-    ADD_TEST(local_kernel_def),
-    ADD_TEST(local_kernel_scope),
-    ADD_TEST(constant),
-    ADD_TEST(constant_source),
-    ADD_TEST(readimage),
-    ADD_TEST(readimage_int16),
-    ADD_TEST(readimage_fp32),
-    ADD_TEST(writeimage),
-    ADD_TEST(writeimage_int16),
-    ADD_TEST(writeimage_fp32),
-    ADD_TEST(mri_one),
-
-    ADD_TEST(mri_multiple),
-    ADD_TEST(image_r8),
-    ADD_TEST(barrier),
-    ADD_TEST_VERSION(wg_barrier, Version(2, 0)),
-    ADD_TEST(int2fp),
-    ADD_TEST(fp2int),
-    ADD_TEST(imagereadwrite),
-    ADD_TEST(imagereadwrite3d),
-    ADD_TEST(readimage3d),
-    ADD_TEST(readimage3d_int16),
-    ADD_TEST(readimage3d_fp32),
-    ADD_TEST(bufferreadwriterect),
-    ADD_TEST(arrayreadwrite),
-    ADD_TEST(arraycopy),
-    ADD_TEST(imagearraycopy),
-    ADD_TEST(imagearraycopy3d),
-    ADD_TEST(imagecopy),
-    ADD_TEST(imagecopy3d),
-    ADD_TEST(imagerandomcopy),
-    ADD_TEST(arrayimagecopy),
-    ADD_TEST(arrayimagecopy3d),
-    ADD_TEST(imagenpot),
-
-    ADD_TEST(vload_global),
-    ADD_TEST(vload_local),
-    ADD_TEST(vload_constant),
-    ADD_TEST(vload_private),
-    ADD_TEST(vstore_global),
-    ADD_TEST(vstore_local),
-    ADD_TEST(vstore_private),
-
-    ADD_TEST(createkernelsinprogram),
-    ADD_TEST(imagedim_pow2),
-    ADD_TEST(imagedim_non_pow2),
-    ADD_TEST(image_param),
-    ADD_TEST(image_multipass_integer_coord),
-    ADD_TEST(image_multipass_float_coord),
-
-    ADD_TEST(explicit_s2v),
-
-    ADD_TEST(enqueue_map_buffer),
-    ADD_TEST(enqueue_map_image),
 
-    ADD_TEST(work_item_functions),
-    ADD_TEST(work_item_functions_out_of_range),
-    ADD_TEST(work_item_functions_out_of_range_hardcoded),
-
-    ADD_TEST(astype),
-
-    ADD_TEST(async_copy_global_to_local),
-    ADD_TEST(async_copy_local_to_global),
-    ADD_TEST(async_strided_copy_global_to_local),
-    ADD_TEST(async_strided_copy_local_to_global),
-    ADD_TEST(async_copy_global_to_local2D),
-    ADD_TEST(async_copy_local_to_global2D),
-    ADD_TEST(async_copy_global_to_local3D),
-    ADD_TEST(async_copy_local_to_global3D),
-    ADD_TEST(async_work_group_copy_fence_import_after_export_aliased_local),
-    ADD_TEST(async_work_group_copy_fence_import_after_export_aliased_global),
-    ADD_TEST(
-        async_work_group_copy_fence_import_after_export_aliased_global_and_local),
-    ADD_TEST(async_work_group_copy_fence_export_after_import_aliased_local),
-    ADD_TEST(async_work_group_copy_fence_export_after_import_aliased_global),
-    ADD_TEST(
-        async_work_group_copy_fence_export_after_import_aliased_global_and_local),
-    ADD_TEST(prefetch),
-    ADD_TEST(kernel_call_kernel_function),
-    ADD_TEST(host_numeric_constants),
-    ADD_TEST(kernel_numeric_constants),
-    ADD_TEST(kernel_limit_constants),
-    ADD_TEST(kernel_preprocessor_macros),
-    ADD_TEST(parameter_types),
-    ADD_TEST(vector_creation),
-    ADD_TEST(vector_swizzle),
-    ADD_TEST(vec_type_hint),
-    ADD_TEST(kernel_memory_alignment_local),
-    ADD_TEST(kernel_memory_alignment_global),
-    ADD_TEST(kernel_memory_alignment_constant),
-    ADD_TEST(kernel_memory_alignment_private),
-
-    ADD_TEST_VERSION(progvar_prog_scope_misc, Version(2, 0)),
-    ADD_TEST_VERSION(progvar_prog_scope_uninit, Version(2, 0)),
-    ADD_TEST_VERSION(progvar_prog_scope_init, Version(2, 0)),
-    ADD_TEST_VERSION(progvar_func_scope, Version(2, 0)),
-
-    ADD_TEST(global_work_offsets),
-    ADD_TEST(get_global_offset),
-
-    ADD_TEST_VERSION(global_linear_id, Version(2, 0)),
-    ADD_TEST_VERSION(local_linear_id, Version(2, 0)),
-    ADD_TEST_VERSION(enqueued_local_size, Version(2, 0)),
-
-    ADD_TEST(simple_read_image_pitch),
-    ADD_TEST(simple_write_image_pitch),
-
-#if defined(__APPLE__)
-    ADD_TEST(queue_priority),
-#endif
-
-    ADD_TEST_VERSION(get_linear_ids, Version(2, 0)),
-    ADD_TEST_VERSION(rw_image_access_qualifier, Version(2, 0)),
-};
+#include <CL/cl_half.h>
 
-const int test_num = ARRAY_SIZE( test_list );
 cl_half_rounding_mode halfRoundingMode = CL_HALF_RTE;
 
 test_status InitCL(cl_device_id device)
@@ -187,7 +48,7 @@ test_status InitCL(cl_device_id device)
 
 int main(int argc, const char *argv[])
 {
-    return runTestHarnessWithCheck(argc, argv, test_num, test_list, false, 0,
-                                   InitCL);
+    return runTestHarnessWithCheck(
+        argc, argv, test_registry::getInstance().num_tests(),
+        test_registry::getInstance().definitions(), false, 0, InitCL);
 }
-