From fb55f7e81c86dc21670bcc8a6e6de7ad53abf044 Mon Sep 17 00:00:00 2001 From: aarongreig Date: Fri, 31 Jul 2020 13:13:08 +0100 Subject: [PATCH] Set new minimum version for the spirv_new tests. (#854) This allows 1.2 implementations with the cl_khr_il_program extension to run them. --- test_common/harness/testHarness.cpp | 6 +++--- test_conformance/spirv_new/main.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test_common/harness/testHarness.cpp b/test_common/harness/testHarness.cpp index fcabda51..a4432fa6 100644 --- a/test_common/harness/testHarness.cpp +++ b/test_common/harness/testHarness.cpp @@ -1041,9 +1041,9 @@ test_status check_spirv_compilation_readiness(cl_device_id device) } else { - version_expected_info("Test", "OpenCL", - ocl_expected_min_version.to_string().c_str(), - ocl_version.to_string().c_str()); + log_error("SPIR-V intermediate language support on OpenCL version " + "%s requires cl_khr_il_program extension.\n", + ocl_version.to_string().c_str()); return TEST_SKIP; } } diff --git a/test_conformance/spirv_new/main.cpp b/test_conformance/spirv_new/main.cpp index afcc310e..cef4677a 100644 --- a/test_conformance/spirv_new/main.cpp +++ b/test_conformance/spirv_new/main.cpp @@ -81,7 +81,7 @@ void spirvTestsRegistry::addTestClass(baseTestClass *test, const char *testName) test_definition testDef; testDef.func = test->getFunction(); testDef.name = testName; - testDef.min_version = Version(2, 1); + testDef.min_version = Version(1, 2); testDefinitions.push_back(testDef); }