Rename builtins

igdrcl_built_in -> builtin_kernel

Change-Id: I366f66ad9264a904c70a9fe27860164dbc8851cc
Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>

manifests/manifest.yml

@@ -14,7 +14,7 @@ components:
   infra:
     branch: infra
     dest_dir: infra
-    revision: 14bd2f0f7c41573071928f72caad1823fc963cbe
+    revision: 15fae173ea2b4ecba8db71685e59cb94ba71ccb7
     type: git
   internal:
     branch: master

offline_compiler/offline_compiler.cpp

@@ -581,7 +581,7 @@ std::string OfflineCompiler::parseBinAsCharArray(uint8_t *binary, size_t size, s
         << std::endl;
     out << "namespace NEO {" << std::endl;
     out << "static RegisterEmbeddedResource register" << builtinName << "Bin(" << std::endl;
-    out << "    \"" << familyNameWithType << "_0_" << fileName.c_str() << ".igdrcl_built_in.bin\"," << std::endl;
+    out << "    \"" << familyNameWithType << "_0_" << fileName.c_str() << ".builtin_kernel.bin\"," << std::endl;
     out << "    (const char *)" << builtinName << "Binary_" << familyNameWithType << "," << std::endl;
     out << "    " << builtinName << "BinarySize_" << familyNameWithType << ");" << std::endl;
     out << "}" << std::endl;

runtime/built_ins/CMakeLists.txt

@@ -29,26 +29,26 @@ target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_BUILT_INS})
 set_property(GLOBAL PROPERTY RUNTIME_SRCS_BUILT_INS ${RUNTIME_SRCS_BUILT_INS})
 
 set(RUNTIME_SRCS_BUILT_IN_KERNELS
-  ${CMAKE_CURRENT_SOURCE_DIR}/kernels/aux_translation.igdrcl_built_in
-  ${CMAKE_CURRENT_SOURCE_DIR}/kernels/copy_buffer_rect.igdrcl_built_in
-  ${CMAKE_CURRENT_SOURCE_DIR}/kernels/copy_buffer_rect_stateless.igdrcl_built_in
-  ${CMAKE_CURRENT_SOURCE_DIR}/kernels/copy_buffer_to_buffer.igdrcl_built_in
-  ${CMAKE_CURRENT_SOURCE_DIR}/kernels/copy_buffer_to_buffer_stateless.igdrcl_built_in
-  ${CMAKE_CURRENT_SOURCE_DIR}/kernels/copy_buffer_to_image3d.igdrcl_built_in
-  ${CMAKE_CURRENT_SOURCE_DIR}/kernels/copy_buffer_to_image3d_stateless.igdrcl_built_in
-  ${CMAKE_CURRENT_SOURCE_DIR}/kernels/copy_image3d_to_buffer.igdrcl_built_in
-  ${CMAKE_CURRENT_SOURCE_DIR}/kernels/copy_image3d_to_buffer_stateless.igdrcl_built_in
-  ${CMAKE_CURRENT_SOURCE_DIR}/kernels/copy_image_to_image1d.igdrcl_built_in
-  ${CMAKE_CURRENT_SOURCE_DIR}/kernels/copy_image_to_image2d.igdrcl_built_in
-  ${CMAKE_CURRENT_SOURCE_DIR}/kernels/copy_image_to_image3d.igdrcl_built_in
-  ${CMAKE_CURRENT_SOURCE_DIR}/kernels/fill_buffer.igdrcl_built_in
-  ${CMAKE_CURRENT_SOURCE_DIR}/kernels/fill_buffer_stateless.igdrcl_built_in
-  ${CMAKE_CURRENT_SOURCE_DIR}/kernels/fill_image1d.igdrcl_built_in
-  ${CMAKE_CURRENT_SOURCE_DIR}/kernels/fill_image2d.igdrcl_built_in
-  ${CMAKE_CURRENT_SOURCE_DIR}/kernels/fill_image3d.igdrcl_built_in
-  ${CMAKE_CURRENT_SOURCE_DIR}/kernels/vme_block_advanced_motion_estimate_bidirectional_check_intel.igdrcl_built_in
-  ${CMAKE_CURRENT_SOURCE_DIR}/kernels/vme_block_advanced_motion_estimate_check_intel.igdrcl_built_in
-  ${CMAKE_CURRENT_SOURCE_DIR}/kernels/vme_block_motion_estimate_intel.igdrcl_built_in
+  ${CMAKE_CURRENT_SOURCE_DIR}/kernels/aux_translation.builtin_kernel
+  ${CMAKE_CURRENT_SOURCE_DIR}/kernels/copy_buffer_rect.builtin_kernel
+  ${CMAKE_CURRENT_SOURCE_DIR}/kernels/copy_buffer_rect_stateless.builtin_kernel
+  ${CMAKE_CURRENT_SOURCE_DIR}/kernels/copy_buffer_to_buffer.builtin_kernel
+  ${CMAKE_CURRENT_SOURCE_DIR}/kernels/copy_buffer_to_buffer_stateless.builtin_kernel
+  ${CMAKE_CURRENT_SOURCE_DIR}/kernels/copy_buffer_to_image3d.builtin_kernel
+  ${CMAKE_CURRENT_SOURCE_DIR}/kernels/copy_buffer_to_image3d_stateless.builtin_kernel
+  ${CMAKE_CURRENT_SOURCE_DIR}/kernels/copy_image3d_to_buffer.builtin_kernel
+  ${CMAKE_CURRENT_SOURCE_DIR}/kernels/copy_image3d_to_buffer_stateless.builtin_kernel
+  ${CMAKE_CURRENT_SOURCE_DIR}/kernels/copy_image_to_image1d.builtin_kernel
+  ${CMAKE_CURRENT_SOURCE_DIR}/kernels/copy_image_to_image2d.builtin_kernel
+  ${CMAKE_CURRENT_SOURCE_DIR}/kernels/copy_image_to_image3d.builtin_kernel
+  ${CMAKE_CURRENT_SOURCE_DIR}/kernels/fill_buffer.builtin_kernel
+  ${CMAKE_CURRENT_SOURCE_DIR}/kernels/fill_buffer_stateless.builtin_kernel
+  ${CMAKE_CURRENT_SOURCE_DIR}/kernels/fill_image1d.builtin_kernel
+  ${CMAKE_CURRENT_SOURCE_DIR}/kernels/fill_image2d.builtin_kernel
+  ${CMAKE_CURRENT_SOURCE_DIR}/kernels/fill_image3d.builtin_kernel
+  ${CMAKE_CURRENT_SOURCE_DIR}/kernels/vme_block_advanced_motion_estimate_bidirectional_check_intel.builtin_kernel
+  ${CMAKE_CURRENT_SOURCE_DIR}/kernels/vme_block_advanced_motion_estimate_check_intel.builtin_kernel
+  ${CMAKE_CURRENT_SOURCE_DIR}/kernels/vme_block_motion_estimate_intel.builtin_kernel
 )
 
 target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_BUILT_IN_KERNELS})

