ahmed/OpenCL-CTS
1
0
Fork 0
mirror of https://github.com/KhronosGroup/OpenCL-CTS.git synced 2026-03-19 06:09:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove imageSupportRequired parameter to runTestHarness (#1077)

Browse Source 
* Tests requiring image support use runTestHarnessWithCheck

Removing special case for images in runTestHarness.

Fixes #710

* Remove imageSupportRequired argument

Tests which require image support now specify this while
calling runTestHarnessWithCheck.

Fixes #710

Signed-off-by: Ellen Norris-Thompson <ellen.norris-thompson@arm.com>
This commit is contained in:
ellnor01
2020-12-09 16:12:40 +00:00
committed by GitHub
parent b7adaa5c3b
commit 5ae5e7a1fa
49 changed files with 60 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
test_common/harness/testHarness.cpp
View File

@@ -61,13 +61,11 @@ bool gCoreILProgram = true;
#define DEFAULT_NUM_ELEMENTS 0x4000
int runTestHarness(int argc, const char *argv[], int testNum,
test_definition testList[], int imageSupportRequired,
int forceNoContextCreation,
test_definition testList[], int forceNoContextCreation,
cl_command_queue_properties queueProps)
{
return runTestHarnessWithCheck(
argc, argv, testNum, testList, forceNoContextCreation, queueProps,
(imageSupportRequired) ? verifyImageSupport : NULL);
return runTestHarnessWithCheck(argc, argv, testNum, testList,
forceNoContextCreation, queueProps, NULL);
}
int skip_init_info(int count)

2
test_common/harness/testHarness.h
View File

@@ -92,7 +92,7 @@ extern cl_uint gRandomSeed;
// dictatated by the passed arguments. Returns EXIT_SUCCESS iff all tests
// succeeded or the tests were listed, otherwise return EXIT_FAILURE.
extern int runTestHarness(int argc, const char *argv[], int testNum,
test_definition testList[], int imageSupportRequired,
test_definition testList[],
int forceNoContextCreation,
cl_command_queue_properties queueProps);

2
test_conformance/api/main.cpp
View File

@@ -152,5 +152,5 @@ const int test_num = ARRAY_SIZE(test_list);
int main(int argc, const char *argv[])
{
return runTestHarness(argc, argv, test_num, test_list, false, false, 0);
return runTestHarness(argc, argv, test_num, test_list, false, 0);
}

2
test_conformance/atomics/main.cpp
View File

@@ -45,6 +45,6 @@ const int test_num = ARRAY_SIZE( test_list );
int main(int argc, const char *argv[])
{
return runTestHarness( argc, argv, test_num, test_list, false, false, 0 );
return runTestHarness(argc, argv, test_num, test_list, false, 0);
}

2
test_conformance/basic/main.cpp
View File

@@ -157,6 +157,6 @@ const int test_num = ARRAY_SIZE( test_list );
int main(int argc, const char *argv[])
{
return runTestHarness( argc, argv, test_num, test_list, false, false, 0 );
return runTestHarness(argc, argv, test_num, test_list, false, 0);
}

2
test_conformance/buffers/main.cpp
View File

