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

Fix test skip handling while test initialization (#670)

Browse Source
This commit is contained in:
Grzegorz Wawiorko
2020-03-11 19:14:29 +01:00
committed by GitHub
parent db570f70e5
commit 78fc283069
4 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test_conformance/SVM/main.cpp
View File

@@ -282,7 +282,9 @@ const int test_num = ARRAY_SIZE( test_list );
test_status InitCL(cl_device_id device) { test_status InitCL(cl_device_id device) {
auto version = get_device_cl_version(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; return TEST_SKIP;
} }

4
test_conformance/device_execution/main.cpp
View File

@@ -30,7 +30,9 @@ int gWimpyMode = 0;
test_status InitCL(cl_device_id device) { test_status InitCL(cl_device_id device) {
auto version = get_device_cl_version(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; return TEST_SKIP;
} }

4
test_conformance/pipes/main.cpp
View File

@@ -22,7 +22,9 @@
test_status InitCL(cl_device_id device) { test_status InitCL(cl_device_id device) {
auto version = get_device_cl_version(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; return TEST_SKIP;
} }

8
test_conformance/subgroups/main.cpp
View File

@@ -36,19 +36,21 @@ static test_status checkSubGroupsExtension(cl_device_id device)
// The extension is optional in OpenCL 2.0 (minimum required version) and // The extension is optional in OpenCL 2.0 (minimum required version) and
// required in later versions. // required in later versions.
auto version = get_device_cl_version(device); 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; return TEST_SKIP;
} }
bool hasExtension = is_extension_available(device, "cl_khr_subgroups"); 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"); log_info("Device does not support 'cl_khr_subgroups'. Skipping the test.\n");
return TEST_SKIP; 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"); log_error("'cl_khr_subgroups' is a required extension, failing.\n");
return TEST_FAIL; return TEST_FAIL;
} }