runtime/built_ins/built_ins_storage.cpp

@@ -25,39 +25,39 @@ const char *getBuiltinAsString(EBuiltInOps::Type builtin) {
     default:
         return getUnknownBuiltinAsString(builtin);
     case EBuiltInOps::AuxTranslation:
-        return "aux_translation.igdrcl_built_in";
+        return "aux_translation.builtin_kernel";
     case EBuiltInOps::CopyBufferToBuffer:
-        return "copy_buffer_to_buffer.igdrcl_built_in";
+        return "copy_buffer_to_buffer.builtin_kernel";
     case EBuiltInOps::CopyBufferToBufferStateless:
-        return "copy_buffer_to_buffer_stateless.igdrcl_built_in";
+        return "copy_buffer_to_buffer_stateless.builtin_kernel";
     case EBuiltInOps::CopyBufferRect:
-        return "copy_buffer_rect.igdrcl_built_in";
+        return "copy_buffer_rect.builtin_kernel";
     case EBuiltInOps::CopyBufferRectStateless:
-        return "copy_buffer_rect_stateless.igdrcl_built_in";
+        return "copy_buffer_rect_stateless.builtin_kernel";
     case EBuiltInOps::FillBuffer:
-        return "fill_buffer.igdrcl_built_in";
+        return "fill_buffer.builtin_kernel";
     case EBuiltInOps::FillBufferStateless:
-        return "fill_buffer_stateless.igdrcl_built_in";
+        return "fill_buffer_stateless.builtin_kernel";
     case EBuiltInOps::CopyBufferToImage3d:
-        return "copy_buffer_to_image3d.igdrcl_built_in";
+        return "copy_buffer_to_image3d.builtin_kernel";
     case EBuiltInOps::CopyBufferToImage3dStateless:
-        return "copy_buffer_to_image3d_stateless.igdrcl_built_in";
+        return "copy_buffer_to_image3d_stateless.builtin_kernel";
     case EBuiltInOps::CopyImage3dToBuffer:
-        return "copy_image3d_to_buffer.igdrcl_built_in";
+        return "copy_image3d_to_buffer.builtin_kernel";
     case EBuiltInOps::CopyImage3dToBufferStateless:
-        return "copy_image3d_to_buffer_stateless.igdrcl_built_in";
+        return "copy_image3d_to_buffer_stateless.builtin_kernel";
     case EBuiltInOps::CopyImageToImage1d:
-        return "copy_image_to_image1d.igdrcl_built_in";
+        return "copy_image_to_image1d.builtin_kernel";
     case EBuiltInOps::CopyImageToImage2d:
-        return "copy_image_to_image2d.igdrcl_built_in";
+        return "copy_image_to_image2d.builtin_kernel";
     case EBuiltInOps::CopyImageToImage3d:
-        return "copy_image_to_image3d.igdrcl_built_in";
+        return "copy_image_to_image3d.builtin_kernel";
     case EBuiltInOps::FillImage1d:
-        return "fill_image1d.igdrcl_built_in";
+        return "fill_image1d.builtin_kernel";
     case EBuiltInOps::FillImage2d:
-        return "fill_image2d.igdrcl_built_in";
+        return "fill_image2d.builtin_kernel";
     case EBuiltInOps::FillImage3d:
-        return "fill_image3d.igdrcl_built_in";
+        return "fill_image3d.builtin_kernel";
     };
 }
 

runtime/built_ins/kernels/CMakeLists.txt

