From d7e8e5040acc9fade7dea6c613ce066e1b367646 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Petit?= Date: Thu, 14 Nov 2019 17:26:32 +0000 Subject: [PATCH] Mark SVM and pipes tests as requiring OpenCL 2.0 (#475) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Kévin Petit --- test_conformance/SVM/main.cpp | 26 ++++---- test_conformance/pipes/main.c | 110 +++++++++++++++++----------------- 2 files changed, 68 insertions(+), 68 deletions(-) diff --git a/test_conformance/SVM/main.cpp b/test_conformance/SVM/main.cpp index 7ce175a6..ba48de82 100644 --- a/test_conformance/SVM/main.cpp +++ b/test_conformance/SVM/main.cpp @@ -262,19 +262,19 @@ cl_int create_cl_objects(cl_device_id device_from_harness, const char** ppCodeSt } test_definition test_list[] = { - ADD_TEST( svm_byte_granularity ), - ADD_TEST( svm_set_kernel_exec_info_svm_ptrs ), - ADD_TEST( svm_fine_grain_memory_consistency ), - ADD_TEST( svm_fine_grain_sync_buffers ), - ADD_TEST( svm_shared_address_space_fine_grain ), - ADD_TEST( svm_shared_sub_buffers ), - ADD_TEST( svm_shared_address_space_fine_grain_buffers ), - ADD_TEST( svm_allocate_shared_buffer ), - ADD_TEST( svm_shared_address_space_coarse_grain_old_api ), - ADD_TEST( svm_shared_address_space_coarse_grain_new_api ), - ADD_TEST( svm_cross_buffer_pointers_coarse_grain ), - ADD_TEST( svm_pointer_passing ), - ADD_TEST( svm_enqueue_api ), + ADD_TEST_VERSION( svm_byte_granularity, Version(2, 0) ), + ADD_TEST_VERSION( svm_set_kernel_exec_info_svm_ptrs, Version(2, 0) ), + ADD_TEST_VERSION( svm_fine_grain_memory_consistency, Version(2, 0) ), + ADD_TEST_VERSION( svm_fine_grain_sync_buffers, Version(2, 0) ), + ADD_TEST_VERSION( svm_shared_address_space_fine_grain, Version(2, 0) ), + ADD_TEST_VERSION( svm_shared_sub_buffers, Version(2, 0) ), + ADD_TEST_VERSION( svm_shared_address_space_fine_grain_buffers, Version(2, 0) ), + ADD_TEST_VERSION( svm_allocate_shared_buffer, Version(2, 0) ), + ADD_TEST_VERSION( svm_shared_address_space_coarse_grain_old_api, Version(2, 0) ), + ADD_TEST_VERSION( svm_shared_address_space_coarse_grain_new_api, Version(2, 0) ), + ADD_TEST_VERSION( svm_cross_buffer_pointers_coarse_grain, Version(2, 0) ), + ADD_TEST_VERSION( svm_pointer_passing, Version(2, 0) ), + ADD_TEST_VERSION( svm_enqueue_api, Version(2, 0) ), ADD_TEST_VERSION( svm_migrate, Version(2, 1)), }; diff --git a/test_conformance/pipes/main.c b/test_conformance/pipes/main.c index 2165c1cc..e4390338 100644 --- a/test_conformance/pipes/main.c +++ b/test_conformance/pipes/main.c @@ -21,61 +21,61 @@ #include "harness/testHarness.h" test_definition test_list[] = { - ADD_TEST( pipe_readwrite_int ), - ADD_TEST( pipe_readwrite_uint ), - ADD_TEST( pipe_readwrite_long ), - ADD_TEST( pipe_readwrite_ulong ), - ADD_TEST( pipe_readwrite_short ), - ADD_TEST( pipe_readwrite_ushort ), - ADD_TEST( pipe_readwrite_float ), - ADD_TEST( pipe_readwrite_half ), - ADD_TEST( pipe_readwrite_char ), - ADD_TEST( pipe_readwrite_uchar ), - ADD_TEST( pipe_readwrite_double ), - ADD_TEST( pipe_readwrite_struct ), - ADD_TEST( pipe_workgroup_readwrite_int ), - ADD_TEST( pipe_workgroup_readwrite_uint ), - ADD_TEST( pipe_workgroup_readwrite_long ), - ADD_TEST( pipe_workgroup_readwrite_ulong ), - ADD_TEST( pipe_workgroup_readwrite_short ), - ADD_TEST( pipe_workgroup_readwrite_ushort ), - ADD_TEST( pipe_workgroup_readwrite_float ), - ADD_TEST( pipe_workgroup_readwrite_half ), - ADD_TEST( pipe_workgroup_readwrite_char ), - ADD_TEST( pipe_workgroup_readwrite_uchar ), - ADD_TEST( pipe_workgroup_readwrite_double ), - ADD_TEST( pipe_workgroup_readwrite_struct ), - ADD_TEST( pipe_subgroup_readwrite_int ), - ADD_TEST( pipe_subgroup_readwrite_uint ), - ADD_TEST( pipe_subgroup_readwrite_long ), - ADD_TEST( pipe_subgroup_readwrite_ulong ), - ADD_TEST( pipe_subgroup_readwrite_short ), - ADD_TEST( pipe_subgroup_readwrite_ushort ), - ADD_TEST( pipe_subgroup_readwrite_float ), - ADD_TEST( pipe_subgroup_readwrite_half ), - ADD_TEST( pipe_subgroup_readwrite_char ), - ADD_TEST( pipe_subgroup_readwrite_uchar ), - ADD_TEST( pipe_subgroup_readwrite_double ), - ADD_TEST( pipe_subgroup_readwrite_struct ), - ADD_TEST( pipe_convenience_readwrite_int ), - ADD_TEST( pipe_convenience_readwrite_uint ), - ADD_TEST( pipe_convenience_readwrite_long ), - ADD_TEST( pipe_convenience_readwrite_ulong ), - ADD_TEST( pipe_convenience_readwrite_short ), - ADD_TEST( pipe_convenience_readwrite_ushort ), - ADD_TEST( pipe_convenience_readwrite_float ), - ADD_TEST( pipe_convenience_readwrite_half ), - ADD_TEST( pipe_convenience_readwrite_char ), - ADD_TEST( pipe_convenience_readwrite_uchar ), - ADD_TEST( pipe_convenience_readwrite_double ), - ADD_TEST( pipe_convenience_readwrite_struct ), - ADD_TEST( pipe_info ), - ADD_TEST( pipe_max_args ), - ADD_TEST( pipe_max_packet_size ), - ADD_TEST( pipe_max_active_reservations ), - ADD_TEST( pipe_query_functions ), - ADD_TEST( pipe_readwrite_errors ), - ADD_TEST( pipe_subgroups_divergence ), + ADD_TEST_VERSION( pipe_readwrite_int, Version(2, 0) ), + ADD_TEST_VERSION( pipe_readwrite_uint, Version(2, 0) ), + ADD_TEST_VERSION( pipe_readwrite_long, Version(2, 0) ), + ADD_TEST_VERSION( pipe_readwrite_ulong, Version(2, 0) ), + ADD_TEST_VERSION( pipe_readwrite_short, Version(2, 0) ), + ADD_TEST_VERSION( pipe_readwrite_ushort, Version(2, 0) ), + ADD_TEST_VERSION( pipe_readwrite_float, Version(2, 0) ), + ADD_TEST_VERSION( pipe_readwrite_half, Version(2, 0) ), + ADD_TEST_VERSION( pipe_readwrite_char, Version(2, 0) ), + ADD_TEST_VERSION( pipe_readwrite_uchar, Version(2, 0) ), + ADD_TEST_VERSION( pipe_readwrite_double, Version(2, 0) ), + ADD_TEST_VERSION( pipe_readwrite_struct, Version(2, 0) ), + ADD_TEST_VERSION( pipe_workgroup_readwrite_int, Version(2, 0) ), + ADD_TEST_VERSION( pipe_workgroup_readwrite_uint, Version(2, 0) ), + ADD_TEST_VERSION( pipe_workgroup_readwrite_long, Version(2, 0) ), + ADD_TEST_VERSION( pipe_workgroup_readwrite_ulong, Version(2, 0) ), + ADD_TEST_VERSION( pipe_workgroup_readwrite_short, Version(2, 0) ), + ADD_TEST_VERSION( pipe_workgroup_readwrite_ushort, Version(2, 0) ), + ADD_TEST_VERSION( pipe_workgroup_readwrite_float, Version(2, 0) ), + ADD_TEST_VERSION( pipe_workgroup_readwrite_half, Version(2, 0) ), + ADD_TEST_VERSION( pipe_workgroup_readwrite_char, Version(2, 0) ), + ADD_TEST_VERSION( pipe_workgroup_readwrite_uchar, Version(2, 0) ), + ADD_TEST_VERSION( pipe_workgroup_readwrite_double, Version(2, 0) ), + ADD_TEST_VERSION( pipe_workgroup_readwrite_struct, Version(2, 0) ), + ADD_TEST_VERSION( pipe_subgroup_readwrite_int, Version(2, 0) ), + ADD_TEST_VERSION( pipe_subgroup_readwrite_uint, Version(2, 0) ), + ADD_TEST_VERSION( pipe_subgroup_readwrite_long, Version(2, 0) ), + ADD_TEST_VERSION( pipe_subgroup_readwrite_ulong, Version(2, 0) ), + ADD_TEST_VERSION( pipe_subgroup_readwrite_short, Version(2, 0) ), + ADD_TEST_VERSION( pipe_subgroup_readwrite_ushort, Version(2, 0) ), + ADD_TEST_VERSION( pipe_subgroup_readwrite_float, Version(2, 0) ), + ADD_TEST_VERSION( pipe_subgroup_readwrite_half, Version(2, 0) ), + ADD_TEST_VERSION( pipe_subgroup_readwrite_char, Version(2, 0) ), + ADD_TEST_VERSION( pipe_subgroup_readwrite_uchar, Version(2, 0) ), + ADD_TEST_VERSION( pipe_subgroup_readwrite_double, Version(2, 0) ), + ADD_TEST_VERSION( pipe_subgroup_readwrite_struct, Version(2, 0) ), + ADD_TEST_VERSION( pipe_convenience_readwrite_int, Version(2, 0) ), + ADD_TEST_VERSION( pipe_convenience_readwrite_uint, Version(2, 0) ), + ADD_TEST_VERSION( pipe_convenience_readwrite_long, Version(2, 0) ), + ADD_TEST_VERSION( pipe_convenience_readwrite_ulong, Version(2, 0) ), + ADD_TEST_VERSION( pipe_convenience_readwrite_short, Version(2, 0) ), + ADD_TEST_VERSION( pipe_convenience_readwrite_ushort, Version(2, 0) ), + ADD_TEST_VERSION( pipe_convenience_readwrite_float, Version(2, 0) ), + ADD_TEST_VERSION( pipe_convenience_readwrite_half, Version(2, 0) ), + ADD_TEST_VERSION( pipe_convenience_readwrite_char, Version(2, 0) ), + ADD_TEST_VERSION( pipe_convenience_readwrite_uchar, Version(2, 0) ), + ADD_TEST_VERSION( pipe_convenience_readwrite_double, Version(2, 0) ), + ADD_TEST_VERSION( pipe_convenience_readwrite_struct, Version(2, 0) ), + ADD_TEST_VERSION( pipe_info, Version(2, 0) ), + ADD_TEST_VERSION( pipe_max_args, Version(2, 0) ), + ADD_TEST_VERSION( pipe_max_packet_size, Version(2, 0) ), + ADD_TEST_VERSION( pipe_max_active_reservations, Version(2, 0) ), + ADD_TEST_VERSION( pipe_query_functions, Version(2, 0) ), + ADD_TEST_VERSION( pipe_readwrite_errors, Version(2, 0) ), + ADD_TEST_VERSION( pipe_subgroups_divergence, Version(2, 0) ), }; const int test_num = ARRAY_SIZE( test_list );