Refactoring of internal options extraction

Change-Id: Ice53746e696ba6de5bb2c901e713594ee90bf99c
Signed-off-by: Pawel Wilma <[email protected]>

Author: pwilma

runtime/program/CMakeLists.txt

@@ -14,6 +14,7 @@ set(RUNTIME_SRCS_PROGRAM
   ${CMAKE_CURRENT_SOURCE_DIR}/create.inl
   ${CMAKE_CURRENT_SOURCE_DIR}/get_info.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/heap_info.h
+  ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/internal_options.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/kernel_arg_info.h
   ${CMAKE_CURRENT_SOURCE_DIR}/kernel_info.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/kernel_info.h

runtime/program/build.cpp

@@ -56,15 +56,7 @@ cl_int Program::build(
             buildStatus = CL_BUILD_IN_PROGRESS;
 
             options = (buildOptions) ? buildOptions : "";
-            std::string reraStr = "-cl-intel-gtpin-rera";
-            size_t pos = options.find(reraStr);
-            if (pos != std::string::npos) {
-                // build option "-cl-intel-gtpin-rera" is present, move it to internalOptions
-                size_t reraLen = reraStr.length();
-                options.erase(pos, reraLen);
-                internalOptions.append(reraStr);
-                internalOptions.append(" ");
-            }
+            extractInternalOptions(options);
 
             CompilerInterface *pCompilerInterface = this->executionEnvironment.getCompilerInterface();
             if (!pCompilerInterface) {
@@ -176,4 +168,15 @@ cl_int Program::build(
 
     return retVal;
 }
+
+void Program::extractInternalOptions(std::string &options) {
+    for (auto &optionString : internalOptionsToExtract) {
+        size_t pos = options.find(optionString);
+        if (pos != std::string::npos) {
+            options.erase(pos, optionString.length());
+            internalOptions.append(optionString);
+            internalOptions.append(" ");
+        }
+    }
+}
 } // namespace OCLRT

runtime/program/internal_options.cpp

@@ -0,0 +1,13 @@
+/*
+ * Copyright (C) 2017-2018 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ */
+
+#include "runtime/program/program.h"
+#include <vector>
+
+namespace OCLRT {
+const std::vector<std::string> Program::internalOptionsToExtract = {"-cl-intel-gtpin-rera"};
+};

runtime/program/program.h

@@ -265,6 +265,8 @@ class Program : public BaseObject<_cl_program> {
     void updateNonUniformFlag();
     void updateNonUniformFlag(const Program **inputProgram, size_t numInputPrograms);
 
+    void extractInternalOptions(std::string &options);
+
     static const std::string clOptNameClVer;
     static const std::string clOptNameUniformWgs;
     // clang-format off
@@ -302,6 +304,7 @@ class Program : public BaseObject<_cl_program> {
     std::string               sourceCode;
     std::string               options;
     std::string               internalOptions;
+    static const std::vector<std::string> internalOptionsToExtract;
     std::string               hashFileName;
     std::string               hashFilePath;
 

unit_tests/mocks/mock_program.h

@@ -125,6 +125,10 @@ class MockProgram : public Program {
 
     Device *getDevicePtr() { return this->pDevice; }
 
+    void extractInternalOptionsForward(std::string &buildOptions) {
+        extractInternalOptions(buildOptions);
+    }
+
     bool contextSet = false;
 };
 

unit_tests/program/CMakeLists.txt

@@ -26,3 +26,4 @@ set(IGDRCL_SRCS_tests_program
   ${CMAKE_CURRENT_SOURCE_DIR}/program_with_source.h
 )
 target_sources(igdrcl_tests PRIVATE ${IGDRCL_SRCS_tests_program})
+add_subdirectories()

unit_tests/program/program_tests.cpp

@@ -2903,3 +2903,27 @@ TEST_F(ProgramTests, givenProgramWithSpirvWhenRebuildProgramIsCalledThenSpirvPat
     EXPECT_EQ(sizeof(spirv), spvSectionDataSize);
     EXPECT_EQ(0, memcmp(spirv, spvSectionData, spvSectionDataSize));
 }
+
+TEST_F(ProgramTests, givenProgramWhenInternalOptionsArePassedThenTheyAreRemovedFromBuildOptions) {
+    ExecutionEnvironment executionEnvironment;
+    MockProgram pProgram(executionEnvironment);
+    pProgram.getInternalOptions().erase();
+    EXPECT_EQ(nullptr, pProgram.getDevicePtr());
+    const char *internalOption = "-cl-intel-gtpin-rera";
+    std::string buildOptions(internalOption);
+    pProgram.extractInternalOptionsForward(buildOptions);
+    EXPECT_EQ(0u, buildOptions.length());
+    EXPECT_TRUE(pProgram.getInternalOptions() == std::string(internalOption) + " ");
+}
+
+TEST_F(ProgramTests, givenProgramWhenUnknownInternalOptionsArePassedThenTheyAreNotRemovedFromBuildOptions) {
+    ExecutionEnvironment executionEnvironment;
+    MockProgram pProgram(executionEnvironment);
+    pProgram.getInternalOptions().erase();
+    EXPECT_EQ(nullptr, pProgram.getDevicePtr());
+    const char *internalOption = "-unknown-internal-options-123";
+    std::string buildOptions(internalOption);
+    pProgram.extractInternalOptionsForward(buildOptions);
+    EXPECT_EQ(0u, pProgram.getInternalOptions().length());
+    EXPECT_TRUE(buildOptions == internalOption);
+}