@@ -85,13 +85,13 @@ macro(macro_for_each_gen)
       string(TOLOWER ${PLATFORM_TYPE} PLATFORM_TYPE_LOWER)
       unset(BUILTINS_COMMANDS)
       foreach(GENERATED_BUILTIN ${GENERATED_BUILTINS})
-        compile_builtin(${GEN_TYPE} ${PLATFORM_TYPE} ${GENERATED_BUILTIN}.igdrcl_built_in ${NEO_BITS} "${BUILTIN_OPTIONS}")
+        compile_builtin(${GEN_TYPE} ${PLATFORM_TYPE} ${GENERATED_BUILTIN}.builtin_kernel ${NEO_BITS} "${BUILTIN_OPTIONS}")
         list(APPEND BUILTINS_COMMANDS ${TargetDir}/${BUILTIN_CPP})
         set(RUNTIME_GENERATED_${GENERATED_BUILTIN}_${family_name_with_type} ${BUILTIN_CPP} PARENT_SCOPE)
       endforeach()
       get_bits_for_stateless(${GEN_TYPE} ${PLATFORM_TYPE})
       foreach(GENERATED_BUILTIN_STATELESS ${GENERATED_BUILTINS_STATELESS})
-        compile_builtin(${GEN_TYPE} ${PLATFORM_TYPE} ${GENERATED_BUILTIN_STATELESS}.igdrcl_built_in ${BITS} "${BUILTIN_OPTIONS_STATELESS}")
+        compile_builtin(${GEN_TYPE} ${PLATFORM_TYPE} ${GENERATED_BUILTIN_STATELESS}.builtin_kernel ${BITS} "${BUILTIN_OPTIONS_STATELESS}")
         list(APPEND BUILTINS_COMMANDS ${TargetDir}/${BUILTIN_CPP})
         set(RUNTIME_GENERATED_${GENERATED_BUILTIN_STATELESS}_${family_name_with_type} ${BUILTIN_CPP} PARENT_SCOPE)
       endforeach()

