diff --git a/test_common/harness/testHarness.cpp b/test_common/harness/testHarness.cpp index 04f12c75..d6b747fb 100644 --- a/test_common/harness/testHarness.cpp +++ b/test_common/harness/testHarness.cpp @@ -78,9 +78,9 @@ int fail_init_info(int count) { log_info("FAILED %d of %d tests.\n", count, count); return EXIT_FAILURE; } -void version_expected_info(const char * test_name, const char * expected_version, const char * device_version) { - log_info("%s skipped (requires at least version %s, but the device reports version %s)\n", - test_name, expected_version, device_version); +void version_expected_info(const char * test_name, const char * api_name, const char * expected_version, const char * device_version) { + log_info("%s skipped (requires at least %s version %s, but the device reports %s version %s)\n", + test_name, api_name, expected_version, api_name, device_version); } int runTestHarnessWithCheck( int argc, const char *argv[], int testNum, test_definition testList[], int forceNoContextCreation, cl_command_queue_properties queueProps, @@ -685,7 +685,7 @@ test_status callSingleTestFunction( test_definition test, cl_device_id deviceToU const Version device_version = get_device_cl_version(deviceToUse); if (test.min_version > device_version) { - version_expected_info(test.name, test.min_version.to_string().c_str(), device_version.to_string().c_str()); + version_expected_info(test.name, "OpenCL", test.min_version.to_string().c_str(), device_version.to_string().c_str()); return TEST_SKIP; } diff --git a/test_common/harness/testHarness.h b/test_common/harness/testHarness.h index 7132e771..68e808f0 100644 --- a/test_common/harness/testHarness.h +++ b/test_common/harness/testHarness.h @@ -135,7 +135,7 @@ extern cl_device_type GetDeviceType( cl_device_id ); // is the only device available, the SAME device is returned, so check! extern cl_device_id GetOpposingDevice( cl_device_id device ); -void version_expected_info(const char * test_name, const char * expected_version, const char * device_version); +void version_expected_info(const char * test_name, const char * api_name, const char * expected_version, const char * device_version); extern int gFlushDenormsToZero; // This is set to 1 if the device does not support denorms (CL_FP_DENORM) diff --git a/test_conformance/SVM/main.cpp b/test_conformance/SVM/main.cpp index fe4aa596..bf492cea 100644 --- a/test_conformance/SVM/main.cpp +++ b/test_conformance/SVM/main.cpp @@ -281,7 +281,7 @@ test_status InitCL(cl_device_id device) { auto version = get_device_cl_version(device); auto expected_min_version = Version(2, 0); if (version < expected_min_version) { - version_expected_info("Test", expected_min_version.to_string().c_str(), version.to_string().c_str()); + version_expected_info("Test", "OpenCL", expected_min_version.to_string().c_str(), version.to_string().c_str()); return TEST_SKIP; } diff --git a/test_conformance/c11_atomics/main.cpp b/test_conformance/c11_atomics/main.cpp index 687861e9..957cce9d 100644 --- a/test_conformance/c11_atomics/main.cpp +++ b/test_conformance/c11_atomics/main.cpp @@ -110,7 +110,7 @@ test_status InitCL(cl_device_id device) { auto expected_min_version = Version(2, 0); if (version < expected_min_version) { - version_expected_info("Test", expected_min_version.to_string().c_str(), version.to_string().c_str()); + version_expected_info("Test", "OpenCL", expected_min_version.to_string().c_str(), version.to_string().c_str()); return TEST_SKIP; } return TEST_PASS; diff --git a/test_conformance/device_execution/main.cpp b/test_conformance/device_execution/main.cpp index 4c0b692f..a86e4a75 100644 --- a/test_conformance/device_execution/main.cpp +++ b/test_conformance/device_execution/main.cpp @@ -32,7 +32,7 @@ test_status InitCL(cl_device_id device) { auto version = get_device_cl_version(device); auto expected_min_version = Version(2, 0); if (version < expected_min_version) { - version_expected_info("Test", expected_min_version.to_string().c_str(), version.to_string().c_str()); + version_expected_info("Test", "OpenCL", expected_min_version.to_string().c_str(), version.to_string().c_str()); return TEST_SKIP; } diff --git a/test_conformance/device_timer/main.cpp b/test_conformance/device_timer/main.cpp index 95391433..0d4bd2fa 100644 --- a/test_conformance/device_timer/main.cpp +++ b/test_conformance/device_timer/main.cpp @@ -39,7 +39,7 @@ test_status InitCL(cl_device_id device) { if (version < expected_min_version) { - version_expected_info("Test", expected_min_version.to_string().c_str(), version.to_string().c_str()); + version_expected_info("Test", "OpenCL", expected_min_version.to_string().c_str(), version.to_string().c_str()); return TEST_SKIP; } diff --git a/test_conformance/generic_address_space/main.cpp b/test_conformance/generic_address_space/main.cpp index 12fa4a6f..e5437260 100644 --- a/test_conformance/generic_address_space/main.cpp +++ b/test_conformance/generic_address_space/main.cpp @@ -75,7 +75,7 @@ test_status InitCL(cl_device_id device) { if (version < expected_min_version) { - version_expected_info("Test", expected_min_version.to_string().c_str(), version.to_string().c_str()); + version_expected_info("Test", "OpenCL", expected_min_version.to_string().c_str(), version.to_string().c_str()); return TEST_SKIP; } diff --git a/test_conformance/non_uniform_work_group/main.cpp b/test_conformance/non_uniform_work_group/main.cpp index e448afef..36e419be 100644 --- a/test_conformance/non_uniform_work_group/main.cpp +++ b/test_conformance/non_uniform_work_group/main.cpp @@ -43,7 +43,7 @@ test_status InitCL(cl_device_id device) { auto expected_min_version = Version(2, 0); if (version < expected_min_version) { - version_expected_info("Test", expected_min_version.to_string().c_str(), version.to_string().c_str()); + version_expected_info("Test", "OpenCL", expected_min_version.to_string().c_str(), version.to_string().c_str()); return TEST_SKIP; } return TEST_PASS; diff --git a/test_conformance/pipes/main.cpp b/test_conformance/pipes/main.cpp index 45b4c289..842eb7c8 100644 --- a/test_conformance/pipes/main.cpp +++ b/test_conformance/pipes/main.cpp @@ -24,7 +24,7 @@ test_status InitCL(cl_device_id device) { auto version = get_device_cl_version(device); auto expected_min_version = Version(2, 0); if (version < expected_min_version) { - version_expected_info("Test", expected_min_version.to_string().c_str(), version.to_string().c_str()); + version_expected_info("Test", "OpenCL", expected_min_version.to_string().c_str(), version.to_string().c_str()); return TEST_SKIP; } diff --git a/test_conformance/printf/test_printf.cpp b/test_conformance/printf/test_printf.cpp index b87385d3..c549ccef 100644 --- a/test_conformance/printf/test_printf.cpp +++ b/test_conformance/printf/test_printf.cpp @@ -1023,7 +1023,7 @@ test_status InitCL( cl_device_id device ) auto expected_min_version = Version(1, 2); if (version < expected_min_version) { - version_expected_info("Test", expected_min_version.to_string().c_str(), version.to_string().c_str()); + version_expected_info("Test", "OpenCL", expected_min_version.to_string().c_str(), version.to_string().c_str()); return TEST_SKIP; } diff --git a/test_conformance/workgroups/main.cpp b/test_conformance/workgroups/main.cpp index 1b47420b..0c5640c8 100644 --- a/test_conformance/workgroups/main.cpp +++ b/test_conformance/workgroups/main.cpp @@ -47,7 +47,7 @@ test_status InitCL(cl_device_id device) { auto expected_min_version = Version(2, 0); if (version < expected_min_version) { - version_expected_info("Test", expected_min_version.to_string().c_str(), version.to_string().c_str()); + version_expected_info("Test","OpenCL", expected_min_version.to_string().c_str(), version.to_string().c_str()); return TEST_SKIP; }