diff --git a/test_conformance/c11_atomics/main.cpp b/test_conformance/c11_atomics/main.cpp index 3132c40d..4b37f745 100644 --- a/test_conformance/c11_atomics/main.cpp +++ b/test_conformance/c11_atomics/main.cpp @@ -29,84 +29,6 @@ int gMaxDeviceThreads = 1024; // maximum number of threads executed on OCL devic cl_device_atomic_capabilities gAtomicMemCap, gAtomicFenceCap; // atomic memory and fence capabilities for this device -extern int test_atomic_init(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements); -extern int test_atomic_store(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements); -extern int test_atomic_load(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements); -extern int test_atomic_store_load(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements); -extern int test_atomic_exchange(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements); -extern int test_atomic_compare_exchange_weak(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements); -extern int test_atomic_compare_exchange_strong(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements); -extern int test_atomic_fetch_add(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements); -extern int test_atomic_fetch_sub(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements); -extern int test_atomic_fetch_and(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements); -extern int test_atomic_fetch_or(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements); -extern int test_atomic_fetch_orand(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements); -extern int test_atomic_fetch_xor(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements); -extern int test_atomic_fetch_xor2(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements); -extern int test_atomic_fetch_min(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements); -extern int test_atomic_fetch_max(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements); -extern int test_atomic_flag(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements); -extern int test_atomic_fence(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements); - -extern int test_svm_atomic_init(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements); -extern int test_svm_atomic_store(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements); -extern int test_svm_atomic_load(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements); -extern int test_svm_atomic_store_load(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements); -extern int test_svm_atomic_exchange(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements); -extern int test_svm_atomic_compare_exchange_weak(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements); -extern int test_svm_atomic_compare_exchange_strong(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements); -extern int test_svm_atomic_fetch_add(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements); -extern int test_svm_atomic_fetch_sub(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements); -extern int test_svm_atomic_fetch_and(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements); -extern int test_svm_atomic_fetch_or(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements); -extern int test_svm_atomic_fetch_orand(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements); -extern int test_svm_atomic_fetch_xor(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements); -extern int test_svm_atomic_fetch_xor2(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements); -extern int test_svm_atomic_fetch_min(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements); -extern int test_svm_atomic_fetch_max(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements); -extern int test_svm_atomic_flag(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements); -extern int test_svm_atomic_fence(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements); - -test_definition test_list[] = { - ADD_TEST( atomic_init ), - ADD_TEST( atomic_store ), - ADD_TEST( atomic_load ), - ADD_TEST( atomic_exchange ), - ADD_TEST( atomic_compare_exchange_weak ), - ADD_TEST( atomic_compare_exchange_strong ), - ADD_TEST( atomic_fetch_add ), - ADD_TEST( atomic_fetch_sub ), - ADD_TEST( atomic_fetch_and ), - ADD_TEST( atomic_fetch_or ), - ADD_TEST( atomic_fetch_orand ), - ADD_TEST( atomic_fetch_xor ), - ADD_TEST( atomic_fetch_xor2 ), - ADD_TEST( atomic_fetch_min ), - ADD_TEST( atomic_fetch_max ), - ADD_TEST( atomic_flag ), - ADD_TEST( atomic_fence ), - - ADD_TEST( svm_atomic_init ), - ADD_TEST( svm_atomic_store ), - ADD_TEST( svm_atomic_load ), - ADD_TEST( svm_atomic_exchange ), - ADD_TEST( svm_atomic_compare_exchange_weak ), - ADD_TEST( svm_atomic_compare_exchange_strong ), - ADD_TEST( svm_atomic_fetch_add ), - ADD_TEST( svm_atomic_fetch_sub ), - ADD_TEST( svm_atomic_fetch_and ), - ADD_TEST( svm_atomic_fetch_or ), - ADD_TEST( svm_atomic_fetch_orand ), - ADD_TEST( svm_atomic_fetch_xor ), - ADD_TEST( svm_atomic_fetch_xor2 ), - ADD_TEST( svm_atomic_fetch_min ), - ADD_TEST( svm_atomic_fetch_max ), - ADD_TEST( svm_atomic_flag ), - ADD_TEST( svm_atomic_fence ), -}; - -const int test_num = ARRAY_SIZE( test_list ); - test_status InitCL(cl_device_id device) { auto version = get_device_cl_version(device); auto expected_min_version = Version(2, 0); @@ -285,5 +207,7 @@ int main(int argc, const char *argv[]) log_info("*** Use of this mode is not sufficient to verify correctness. ***\n"); log_info("*** ***\n"); } - return runTestHarnessWithCheck(argc, argv, test_num, test_list, false, false, InitCL); + return runTestHarnessWithCheck( + argc, argv, test_registry::getInstance().num_tests(), + test_registry::getInstance().definitions(), false, false, InitCL); } diff --git a/test_conformance/c11_atomics/test_atomics.cpp b/test_conformance/c11_atomics/test_atomics.cpp index 82438a74..95e0c13f 100644 --- a/test_conformance/c11_atomics/test_atomics.cpp +++ b/test_conformance/c11_atomics/test_atomics.cpp @@ -80,9 +80,9 @@ public: } }; -int test_atomic_store_generic(cl_device_id deviceID, cl_context context, - cl_command_queue queue, int num_elements, - bool useSVM) +static int test_atomic_store_generic(cl_device_id deviceID, cl_context context, + cl_command_queue queue, int num_elements, + bool useSVM) { int error = 0; CBasicTestStore test_int(TYPE_ATOMIC_INT, @@ -156,17 +156,15 @@ int test_atomic_store_generic(cl_device_id deviceID, cl_context context, return error; } -int test_atomic_store(cl_device_id deviceID, cl_context context, - cl_command_queue queue, int num_elements) +REGISTER_TEST(atomic_store) { - return test_atomic_store_generic(deviceID, context, queue, num_elements, + return test_atomic_store_generic(device, context, queue, num_elements, false); } -int test_svm_atomic_store(cl_device_id deviceID, cl_context context, - cl_command_queue queue, int num_elements) +REGISTER_TEST(svm_atomic_store) { - return test_atomic_store_generic(deviceID, context, queue, num_elements, + return test_atomic_store_generic(device, context, queue, num_elements, true); } @@ -202,9 +200,9 @@ public: } }; -int test_atomic_init_generic(cl_device_id deviceID, cl_context context, - cl_command_queue queue, int num_elements, - bool useSVM) +static int test_atomic_init_generic(cl_device_id deviceID, cl_context context, + cl_command_queue queue, int num_elements, + bool useSVM) { int error = 0; CBasicTestInit test_int(TYPE_ATOMIC_INT, useSVM); @@ -277,18 +275,15 @@ int test_atomic_init_generic(cl_device_id deviceID, cl_context context, return error; } -int test_atomic_init(cl_device_id deviceID, cl_context context, - cl_command_queue queue, int num_elements) +REGISTER_TEST(atomic_init) { - return test_atomic_init_generic(deviceID, context, queue, num_elements, + return test_atomic_init_generic(device, context, queue, num_elements, false); } -int test_svm_atomic_init(cl_device_id deviceID, cl_context context, - cl_command_queue queue, int num_elements) +REGISTER_TEST(svm_atomic_init) { - return test_atomic_init_generic(deviceID, context, queue, num_elements, - true); + return test_atomic_init_generic(device, context, queue, num_elements, true); } template @@ -377,9 +372,9 @@ public: } }; -int test_atomic_load_generic(cl_device_id deviceID, cl_context context, - cl_command_queue queue, int num_elements, - bool useSVM) +static int test_atomic_load_generic(cl_device_id deviceID, cl_context context, + cl_command_queue queue, int num_elements, + bool useSVM) { int error = 0; CBasicTestLoad test_int(TYPE_ATOMIC_INT, useSVM); @@ -452,18 +447,15 @@ int test_atomic_load_generic(cl_device_id deviceID, cl_context context, return error; } -int test_atomic_load(cl_device_id deviceID, cl_context context, - cl_command_queue queue, int num_elements) +REGISTER_TEST(atomic_load) { - return test_atomic_load_generic(deviceID, context, queue, num_elements, + return test_atomic_load_generic(device, context, queue, num_elements, false); } -int test_svm_atomic_load(cl_device_id deviceID, cl_context context, - cl_command_queue queue, int num_elements) +REGISTER_TEST(svm_atomic_load) { - return test_atomic_load_generic(deviceID, context, queue, num_elements, - true); + return test_atomic_load_generic(device, context, queue, num_elements, true); } template @@ -568,9 +560,10 @@ public: } }; -int test_atomic_exchange_generic(cl_device_id deviceID, cl_context context, - cl_command_queue queue, int num_elements, - bool useSVM) +static int test_atomic_exchange_generic(cl_device_id deviceID, + cl_context context, + cl_command_queue queue, + int num_elements, bool useSVM) { int error = 0; CBasicTestExchange test_int(TYPE_ATOMIC_INT, @@ -644,17 +637,15 @@ int test_atomic_exchange_generic(cl_device_id deviceID, cl_context context, return error; } -int test_atomic_exchange(cl_device_id deviceID, cl_context context, - cl_command_queue queue, int num_elements) +REGISTER_TEST(atomic_exchange) { - return test_atomic_exchange_generic(deviceID, context, queue, num_elements, + return test_atomic_exchange_generic(device, context, queue, num_elements, false); } -int test_svm_atomic_exchange(cl_device_id deviceID, cl_context context, - cl_command_queue queue, int num_elements) +REGISTER_TEST(svm_atomic_exchange) { - return test_atomic_exchange_generic(deviceID, context, queue, num_elements, + return test_atomic_exchange_generic(device, context, queue, num_elements, true); } @@ -830,10 +821,11 @@ public: } }; -int test_atomic_compare_exchange_strong_generic(cl_device_id deviceID, - cl_context context, - cl_command_queue queue, - int num_elements, bool useSVM) +static int test_atomic_compare_exchange_strong_generic(cl_device_id deviceID, + cl_context context, + cl_command_queue queue, + int num_elements, + bool useSVM) { int error = 0; CBasicTestCompareStrong test_int(TYPE_ATOMIC_INT, @@ -899,21 +891,15 @@ int test_atomic_compare_exchange_strong_generic(cl_device_id deviceID, return error; } -int test_atomic_compare_exchange_strong(cl_device_id deviceID, - cl_context context, - cl_command_queue queue, - int num_elements) +REGISTER_TEST(atomic_compare_exchange_strong) { - return test_atomic_compare_exchange_strong_generic(deviceID, context, queue, + return test_atomic_compare_exchange_strong_generic(device, context, queue, num_elements, false); } -int test_svm_atomic_compare_exchange_strong(cl_device_id deviceID, - cl_context context, - cl_command_queue queue, - int num_elements) +REGISTER_TEST(svm_atomic_compare_exchange_strong) { - return test_atomic_compare_exchange_strong_generic(deviceID, context, queue, + return test_atomic_compare_exchange_strong_generic(device, context, queue, num_elements, true); } @@ -966,10 +952,11 @@ public: } }; -int test_atomic_compare_exchange_weak_generic(cl_device_id deviceID, - cl_context context, - cl_command_queue queue, - int num_elements, bool useSVM) +static int test_atomic_compare_exchange_weak_generic(cl_device_id deviceID, + cl_context context, + cl_command_queue queue, + int num_elements, + bool useSVM) { int error = 0; CBasicTestCompareWeak test_int(TYPE_ATOMIC_INT, @@ -1035,19 +1022,15 @@ int test_atomic_compare_exchange_weak_generic(cl_device_id deviceID, return error; } -int test_atomic_compare_exchange_weak(cl_device_id deviceID, cl_context context, - cl_command_queue queue, int num_elements) +REGISTER_TEST(atomic_compare_exchange_weak) { - return test_atomic_compare_exchange_weak_generic(deviceID, context, queue, + return test_atomic_compare_exchange_weak_generic(device, context, queue, num_elements, false); } -int test_svm_atomic_compare_exchange_weak(cl_device_id deviceID, - cl_context context, - cl_command_queue queue, - int num_elements) +REGISTER_TEST(svm_atomic_compare_exchange_weak) { - return test_atomic_compare_exchange_weak_generic(deviceID, context, queue, + return test_atomic_compare_exchange_weak_generic(device, context, queue, num_elements, true); } @@ -1111,9 +1094,10 @@ public: } }; -int test_atomic_fetch_add_generic(cl_device_id deviceID, cl_context context, - cl_command_queue queue, int num_elements, - bool useSVM) +static int test_atomic_fetch_add_generic(cl_device_id deviceID, + cl_context context, + cl_command_queue queue, + int num_elements, bool useSVM) { int error = 0; CBasicTestFetchAdd test_int(TYPE_ATOMIC_INT, @@ -1179,17 +1163,15 @@ int test_atomic_fetch_add_generic(cl_device_id deviceID, cl_context context, return error; } -int test_atomic_fetch_add(cl_device_id deviceID, cl_context context, - cl_command_queue queue, int num_elements) +REGISTER_TEST(atomic_fetch_add) { - return test_atomic_fetch_add_generic(deviceID, context, queue, num_elements, + return test_atomic_fetch_add_generic(device, context, queue, num_elements, false); } -int test_svm_atomic_fetch_add(cl_device_id deviceID, cl_context context, - cl_command_queue queue, int num_elements) +REGISTER_TEST(svm_atomic_fetch_add) { - return test_atomic_fetch_add_generic(deviceID, context, queue, num_elements, + return test_atomic_fetch_add_generic(device, context, queue, num_elements, true); } @@ -1238,9 +1220,10 @@ public: } }; -int test_atomic_fetch_sub_generic(cl_device_id deviceID, cl_context context, - cl_command_queue queue, int num_elements, - bool useSVM) +static int test_atomic_fetch_sub_generic(cl_device_id deviceID, + cl_context context, + cl_command_queue queue, + int num_elements, bool useSVM) { int error = 0; CBasicTestFetchSub test_int(TYPE_ATOMIC_INT, @@ -1306,17 +1289,15 @@ int test_atomic_fetch_sub_generic(cl_device_id deviceID, cl_context context, return error; } -int test_atomic_fetch_sub(cl_device_id deviceID, cl_context context, - cl_command_queue queue, int num_elements) +REGISTER_TEST(atomic_fetch_sub) { - return test_atomic_fetch_sub_generic(deviceID, context, queue, num_elements, + return test_atomic_fetch_sub_generic(device, context, queue, num_elements, false); } -int test_svm_atomic_fetch_sub(cl_device_id deviceID, cl_context context, - cl_command_queue queue, int num_elements) +REGISTER_TEST(svm_atomic_fetch_sub) { - return test_atomic_fetch_sub_generic(deviceID, context, queue, num_elements, + return test_atomic_fetch_sub_generic(device, context, queue, num_elements, true); } @@ -1389,9 +1370,10 @@ public: } }; -int test_atomic_fetch_or_generic(cl_device_id deviceID, cl_context context, - cl_command_queue queue, int num_elements, - bool useSVM) +static int test_atomic_fetch_or_generic(cl_device_id deviceID, + cl_context context, + cl_command_queue queue, + int num_elements, bool useSVM) { int error = 0; CBasicTestFetchOr test_int(TYPE_ATOMIC_INT, @@ -1457,17 +1439,15 @@ int test_atomic_fetch_or_generic(cl_device_id deviceID, cl_context context, return error; } -int test_atomic_fetch_or(cl_device_id deviceID, cl_context context, - cl_command_queue queue, int num_elements) +REGISTER_TEST(atomic_fetch_or) { - return test_atomic_fetch_or_generic(deviceID, context, queue, num_elements, + return test_atomic_fetch_or_generic(device, context, queue, num_elements, false); } -int test_svm_atomic_fetch_or(cl_device_id deviceID, cl_context context, - cl_command_queue queue, int num_elements) +REGISTER_TEST(svm_atomic_fetch_or) { - return test_atomic_fetch_or_generic(deviceID, context, queue, num_elements, + return test_atomic_fetch_or_generic(device, context, queue, num_elements, true); } @@ -1524,9 +1504,10 @@ public: } }; -int test_atomic_fetch_xor_generic(cl_device_id deviceID, cl_context context, - cl_command_queue queue, int num_elements, - bool useSVM) +static int test_atomic_fetch_xor_generic(cl_device_id deviceID, + cl_context context, + cl_command_queue queue, + int num_elements, bool useSVM) { int error = 0; CBasicTestFetchXor test_int(TYPE_ATOMIC_INT, @@ -1592,17 +1573,15 @@ int test_atomic_fetch_xor_generic(cl_device_id deviceID, cl_context context, return error; } -int test_atomic_fetch_xor(cl_device_id deviceID, cl_context context, - cl_command_queue queue, int num_elements) +REGISTER_TEST(atomic_fetch_xor) { - return test_atomic_fetch_xor_generic(deviceID, context, queue, num_elements, + return test_atomic_fetch_xor_generic(device, context, queue, num_elements, false); } -int test_svm_atomic_fetch_xor(cl_device_id deviceID, cl_context context, - cl_command_queue queue, int num_elements) +REGISTER_TEST(svm_atomic_fetch_xor) { - return test_atomic_fetch_xor_generic(deviceID, context, queue, num_elements, + return test_atomic_fetch_xor_generic(device, context, queue, num_elements, true); } @@ -1675,9 +1654,10 @@ public: } }; -int test_atomic_fetch_and_generic(cl_device_id deviceID, cl_context context, - cl_command_queue queue, int num_elements, - bool useSVM) +static int test_atomic_fetch_and_generic(cl_device_id deviceID, + cl_context context, + cl_command_queue queue, + int num_elements, bool useSVM) { int error = 0; CBasicTestFetchAnd test_int(TYPE_ATOMIC_INT, @@ -1743,17 +1723,15 @@ int test_atomic_fetch_and_generic(cl_device_id deviceID, cl_context context, return error; } -int test_atomic_fetch_and(cl_device_id deviceID, cl_context context, - cl_command_queue queue, int num_elements) +REGISTER_TEST(atomic_fetch_and) { - return test_atomic_fetch_and_generic(deviceID, context, queue, num_elements, + return test_atomic_fetch_and_generic(device, context, queue, num_elements, false); } -int test_svm_atomic_fetch_and(cl_device_id deviceID, cl_context context, - cl_command_queue queue, int num_elements) +REGISTER_TEST(svm_atomic_fetch_and) { - return test_atomic_fetch_and_generic(deviceID, context, queue, num_elements, + return test_atomic_fetch_and_generic(device, context, queue, num_elements, true); } @@ -1855,9 +1833,10 @@ public: } }; -int test_atomic_fetch_orand_generic(cl_device_id deviceID, cl_context context, - cl_command_queue queue, int num_elements, - bool useSVM) +static int test_atomic_fetch_orand_generic(cl_device_id deviceID, + cl_context context, + cl_command_queue queue, + int num_elements, bool useSVM) { int error = 0; CBasicTestFetchOrAnd test_int(TYPE_ATOMIC_INT, @@ -1923,18 +1902,16 @@ int test_atomic_fetch_orand_generic(cl_device_id deviceID, cl_context context, return error; } -int test_atomic_fetch_orand(cl_device_id deviceID, cl_context context, - cl_command_queue queue, int num_elements) +REGISTER_TEST(atomic_fetch_orand) { - return test_atomic_fetch_orand_generic(deviceID, context, queue, - num_elements, false); + return test_atomic_fetch_orand_generic(device, context, queue, num_elements, + false); } -int test_svm_atomic_fetch_orand(cl_device_id deviceID, cl_context context, - cl_command_queue queue, int num_elements) +REGISTER_TEST(svm_atomic_fetch_orand) { - return test_atomic_fetch_orand_generic(deviceID, context, queue, - num_elements, true); + return test_atomic_fetch_orand_generic(device, context, queue, num_elements, + true); } template @@ -2035,9 +2012,10 @@ public: } }; -int test_atomic_fetch_xor2_generic(cl_device_id deviceID, cl_context context, - cl_command_queue queue, int num_elements, - bool useSVM) +static int test_atomic_fetch_xor2_generic(cl_device_id deviceID, + cl_context context, + cl_command_queue queue, + int num_elements, bool useSVM) { int error = 0; CBasicTestFetchXor2 test_int(TYPE_ATOMIC_INT, @@ -2103,18 +2081,16 @@ int test_atomic_fetch_xor2_generic(cl_device_id deviceID, cl_context context, return error; } -int test_atomic_fetch_xor2(cl_device_id deviceID, cl_context context, - cl_command_queue queue, int num_elements) +REGISTER_TEST(atomic_fetch_xor2) { - return test_atomic_fetch_xor2_generic(deviceID, context, queue, - num_elements, false); + return test_atomic_fetch_xor2_generic(device, context, queue, num_elements, + false); } -int test_svm_atomic_fetch_xor2(cl_device_id deviceID, cl_context context, - cl_command_queue queue, int num_elements) +REGISTER_TEST(svm_atomic_fetch_xor2) { - return test_atomic_fetch_xor2_generic(deviceID, context, queue, - num_elements, true); + return test_atomic_fetch_xor2_generic(device, context, queue, num_elements, + true); } template @@ -2170,9 +2146,10 @@ public: } }; -int test_atomic_fetch_min_generic(cl_device_id deviceID, cl_context context, - cl_command_queue queue, int num_elements, - bool useSVM) +static int test_atomic_fetch_min_generic(cl_device_id deviceID, + cl_context context, + cl_command_queue queue, + int num_elements, bool useSVM) { int error = 0; CBasicTestFetchMin test_int(TYPE_ATOMIC_INT, @@ -2238,17 +2215,15 @@ int test_atomic_fetch_min_generic(cl_device_id deviceID, cl_context context, return error; } -int test_atomic_fetch_min(cl_device_id deviceID, cl_context context, - cl_command_queue queue, int num_elements) +REGISTER_TEST(atomic_fetch_min) { - return test_atomic_fetch_min_generic(deviceID, context, queue, num_elements, + return test_atomic_fetch_min_generic(device, context, queue, num_elements, false); } -int test_svm_atomic_fetch_min(cl_device_id deviceID, cl_context context, - cl_command_queue queue, int num_elements) +REGISTER_TEST(svm_atomic_fetch_min) { - return test_atomic_fetch_min_generic(deviceID, context, queue, num_elements, + return test_atomic_fetch_min_generic(device, context, queue, num_elements, true); } @@ -2305,9 +2280,10 @@ public: } }; -int test_atomic_fetch_max_generic(cl_device_id deviceID, cl_context context, - cl_command_queue queue, int num_elements, - bool useSVM) +static int test_atomic_fetch_max_generic(cl_device_id deviceID, + cl_context context, + cl_command_queue queue, + int num_elements, bool useSVM) { int error = 0; CBasicTestFetchMax test_int(TYPE_ATOMIC_INT, @@ -2373,17 +2349,15 @@ int test_atomic_fetch_max_generic(cl_device_id deviceID, cl_context context, return error; } -int test_atomic_fetch_max(cl_device_id deviceID, cl_context context, - cl_command_queue queue, int num_elements) +REGISTER_TEST(atomic_fetch_max) { - return test_atomic_fetch_max_generic(deviceID, context, queue, num_elements, + return test_atomic_fetch_max_generic(device, context, queue, num_elements, false); } -int test_svm_atomic_fetch_max(cl_device_id deviceID, cl_context context, - cl_command_queue queue, int num_elements) +REGISTER_TEST(svm_atomic_fetch_max) { - return test_atomic_fetch_max_generic(deviceID, context, queue, num_elements, + return test_atomic_fetch_max_generic(device, context, queue, num_elements, true); } @@ -2597,9 +2571,9 @@ public: } }; -int test_atomic_flag_generic(cl_device_id deviceID, cl_context context, - cl_command_queue queue, int num_elements, - bool useSVM) +static int test_atomic_flag_generic(cl_device_id deviceID, cl_context context, + cl_command_queue queue, int num_elements, + bool useSVM) { int error = 0; CBasicTestFlag test_flag(TYPE_ATOMIC_FLAG, @@ -2609,18 +2583,15 @@ int test_atomic_flag_generic(cl_device_id deviceID, cl_context context, return error; } -int test_atomic_flag(cl_device_id deviceID, cl_context context, - cl_command_queue queue, int num_elements) +REGISTER_TEST(atomic_flag) { - return test_atomic_flag_generic(deviceID, context, queue, num_elements, + return test_atomic_flag_generic(device, context, queue, num_elements, false); } -int test_svm_atomic_flag(cl_device_id deviceID, cl_context context, - cl_command_queue queue, int num_elements) +REGISTER_TEST(svm_atomic_flag) { - return test_atomic_flag_generic(deviceID, context, queue, num_elements, - true); + return test_atomic_flag_generic(device, context, queue, num_elements, true); } template @@ -3149,9 +3120,9 @@ private: struct TestDefinition _subCase; }; -int test_atomic_fence_generic(cl_device_id deviceID, cl_context context, - cl_command_queue queue, int num_elements, - bool useSVM) +static int test_atomic_fence_generic(cl_device_id deviceID, cl_context context, + cl_command_queue queue, int num_elements, + bool useSVM) { int error = 0; CBasicTestFence test_int(TYPE_ATOMIC_INT, @@ -3217,16 +3188,14 @@ int test_atomic_fence_generic(cl_device_id deviceID, cl_context context, return error; } -int test_atomic_fence(cl_device_id deviceID, cl_context context, - cl_command_queue queue, int num_elements) +REGISTER_TEST(atomic_fence) { - return test_atomic_fence_generic(deviceID, context, queue, num_elements, + return test_atomic_fence_generic(device, context, queue, num_elements, false); } -int test_svm_atomic_fence(cl_device_id deviceID, cl_context context, - cl_command_queue queue, int num_elements) +REGISTER_TEST(svm_atomic_fence) { - return test_atomic_fence_generic(deviceID, context, queue, num_elements, + return test_atomic_fence_generic(device, context, queue, num_elements, true); }