runtime/built_ins/registry/register_copy_kernels_source.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017-2019 Intel Corporation
+ * Copyright (C) 2017-2020 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -17,7 +17,7 @@ static RegisterEmbeddedResource registerCopyBufferToBufferSrc(
         BuiltinCode::getExtension(BuiltinCode::ECodeType::Source))
         .c_str(),
     std::string(
-#include "runtime/built_ins/kernels/copy_buffer_to_buffer.igdrcl_built_in"
+#include "runtime/built_ins/kernels/copy_buffer_to_buffer.builtin_kernel"
         ));
 
 static RegisterEmbeddedResource registerCopyBufferToBufferStatelessSrc(
@@ -26,7 +26,7 @@ static RegisterEmbeddedResource registerCopyBufferToBufferStatelessSrc(
         BuiltinCode::getExtension(BuiltinCode::ECodeType::Source))
         .c_str(),
     std::string(
-#include "runtime/built_ins/kernels/copy_buffer_to_buffer_stateless.igdrcl_built_in"
+#include "runtime/built_ins/kernels/copy_buffer_to_buffer_stateless.builtin_kernel"
         ));
 
 static RegisterEmbeddedResource registerCopyBufferRectSrc(
@@ -35,7 +35,7 @@ static RegisterEmbeddedResource registerCopyBufferRectSrc(
         BuiltinCode::getExtension(BuiltinCode::ECodeType::Source))
         .c_str(),
     std::string(
-#include "runtime/built_ins/kernels/copy_buffer_rect.igdrcl_built_in"
+#include "runtime/built_ins/kernels/copy_buffer_rect.builtin_kernel"
         ));
 
 static RegisterEmbeddedResource registerCopyBufferRectStatelessSrc(
@@ -44,7 +44,7 @@ static RegisterEmbeddedResource registerCopyBufferRectStatelessSrc(
         BuiltinCode::getExtension(BuiltinCode::ECodeType::Source))
         .c_str(),
     std::string(
-#include "runtime/built_ins/kernels/copy_buffer_rect_stateless.igdrcl_built_in"
+#include "runtime/built_ins/kernels/copy_buffer_rect_stateless.builtin_kernel"
         ));
 
 static RegisterEmbeddedResource registerFillBufferSrc(
@@ -53,7 +53,7 @@ static RegisterEmbeddedResource registerFillBufferSrc(
         BuiltinCode::getExtension(BuiltinCode::ECodeType::Source))
         .c_str(),
     std::string(
-#include "runtime/built_ins/kernels/fill_buffer.igdrcl_built_in"
+#include "runtime/built_ins/kernels/fill_buffer.builtin_kernel"
         ));
 
 static RegisterEmbeddedResource registerFillBufferStatelessSrc(
@@ -62,7 +62,7 @@ static RegisterEmbeddedResource registerFillBufferStatelessSrc(
         BuiltinCode::getExtension(BuiltinCode::ECodeType::Source))
         .c_str(),
     std::string(
-#include "runtime/built_ins/kernels/fill_buffer_stateless.igdrcl_built_in"
+#include "runtime/built_ins/kernels/fill_buffer_stateless.builtin_kernel"
         ));
 
 static RegisterEmbeddedResource registerCopyBufferToImage3dSrc(
@@ -71,7 +71,7 @@ static RegisterEmbeddedResource registerCopyBufferToImage3dSrc(
         BuiltinCode::getExtension(BuiltinCode::ECodeType::Source))
         .c_str(),
     std::string(
-#include "runtime/built_ins/kernels/copy_buffer_to_image3d.igdrcl_built_in"
+#include "runtime/built_ins/kernels/copy_buffer_to_image3d.builtin_kernel"
         ));
 
 static RegisterEmbeddedResource registerCopyBufferToImage3dStatelessSrc(
@@ -80,7 +80,7 @@ static RegisterEmbeddedResource registerCopyBufferToImage3dStatelessSrc(
         BuiltinCode::getExtension(BuiltinCode::ECodeType::Source))
         .c_str(),
     std::string(
-#include "runtime/built_ins/kernels/copy_buffer_to_image3d_stateless.igdrcl_built_in"
+#include "runtime/built_ins/kernels/copy_buffer_to_image3d_stateless.builtin_kernel"
         ));
 
 static RegisterEmbeddedResource registerCopyImage3dToBufferSrc(
@@ -89,7 +89,7 @@ static RegisterEmbeddedResource registerCopyImage3dToBufferSrc(
         BuiltinCode::getExtension(BuiltinCode::ECodeType::Source))
         .c_str(),
     std::string(
-#include "runtime/built_ins/kernels/copy_image3d_to_buffer.igdrcl_built_in"
+#include "runtime/built_ins/kernels/copy_image3d_to_buffer.builtin_kernel"
         ));
 
 static RegisterEmbeddedResource registerCopyImage3dToBufferStatelessSrc(
@@ -98,7 +98,7 @@ static RegisterEmbeddedResource registerCopyImage3dToBufferStatelessSrc(
         BuiltinCode::getExtension(BuiltinCode::ECodeType::Source))
         .c_str(),
     std::string(
-#include "runtime/built_ins/kernels/copy_image3d_to_buffer_stateless.igdrcl_built_in"
+#include "runtime/built_ins/kernels/copy_image3d_to_buffer_stateless.builtin_kernel"
         ));
 
 static RegisterEmbeddedResource registerCopyImageToImage1dSrc(
@@ -107,7 +107,7 @@ static RegisterEmbeddedResource registerCopyImageToImage1dSrc(
         BuiltinCode::getExtension(BuiltinCode::ECodeType::Source))
         .c_str(),
     std::string(
-#include "runtime/built_ins/kernels/copy_image_to_image1d.igdrcl_built_in"
+#include "runtime/built_ins/kernels/copy_image_to_image1d.builtin_kernel"
         ));
 
 static RegisterEmbeddedResource registerCopyImageToImage2dSrc(
@@ -116,7 +116,7 @@ static RegisterEmbeddedResource registerCopyImageToImage2dSrc(
         BuiltinCode::getExtension(BuiltinCode::ECodeType::Source))
         .c_str(),
     std::string(
-#include "runtime/built_ins/kernels/copy_image_to_image2d.igdrcl_built_in"
+#include "runtime/built_ins/kernels/copy_image_to_image2d.builtin_kernel"
         ));
 
 static RegisterEmbeddedResource registerCopyImageToImage3dSrc(
@@ -125,7 +125,7 @@ static RegisterEmbeddedResource registerCopyImageToImage3dSrc(
         BuiltinCode::getExtension(BuiltinCode::ECodeType::Source))
         .c_str(),
     std::string(
-#include "runtime/built_ins/kernels/copy_image_to_image3d.igdrcl_built_in"
+#include "runtime/built_ins/kernels/copy_image_to_image3d.builtin_kernel"
         ));
 
 static RegisterEmbeddedResource registerFillImage1dSrc(
@@ -134,7 +134,7 @@ static RegisterEmbeddedResource registerFillImage1dSrc(
         BuiltinCode::getExtension(BuiltinCode::ECodeType::Source))
         .c_str(),
     std::string(
-#include "runtime/built_ins/kernels/fill_image1d.igdrcl_built_in"
+#include "runtime/built_ins/kernels/fill_image1d.builtin_kernel"
         ));
 
 static RegisterEmbeddedResource registerFillImage2dSrc(
@@ -143,7 +143,7 @@ static RegisterEmbeddedResource registerFillImage2dSrc(
         BuiltinCode::getExtension(BuiltinCode::ECodeType::Source))
         .c_str(),
     std::string(
-#include "runtime/built_ins/kernels/fill_image2d.igdrcl_built_in"
+#include "runtime/built_ins/kernels/fill_image2d.builtin_kernel"
         ));
 
 static RegisterEmbeddedResource registerFillImage3dSrc(
@@ -152,7 +152,7 @@ static RegisterEmbeddedResource registerFillImage3dSrc(
         BuiltinCode::getExtension(BuiltinCode::ECodeType::Source))
         .c_str(),
     std::string(
-#include "runtime/built_ins/kernels/fill_image3d.igdrcl_built_in"
+#include "runtime/built_ins/kernels/fill_image3d.builtin_kernel"
         ));
 
 static RegisterEmbeddedResource registerAuxTranslationSrc(
@@ -161,7 +161,7 @@ static RegisterEmbeddedResource registerAuxTranslationSrc(
         BuiltinCode::getExtension(BuiltinCode::ECodeType::Source))
         .c_str(),
     std::string(
-#include "runtime/built_ins/kernels/aux_translation.igdrcl_built_in"
+#include "runtime/built_ins/kernels/aux_translation.builtin_kernel"
         ));
 
 } // namespace NEO

