diff --git a/test_conformance/SVM/main.cpp b/test_conformance/SVM/main.cpp index 9c471f02..8b24e24a 100644 --- a/test_conformance/SVM/main.cpp +++ b/test_conformance/SVM/main.cpp @@ -282,7 +282,9 @@ const int test_num = ARRAY_SIZE( test_list ); test_status InitCL(cl_device_id device) { auto version = get_device_cl_version(device); - if (version < Version(2, 0)) { + 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()); return TEST_SKIP; } diff --git a/test_conformance/device_execution/main.cpp b/test_conformance/device_execution/main.cpp index 463dfa7a..6a7ca4bc 100644 --- a/test_conformance/device_execution/main.cpp +++ b/test_conformance/device_execution/main.cpp @@ -30,7 +30,9 @@ int gWimpyMode = 0; test_status InitCL(cl_device_id device) { auto version = get_device_cl_version(device); - if (version < Version(2, 0)) { + 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()); return TEST_SKIP; } diff --git a/test_conformance/pipes/main.cpp b/test_conformance/pipes/main.cpp index 39dca81e..f996770a 100644 --- a/test_conformance/pipes/main.cpp +++ b/test_conformance/pipes/main.cpp @@ -22,7 +22,9 @@ test_status InitCL(cl_device_id device) { auto version = get_device_cl_version(device); - if (version < Version(2, 0)) { + 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()); return TEST_SKIP; } diff --git a/test_conformance/subgroups/main.cpp b/test_conformance/subgroups/main.cpp index bf692d49..85a63cba 100644 --- a/test_conformance/subgroups/main.cpp +++ b/test_conformance/subgroups/main.cpp @@ -36,19 +36,21 @@ static test_status checkSubGroupsExtension(cl_device_id device) // The extension is optional in OpenCL 2.0 (minimum required version) and // required in later versions. auto version = get_device_cl_version(device); + auto expected_min_version = Version(2, 0); - if (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()); return TEST_SKIP; } bool hasExtension = is_extension_available(device, "cl_khr_subgroups"); - if ((version == Version(2, 0)) && !hasExtension) { + if ((version == expected_min_version) && !hasExtension) { log_info("Device does not support 'cl_khr_subgroups'. Skipping the test.\n"); return TEST_SKIP; } - if ((version > Version(2, 0)) && !hasExtension) { + if ((version > expected_min_version) && !hasExtension) { log_error("'cl_khr_subgroups' is a required extension, failing.\n"); return TEST_FAIL; }