Builtin kernels refactoring

Related-To: NEO-3220
Change-Id: Ib85a1f4fd69b47bc8e819a29cc4adec73bda72e0
Signed-off-by: Pawel Wilma <pawel.wilma@intel.com>

CMakeLists.txt

@@ -782,6 +782,7 @@ include_directories(${NEO_SOURCE_DIR}/core/memory_manager/definitions${BRANCH_DI
 include_directories(${NEO_SOURCE_DIR}/core/memory_properties${BRANCH_DIR_SUFFIX})
 include_directories(${NEO_SOURCE_DIR}/core/sku_info/definitions${BRANCH_DIR_SUFFIX})
 include_directories(${NEO_SOURCE_DIR}/runtime/built_ins/builtinops${BRANCH_DIR_SUFFIX})
+include_directories(${NEO_SOURCE_DIR}/runtime/command_queue/definitions${BRANCH_DIR_SUFFIX})
 include_directories(${NEO_SOURCE_DIR}/runtime/command_stream/definitions${BRANCH_DIR_SUFFIX})
 include_directories(${NEO_SOURCE_DIR}/runtime/gen_common/reg_configs${BRANCH_DIR_SUFFIX})
 include_directories(${NEO_SOURCE_DIR}/runtime/gmm_helper/${BRANCH_DIR_SUFFIX})

runtime/built_ins/CMakeLists.txt

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2017-2019 Intel Corporation
+# Copyright (C) 2017-2020 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
@@ -12,13 +12,15 @@ set(RUNTIME_SRCS_BUILT_INS
   ${CMAKE_CURRENT_SOURCE_DIR}/built_ins.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/built_ins.h
   ${CMAKE_CURRENT_SOURCE_DIR}/built_in_ops_base.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/builtinops${BRANCH_DIR_SUFFIX}/built_in_ops.h
   ${CMAKE_CURRENT_SOURCE_DIR}/built_ins.inl
   ${CMAKE_CURRENT_SOURCE_DIR}/sip.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/sip.h
   ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/unknown_built_in_name.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/vme_dispatch_builder.h
 )
+
+add_subdirectory(builtinops)
+
 target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_BUILT_INS})
 set_property(GLOBAL PROPERTY RUNTIME_SRCS_BUILT_INS ${RUNTIME_SRCS_BUILT_INS})
 

runtime/built_ins/built_ins.cpp