@@ -141,5 +141,5 @@ const char* flag_set_names[] = {
int main( int argc, const char *argv[] )
{
return runTestHarness( argc, argv, test_num, test_list, false, false, 0 );
return runTestHarness(argc, argv, test_num, test_list, false, 0);
}

2
test_conformance/clcpp/address_spaces/main.cpp
View File

@@ -21,5 +21,5 @@
int main(int argc, const char *argv[])
{
auto& tests = autotest::test_suite::global_test_suite().test_defs;
return runTestHarness(argc, argv, tests.size(), tests.data(), false, false, 0);
return runTestHarness(argc, argv, tests.size(), tests.data(), false, 0);
}

2
test_conformance/clcpp/api/main.cpp
View File

@@ -23,5 +23,5 @@
int main(int argc, const char *argv[])
{
auto& tests = autotest::test_suite::global_test_suite().test_defs;
return runTestHarness(argc, argv, tests.size(), tests.data(), false, false, 0);
return runTestHarness(argc, argv, tests.size(), tests.data(), false, 0);
}

2
test_conformance/clcpp/atomics/main.cpp
View File

@@ -21,5 +21,5 @@
int main(int argc, const char *argv[])
{
auto& tests = autotest::test_suite::global_test_suite().test_defs;
return runTestHarness(argc, argv, tests.size(), tests.data(), false, false, 0);
return runTestHarness(argc, argv, tests.size(), tests.data(), false, 0);
}

2
test_conformance/clcpp/attributes/main.cpp
View File

@@ -23,5 +23,5 @@
int main(int argc, const char *argv[])
{
auto& tests = autotest::test_suite::global_test_suite().test_defs;
return runTestHarness(argc, argv, tests.size(), tests.data(), false, false, 0);
return runTestHarness(argc, argv, tests.size(), tests.data(), false, 0);
}

2
test_conformance/clcpp/common_funcs/main.cpp
View File

@@ -39,5 +39,5 @@ int main(int argc, const char *argv[])
}
auto& tests = autotest::test_suite::global_test_suite().test_defs;
return runTestHarness(argc, argv, tests.size(), tests.data(), false, false, 0);
return runTestHarness(argc, argv, tests.size(), tests.data(), false, 0);
}

2
test_conformance/clcpp/convert/main.cpp
View File

@@ -21,5 +21,5 @@
int main(int argc, const char *argv[])
{
auto& tests = autotest::test_suite::global_test_suite().test_defs;
return runTestHarness(argc, argv, tests.size(), tests.data(), false, false, 0);
return runTestHarness(argc, argv, tests.size(), tests.data(), false, 0);
}

2
test_conformance/clcpp/device_queue/main.cpp
View File

@@ -21,5 +21,5 @@
int main(int argc, const char *argv[])
{
auto& tests = autotest::test_suite::global_test_suite().test_defs;
return runTestHarness(argc, argv, tests.size(), tests.data(), false, false, 0);
return runTestHarness(argc, argv, tests.size(), tests.data(), false, 0);
}

2
test_conformance/clcpp/geometric_funcs/main.cpp
View File

@@ -40,5 +40,5 @@ int main(int argc, const char *argv[])
}
auto& tests = autotest::test_suite::global_test_suite().test_defs;
return runTestHarness(argc, argv, tests.size(), tests.data(), false, false, 0);
return runTestHarness(argc, argv, tests.size(), tests.data(), false, 0);
}

2
test_conformance/clcpp/images/main.cpp
View File

@@ -26,5 +26,5 @@
int main(int argc, const char *argv[])
{
auto& tests = autotest::test_suite::global_test_suite().test_defs;
return runTestHarness(argc, argv, tests.size(), tests.data(), false, false, 0);
return runTestHarness(argc, argv, tests.size(), tests.data(), false, 0);
}

2
test_conformance/clcpp/integer_funcs/main.cpp
View File

@@ -22,5 +22,5 @@
int main(int argc, const char *argv[])
{
auto& tests = autotest::test_suite::global_test_suite().test_defs;
return runTestHarness(argc, argv, tests.size(), tests.data(), false, false, 0);
return runTestHarness(argc, argv, tests.size(), tests.data(), false, 0);
}

2
test_conformance/clcpp/math_funcs/main.cpp
View File

@@ -46,5 +46,5 @@ int main(int argc, const char *argv[])
}
auto& tests = autotest::test_suite::global_test_suite().test_defs;
return runTestHarness(argc, argv, tests.size(), tests.data(), false, false, 0);
return runTestHarness(argc, argv, tests.size(), tests.data(), false, 0);
}

2
test_conformance/clcpp/pipes/main.cpp
View File

@@ -21,5 +21,5 @@
int main(int argc, const char *argv[])
{
auto& tests = autotest::test_suite::global_test_suite().test_defs;
return runTestHarness(argc, argv, tests.size(), tests.data(), false, false, 0);
return runTestHarness(argc, argv, tests.size(), tests.data(), false, 0);
}

2
test_conformance/clcpp/program_scope_ctors_dtors/main.cpp
View File