runtime/built_ins/registry/register_ext_vme_source.cpp

@@ -18,7 +18,7 @@ static RegisterEmbeddedResource registerVmeSrc(
         BuiltinCode::getExtension(BuiltinCode::ECodeType::Source))
         .c_str(),
     std::string(
-#include "runtime/built_ins/kernels/vme_block_motion_estimate_intel.igdrcl_built_in"
+#include "runtime/built_ins/kernels/vme_block_motion_estimate_intel.builtin_kernel"
         ));
 
 static RegisterEmbeddedResource registerVmeAdvancedSrc(
@@ -27,7 +27,7 @@ static RegisterEmbeddedResource registerVmeAdvancedSrc(
         BuiltinCode::getExtension(BuiltinCode::ECodeType::Source))
         .c_str(),
     std::string(
-#include "runtime/built_ins/kernels/vme_block_advanced_motion_estimate_check_intel.igdrcl_built_in"
+#include "runtime/built_ins/kernels/vme_block_advanced_motion_estimate_check_intel.builtin_kernel"
         ));
 
 static RegisterEmbeddedResource registerVmeAdvancedBidirectionalSrc(
@@ -36,7 +36,7 @@ static RegisterEmbeddedResource registerVmeAdvancedBidirectionalSrc(
         BuiltinCode::getExtension(BuiltinCode::ECodeType::Source))
         .c_str(),
     std::string(
-#include "runtime/built_ins/kernels/vme_block_advanced_motion_estimate_bidirectional_check_intel.igdrcl_built_in"
+#include "runtime/built_ins/kernels/vme_block_advanced_motion_estimate_bidirectional_check_intel.builtin_kernel"
         ));
 
 } // namespace NEO

runtime/built_ins/vme_builtin.cpp

@@ -18,15 +18,15 @@
 namespace NEO {
 
 static const char *blockMotionEstimateIntelSrc = {
-#include "kernels/vme_block_motion_estimate_intel_frontend.igdrcl_built_in"
+#include "kernels/vme_block_motion_estimate_intel_frontend.builtin_kernel"
 };
 
 static const char *blockAdvancedMotionEstimateCheckIntelSrc = {
-#include "kernels/vme_block_advanced_motion_estimate_check_intel_frontend.igdrcl_built_in"
+#include "kernels/vme_block_advanced_motion_estimate_check_intel_frontend.builtin_kernel"
 };
 
 static const char *blockAdvancedMotionEstimateBidirectionalCheckIntelSrc = {
-#include "kernels/vme_block_advanced_motion_estimate_bidirectional_check_intel_frontend.igdrcl_built_in"
+#include "kernels/vme_block_advanced_motion_estimate_bidirectional_check_intel_frontend.builtin_kernel"
 };
 
 static const std::tuple<const char *, const char *> mediaBuiltIns[] = {
@@ -90,9 +90,9 @@ const char *getAdditionalBuiltinAsString(EBuiltInOps::Type builtin) {
     default:
         return nullptr;
     case EBuiltInOps::VmeBlockMotionEstimateIntel:
-        return "vme_block_motion_estimate_intel.igdrcl_built_in";
+        return "vme_block_motion_estimate_intel.builtin_kernel";
     case EBuiltInOps::VmeBlockAdvancedMotionEstimateCheckIntel:
-        return "vme_block_advanced_motion_estimate_check_intel.igdrcl_built_in";
+        return "vme_block_advanced_motion_estimate_check_intel.builtin_kernel";
     case EBuiltInOps::VmeBlockAdvancedMotionEstimateBidirectionalCheckIntel:
         return "vme_block_advanced_motion_estimate_bidirectional_check_intel";
     }

runtime/builtin_kernels_simulation/gen11/scheduler_simulation_gen11.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017-2019 Intel Corporation
+ * Copyright (C) 2017-2020 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -28,8 +28,7 @@ float __intel__getProfilingTimerResolution() {
 }
 
 #include "runtime/gen11/device_enqueue.h"
-#include "runtime/gen11/scheduler_definitions.h"
-#include "runtime/gen11/scheduler_igdrcl_built_in.inl"
+#include "runtime/gen11/scheduler_builtin_kernel.inl"
 #include "runtime/scheduler/scheduler.cl"
 } // namespace Gen11SchedulerSimulation
 

runtime/builtin_kernels_simulation/gen12lp/scheduler_simulation_gen12lp.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019 Intel Corporation
+ * Copyright (C) 2019-2020 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -30,8 +30,7 @@ float __intel__getProfilingTimerResolution() {
 }
 
 #include "runtime/gen12lp/device_enqueue.h"
-#include "runtime/gen12lp/scheduler_definitions.h"
-#include "runtime/gen12lp/scheduler_igdrcl_built_in.inl"
+#include "runtime/gen12lp/scheduler_builtin_kernel.inl"
 #include "runtime/scheduler/scheduler.cl"
 } // namespace Gen12LPSchedulerSimulation
 

