From 4e9c1178a39dff00dec1747fb73116bbe68b1d63 Mon Sep 17 00:00:00 2001 From: "Koska, Andrzej" Date: Thu, 4 Jan 2018 17:48:02 +0100 Subject: [PATCH] Add -all on the begining of extensionsList -all resets all compiler settings. Change-Id: I8eec4beffa27673918d741f4b0d9d894f40a2cee --- runtime/platform/platform.cpp | 2 +- unit_tests/platform/platform_tests.cpp | 2 +- unit_tests/program/program_tests.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/runtime/platform/platform.cpp b/runtime/platform/platform.cpp index cdd171b9d6..0a0591dbcd 100644 --- a/runtime/platform/platform.cpp +++ b/runtime/platform/platform.cpp @@ -107,7 +107,7 @@ std::string Platform::getCompilerExtensions(const char *deviceExtensions) { while ((pos = extensionsList.find(" ", pos)) != std::string::npos) { extensionsList.replace(pos, 1, ",+"); } - extensionsList = "-cl-ext=+" + extensionsList; + extensionsList = "-cl-ext=-all,+" + extensionsList; return extensionsList; } diff --git a/unit_tests/platform/platform_tests.cpp b/unit_tests/platform/platform_tests.cpp index eb301a4953..25bb2cfce3 100644 --- a/unit_tests/platform/platform_tests.cpp +++ b/unit_tests/platform/platform_tests.cpp @@ -82,7 +82,7 @@ TEST_F(PlatformTest, PlatformGetCompilerExtensions) { pPlatform->initialize(numPlatformDevices, platformDevices); compilerExtensions = pPlatform->getCompilerExtensions(); - EXPECT_THAT(compilerExtensions, ::testing::HasSubstr(std::string("-cl-ext=+cl"))); + EXPECT_THAT(compilerExtensions, ::testing::HasSubstr(std::string("-cl-ext=-all,+cl"))); if (std::string(pPlatform->getDevice(0)->getDeviceInfo().clVersion).find("OpenCL 2.1") != std::string::npos) { EXPECT_THAT(compilerExtensions, ::testing::HasSubstr(std::string("cl_khr_subgroups"))); } diff --git a/unit_tests/program/program_tests.cpp b/unit_tests/program/program_tests.cpp index 96c5eb7450..b0898bc29c 100644 --- a/unit_tests/program/program_tests.cpp +++ b/unit_tests/program/program_tests.cpp @@ -695,7 +695,7 @@ TEST_P(ProgramFromSourceTest, CreateWithSource_Build) { // EXPECT_EQ(0, retVal); retVal = pProgram->build(0, nullptr, nullptr, nullptr, nullptr, false); EXPECT_EQ(CL_SUCCESS, retVal); - EXPECT_THAT(pProgram->getInternalOptions(), ::testing::HasSubstr(std::string("-cl-ext=+cl"))); + EXPECT_THAT(pProgram->getInternalOptions(), ::testing::HasSubstr(std::string("-cl-ext=-all,+cl"))); // get build log size_t param_value_size_ret = 0u;