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

Add API name to version_expected_info function

Browse Source
This commit is contained in:
Grzegorz Wawiorko
2020-03-27 19:29:13 +01:00
committed by Alastair Murray
parent bfc1cc47f3
commit d643dc5399
11 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
test_common/harness/testHarness.cpp
View File

@@ -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;
}

2
test_common/harness/testHarness.h
View File

@@ -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)

2
test_conformance/SVM/main.cpp
View File

@@ -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;
}

2
test_conformance/c11_atomics/main.cpp
View File

@@ -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;

2
test_conformance/device_execution/main.cpp
View File

@@ -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;
}

2
test_conformance/device_timer/main.cpp
View File

@@ -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;
}

2
test_conformance/generic_address_space/main.cpp
View File

@@ -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;
}

2
test_conformance/non_uniform_work_group/main.cpp
View File

@@ -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;

2
test_conformance/pipes/main.cpp
View File

@@ -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;
}

2
test_conformance/printf/test_printf.cpp
View File

@@ -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;
}

2
test_conformance/workgroups/main.cpp
View File

@@ -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;
}