Possibility to apply additional build options

Change-Id: Ic654f57b462e32f464db9df94aed1061bc5a7bac

Author: pwilma

runtime/program/CMakeLists.txt

@@ -1,11 +1,12 @@
 #
-# Copyright (C) 2018 Intel Corporation
+# Copyright (C) 2018-2019 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
 
 set(RUNTIME_SRCS_PROGRAM
   ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
+  ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/additional_options.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/block_kernel_manager.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/block_kernel_manager.h
   ${CMAKE_CURRENT_SOURCE_DIR}/build.cpp

runtime/program/additional_options.cpp

@@ -0,0 +1,13 @@
+/*
+ * Copyright (C) 2017-2019 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ */
+
+#include "runtime/program/program.h"
+
+namespace OCLRT {
+void Program::applyAdditionalOptions() {
+}
+}; // namespace OCLRT

runtime/program/build.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017-2018 Intel Corporation
+ * Copyright (C) 2017-2019 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -57,6 +57,7 @@ cl_int Program::build(
 
             options = (buildOptions) ? buildOptions : "";
             extractInternalOptions(options);
+            applyAdditionalOptions();
 
             CompilerInterface *pCompilerInterface = this->executionEnvironment.getCompilerInterface();
             if (!pCompilerInterface) {

runtime/program/program.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017-2018 Intel Corporation
+ * Copyright (C) 2017-2019 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -266,6 +266,7 @@ class Program : public BaseObject<_cl_program> {
     void updateNonUniformFlag(const Program **inputProgram, size_t numInputPrograms);
 
     void extractInternalOptions(std::string &options);
+    MOCKABLE_VIRTUAL void applyAdditionalOptions();
 
     MOCKABLE_VIRTUAL bool appendKernelDebugOptions();
     void notifyDebuggerWithSourceCode(std::string &filename);

unit_tests/program/program_tests.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017-2018 Intel Corporation
+ * Copyright (C) 2017-2019 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -2926,3 +2926,22 @@ TEST_F(ProgramTests, givenProgramWhenUnknownInternalOptionsArePassedThenTheyAreN
     EXPECT_EQ(0u, pProgram.getInternalOptions().length());
     EXPECT_TRUE(buildOptions == internalOption);
 }
+
+class AdditionalOptionsMockProgram : public MockProgram {
+  public:
+    AdditionalOptionsMockProgram() : MockProgram(executionEnvironment) {}
+    void applyAdditionalOptions() override {
+        applyAdditionalOptionsCalled++;
+        MockProgram::applyAdditionalOptions();
+    }
+    uint32_t applyAdditionalOptionsCalled = 0;
+    ExecutionEnvironment executionEnvironment;
+};
+
+TEST_F(ProgramTests, givenProgramWhenBuiltThenAdditionalOptionsAreApplied) {
+    AdditionalOptionsMockProgram program;
+    cl_device_id device = pDevice;
+
+    program.build(1, &device, nullptr, nullptr, nullptr, false);
+    EXPECT_EQ(1u, program.applyAdditionalOptionsCalled);
+}