runtime/builtin_kernels_simulation/gen8/scheduler_simulation_gen8.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017-2019 Intel Corporation
+ * Copyright (C) 2017-2020 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -28,8 +28,7 @@ float __intel__getProfilingTimerResolution() {
 }
 
 #include "runtime/gen8/device_enqueue.h"
-#include "runtime/gen8/scheduler_definitions.h"
-#include "runtime/gen8/scheduler_igdrcl_built_in.inl"
+#include "runtime/gen8/scheduler_builtin_kernel.inl"
 #include "runtime/scheduler/scheduler.cl"
 } // namespace Gen8SchedulerSimulation
 

runtime/builtin_kernels_simulation/gen9/scheduler_simulation_gen9.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017-2019 Intel Corporation
+ * Copyright (C) 2017-2020 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -30,8 +30,7 @@ float __intel__getProfilingTimerResolution() {
 }
 
 #include "runtime/gen9/device_enqueue.h"
-#include "runtime/gen9/scheduler_definitions.h"
-#include "runtime/gen9/scheduler_igdrcl_built_in.inl"
+#include "runtime/gen9/scheduler_builtin_kernel.inl"
 #include "runtime/scheduler/scheduler.cl"
 } // namespace Gen9SchedulerSimulation
 

runtime/enable_gens.cmake

@@ -77,7 +77,7 @@ macro(macro_for_each_gen)
   if(${SUPPORT_DEVICE_ENQUEUE_${GEN_TYPE}})
     list(APPEND RUNTIME_SRCS_${GEN_TYPE}_H_BASE ${GENX_PREFIX}/device_enqueue.h)
     list(APPEND RUNTIME_SRCS_${GEN_TYPE}_H_BASE ${GENX_PREFIX}/scheduler_definitions.h)
-    list(APPEND RUNTIME_SRCS_${GEN_TYPE}_H_BASE ${GENX_PREFIX}/scheduler_igdrcl_built_in.inl)
+    list(APPEND RUNTIME_SRCS_${GEN_TYPE}_H_BASE ${GENX_PREFIX}/scheduler_builtin_kernel.inl)
     list(APPEND RUNTIME_SRCS_${GEN_TYPE}_CPP_BASE ${GENX_PREFIX}/device_queue_${GEN_TYPE_LOWER}.cpp)
   endif()
 

runtime/gen11/scheduler_builtin_kernel.inl

@@ -1,10 +1,12 @@
 /*
- * Copyright (C) 2018-2019 Intel Corporation
+ * Copyright (C) 2018-2020 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
+#include "scheduler_definitions.h"
+
 uint GetPatchValueForSLMSize(uint slMsize) {
     uint PatchValue = 0;
     if (slMsize == 0) {

runtime/gen12lp/scheduler_builtin_kernel.inl

@@ -1,12 +1,11 @@
 /*
- * Copyright (C) 2019 Intel Corporation
+ * Copyright (C) 2019-2020 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
-#ifdef _DUMMY_WA
-#endif
+#include "scheduler_definitions.h"
 
 uint GetPatchValueForSLMSize(uint slMsize) {
     //todo: veryfy this optimization :

runtime/gen8/scheduler_builtin_kernel.inl

@@ -1,10 +1,12 @@
 /*
- * Copyright (C) 2017-2018 Intel Corporation
+ * Copyright (C) 2017-2020 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
+#include "scheduler_definitions.h"
+
 uint GetPatchValueForSLMSize(uint slMsize) {
     uint PatchValue;
     if (slMsize == 0) {

runtime/gen9/scheduler_builtin_kernel.inl

@@ -1,25 +1,12 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (C) 2017-2020 Intel Corporation
  *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
+ * SPDX-License-Identifier: MIT
  *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
  */
 