@@ -20,5 +20,5 @@
int main(int argc, const char *argv[])
{
auto& tests = autotest::test_suite::global_test_suite().test_defs;
return runTestHarness(argc, argv, tests.size(), tests.data(), false, false, 0);
return runTestHarness(argc, argv, tests.size(), tests.data(), false, 0);
}

2
test_conformance/clcpp/reinterpret/main.cpp
View File

@@ -21,5 +21,5 @@
int main(int argc, const char *argv[])
{
auto& tests = autotest::test_suite::global_test_suite().test_defs;
return runTestHarness(argc, argv, tests.size(), tests.data(), false, false, 0);
return runTestHarness(argc, argv, tests.size(), tests.data(), false, 0);
}

2
test_conformance/clcpp/relational_funcs/main.cpp
View File

@@ -22,5 +22,5 @@
int main(int argc, const char *argv[])
{
auto& tests = autotest::test_suite::global_test_suite().test_defs;
return runTestHarness(argc, argv, tests.size(), tests.data(), false, false, 0);
return runTestHarness(argc, argv, tests.size(), tests.data(), false, 0);
}

2
test_conformance/clcpp/spec_constants/main.cpp
View File

@@ -22,5 +22,5 @@
int main(int argc, const char *argv[])
{
auto& tests = autotest::test_suite::global_test_suite().test_defs;
return runTestHarness(argc, argv, tests.size(), tests.data(), false, false, 0);
return runTestHarness(argc, argv, tests.size(), tests.data(), false, 0);
}

2
test_conformance/clcpp/subgroups/main.cpp
View File

@@ -25,5 +25,5 @@
int main(int argc, const char *argv[])
{
auto& tests = autotest::test_suite::global_test_suite().test_defs;
return runTestHarness(argc, argv, tests.size(), tests.data(), false, false, 0);
return runTestHarness(argc, argv, tests.size(), tests.data(), false, 0);
}

2
test_conformance/clcpp/synchronization/main.cpp
View File

@@ -23,5 +23,5 @@
int main(int argc, const char *argv[])
{
auto& tests = autotest::test_suite::global_test_suite().test_defs;
return runTestHarness(argc, argv, tests.size(), tests.data(), false, false, 0);
return runTestHarness(argc, argv, tests.size(), tests.data(), false, 0);
}

2
test_conformance/clcpp/vload_vstore/main.cpp
View File

@@ -21,5 +21,5 @@
int main(int argc, const char *argv[])
{
auto& tests = autotest::test_suite::global_test_suite().test_defs;
return runTestHarness(argc, argv, tests.size(), tests.data(), false, false, 0);
return runTestHarness(argc, argv, tests.size(), tests.data(), false, 0);
}

2
test_conformance/clcpp/workgroups/main.cpp
View File

@@ -25,5 +25,5 @@
int main(int argc, const char *argv[])
{
auto& tests = autotest::test_suite::global_test_suite().test_defs;
return runTestHarness(argc, argv, tests.size(), tests.data(), false, false, 0);
return runTestHarness(argc, argv, tests.size(), tests.data(), false, 0);
}

2
test_conformance/clcpp/workitems/main.cpp
View File

@@ -21,5 +21,5 @@
int main(int argc, const char *argv[])
{
auto& tests = autotest::test_suite::global_test_suite().test_defs;
return runTestHarness(argc, argv, tests.size(), tests.data(), false, false, 0);
return runTestHarness(argc, argv, tests.size(), tests.data(), false, 0);
}

2
test_conformance/commonfns/main.cpp
View File

@@ -58,6 +58,6 @@ const int test_num = ARRAY_SIZE( test_list );
int main(int argc, const char *argv[])
{
initVecSizes();
return runTestHarness( argc, argv, test_num, test_list, false, false, 0 );
return runTestHarness(argc, argv, test_num, test_list, false, 0);
}

2
test_conformance/compiler/main.cpp
View File

@@ -107,5 +107,5 @@ const int test_num = ARRAY_SIZE(test_list);
int main(int argc, const char *argv[])
{
return runTestHarness(argc, argv, test_num, test_list, false, false, 0);
return runTestHarness(argc, argv, test_num, test_list, false, 0);
}

3
test_conformance/computeinfo/main.cpp
View File

