Add -all on the begining of extensionsList

-all resets all compiler settings.

Change-Id: I8eec4beffa27673918d741f4b0d9d894f40a2cee
This commit is contained in:
Koska, Andrzej
2018-01-04 17:48:02 +01:00
parent 1fd771e5a5
commit 4e9c1178a3
3 changed files with 3 additions and 3 deletions

View File

@ -107,7 +107,7 @@ std::string Platform::getCompilerExtensions(const char *deviceExtensions) {
while ((pos = extensionsList.find(" ", pos)) != std::string::npos) { while ((pos = extensionsList.find(" ", pos)) != std::string::npos) {
extensionsList.replace(pos, 1, ",+"); extensionsList.replace(pos, 1, ",+");
} }
extensionsList = "-cl-ext=+" + extensionsList; extensionsList = "-cl-ext=-all,+" + extensionsList;
return extensionsList; return extensionsList;
} }

View File

@ -82,7 +82,7 @@ TEST_F(PlatformTest, PlatformGetCompilerExtensions) {
pPlatform->initialize(numPlatformDevices, platformDevices); pPlatform->initialize(numPlatformDevices, platformDevices);
compilerExtensions = pPlatform->getCompilerExtensions(); 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) { 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"))); EXPECT_THAT(compilerExtensions, ::testing::HasSubstr(std::string("cl_khr_subgroups")));
} }

View File

@ -695,7 +695,7 @@ TEST_P(ProgramFromSourceTest, CreateWithSource_Build) {
// EXPECT_EQ(0, retVal); // EXPECT_EQ(0, retVal);
retVal = pProgram->build(0, nullptr, nullptr, nullptr, nullptr, false); retVal = pProgram->build(0, nullptr, nullptr, nullptr, nullptr, false);
EXPECT_EQ(CL_SUCCESS, retVal); 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 // get build log
size_t param_value_size_ret = 0u; size_t param_value_size_ret = 0u;