ocloc: allow options to be used when using spirv input

Related-To: NEO-3128

Change-Id: Ib46e17003c81aff0cec23273674b639b9572c80f
Signed-off-by: Mateusz Hoppe <mateusz.hoppe@intel.com>

Author: HoppeMateusz

offline_compiler/offline_compiler.cpp

@@ -166,7 +166,7 @@ int OfflineCompiler::buildSourceCode() {
 
         } else {
             auto igcSrc = CIF::Builtins::CreateConstBuffer(igcMain.get(), sourceCode.c_str(), sourceCode.size());
-            auto igcOptions = CIF::Builtins::CreateConstBuffer(igcMain.get(), nullptr, 0);
+            auto igcOptions = CIF::Builtins::CreateConstBuffer(igcMain.get(), options.c_str(), options.size());
             auto igcInternalOptions = CIF::Builtins::CreateConstBuffer(igcMain.get(), internalOptions.c_str(), internalOptions.size());
             auto igcTranslationCtx = igcDeviceCtx->CreateTranslationCtx(inputFileSpirV ? IGC::CodeType::spirV : IGC::CodeType::llvmBc, IGC::CodeType::oclGenBin);
             igcOutput = igcTranslationCtx->Translate(igcSrc.get(), igcOptions.get(), igcInternalOptions.get(), nullptr, 0);

unit_tests/offline_compiler/offline_compiler_tests.cpp

@@ -631,7 +631,7 @@ TEST(OfflineCompilerTest, givenDefaultOfflineCompilerObjectWhenNoOptionsAreChang
     EXPECT_FALSE(mockOfflineCompiler->inputFileSpirV);
 }
 
-TEST(OfflineCompilerTest, givenIntermediatedRepresentationInputWhenBuildSourceCodeIsCalledThenProperTranslationContextIsUed) {
+TEST(OfflineCompilerTest, givenIntermediatedRepresentationInputWhenBuildSourceCodeIsCalledThenProperTranslationContextIsUsed) {
     MockOfflineCompiler mockOfflineCompiler;
     auto argv = {
         "ocloc",
@@ -676,6 +676,39 @@ TEST(OfflineCompilerTest, givenBinaryInputThenDontTruncateSourceAtFirstZero) {
     EXPECT_LT(0U, mockOfflineCompiler->sourceCode.size());
 }
 
+TEST(OfflineCompilerTest, givenSpirvInputFileWhenCmdLineHasOptionsThenCorrectOptionsArePassedToCompiler) {
+    char data[] = {1, 2, 3, 4, 5, 6, 7, 8};
+    MockCompilerDebugVars igcDebugVars(gEnvironment->igcDebugVars);
+    igcDebugVars.binaryToReturn = data;
+    igcDebugVars.binaryToReturnSize = sizeof(data);
+
+    NEO::setIgcDebugVars(igcDebugVars);
+
+    MockOfflineCompiler mockOfflineCompiler;
+    auto argv = {
+        "ocloc",
+        "-file",
+        "test_files/emptykernel.cl",
+        "-spirv_input",
+        "-device",
+        gEnvironment->devicePrefix.c_str(),
+        "-options",
+        "test_options_passed"};
+
+    auto retVal = mockOfflineCompiler.initialize(argv.size(), argv.begin());
+    auto mockIgcOclDeviceCtx = new NEO::MockIgcOclDeviceCtx();
+    mockOfflineCompiler.igcDeviceCtx = CIF::RAII::Pack<IGC::IgcOclDeviceCtxLatest>(mockIgcOclDeviceCtx);
+    ASSERT_EQ(CL_SUCCESS, retVal);
+
+    mockOfflineCompiler.inputFileSpirV = true;
+
+    retVal = mockOfflineCompiler.buildSourceCode();
+    EXPECT_EQ(CL_SUCCESS, retVal);
+
+    EXPECT_STREQ("test_options_passed", mockOfflineCompiler.options.c_str());
+    NEO::setIgcDebugVars(gEnvironment->igcDebugVars);
+}
+
 TEST(OfflineCompilerTest, givenOutputFileOptionWhenSourceIsCompiledThenOutputFileHasCorrectName) {
     auto argv = {
         "ocloc",
@@ -773,7 +806,7 @@ TEST(OfflineCompilerTest, givenInternalOptionsWhenCmdLineParsedThenOptionsAreApp
     EXPECT_THAT(internalOptions, ::testing::HasSubstr(std::string("myInternalOptions")));
 }
 
-TEST(OfflineCompilerTest, givenInputOtpionsAndInternalOptionsFilesWhenOfflineCompilerIsInitializedThenCorrectOptionsAreSetAndRemainAfterBuild) {
+TEST(OfflineCompilerTest, givenInputOptionsAndInternalOptionsFilesWhenOfflineCompilerIsInitializedThenCorrectOptionsAreSetAndRemainAfterBuild) {
     auto mockOfflineCompiler = std::unique_ptr<MockOfflineCompiler>(new MockOfflineCompiler());
     ASSERT_NE(nullptr, mockOfflineCompiler);