@@ -1455,6 +1455,5 @@ int main(int argc, const char** argv)
}
}
return runTestHarness(argCount, argList, test_num, test_list, false, true,
0);
return runTestHarness(argCount, argList, test_num, test_list, true, 0);
}

2
test_conformance/device_partition/main.cpp
View File

@@ -41,5 +41,5 @@ const int test_num = ARRAY_SIZE( test_list );
int main(int argc, const char *argv[])
{
return runTestHarness( argc, argv, test_num, test_list, false, true, 0 );
return runTestHarness(argc, argv, test_num, test_list, true, 0);
}

2
test_conformance/events/main.cpp
View File

@@ -62,6 +62,6 @@ const int test_num = ARRAY_SIZE( test_list );
int main(int argc, const char *argv[])
{
return runTestHarness( argc, argv, test_num, test_list, false, false, 0 );
return runTestHarness(argc, argv, test_num, test_list, false, 0);
}

2
test_conformance/geometrics/main.cpp
View File

@@ -38,6 +38,6 @@ const int test_num = ARRAY_SIZE( test_list );
int main(int argc, const char *argv[])
{
return runTestHarness( argc, argv, test_num, test_list, false, false, 0 );
return runTestHarness(argc, argv, test_num, test_list, false, 0);
}

3
test_conformance/images/clCopyImage/main.cpp
View File

@@ -151,7 +151,8 @@ int main(int argc, const char *argv[])
if( gTestSmallImages )
log_info( "Note: Using small test images\n" );
int ret = runTestHarness( argCount, argList, test_num, test_list, true, false, 0 );
int ret = runTestHarnessWithCheck(argCount, argList, test_num, test_list,
false, 0, verifyImageSupport);
free(argList);
return ret;

3
test_conformance/images/clFillImage/main.cpp
View File

@@ -124,7 +124,8 @@ int main(int argc, const char *argv[])
if ( gTestSmallImages )
log_info( "Note: Using small test images\n" );
int ret = runTestHarness( argCount, argList, test_num, test_list, true, false, 0 );
int ret = runTestHarnessWithCheck(argCount, argList, test_num, test_list,
false, 0, verifyImageSupport);
free(argList);
return ret;

3
test_conformance/images/clGetInfo/main.cpp
View File

@@ -108,7 +108,8 @@ int main(int argc, const char *argv[])
if( gTestSmallImages )
log_info( "Note: Using small test images\n" );
int ret = runTestHarness( argCount, argList, test_num, test_list, true, false, 0 );
int ret = runTestHarnessWithCheck(argCount, argList, test_num, test_list,
false, 0, verifyImageSupport);
free(argList);
return ret;

3
test_conformance/images/clReadWriteImage/main.cpp
View File

@@ -112,7 +112,8 @@ int main(int argc, const char *argv[])
if( gTestSmallImages )
log_info( "Note: Using small test images\n" );
int ret = runTestHarness( argCount, argList, test_num, test_list, true, false, 0 );
int ret = runTestHarnessWithCheck(argCount, argList, test_num, test_list,
false, 0, verifyImageSupport);
free(argList);
return ret;

3
test_conformance/images/kernel_image_methods/main.cpp
View File

@@ -112,7 +112,8 @@ int main(int argc, const char *argv[])
if( gTestSmallImages )
log_info( "Note: Using small test images\n" );
int ret = runTestHarness( argCount, argList, test_num, test_list, true, false, 0 );
int ret = runTestHarnessWithCheck(argCount, argList, test_num, test_list,
false, 0, verifyImageSupport);
free(argList);
return ret;

3
test_conformance/images/kernel_read_write/main.cpp
View File

@@ -395,7 +395,8 @@ int main(int argc, const char *argv[])
FPU_mode_type oldMode;
DisableFTZ(&oldMode);
int ret = runTestHarness( argCount, argList, test_num, test_list, true, false, 0 );
int ret = runTestHarnessWithCheck(argCount, argList, test_num, test_list,
false, 0, verifyImageSupport);
// Restore FP state before leaving
RestoreFPState(&oldMode);

3
test_conformance/images/samplerlessReads/main.cpp
View File