@@ -876,8 +876,6 @@ BuiltinDispatchInfoBuilder &BuiltIns::getBuiltinDispatchInfoBuilder(EBuiltInOps:
     uint32_t operationId = static_cast<uint32_t>(operation);
     auto &operationBuilder = BuiltinOpsBuilders[operationId];
     switch (operation) {
-    default:
-        throw std::runtime_error("getBuiltinDispatchInfoBuilder failed");
     case EBuiltInOps::CopyBufferToBuffer:
         std::call_once(operationBuilder.second, [&] { operationBuilder.first = std::make_unique<BuiltInOp<EBuiltInOps::CopyBufferToBuffer>>(*this, context, device); });
         break;
@@ -926,6 +924,8 @@ BuiltinDispatchInfoBuilder &BuiltIns::getBuiltinDispatchInfoBuilder(EBuiltInOps:
     case EBuiltInOps::AuxTranslation:
         std::call_once(operationBuilder.second, [&] { operationBuilder.first = std::make_unique<BuiltInOp<EBuiltInOps::AuxTranslation>>(*this, context, device); });
         break;
+    default:
+        return getUnknownDispatchInfoBuilder(operation, context, device);
     }
     return *operationBuilder.first;
 }

runtime/built_ins/built_ins.h

@@ -168,7 +168,9 @@ class BuiltIns {
     std::pair<std::unique_ptr<BuiltinDispatchInfoBuilder>, std::once_flag> BuiltinOpsBuilders[static_cast<uint32_t>(EBuiltInOps::COUNT)];
 
     BuiltinDispatchInfoBuilder &getBuiltinDispatchInfoBuilder(EBuiltInOps::Type op, Context &context, Device &device);
-
+    BuiltinDispatchInfoBuilder &getUnknownDispatchInfoBuilder(EBuiltInOps::Type op, Context &context, Device &device);
+    std::unique_ptr<BuiltinDispatchInfoBuilder> setBuiltinDispatchInfoBuilder(EBuiltInOps::Type op, Context &context, Device &device,
+                                                                              std::unique_ptr<BuiltinDispatchInfoBuilder> newBuilder);
     BuiltIns();
     virtual ~BuiltIns();
 

runtime/built_ins/built_ins.inl

@@ -1,22 +1,15 @@
 /*
- * Copyright (C) 2018-2019 Intel Corporation
+ * Copyright (C) 2018-2020 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #include "runtime/built_ins/aux_translation_builtin.h"
+#include "runtime/built_ins/populate_built_ins.inl"
 #include "runtime/kernel/kernel.h"
 #include "runtime/mem_obj/buffer.h"
-
 namespace NEO {
-template <typename... KernelsDescArgsT>
-void BuiltinDispatchInfoBuilder::populate(Context &context, Device &device, EBuiltInOps::Type op, const char *options, KernelsDescArgsT &&... desc) {
-    auto src = kernelsLib.getBuiltinsLib().getBuiltinCode(op, BuiltinCode::ECodeType::Any, device);
-    prog.reset(BuiltinsLib::createProgramFromCode(src, context, device).release());
-    prog->build(0, nullptr, options, nullptr, nullptr, kernelsLib.isCacheingEnabled());
-    grabKernels(std::forward<KernelsDescArgsT>(desc)...);
-}
 
 BuiltInOp<EBuiltInOps::AuxTranslation>::BuiltInOp(BuiltIns &kernelsLib, Context &context, Device &device) : BuiltinDispatchInfoBuilder(kernelsLib) {
     BuiltinDispatchInfoBuilder::populate(context, device, EBuiltInOps::AuxTranslation, "", "fullCopy", baseKernel);

runtime/built_ins/builtinops/CMakeLists.txt

@@ -0,0 +1,14 @@
+#
+# Copyright (C) 2020 Intel Corporation
+#
+# SPDX-License-Identifier: MIT
+#
+
+set(RUNTIME_SRCS_BUILT_INS_OPS
+  ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
+  ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/built_in_ops.h
+)
+
+target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_EMBARGO_BUILT_INS_OPS})
+
+add_subdirectories()

runtime/built_ins/populate_built_ins.inl

@@ -0,0 +1,16 @@
+/*
+ * Copyright (C) 2019-2020 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ */
+
+namespace NEO {
+template <typename... KernelsDescArgsT>
+void BuiltinDispatchInfoBuilder::populate(Context &context, Device &device, EBuiltInOps::Type op, const char *options, KernelsDescArgsT &&... desc) {
+    auto src = kernelsLib.getBuiltinsLib().getBuiltinCode(op, BuiltinCode::ECodeType::Any, device);
+    prog.reset(BuiltinsLib::createProgramFromCode(src, context, device).release());
+    prog->build(0, nullptr, options, nullptr, nullptr, kernelsLib.isCacheingEnabled());
+    grabKernels(std::forward<KernelsDescArgsT>(desc)...);
+}
+} // namespace NEO

runtime/built_ins/registry/CMakeLists.txt

@@ -22,3 +22,5 @@ target_include_directories(${BUILTINS_SOURCES_LIB_NAME} PRIVATE
   ${NEO__IGC_INCLUDE_DIR}
   ${THIRD_PARTY_DIR}
 )
+
+add_subdirectories()

runtime/built_ins/unknown_built_in_name.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019 Intel Corporation
+ * Copyright (C) 2019-2020 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -12,4 +12,8 @@ namespace NEO {
 const char *getUnknownBuiltinAsString(EBuiltInOps::Type builtin) {
     return "unknown";
 }
+
+BuiltinDispatchInfoBuilder &BuiltIns::getUnknownDispatchInfoBuilder(EBuiltInOps::Type operation, Context &context, Device &device) {
+    throw std::runtime_error("getBuiltinDispatchInfoBuilder failed");
+}
 } // namespace NEO

runtime/command_queue/command_queue.h

@@ -31,6 +31,7 @@ class Kernel;
 class MemObj;
 class PerformanceCounters;
 struct CompletionStamp;
+struct DispatchGlobalsArgs;
 struct MultiDispatchInfo;
 
 enum class QueuePriority {
@@ -310,6 +311,12 @@ class CommandQueue : public BaseObject<_cl_command_queue> {
     }
 
     virtual cl_int finish() { return CL_SUCCESS; }
+    virtual cl_int enqueueInitDispatchGlobals(DispatchGlobalsArgs *dispatchGlobalsArgs,
+                                              cl_uint numEventsInWaitList,
+                                              const cl_event *eventWaitList,
+                                              cl_event *event) {
+        return CL_SUCCESS;
+    }
 
     virtual cl_int flush() { return CL_SUCCESS; }
 

runtime/command_queue/command_queue_hw.h

@@ -287,12 +287,17 @@ class CommandQueueHw : public CommandQueue {
                                     cl_uint numEventsInWaitList,
                                     const cl_event *eventWaitList,
                                     cl_event *event) override;
+
     cl_int enqueueResourceBarrier(BarrierCommand *resourceBarrier,
                                   cl_uint numEventsInWaitList,
                                   const cl_event *eventWaitList,
                                   cl_event *event) override;
 
     cl_int finish() override;
+    cl_int enqueueInitDispatchGlobals(DispatchGlobalsArgs *dispatchGlobalsArgs,
+                                      cl_uint numEventsInWaitList,
+                                      const cl_event *eventWaitList,
+                                      cl_event *event) override;
     cl_int flush() override;
 
     template <uint32_t enqueueType>

runtime/command_queue/definitions/enqueue_init_dispatch_globals.h

@@ -0,0 +1,23 @@
+/*
+ * Copyright (C) 2019-2020 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ */
+
+#pragma once
+#include "runtime/command_queue/command_queue_hw.h"
+
+namespace NEO {
+
+struct DispatchGlobalsArgs {
+};
+
+template <typename GfxFamily>
+cl_int CommandQueueHw<GfxFamily>::enqueueInitDispatchGlobals(DispatchGlobalsArgs *dispatchGlobalsArgs,
+                                                             cl_uint numEventsInWaitList,
+                                                             const cl_event *eventWaitList,
+                                                             cl_event *event) {
+    return CL_INVALID_VALUE;
+}
+} // namespace NEO

runtime/gen11/command_queue_gen11.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2019 Intel Corporation
+ * Copyright (C) 2018-2020 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -10,6 +10,8 @@
 #include "runtime/command_queue/command_queue_hw_bdw_plus.inl"
 #include "runtime/command_queue/enqueue_resource_barrier.h"
 
+#include "enqueue_init_dispatch_globals.h"
+
 namespace NEO {
 
 typedef ICLFamily Family;

runtime/gen12lp/command_queue_gen12lp.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019 Intel Corporation
+ * Copyright (C) 2019-2020 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -9,6 +9,7 @@
 #include "runtime/command_queue/command_queue_hw_bdw_plus.inl"
 
 #include "command_queue_helpers_gen12lp.inl"
+#include "enqueue_init_dispatch_globals.h"
 
 namespace NEO {
 

runtime/gen8/command_queue_gen8.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017-2019 Intel Corporation
+ * Copyright (C) 2017-2020 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -10,6 +10,8 @@
 #include "runtime/command_queue/command_queue_hw_bdw_plus.inl"
 #include "runtime/command_queue/enqueue_resource_barrier.h"
 
+#include "enqueue_init_dispatch_globals.h"
+
 namespace NEO {
 
 typedef BDWFamily Family;

runtime/gen9/command_queue_gen9.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017-2019 Intel Corporation
+ * Copyright (C) 2017-2020 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -10,6 +10,8 @@
 #include "runtime/command_queue/command_queue_hw_bdw_plus.inl"
 #include "runtime/command_queue/enqueue_resource_barrier.h"
 
+#include "enqueue_init_dispatch_globals.h"
+
 namespace NEO {
 
 typedef SKLFamily Family;

unit_tests/built_ins/CMakeLists.txt

@@ -1,13 +1,16 @@
 #
-# Copyright (C) 2017-2019 Intel Corporation
+# Copyright (C) 2017-2020 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
 
 set(IGDRCL_SRCS_tests_built_in
   ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
+  ${CMAKE_CURRENT_SOURCE_DIR}/built_ins_file_names.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/built_ins_file_names.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/built_in_kernels_tests.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/built_in_tests.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/get_built_ins_file_names.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/sip_tests.cpp
 )
 target_sources(igdrcl_tests PRIVATE ${IGDRCL_SRCS_tests_built_in})

unit_tests/built_ins/built_in_tests.cpp

@@ -20,6 +20,7 @@
 #include "runtime/helpers/dispatch_info_builder.h"
 #include "runtime/kernel/kernel.h"
 #include "test.h"
+#include "unit_tests/built_ins/built_ins_file_names.h"
 #include "unit_tests/fixtures/built_in_fixture.h"
 #include "unit_tests/fixtures/context_fixture.h"
 #include "unit_tests/fixtures/device_fixture.h"
@@ -119,53 +120,11 @@ struct VmeBuiltInTests : BuiltInTests {
 TEST_F(BuiltInTests, SourceConsistency) {
     size_t size = 0;
 
-    AppendBuiltInStringFromFile(
-        "test_files/aux_translation.igdrcl_built_in", size);
-    ASSERT_NE(0u, size);
-
-    AppendBuiltInStringFromFile(
-        "test_files/copy_buffer_to_buffer.igdrcl_built_in", size);
-    ASSERT_NE(0u, size);
-
-    AppendBuiltInStringFromFile(
-        "test_files/fill_buffer.igdrcl_built_in", size);
-    ASSERT_NE(0u, size);
-
-    AppendBuiltInStringFromFile(
-        "test_files/fill_image1d.igdrcl_built_in", size);
-    ASSERT_NE(0u, size);
-
-    AppendBuiltInStringFromFile(
-        "test_files/fill_image2d.igdrcl_built_in", size);
-    ASSERT_NE(0u, size);
-
-    AppendBuiltInStringFromFile(
-        "test_files/fill_image3d.igdrcl_built_in", size);
-    ASSERT_NE(0u, size);
-
-    AppendBuiltInStringFromFile(
-        "test_files/copy_image_to_image1d.igdrcl_built_in", size);
-    ASSERT_NE(0u, size);
-
-    AppendBuiltInStringFromFile(
-        "test_files/copy_image_to_image2d.igdrcl_built_in", size);
-    ASSERT_NE(0u, size);
-
-    AppendBuiltInStringFromFile(
-        "test_files/copy_image_to_image3d.igdrcl_built_in", size);
-    ASSERT_NE(0u, size);
-
-    AppendBuiltInStringFromFile(
-        "test_files/copy_buffer_rect.igdrcl_built_in", size);
-    ASSERT_NE(0u, size);
-
-    AppendBuiltInStringFromFile(
-        "test_files/copy_buffer_to_image3d.igdrcl_built_in", size);
-    ASSERT_NE(0u, size);
-
-    AppendBuiltInStringFromFile(
-        "test_files/copy_image3d_to_buffer.igdrcl_built_in", size);
-    ASSERT_NE(0u, size);
+    for (auto &fileName : getBuiltInFileNames()) {
+        AppendBuiltInStringFromFile(
+            fileName, size);
+        ASSERT_NE(0u, size);
+    }
 
     // convert /r/n to /n
     size_t start_pos = 0;
@@ -180,8 +139,7 @@ TEST_F(BuiltInTests, SourceConsistency) {
     }
 
     uint64_t hash = Hash::hash(allBuiltIns.c_str(), allBuiltIns.length());
-    std::string hashName = "test_files/" + std::to_string(hash);
-    hashName.append(".cl");
+    auto hashName = getBuiltInHashFileName(hash);
 
     //Fisrt fail, if we are inconsistent
     EXPECT_EQ(true, fileExists(hashName)) << "**********\nBuilt in kernels need to be regenerated for the mock compilers!\n**********";

unit_tests/built_ins/built_ins_file_names.cpp

@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) 2019-2020 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ */
+
+#include <string>
+#include <vector>
+
+namespace NEO {
+std::vector<std::string> buintInFileNames = {
+    "test_files/aux_translation.igdrcl_built_in",
+    "test_files/copy_buffer_to_buffer.igdrcl_built_in",
+    "test_files/fill_buffer.igdrcl_built_in",
+    "test_files/fill_image1d.igdrcl_built_in",
+    "test_files/fill_image2d.igdrcl_built_in",
+    "test_files/fill_image3d.igdrcl_built_in",
+    "test_files/copy_image_to_image1d.igdrcl_built_in",
+    "test_files/copy_image_to_image2d.igdrcl_built_in",
+    "test_files/copy_image_to_image3d.igdrcl_built_in",
+    "test_files/copy_buffer_rect.igdrcl_built_in",
+    "test_files/copy_buffer_to_image3d.igdrcl_built_in",
+    "test_files/copy_image3d_to_buffer.igdrcl_built_in"};
+}

unit_tests/built_ins/built_ins_file_names.h

@@ -0,0 +1,16 @@
+/*
+ * Copyright (C) 2019-2020 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ */
+
+#include <string>
+#include <vector>
+
+#pragma once
+
+namespace NEO {
+std::vector<std::string> getBuiltInFileNames();
+std::string getBuiltInHashFileName(uint64_t hash);
+} // namespace NEO

unit_tests/built_ins/get_built_ins_file_names.cpp

@@ -0,0 +1,22 @@
+/*
+ * Copyright (C) 2019-2020 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ */
+
+#include "unit_tests/built_ins/built_ins_file_names.h"
+
+namespace NEO {
+
+extern std::vector<std::string> buintInFileNames;
+
+std::vector<std::string> getBuiltInFileNames() {
+    return buintInFileNames;
+}
+
+std::string getBuiltInHashFileName(uint64_t hash) {
+    std::string hashName = "test_files/" + std::to_string(hash) + ".cl";
+    return hashName;
+}
+} // namespace NEO

unit_tests/command_queue/command_queue_hw_tests.cpp

@@ -1304,3 +1304,7 @@ HWTEST_F(CommandQueueHwTest, givenFinishWhenFlushBatchedSubmissionsFailsThenErro
     cl_int errorCode = cmdQueue.finish();
     EXPECT_EQ(CL_OUT_OF_RESOURCES, errorCode);
 }
+
+HWTEST_F(CommandQueueHwTest, givenEmptyDispatchGlobalsArgsWhenEnqueueInitDispatchGlobalsCalledThenErrorIsReturned) {
+    EXPECT_EQ(CL_INVALID_VALUE, pCmdQ->enqueueInitDispatchGlobals(nullptr, 0, nullptr, nullptr));
+}

unit_tests/command_queue/command_queue_tests.cpp

@@ -1084,3 +1084,15 @@ TEST(CommandQueue, GivenCommandQueueWhenCheckingIfIsCacheFlushCommandCalledThenF
     bool isCommandCacheFlush = cmdQ.isCacheFlushCommand(0u);
     EXPECT_FALSE(isCommandCacheFlush);
 }
+
+TEST(CommandQueue, GivenCommandQueueWhenEnqueueInitDispatchGlobalsCalledThenSuccessReturned) {
+    MockContext context;
+    CommandQueue cmdQ(&context, nullptr, 0);
+
+    cl_int result = cmdQ.enqueueInitDispatchGlobals(
+        nullptr,
+        0,
+        nullptr,
+        nullptr);
+    EXPECT_EQ(CL_SUCCESS, result);
+}

unit_tests/helpers/kernel_binary_helper.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017-2019 Intel Corporation
+ * Copyright (C) 2017-2020 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -14,8 +14,6 @@
 
 extern PRODUCT_FAMILY productFamily;
 
-const std::string KernelBinaryHelper::BUILT_INS("7030307152995455603");
-
 KernelBinaryHelper::KernelBinaryHelper(const std::string &name, bool appendOptionsToFileName) {
     // set mock compiler to return expected kernel
     MockCompilerDebugVars fclDebugVars;

unit_tests/helpers/kernel_binary_helper_hash_value.cpp

@@ -0,0 +1,10 @@
+/*
+ * Copyright (C) 2019-2020 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ */
+
+#include "unit_tests/helpers/kernel_binary_helper.h"
+
+const std::string KernelBinaryHelper::BUILT_INS("7030307152995455603");

unit_tests/libult/CMakeLists.txt

@@ -90,6 +90,7 @@ set(IGDRCL_SRCS_LIB_ULT_ENV
   ${NEO_SOURCE_DIR}/unit_tests/fixtures/program_fixture.h
   ${NEO_SOURCE_DIR}/unit_tests/helpers/kernel_binary_helper.cpp
   ${NEO_SOURCE_DIR}/unit_tests/helpers/kernel_binary_helper.h
+  ${NEO_SOURCE_DIR}/unit_tests/helpers${BRANCH_DIR_SUFFIX}/kernel_binary_helper_hash_value.cpp
   ${NEO_SOURCE_DIR}/unit_tests/indirect_heap/indirect_heap_fixture.cpp
   ${NEO_SOURCE_DIR}/unit_tests/indirect_heap/indirect_heap_fixture.h
   ${NEO_SOURCE_DIR}/unit_tests/ult_config_listener.cpp

unit_tests/main.cpp

@@ -15,6 +15,7 @@
 #include "runtime/os_interface/hw_info_config.h"
 #include "runtime/os_interface/ocl_reg_path.h"
 #include "unit_tests/custom_event_listener.h"
+#include "unit_tests/helpers/kernel_binary_helper.h"
 #include "unit_tests/mocks/mock_gmm.h"
 #include "unit_tests/mocks/mock_program.h"
 #include "unit_tests/mocks/mock_sip.h"
@@ -408,8 +409,8 @@ int main(int argc, char **argv) {
     MockCompilerDebugVars fclDebugVars;
     MockCompilerDebugVars igcDebugVars;
 
-    retrieveBinaryKernelFilename(fclDebugVars.fileName, "7030307152995455603_", ".bc");
-    retrieveBinaryKernelFilename(igcDebugVars.fileName, "7030307152995455603_", ".gen");
+    retrieveBinaryKernelFilename(fclDebugVars.fileName, KernelBinaryHelper::BUILT_INS + "_", ".bc");
+    retrieveBinaryKernelFilename(igcDebugVars.fileName, KernelBinaryHelper::BUILT_INS + "_", ".gen");
 
     gEnvironment->setMockFileNames(fclDebugVars.fileName, igcDebugVars.fileName);
     gEnvironment->setDefaultDebugVars(fclDebugVars, igcDebugVars, device);

unit_tests/mocks/mock_builtin_dispatch_info_builder.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017-2019 Intel Corporation
+ * Copyright (C) 2017-2020 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -36,8 +36,20 @@ class MockBuiltinDispatchInfoBuilder : public BuiltinDispatchInfoBuilder {
         return &multiDispatchInfo;
     };
 
+    void setFailingArgIndex(uint32_t index) {
+        withFailureInjection = true;
+        failingArgIndex = index;
+    }
+
+    virtual bool setExplicitArg(uint32_t argIndex, size_t argSize, const void *argVal, cl_int &err) const override {
+        err = (withFailureInjection && argIndex == failingArgIndex) ? CL_INVALID_ARG_VALUE : CL_SUCCESS;
+        return false;
+    }
+
   protected:
     mutable BuiltinOpParams builtinOpParams;
     mutable MultiDispatchInfo multiDispatchInfo;
     BuiltinDispatchInfoBuilder *originalBuilder;
+    bool withFailureInjection = false;
+    uint32_t failingArgIndex = 0;
 };