+#include "scheduler_definitions.h"
+
 uint GetPatchValueForSLMSize(uint slMsize) {
     uint PatchValue = 0;
     if (slMsize == 0) {

runtime/scheduler/scheduler.cl

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017-2019 Intel Corporation
+ * Copyright (C) 2017-2020 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -563,7 +563,7 @@ int AddGlobalToDebugBufferAllIds( __global DebugDataBuffer* ddb, __global uchar*
 #define MAX_SLB_OFFSET ( SECOND_LEVEL_BUFFER_SPACE_FOR_EACH_ENQUEUE * SECOND_LEVEL_BUFFER_NUMBER_OF_ENQUEUES )
 
 #ifndef SCHEDULER_EMULATION
-#include "scheduler_igdrcl_built_in.inl"
+#include "scheduler_builtin_kernel.inl"
 #endif
 
 //SOME COMMON CODE FUNCTIONS

runtime/scheduler/scheduler_kernel.cpp

@@ -64,7 +64,7 @@ void SchedulerKernel::computeGws() {
     printDebugString(DebugManager.flags.PrintDebugMessages.get(), stderr, "Scheduler GWS: %" PRIu64, static_cast<uint64_t>(gws));
 }
 BuiltinCode SchedulerKernel::loadSchedulerKernel(Device *device) {
-    std::string schedulerResourceName = getFamilyNameWithType(device->getHardwareInfo()) + "_0_scheduler.igdrcl_built_in.bin";
+    std::string schedulerResourceName = getFamilyNameWithType(device->getHardwareInfo()) + "_0_scheduler.builtin_kernel.bin";
 
     BuiltinCode ret;
     auto storage = std::make_unique<EmbeddedStorage>("");

unit_tests/built_ins/built_in_tests.cpp

@@ -1114,20 +1114,20 @@ TEST_F(VmeBuiltInTests, BuiltinDispatchInfoBuilderAdvancedVMEBuilder) {
 }
 
 TEST_F(VmeBuiltInTests, getBuiltinAsString) {
-    EXPECT_EQ(0, strcmp("aux_translation.igdrcl_built_in", getBuiltinAsString(EBuiltInOps::AuxTranslation)));
-    EXPECT_EQ(0, strcmp("copy_buffer_to_buffer.igdrcl_built_in", getBuiltinAsString(EBuiltInOps::CopyBufferToBuffer)));
-    EXPECT_EQ(0, strcmp("copy_buffer_rect.igdrcl_built_in", getBuiltinAsString(EBuiltInOps::CopyBufferRect)));
-    EXPECT_EQ(0, strcmp("fill_buffer.igdrcl_built_in", getBuiltinAsString(EBuiltInOps::FillBuffer)));
-    EXPECT_EQ(0, strcmp("copy_buffer_to_image3d.igdrcl_built_in", getBuiltinAsString(EBuiltInOps::CopyBufferToImage3d)));
-    EXPECT_EQ(0, strcmp("copy_image3d_to_buffer.igdrcl_built_in", getBuiltinAsString(EBuiltInOps::CopyImage3dToBuffer)));
-    EXPECT_EQ(0, strcmp("copy_image_to_image1d.igdrcl_built_in", getBuiltinAsString(EBuiltInOps::CopyImageToImage1d)));
-    EXPECT_EQ(0, strcmp("copy_image_to_image2d.igdrcl_built_in", getBuiltinAsString(EBuiltInOps::CopyImageToImage2d)));
-    EXPECT_EQ(0, strcmp("copy_image_to_image3d.igdrcl_built_in", getBuiltinAsString(EBuiltInOps::CopyImageToImage3d)));
-    EXPECT_EQ(0, strcmp("fill_image1d.igdrcl_built_in", getBuiltinAsString(EBuiltInOps::FillImage1d)));
-    EXPECT_EQ(0, strcmp("fill_image2d.igdrcl_built_in", getBuiltinAsString(EBuiltInOps::FillImage2d)));
-    EXPECT_EQ(0, strcmp("fill_image3d.igdrcl_built_in", getBuiltinAsString(EBuiltInOps::FillImage3d)));
-    EXPECT_EQ(0, strcmp("vme_block_motion_estimate_intel.igdrcl_built_in", getBuiltinAsString(EBuiltInOps::VmeBlockMotionEstimateIntel)));
-    EXPECT_EQ(0, strcmp("vme_block_advanced_motion_estimate_check_intel.igdrcl_built_in", getBuiltinAsString(EBuiltInOps::VmeBlockAdvancedMotionEstimateCheckIntel)));
+    EXPECT_EQ(0, strcmp("aux_translation.builtin_kernel", getBuiltinAsString(EBuiltInOps::AuxTranslation)));
+    EXPECT_EQ(0, strcmp("copy_buffer_to_buffer.builtin_kernel", getBuiltinAsString(EBuiltInOps::CopyBufferToBuffer)));
+    EXPECT_EQ(0, strcmp("copy_buffer_rect.builtin_kernel", getBuiltinAsString(EBuiltInOps::CopyBufferRect)));
+    EXPECT_EQ(0, strcmp("fill_buffer.builtin_kernel", getBuiltinAsString(EBuiltInOps::FillBuffer)));
+    EXPECT_EQ(0, strcmp("copy_buffer_to_image3d.builtin_kernel", getBuiltinAsString(EBuiltInOps::CopyBufferToImage3d)));
+    EXPECT_EQ(0, strcmp("copy_image3d_to_buffer.builtin_kernel", getBuiltinAsString(EBuiltInOps::CopyImage3dToBuffer)));
+    EXPECT_EQ(0, strcmp("copy_image_to_image1d.builtin_kernel", getBuiltinAsString(EBuiltInOps::CopyImageToImage1d)));
+    EXPECT_EQ(0, strcmp("copy_image_to_image2d.builtin_kernel", getBuiltinAsString(EBuiltInOps::CopyImageToImage2d)));
+    EXPECT_EQ(0, strcmp("copy_image_to_image3d.builtin_kernel", getBuiltinAsString(EBuiltInOps::CopyImageToImage3d)));
+    EXPECT_EQ(0, strcmp("fill_image1d.builtin_kernel", getBuiltinAsString(EBuiltInOps::FillImage1d)));
+    EXPECT_EQ(0, strcmp("fill_image2d.builtin_kernel", getBuiltinAsString(EBuiltInOps::FillImage2d)));
+    EXPECT_EQ(0, strcmp("fill_image3d.builtin_kernel", getBuiltinAsString(EBuiltInOps::FillImage3d)));
+    EXPECT_EQ(0, strcmp("vme_block_motion_estimate_intel.builtin_kernel", getBuiltinAsString(EBuiltInOps::VmeBlockMotionEstimateIntel)));
+    EXPECT_EQ(0, strcmp("vme_block_advanced_motion_estimate_check_intel.builtin_kernel", getBuiltinAsString(EBuiltInOps::VmeBlockAdvancedMotionEstimateCheckIntel)));
     EXPECT_EQ(0, strcmp("vme_block_advanced_motion_estimate_bidirectional_check_intel", getBuiltinAsString(EBuiltInOps::VmeBlockAdvancedMotionEstimateBidirectionalCheckIntel)));
     EXPECT_EQ(0, strcmp("unknown", getBuiltinAsString(EBuiltInOps::COUNT)));
 }
@@ -1167,13 +1167,13 @@ TEST_F(BuiltInTests, createBuiltinResourceName) {
     std::string resourceNameForPlatform = createBuiltinResourceName(builtin, extension, platformName);
     std::string resourceNameForPlatformAndStepping = createBuiltinResourceName(builtin, extension, platformName, deviceRevId);
 
-    EXPECT_EQ(0, strcmp("copy_buffer_to_buffer.igdrcl_built_in.cl", resourceNameGeneric.c_str()));
-    EXPECT_EQ(0, strcmp("skl_0_copy_buffer_to_buffer.igdrcl_built_in.cl", resourceNameForPlatform.c_str()));
-    EXPECT_EQ(0, strcmp("skl_9_copy_buffer_to_buffer.igdrcl_built_in.cl", resourceNameForPlatformAndStepping.c_str()));
+    EXPECT_EQ(0, strcmp("copy_buffer_to_buffer.builtin_kernel.cl", resourceNameGeneric.c_str()));
+    EXPECT_EQ(0, strcmp("skl_0_copy_buffer_to_buffer.builtin_kernel.cl", resourceNameForPlatform.c_str()));
+    EXPECT_EQ(0, strcmp("skl_9_copy_buffer_to_buffer.builtin_kernel.cl", resourceNameForPlatformAndStepping.c_str()));
 }
 
 TEST_F(BuiltInTests, joinPath) {
-    std::string resourceName = "copy_buffer_to_buffer.igdrcl_built_in.cl";
+    std::string resourceName = "copy_buffer_to_buffer.builtin_kernel.cl";
     std::string resourcePath = "path";
 
     EXPECT_EQ(0, strcmp(resourceName.c_str(), joinPath("", resourceName).c_str()));
@@ -1225,7 +1225,7 @@ TEST_F(BuiltInTests, EmbeddedStorageLoadImpl) {
     };
     MockEmbeddedStorage mockEmbeddedStorage("root");
 
-    BuiltinResourceT br = mockEmbeddedStorage.loadImpl("copy_buffer_to_buffer.igdrcl_built_in.cl");
+    BuiltinResourceT br = mockEmbeddedStorage.loadImpl("copy_buffer_to_buffer.builtin_kernel.cl");
     EXPECT_NE(0u, br.size());
 
     BuiltinResourceT bnr = mockEmbeddedStorage.loadImpl("unknown.cl");

unit_tests/built_ins/built_ins_file_names.cpp

@@ -10,16 +10,16 @@
 
 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"};
+    "test_files/aux_translation.builtin_kernel",
+    "test_files/copy_buffer_to_buffer.builtin_kernel",
+    "test_files/fill_buffer.builtin_kernel",
+    "test_files/fill_image1d.builtin_kernel",
+    "test_files/fill_image2d.builtin_kernel",
+    "test_files/fill_image3d.builtin_kernel",
+    "test_files/copy_image_to_image1d.builtin_kernel",
+    "test_files/copy_image_to_image2d.builtin_kernel",
+    "test_files/copy_image_to_image3d.builtin_kernel",
+    "test_files/copy_buffer_rect.builtin_kernel",
+    "test_files/copy_buffer_to_image3d.builtin_kernel",
+    "test_files/copy_image3d_to_buffer.builtin_kernel"};
 }

unit_tests/offline_compiler/offline_compiler_tests.cpp

@@ -352,7 +352,7 @@ TEST_F(OfflineCompilerTests, GoodParseBinToCharArray) {
                                               "namespace NEO {\n"
                                               "static RegisterEmbeddedResource registerSchedulerBin(\n"
                                               "    \"" +
-                         gEnvironment->familyNameWithType + "_0_scheduler.igdrcl_built_in.bin\",\n"
+                         gEnvironment->familyNameWithType + "_0_scheduler.builtin_kernel.bin\",\n"
                                                             "    (const char *)SchedulerBinary_" +
                          familyNameWithType + ",\n"
                                               "    SchedulerBinarySize_" +
@@ -621,7 +621,7 @@ TEST(OfflineCompilerTest, getStringWithinDelimiters) {
     ASSERT_NE(nullptr, mockOfflineCompiler);
 
     size_t srcSize = 0;
-    auto ptrSrc = loadDataFromFile("test_files/copy_buffer_to_buffer.igdrcl_built_in", srcSize);
+    auto ptrSrc = loadDataFromFile("test_files/copy_buffer_to_buffer.builtin_kernel", srcSize);
 
     const std::string src = ptrSrc.get();
     ASSERT_EQ(srcSize, src.size());