@@ -152,7 +152,8 @@ int main(int argc, const char *argv[])
FPU_mode_type oldMode;
DisableFTZ(&oldMode);
int ret = runTestHarness( argCount, argList, test_num, test_list, true, false, 0 );
int ret = runTestHarnessWithCheck(argCount, argList, test_num, test_list,
false, 0, verifyImageSupport);
// Restore FP state before leaving
RestoreFPState(&oldMode);

2
test_conformance/integer_ops/main.cpp
View File

@@ -212,6 +212,6 @@ void fill_test_values( cl_long *outBufferA, cl_long *outBufferB, size_t numEleme
int main(int argc, const char *argv[])
{
return runTestHarness( argc, argv, test_num, test_list, false, false, 0 );
return runTestHarness(argc, argv, test_num, test_list, false, 0);
}

2
test_conformance/mem_host_flags/main.cpp
View File

@@ -47,5 +47,5 @@ int main(int argc, const char *argv[])
{
log_info("1st part, non gl-sharing objects...\n");
gTestRounding = true;
return runTestHarness( argc, argv, test_num, test_list, false, false, 0 );
return runTestHarness(argc, argv, test_num, test_list, false, 0);
}

2
test_conformance/multiple_device_context/main.cpp
View File

@@ -41,6 +41,6 @@ const int test_num = ARRAY_SIZE( test_list );
int main(int argc, const char *argv[])
{
return runTestHarness( argc, argv, test_num, test_list, false, true, 0 );
return runTestHarness(argc, argv, test_num, test_list, true, 0);
}

3
test_conformance/profiling/main.cpp
View File

@@ -126,6 +126,7 @@ int check_times(cl_ulong queueStart, cl_ulong commandSubmit, cl_ulong commandSta
int main( int argc, const char *argv[] )
{
return runTestHarness( argc, argv, test_num, test_list, false, false, CL_QUEUE_PROFILING_ENABLE );
return runTestHarness(argc, argv, test_num, test_list, false,
CL_QUEUE_PROFILING_ENABLE);
}

2
test_conformance/relationals/main.cpp
View File

@@ -70,6 +70,6 @@ const int test_num = ARRAY_SIZE( test_list );
int main(int argc, const char *argv[])
{
return runTestHarness( argc, argv, test_num, test_list, false, false, 0 );
return runTestHarness(argc, argv, test_num, test_list, false, 0);
}

4
test_conformance/select/test_select.cpp
View File

@@ -343,7 +343,7 @@ static int doTest(cl_command_queue queue, cl_context context, Type stype, Type c
programs[vecsize] = makeSelectProgram(&kernels[vecsize], context, stype, cmptype, element_count[vecsize] );
if (!programs[vecsize] || !kernels[vecsize]) {
++s_test_fail;
++s_test_cnt;
++s_test_cnt;
return -1;
}
}
@@ -645,7 +645,7 @@ int main(int argc, const char* argv[])
log_info("*** Wimpy Reduction Factor: %-27u ***\n\n", s_wimpy_reduction_factor);
}
int err = runTestHarness( argCount, argList, test_num, test_list, false, false, 0 );
int err = runTestHarness(argCount, argList, test_num, test_list, false, 0);
free( argList );

2
test_conformance/thread_dimensions/main.cpp
View File

@@ -38,6 +38,6 @@ const int test_num = ARRAY_SIZE( test_list );
int main(int argc, const char *argv[])
{
return runTestHarness( argc, argv, test_num, test_list, false, false, 0 );
return runTestHarness(argc, argv, test_num, test_list, false, 0);
}

2
test_conformance/vectors/main.cpp
View File

@@ -40,5 +40,5 @@ const int test_num = ARRAY_SIZE(test_list);
int main(int argc, const char *argv[])
{
return runTestHarness(argc, argv, test_num, test_list, false, false, 0);
return runTestHarness(argc, argv, test_num, test_list, false, 0);
}

2
test_extensions/media_sharing/main.cpp
View File

@@ -200,5 +200,5 @@ int main(int argc, const char *argv[])
if (!MediaSurfaceSharingExtensionInit())
return TEST_FAIL;
return runTestHarness(argc, argv, test_num, test_list, false, true, 0);
return runTestHarness(argc, argv, test_num, test_list, true, 0);
}