Add __IMAGE_SUPPORT__ option when compiling without device

fhazubski-Intel · Compute-Runtime-Automation · commit 5d922eea7589 · 2021-01-20T18:50:02.000+01:00
Signed-off-by: Filip Hazubski &lt;filip.hazubski@intel.com&gt;
diff --git a/opencl/test/unit_test/offline_compiler/offline_compiler_tests.cpp b/opencl/test/unit_test/offline_compiler/offline_compiler_tests.cpp
@@ -1437,7 +1437,7 @@ TEST(OclocCompile, givenCommandLineWithoutDeviceWhenCompilingToSpirvThenSucceeds
     ASSERT_EQ(0, retVal);
     retVal = ocloc.build();
     EXPECT_EQ(0, retVal);
-    EXPECT_THAT(ocloc.internalOptions.c_str(), testing::HasSubstr("-ocl-version=300 -cl-ext=-all,+cl_khr_3d_image_writes"));
+    EXPECT_THAT(ocloc.internalOptions.c_str(), testing::HasSubstr("-ocl-version=300 -cl-ext=-all,+cl_khr_3d_image_writes -D__IMAGE_SUPPORT__=1"));
 }
 
 TEST(OclocCompile, givenDeviceAndInternalOptionsOptionWhenCompilingToSpirvThenInternalOptionsAreSetCorrectly) {
diff --git a/shared/offline_compiler/source/offline_compiler.cpp b/shared/offline_compiler/source/offline_compiler.cpp
@@ -393,6 +393,7 @@ int OfflineCompiler::initialize(size_t numArgs, const std::vector<std::string> &
     }
     if (deviceName.empty()) {
         internalOptions = CompilerOptions::concatenate("-ocl-version=300 -cl-ext=-all,+cl_khr_3d_image_writes", internalOptions);
+        CompilerOptions::concatenateAppend(internalOptions, CompilerOptions::enableImageSupport);
     } else {
         std::string extensionsList = getExtensionsList(hwInfo);
         if (requiresAdditionalExtensions(options)) {

Original file line number	Diff line number	Diff line change
`@@ -1437,7 +1437,7 @@ TEST(OclocCompile, givenCommandLineWithoutDeviceWhenCompilingToSpirvThenSucceeds`
`1437`	`1437`	`ASSERT_EQ(0, retVal);`
`1438`	`1438`	`retVal = ocloc.build();`
`1439`	`1439`	`EXPECT_EQ(0, retVal);`
`1440`		`- EXPECT_THAT(ocloc.internalOptions.c_str(), testing::HasSubstr("-ocl-version=300 -cl-ext=-all,+cl_khr_3d_image_writes"));`
	`1440`	`+ EXPECT_THAT(ocloc.internalOptions.c_str(), testing::HasSubstr("-ocl-version=300 -cl-ext=-all,+cl_khr_3d_image_writes -D__IMAGE_SUPPORT__=1"));`
`1441`	`1441`	`}`
`1442`	`1442`
`1443`	`1443`	`TEST(OclocCompile, givenDeviceAndInternalOptionsOptionWhenCompilingToSpirvThenInternalOptionsAreSetCorrectly) {`
Original file line number	Diff line number	Diff line change
`@@ -393,6 +393,7 @@ int OfflineCompiler::initialize(size_t numArgs, const std::vector<std::string> &`
`393`	`393`	`}`
`394`	`394`	`if (deviceName.empty()) {`
`395`	`395`	`internalOptions = CompilerOptions::concatenate("-ocl-version=300 -cl-ext=-all,+cl_khr_3d_image_writes", internalOptions);`
	`396`	`+ CompilerOptions::concatenateAppend(internalOptions, CompilerOptions::enableImageSupport);`
`396`	`397`	`} else {`
`397`	`398`	`std::string extensionsList = getExtensionsList(hwInfo);`
`398`	`399`	`if (requiresAdditionalExtensions(options)) {`