Move headers to core

- address_patch.h - options.h - registered_method_dispatcher.h - grf_config.h Rename OCL_RUNTIME_PROFILING -> KMD_PROFILING Related-To: NEO-3982 Change-Id: I06cf72729e9d7d7d2ff0bd169fcbada00c4b509a Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>
2026-01-08 22:12:59 +08:00 · 2019-12-09 15:29:30 +01:00
parent 1856248e7e
commit 5fa53f4516
149 changed files with 209 additions and 197 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -588,8 +588,8 @@ option(USE_CL_CACHE "Use OpenCL program binary cache" ON)
 set(CL_CACHE_LOCATION "cl_cache" CACHE STRING "OpenCL program binary cache location")

 # Put profiling enable flag into define
-if(OCL_RUNTIME_PROFILING)
-  add_definitions(-DOCL_RUNTIME_PROFILING=${OCL_RUNTIME_PROFILING})
+if(KMD_PROFILING)
+  add_definitions(-DKMD_PROFILING=${KMD_PROFILING})
 endif()

 if(MSVC)
--- a/core/execution_environment/root_device_environment.h
+++ b/core/execution_environment/root_device_environment.h
@@ -6,7 +6,7 @@
 */

 #pragma once
-#include "runtime/helpers/options.h"
+#include "core/helpers/options.h"

 #include <cstdint>
 #include <memory>
--- a/core/helpers/CMakeLists.txt
+++ b/core/helpers/CMakeLists.txt
@@ -7,6 +7,7 @@
 set(NEO_CORE_HELPERS
  ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
  ${CMAKE_CURRENT_SOURCE_DIR}/abort.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/address_patch.h
  ${CMAKE_CURRENT_SOURCE_DIR}/aligned_memory.h
  ${CMAKE_CURRENT_SOURCE_DIR}/basic_math.h
  ${CMAKE_CURRENT_SOURCE_DIR}/cache_policy.cpp
@@ -34,12 +35,14 @@ set(NEO_CORE_HELPERS
  ${CMAKE_CURRENT_SOURCE_DIR}/kmd_notify_properties.cpp
  ${CMAKE_CURRENT_SOURCE_DIR}/kmd_notify_properties.h
  ${CMAKE_CURRENT_SOURCE_DIR}/non_copyable_or_moveable.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/options.h
  ${CMAKE_CURRENT_SOURCE_DIR}/pipeline_select_args.h
  ${CMAKE_CURRENT_SOURCE_DIR}/preamble.h
  ${CMAKE_CURRENT_SOURCE_DIR}/preamble_base.inl
  ${CMAKE_CURRENT_SOURCE_DIR}/preamble_bdw_plus.inl
  ${CMAKE_CURRENT_SOURCE_DIR}/ptr_math.h
  ${CMAKE_CURRENT_SOURCE_DIR}/register_offsets.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/registered_method_dispatcher.h
  ${CMAKE_CURRENT_SOURCE_DIR}/simd_helper.h
  ${CMAKE_CURRENT_SOURCE_DIR}/state_base_address.h
  ${CMAKE_CURRENT_SOURCE_DIR}/state_base_address_base.inl
--- a/runtime/helpers/address_patch.h
+++ b/runtime/helpers/address_patch.h
--- a/runtime/helpers/options.h
+++ b/runtime/helpers/options.h
@@ -11,8 +11,8 @@
 #include <cstddef>
 #include <cstdint>

-#ifndef OCL_RUNTIME_PROFILING
-#define OCL_RUNTIME_PROFILING 0
+#ifndef KMD_PROFILING
+#define KMD_PROFILING 0
 #endif

 enum CommandStreamReceiverType {
--- a/runtime/helpers/registered_method_dispatcher.h
+++ b/runtime/helpers/registered_method_dispatcher.h
--- a/core/kernel/CMakeLists.txt
+++ b/core/kernel/CMakeLists.txt
@@ -0,0 +1,13 @@
+#
+# Copyright (C) 2019 Intel Corporation
+#
+# SPDX-License-Identifier: MIT
+#
+
+set(NEO_CORE_KERNEL
+  ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
+  ${CMAKE_CURRENT_SOURCE_DIR}/grf_config.h
+)
+
+set_property(GLOBAL PROPERTY NEO_CORE_KERNEL ${NEO_CORE_KERNEL})
+add_subdirectories()
--- a/runtime/kernel/grf_config.h
+++ b/runtime/kernel/grf_config.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018 Intel Corporation
+ * Copyright (C) 2018-2019 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
--- a/core/unit_tests/gen8/test_preamble_gen8.cpp
+++ b/core/unit_tests/gen8/test_preamble_gen8.cpp
@@ -5,11 +5,11 @@
 *
 */

+#include "core/helpers/options.h"
 #include "core/helpers/preamble.h"
 #include "core/unit_tests/preamble/preamble_fixture.h"
 #include "runtime/command_stream/thread_arbitration_policy.h"
 #include "runtime/gen8/reg_configs.h"
-#include "runtime/helpers/options.h"
 #include "unit_tests/fixtures/platform_fixture.h"

 using namespace NEO;
--- a/core/unit_tests/os_interface/aub_memory_operations_handler_tests.h
+++ b/core/unit_tests/os_interface/aub_memory_operations_handler_tests.h
@@ -8,9 +8,9 @@
 #pragma once

 #include "core/helpers/hw_info.h"
+#include "core/helpers/options.h"
 #include "core/os_interface/aub_memory_operations_handler.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
-#include "runtime/helpers/options.h"
 #include "runtime/os_interface/device_factory.h"
 #include "unit_tests/mocks/mock_graphics_allocation.h"

--- a/core/unit_tests/preamble/preamble_fixture.h
+++ b/core/unit_tests/preamble/preamble_fixture.h
@@ -6,8 +6,8 @@
 */

 #pragma once
+#include "core/helpers/options.h"
 #include "core/helpers/preamble.h"
-#include "runtime/helpers/options.h"
 #include "unit_tests/command_stream/linear_stream_fixture.h"
 #include "unit_tests/fixtures/device_fixture.h"
 #include "unit_tests/fixtures/platform_fixture.h"
--- a/core/unit_tests/preemption/preemption_tests.cpp
+++ b/core/unit_tests/preemption/preemption_tests.cpp
@@ -7,11 +7,11 @@

 #include "core/command_stream/preemption.h"
 #include "core/helpers/hw_helper.h"
+#include "core/helpers/options.h"
 #include "core/unit_tests/fixtures/preemption_fixture.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
 #include "runtime/command_queue/command_queue_hw.h"
 #include "runtime/helpers/dispatch_info.h"
-#include "runtime/helpers/options.h"
 #include "unit_tests/helpers/dispatch_flags_helper.h"
 #include "unit_tests/helpers/hw_parse.h"
 #include "unit_tests/mocks/mock_builtins.h"
--- a/offline_compiler/options.cpp
+++ b/offline_compiler/options.cpp
@@ -5,7 +5,7 @@
 *
 */

-#include "runtime/helpers/options.h"
+#include "core/helpers/options.h"

 #include "core/helpers/hw_cmds.h"
 #include "runtime/helpers/array_count.h"
--- a/runtime/api/api.cpp
+++ b/runtime/api/api.cpp
@@ -11,6 +11,7 @@
 #include "core/helpers/aligned_memory.h"
 #include "core/helpers/hw_info.h"
 #include "core/helpers/kernel_helpers.h"
+#include "core/helpers/options.h"
 #include "core/memory_manager/unified_memory_manager.h"
 #include "core/utilities/stackvec.h"
 #include "runtime/accelerators/intel_motion_estimation.h"
@@ -28,7 +29,6 @@
 #include "runtime/helpers/get_info.h"
 #include "runtime/helpers/mem_properties_parser_helper.h"
 #include "runtime/helpers/memory_properties_flags_helpers.h"
-#include "runtime/helpers/options.h"
 #include "runtime/helpers/queue_helpers.h"
 #include "runtime/helpers/validators.h"
 #include "runtime/kernel/kernel.h"
--- a/runtime/aub/aub_center.cpp
+++ b/runtime/aub/aub_center.cpp
@@ -8,9 +8,9 @@
 #include "runtime/aub/aub_center.h"

 #include "core/helpers/hw_info.h"
+#include "core/helpers/options.h"
 #include "runtime/aub/aub_helper.h"
 #include "runtime/helpers/device_helpers.h"
-#include "runtime/helpers/options.h"
 #include "runtime/os_interface/debug_settings_manager.h"

 #include "third_party/aub_stream/headers/aub_manager.h"
--- a/runtime/aub/aub_center.h
+++ b/runtime/aub/aub_center.h
@@ -6,9 +6,9 @@
 */

 #pragma once
+#include "core/helpers/options.h"
 #include "runtime/command_stream/aub_stream_provider.h"
 #include "runtime/command_stream/aub_subcapture.h"
-#include "runtime/helpers/options.h"
 #include "runtime/memory_manager/address_mapper.h"
 #include "runtime/memory_manager/physical_address_allocator.h"

--- a/runtime/aub_mem_dump/aub_alloc_dump.h
+++ b/runtime/aub_mem_dump/aub_alloc_dump.h
@@ -7,10 +7,10 @@

 #pragma once

+#include "core/helpers/options.h"
 #include "core/memory_manager/graphics_allocation.h"
 #include "runtime/aub_mem_dump/aub_mem_dump.h"
 #include "runtime/gmm_helper/resource_info.h"
-#include "runtime/helpers/options.h"
 #include "runtime/os_interface/debug_settings_manager.h"

 using namespace NEO;
--- a/runtime/command_queue/command_queue.cpp
+++ b/runtime/command_queue/command_queue.cpp
@@ -8,6 +8,7 @@
 #include "runtime/command_queue/command_queue.h"

 #include "core/helpers/aligned_memory.h"
+#include "core/helpers/options.h"
 #include "core/helpers/ptr_math.h"
 #include "core/helpers/string.h"
 #include "runtime/built_ins/builtins_dispatch_builder.h"
@@ -23,7 +24,6 @@
 #include "runtime/helpers/get_info.h"
 #include "runtime/helpers/hardware_commands_helper.h"
 #include "runtime/helpers/mipmap.h"
-#include "runtime/helpers/options.h"
 #include "runtime/helpers/queue_helpers.h"
 #include "runtime/helpers/surface_formats.h"
 #include "runtime/helpers/timestamp_packet.h"
--- a/runtime/command_queue/enqueue_common.h
+++ b/runtime/command_queue/enqueue_common.h
@@ -6,6 +6,7 @@
 */

 #pragma once
+#include "core/helpers/options.h"
 #include "core/program/sync_buffer_handler.h"
 #include "core/utilities/range.h"
 #include "runtime/built_ins/built_ins.h"
@@ -23,7 +24,6 @@
 #include "runtime/helpers/engine_node_helper.h"
 #include "runtime/helpers/enqueue_properties.h"
 #include "runtime/helpers/hardware_commands_helper.h"
-#include "runtime/helpers/options.h"
 #include "runtime/helpers/task_information.h"
 #include "runtime/mem_obj/buffer.h"
 #include "runtime/mem_obj/image.h"
--- a/runtime/command_stream/aub_command_stream_receiver.cpp
+++ b/runtime/command_stream/aub_command_stream_receiver.cpp
@@ -9,9 +9,9 @@

 #include "core/helpers/debug_helpers.h"
 #include "core/helpers/hw_info.h"
+#include "core/helpers/options.h"
 #include "runtime/execution_environment/execution_environment.h"
 #include "runtime/helpers/device_helpers.h"
-#include "runtime/helpers/options.h"
 #include "runtime/memory_manager/os_agnostic_memory_manager.h"
 #include "runtime/os_interface/os_inc_base.h"

--- a/runtime/command_stream/command_stream_receiver.h
+++ b/runtime/command_stream/command_stream_receiver.h
@@ -9,16 +9,15 @@
 #include "core/command_stream/linear_stream.h"
 #include "core/helpers/aligned_memory.h"
 #include "core/helpers/completion_stamp.h"
+#include "core/helpers/options.h"
 #include "core/indirect_heap/indirect_heap.h"
+#include "core/kernel/grf_config.h"
 #include "runtime/command_stream/aub_subcapture.h"
 #include "runtime/command_stream/csr_definitions.h"
 #include "runtime/command_stream/submissions_aggregator.h"
 #include "runtime/command_stream/thread_arbitration_policy.h"
-#include "runtime/helpers/address_patch.h"
 #include "runtime/helpers/blit_commands_helper.h"
 #include "runtime/helpers/flat_batch_buffer_helper.h"
-#include "runtime/helpers/options.h"
-#include "runtime/kernel/grf_config.h"

 #include <cstddef>
 #include <cstdint>
--- a/runtime/command_stream/command_stream_receiver_hw.h
+++ b/runtime/command_stream/command_stream_receiver_hw.h
@@ -8,11 +8,11 @@
 #pragma once
 #include "core/helpers/hw_cmds.h"
 #include "core/helpers/hw_info.h"
+#include "core/helpers/options.h"
 #include "runtime/command_stream/command_stream_receiver.h"
 #include "runtime/execution_environment/execution_environment.h"
 #include "runtime/helpers/csr_deps.h"
 #include "runtime/helpers/dirty_state_helpers.h"
-#include "runtime/helpers/options.h"

 namespace NEO {
 template <typename GfxFamily>
--- a/runtime/command_stream/command_stream_receiver_hw_base.inl
+++ b/runtime/command_stream/command_stream_receiver_hw_base.inl
@@ -9,6 +9,7 @@
 #include "core/command_stream/preemption.h"
 #include "core/helpers/cache_policy.h"
 #include "core/helpers/hw_helper.h"
+#include "core/helpers/options.h"
 #include "core/helpers/preamble.h"
 #include "core/helpers/ptr_math.h"
 #include "core/helpers/state_base_address.h"
@@ -23,7 +24,6 @@
 #include "runtime/helpers/blit_commands_helper.h"
 #include "runtime/helpers/flat_batch_buffer_helper_hw.h"
 #include "runtime/helpers/flush_stamp.h"
-#include "runtime/helpers/options.h"
 #include "runtime/helpers/state_compute_mode_helper.h"
 #include "runtime/helpers/timestamp_packet.h"
 #include "runtime/memory_manager/internal_allocation_storage.h"
--- a/runtime/command_stream/create_command_stream_impl.cpp
+++ b/runtime/command_stream/create_command_stream_impl.cpp
@@ -5,11 +5,11 @@
 *
 */

+#include "core/helpers/options.h"
 #include "runtime/command_stream/aub_command_stream_receiver.h"
 #include "runtime/command_stream/command_stream_receiver_with_aub_dump.h"
 #include "runtime/command_stream/tbx_command_stream_receiver.h"
 #include "runtime/execution_environment/execution_environment.h"
-#include "runtime/helpers/options.h"
 #include "runtime/os_interface/device_factory.h"

 namespace NEO {
--- a/runtime/command_stream/csr_definitions.h
+++ b/runtime/command_stream/csr_definitions.h
@@ -8,10 +8,10 @@
 #pragma once
 #include "core/helpers/hw_info.h"
 #include "core/helpers/pipeline_select_args.h"
+#include "core/kernel/grf_config.h"
 #include "core/memory_manager/memory_constants.h"
 #include "runtime/helpers/csr_deps.h"
 #include "runtime/helpers/properties_helper.h"
-#include "runtime/kernel/grf_config.h"

 #include <limits>

--- a/runtime/command_stream/tbx_command_stream_receiver.cpp
+++ b/runtime/command_stream/tbx_command_stream_receiver.cpp
@@ -8,8 +8,8 @@
 #include "runtime/command_stream/tbx_command_stream_receiver.h"

 #include "core/helpers/hw_info.h"
+#include "core/helpers/options.h"
 #include "runtime/execution_environment/execution_environment.h"
-#include "runtime/helpers/options.h"

 #include <string>

--- a/runtime/core_files.cmake
+++ b/runtime/core_files.cmake
@@ -14,6 +14,7 @@ append_sources_from_properties(NEO_CORE_SOURCES
  NEO_CORE_GMM_HELPER
  NEO_CORE_HELPERS
  NEO_CORE_INDIRECT_HEAP
+  NEO_CORE_KERNEL
  NEO_CORE_MEMORY_MANAGER
  NEO_CORE_OS_INTERFACE
  NEO_CORE_PAGE_FAULT_MANAGER
--- a/runtime/device/device_caps.cpp
+++ b/runtime/device/device_caps.cpp
@@ -7,10 +7,10 @@

 #include "core/helpers/basic_math.h"
 #include "core/helpers/hw_helper.h"
+#include "core/helpers/options.h"
 #include "runtime/command_stream/command_stream_receiver.h"
 #include "runtime/device/device.h"
 #include "runtime/device/driver_info.h"
-#include "runtime/helpers/options.h"
 #include "runtime/memory_manager/memory_manager.h"
 #include "runtime/os_interface/hw_info_config.h"
 #include "runtime/os_interface/os_interface.h"
--- a/runtime/dll/linux/drm_neo_create.cpp
+++ b/runtime/dll/linux/drm_neo_create.cpp
@@ -9,7 +9,7 @@
 #include "core/helpers/hw_cmds.h"
 #include "core/helpers/hw_helper.h"
 #include "core/helpers/hw_info.h"
-#include "runtime/helpers/options.h"
+#include "core/helpers/options.h"
 #include "runtime/os_interface/debug_settings_manager.h"
 #include "runtime/os_interface/linux/drm_neo.h"
 #include "runtime/os_interface/linux/drm_null_device.h"
--- a/runtime/dll/options.cpp
+++ b/runtime/dll/options.cpp
@@ -5,7 +5,7 @@
 *
 */

-#include "runtime/helpers/options.h"
+#include "core/helpers/options.h"

 #include "core/helpers/hw_cmds.h"
 #include "runtime/helpers/array_count.h"
--- a/runtime/helpers/CMakeLists.txt
+++ b/runtime/helpers/CMakeLists.txt
@@ -6,7 +6,6 @@

 set(RUNTIME_SRCS_HELPERS_BASE
  ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-  ${CMAKE_CURRENT_SOURCE_DIR}/address_patch.h
  ${CMAKE_CURRENT_SOURCE_DIR}/array_count.h
  ${CMAKE_CURRENT_SOURCE_DIR}/base_object.cpp
  ${CMAKE_CURRENT_SOURCE_DIR}/base_object.h
@@ -51,7 +50,6 @@ set(RUNTIME_SRCS_HELPERS_BASE
  ${CMAKE_CURRENT_SOURCE_DIR}/mipmap.cpp
  ${CMAKE_CURRENT_SOURCE_DIR}/mipmap.h
  ${CMAKE_CURRENT_SOURCE_DIR}/options.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/options.h
  ${CMAKE_CURRENT_SOURCE_DIR}/per_thread_data.cpp
  ${CMAKE_CURRENT_SOURCE_DIR}/per_thread_data.h
  ${CMAKE_CURRENT_SOURCE_DIR}/pipeline_select_helper.h
@@ -59,7 +57,6 @@ set(RUNTIME_SRCS_HELPERS_BASE
  ${CMAKE_CURRENT_SOURCE_DIR}/properties_helper.cpp
  ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/queue_helpers.cpp
  ${CMAKE_CURRENT_SOURCE_DIR}/queue_helpers.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/registered_method_dispatcher.h
  ${CMAKE_CURRENT_SOURCE_DIR}/sampler_helpers.h
  ${CMAKE_CURRENT_SOURCE_DIR}/state_compute_mode_helper.h
  ${CMAKE_CURRENT_SOURCE_DIR}/string_helpers.h
--- a/runtime/helpers/dispatch_info.h
+++ b/runtime/helpers/dispatch_info.h
@@ -7,10 +7,10 @@

 #pragma once

+#include "core/helpers/registered_method_dispatcher.h"
 #include "core/helpers/vec.h"
 #include "core/utilities/stackvec.h"
 #include "runtime/built_ins/builtins_dispatch_builder.h"
-#include "runtime/helpers/registered_method_dispatcher.h"
 #include "runtime/mem_obj/mem_obj.h"
 #include "runtime/memory_manager/surface.h"

--- a/runtime/helpers/flat_batch_buffer_helper.h
+++ b/runtime/helpers/flat_batch_buffer_helper.h
@@ -7,8 +7,8 @@

 #pragma once

+#include "core/helpers/address_patch.h"
 #include "runtime/command_stream/submissions_aggregator.h"
-#include "runtime/helpers/address_patch.h"

 #include <map>
 #include <vector>
--- a/runtime/helpers/hardware_commands_helper.inl
+++ b/runtime/helpers/hardware_commands_helper.inl
@@ -6,6 +6,7 @@
 */

 #include "core/command_stream/preemption.h"
+#include "core/helpers/address_patch.h"
 #include "core/helpers/aligned_memory.h"
 #include "core/helpers/basic_math.h"
 #include "core/helpers/ptr_math.h"
@@ -13,7 +14,6 @@
 #include "core/indirect_heap/indirect_heap.h"
 #include "runtime/command_queue/local_id_gen.h"
 #include "runtime/command_stream/csr_definitions.h"
-#include "runtime/helpers/address_patch.h"
 #include "runtime/helpers/dispatch_info.h"
 #include "runtime/kernel/kernel.h"
 #include "runtime/os_interface/debug_settings_manager.h"
--- a/runtime/helpers/options.cpp
+++ b/runtime/helpers/options.cpp
@@ -5,7 +5,7 @@
 *
 */

-#include "runtime/helpers/options.h"
+#include "core/helpers/options.h"

 #include "core/helpers/hw_cmds.h"
 #include "runtime/helpers/array_count.h"
--- a/runtime/kernel/CMakeLists.txt
+++ b/runtime/kernel/CMakeLists.txt
@@ -8,7 +8,6 @@ set(RUNTIME_SRCS_KERNEL
  ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
  ${CMAKE_CURRENT_SOURCE_DIR}/dynamic_kernel_info.h
  ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/get_additional_kernel_info.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/grf_config.h
  ${CMAKE_CURRENT_SOURCE_DIR}/image_transformer.cpp
  ${CMAKE_CURRENT_SOURCE_DIR}/image_transformer.h
  ${CMAKE_CURRENT_SOURCE_DIR}/kernel.cpp
--- a/runtime/kernel/kernel.h
+++ b/runtime/kernel/kernel.h
@@ -6,13 +6,13 @@
 */

 #pragma once
+#include "core/helpers/address_patch.h"
 #include "core/helpers/preamble.h"
 #include "core/unified_memory/unified_memory.h"
 #include "core/utilities/stackvec.h"
 #include "runtime/api/cl_types.h"
 #include "runtime/command_stream/thread_arbitration_policy.h"
 #include "runtime/device_queue/device_queue.h"
-#include "runtime/helpers/address_patch.h"
 #include "runtime/helpers/base_object.h"
 #include "runtime/helpers/properties_helper.h"
 #include "runtime/os_interface/debug_settings_manager.h"
--- a/runtime/memory_manager/memory_manager.cpp
+++ b/runtime/memory_manager/memory_manager.cpp
@@ -11,6 +11,7 @@
 #include "core/helpers/basic_math.h"
 #include "core/helpers/hw_helper.h"
 #include "core/helpers/hw_info.h"
+#include "core/helpers/options.h"
 #include "core/memory_manager/host_ptr_manager.h"
 #include "core/utilities/stackvec.h"
 #include "runtime/command_stream/command_stream_receiver.h"
@@ -20,7 +21,6 @@
 #include "runtime/gmm_helper/gmm.h"
 #include "runtime/gmm_helper/resource_info.h"
 #include "runtime/helpers/hardware_commands_helper.h"
-#include "runtime/helpers/options.h"
 #include "runtime/mem_obj/image.h"
 #include "runtime/memory_manager/deferrable_allocation_deletion.h"
 #include "runtime/memory_manager/deferred_deleter.h"
--- a/runtime/memory_manager/os_agnostic_memory_manager.cpp
+++ b/runtime/memory_manager/os_agnostic_memory_manager.cpp
@@ -12,6 +12,7 @@
 #include "core/helpers/aligned_memory.h"
 #include "core/helpers/basic_math.h"
 #include "core/helpers/hw_info.h"
+#include "core/helpers/options.h"
 #include "core/helpers/ptr_math.h"
 #include "core/memory_manager/host_ptr_manager.h"
 #include "core/os_interface/os_memory.h"
@@ -19,7 +20,6 @@
 #include "runtime/execution_environment/execution_environment.h"
 #include "runtime/gmm_helper/gmm.h"
 #include "runtime/gmm_helper/resource_info.h"
-#include "runtime/helpers/options.h"
 #include "runtime/helpers/surface_formats.h"

 #include <cassert>
--- a/runtime/os_interface/device_factory.cpp
+++ b/runtime/os_interface/device_factory.cpp
@@ -7,10 +7,10 @@

 #include "core/execution_environment/root_device_environment.h"
 #include "core/helpers/hw_helper.h"
+#include "core/helpers/options.h"
 #include "core/os_interface/aub_memory_operations_handler.h"
 #include "runtime/aub/aub_center.h"
 #include "runtime/device/device.h"
-#include "runtime/helpers/options.h"
 #include "runtime/os_interface/debug_settings_manager.h"
 #include "runtime/os_interface/hw_info_config.h"

--- a/runtime/os_interface/linux/drm_memory_manager.cpp
+++ b/runtime/os_interface/linux/drm_memory_manager.cpp
@@ -9,6 +9,7 @@

 #include "core/gmm_helper/gmm_helper.h"
 #include "core/helpers/hw_info.h"
+#include "core/helpers/options.h"
 #include "core/helpers/ptr_math.h"
 #include "core/memory_manager/host_ptr_manager.h"
 #include "runtime/command_stream/command_stream_receiver.h"
@@ -16,7 +17,6 @@
 #include "runtime/execution_environment/execution_environment.h"
 #include "runtime/gmm_helper/gmm.h"
 #include "runtime/gmm_helper/resource_info.h"
-#include "runtime/helpers/options.h"
 #include "runtime/helpers/surface_formats.h"
 #include "runtime/os_interface/linux/allocator_helper.h"
 #include "runtime/os_interface/linux/os_context_linux.h"
--- a/runtime/os_interface/windows/gdi_interface.h
+++ b/runtime/os_interface/windows/gdi_interface.h
@@ -6,8 +6,8 @@
 */

 #pragma once
+#include "core/helpers/options.h"
 #include "core/os_interface/windows/os_library_win.h"
-#include "runtime/helpers/options.h"
 #include "runtime/os_interface/windows/os_inc.h"
 #include "runtime/os_interface/windows/thk_wrapper.h"

@@ -24,55 +24,55 @@ class Gdi {
    Gdi();
    ~Gdi(){};

-    ThkWrapper<OCL_RUNTIME_PROFILING, IN OUT D3DKMT_OPENADAPTERFROMHDC *> openAdapterFromHdc;
-    ThkWrapper<OCL_RUNTIME_PROFILING, IN OUT D3DKMT_OPENADAPTERFROMLUID *> openAdapterFromLuid;
-    ThkWrapper<OCL_RUNTIME_PROFILING, IN OUT D3DKMT_CREATEALLOCATION *> createAllocation;
-    ThkWrapper<OCL_RUNTIME_PROFILING, IN CONST D3DKMT_DESTROYALLOCATION *> destroyAllocation;
-    ThkWrapper<OCL_RUNTIME_PROFILING, IN CONST D3DKMT_DESTROYALLOCATION2 *> destroyAllocation2;
-    ThkWrapper<OCL_RUNTIME_PROFILING, IN CONST D3DKMT_QUERYADAPTERINFO *> queryAdapterInfo;
-    ThkWrapper<OCL_RUNTIME_PROFILING, IN CONST D3DKMT_CLOSEADAPTER *> closeAdapter;
-    ThkWrapper<OCL_RUNTIME_PROFILING, IN OUT D3DKMT_CREATEDEVICE *> createDevice;
-    ThkWrapper<OCL_RUNTIME_PROFILING, IN CONST D3DKMT_DESTROYDEVICE *> destroyDevice;
-    ThkWrapper<OCL_RUNTIME_PROFILING, IN CONST D3DKMT_ESCAPE *> escape;
-    ThkWrapper<OCL_RUNTIME_PROFILING, IN D3DKMT_CREATECONTEXTVIRTUAL *> createContext;
-    ThkWrapper<OCL_RUNTIME_PROFILING, IN CONST D3DKMT_DESTROYCONTEXT *> destroyContext;
-    ThkWrapper<OCL_RUNTIME_PROFILING, IN OUT D3DKMT_OPENRESOURCE *> openResource;
-    ThkWrapper<OCL_RUNTIME_PROFILING, IN OUT D3DKMT_OPENRESOURCEFROMNTHANDLE *> openResourceFromNtHandle;
-    ThkWrapper<OCL_RUNTIME_PROFILING, IN OUT D3DKMT_QUERYRESOURCEINFO *> queryResourceInfo;
-    ThkWrapper<OCL_RUNTIME_PROFILING, IN OUT D3DKMT_QUERYRESOURCEINFOFROMNTHANDLE *> queryResourceInfoFromNtHandle;
-    ThkWrapper<OCL_RUNTIME_PROFILING, IN OUT D3DKMT_LOCK *> lock;
-    ThkWrapper<OCL_RUNTIME_PROFILING, IN CONST D3DKMT_UNLOCK *> unlock;
-    ThkWrapper<OCL_RUNTIME_PROFILING, IN OUT D3DKMT_RENDER *> render;
-    ThkWrapper<OCL_RUNTIME_PROFILING, IN OUT D3DKMT_CREATESYNCHRONIZATIONOBJECT *> createSynchronizationObject;
-    ThkWrapper<OCL_RUNTIME_PROFILING, IN OUT D3DKMT_CREATESYNCHRONIZATIONOBJECT2 *> createSynchronizationObject2;
-    ThkWrapper<OCL_RUNTIME_PROFILING, IN CONST D3DKMT_DESTROYSYNCHRONIZATIONOBJECT *> destroySynchronizationObject;
-    ThkWrapper<OCL_RUNTIME_PROFILING, IN CONST D3DKMT_SIGNALSYNCHRONIZATIONOBJECT *> signalSynchronizationObject;
-    ThkWrapper<OCL_RUNTIME_PROFILING, IN CONST_FROM_WDK_10_0_18328_0 D3DKMT_WAITFORSYNCHRONIZATIONOBJECT *> waitForSynchronizationObject;
-    ThkWrapper<OCL_RUNTIME_PROFILING, IN CONST D3DKMT_WAITFORSYNCHRONIZATIONOBJECTFROMCPU *> waitForSynchronizationObjectFromCpu;
-    ThkWrapper<OCL_RUNTIME_PROFILING, IN CONST D3DKMT_SIGNALSYNCHRONIZATIONOBJECTFROMCPU *> signalSynchronizationObjectFromCpu;
-    ThkWrapper<OCL_RUNTIME_PROFILING, IN CONST D3DKMT_WAITFORSYNCHRONIZATIONOBJECTFROMGPU *> waitForSynchronizationObjectFromGpu;
-    ThkWrapper<OCL_RUNTIME_PROFILING, IN CONST D3DKMT_SIGNALSYNCHRONIZATIONOBJECTFROMGPU *> signalSynchronizationObjectFromGpu;
-    ThkWrapper<OCL_RUNTIME_PROFILING, IN OUT D3DKMT_CREATEPAGINGQUEUE *> createPagingQueue;
-    ThkWrapper<OCL_RUNTIME_PROFILING, IN OUT D3DDDI_DESTROYPAGINGQUEUE *> destroyPagingQueue;
-    ThkWrapper<OCL_RUNTIME_PROFILING, IN OUT D3DKMT_LOCK2 *> lock2;
-    ThkWrapper<OCL_RUNTIME_PROFILING, IN CONST D3DKMT_UNLOCK2 *> unlock2;
-    ThkWrapper<OCL_RUNTIME_PROFILING, IN OUT D3DDDI_MAPGPUVIRTUALADDRESS *> mapGpuVirtualAddress;
-    ThkWrapper<OCL_RUNTIME_PROFILING, IN OUT D3DDDI_RESERVEGPUVIRTUALADDRESS *> reserveGpuVirtualAddress;
-    ThkWrapper<OCL_RUNTIME_PROFILING, IN CONST D3DKMT_FREEGPUVIRTUALADDRESS *> freeGpuVirtualAddress;
-    ThkWrapper<OCL_RUNTIME_PROFILING, IN CONST D3DKMT_UPDATEGPUVIRTUALADDRESS *> updateGpuVirtualAddress;
-    ThkWrapper<OCL_RUNTIME_PROFILING, IN CONST D3DKMT_SUBMITCOMMAND *> submitCommand;
-    ThkWrapper<OCL_RUNTIME_PROFILING, IN OUT D3DDDI_MAKERESIDENT *> makeResident;
-    ThkWrapper<OCL_RUNTIME_PROFILING, IN D3DKMT_EVICT *> evict;
-    ThkWrapper<OCL_RUNTIME_PROFILING, IN D3DKMT_REGISTERTRIMNOTIFICATION *> registerTrimNotification;
-    ThkWrapper<OCL_RUNTIME_PROFILING, IN D3DKMT_UNREGISTERTRIMNOTIFICATION *> unregisterTrimNotification;
+    ThkWrapper<IN OUT D3DKMT_OPENADAPTERFROMHDC *> openAdapterFromHdc;
+    ThkWrapper<IN OUT D3DKMT_OPENADAPTERFROMLUID *> openAdapterFromLuid;
+    ThkWrapper<IN OUT D3DKMT_CREATEALLOCATION *> createAllocation;
+    ThkWrapper<IN CONST D3DKMT_DESTROYALLOCATION *> destroyAllocation;
+    ThkWrapper<IN CONST D3DKMT_DESTROYALLOCATION2 *> destroyAllocation2;
+    ThkWrapper<IN CONST D3DKMT_QUERYADAPTERINFO *> queryAdapterInfo;
+    ThkWrapper<IN CONST D3DKMT_CLOSEADAPTER *> closeAdapter;
+    ThkWrapper<IN OUT D3DKMT_CREATEDEVICE *> createDevice;
+    ThkWrapper<IN CONST D3DKMT_DESTROYDEVICE *> destroyDevice;
+    ThkWrapper<IN CONST D3DKMT_ESCAPE *> escape;
+    ThkWrapper<IN D3DKMT_CREATECONTEXTVIRTUAL *> createContext;
+    ThkWrapper<IN CONST D3DKMT_DESTROYCONTEXT *> destroyContext;
+    ThkWrapper<IN OUT D3DKMT_OPENRESOURCE *> openResource;
+    ThkWrapper<IN OUT D3DKMT_OPENRESOURCEFROMNTHANDLE *> openResourceFromNtHandle;
+    ThkWrapper<IN OUT D3DKMT_QUERYRESOURCEINFO *> queryResourceInfo;
+    ThkWrapper<IN OUT D3DKMT_QUERYRESOURCEINFOFROMNTHANDLE *> queryResourceInfoFromNtHandle;
+    ThkWrapper<IN OUT D3DKMT_LOCK *> lock;
+    ThkWrapper<IN CONST D3DKMT_UNLOCK *> unlock;
+    ThkWrapper<IN OUT D3DKMT_RENDER *> render;
+    ThkWrapper<IN OUT D3DKMT_CREATESYNCHRONIZATIONOBJECT *> createSynchronizationObject;
+    ThkWrapper<IN OUT D3DKMT_CREATESYNCHRONIZATIONOBJECT2 *> createSynchronizationObject2;
+    ThkWrapper<IN CONST D3DKMT_DESTROYSYNCHRONIZATIONOBJECT *> destroySynchronizationObject;
+    ThkWrapper<IN CONST D3DKMT_SIGNALSYNCHRONIZATIONOBJECT *> signalSynchronizationObject;
+    ThkWrapper<IN CONST_FROM_WDK_10_0_18328_0 D3DKMT_WAITFORSYNCHRONIZATIONOBJECT *> waitForSynchronizationObject;
+    ThkWrapper<IN CONST D3DKMT_WAITFORSYNCHRONIZATIONOBJECTFROMCPU *> waitForSynchronizationObjectFromCpu;
+    ThkWrapper<IN CONST D3DKMT_SIGNALSYNCHRONIZATIONOBJECTFROMCPU *> signalSynchronizationObjectFromCpu;
+    ThkWrapper<IN CONST D3DKMT_WAITFORSYNCHRONIZATIONOBJECTFROMGPU *> waitForSynchronizationObjectFromGpu;
+    ThkWrapper<IN CONST D3DKMT_SIGNALSYNCHRONIZATIONOBJECTFROMGPU *> signalSynchronizationObjectFromGpu;
+    ThkWrapper<IN OUT D3DKMT_CREATEPAGINGQUEUE *> createPagingQueue;
+    ThkWrapper<IN OUT D3DDDI_DESTROYPAGINGQUEUE *> destroyPagingQueue;
+    ThkWrapper<IN OUT D3DKMT_LOCK2 *> lock2;
+    ThkWrapper<IN CONST D3DKMT_UNLOCK2 *> unlock2;
+    ThkWrapper<IN OUT D3DDDI_MAPGPUVIRTUALADDRESS *> mapGpuVirtualAddress;
+    ThkWrapper<IN OUT D3DDDI_RESERVEGPUVIRTUALADDRESS *> reserveGpuVirtualAddress;
+    ThkWrapper<IN CONST D3DKMT_FREEGPUVIRTUALADDRESS *> freeGpuVirtualAddress;
+    ThkWrapper<IN CONST D3DKMT_UPDATEGPUVIRTUALADDRESS *> updateGpuVirtualAddress;
+    ThkWrapper<IN CONST D3DKMT_SUBMITCOMMAND *> submitCommand;
+    ThkWrapper<IN OUT D3DDDI_MAKERESIDENT *> makeResident;
+    ThkWrapper<IN D3DKMT_EVICT *> evict;
+    ThkWrapper<IN D3DKMT_REGISTERTRIMNOTIFICATION *> registerTrimNotification;
+    ThkWrapper<IN D3DKMT_UNREGISTERTRIMNOTIFICATION *> unregisterTrimNotification;

    // HW queue
-    ThkWrapper<OCL_RUNTIME_PROFILING, IN OUT D3DKMT_CREATEHWQUEUE *> createHwQueue;
-    ThkWrapper<OCL_RUNTIME_PROFILING, IN CONST D3DKMT_DESTROYHWQUEUE *> destroyHwQueue;
-    ThkWrapper<OCL_RUNTIME_PROFILING, IN CONST D3DKMT_SUBMITCOMMANDTOHWQUEUE *> submitCommandToHwQueue;
+    ThkWrapper<IN OUT D3DKMT_CREATEHWQUEUE *> createHwQueue;
+    ThkWrapper<IN CONST D3DKMT_DESTROYHWQUEUE *> destroyHwQueue;
+    ThkWrapper<IN CONST D3DKMT_SUBMITCOMMANDTOHWQUEUE *> submitCommandToHwQueue;

    // For debug purposes
-    ThkWrapper<OCL_RUNTIME_PROFILING, IN OUT D3DKMT_GETDEVICESTATE *> getDeviceState;
+    ThkWrapper<IN OUT D3DKMT_GETDEVICESTATE *> getDeviceState;

    bool isInitialized() {
        return initialized;
--- a/runtime/os_interface/windows/thk_wrapper.h
+++ b/runtime/os_interface/windows/thk_wrapper.h
@@ -70,7 +70,7 @@ enum SystemCallsIds {
    SYSTIMER_ID_OGL = 400,
 };

-template <bool UseTimer, typename Param>
+template <typename Param>
 class ThkWrapper {
    typedef NTSTATUS(APIENTRY *Func)(Param);

@@ -78,7 +78,7 @@ class ThkWrapper {
    Func mFunc = nullptr;

    inline NTSTATUS operator()(Param param) const {
-        if (UseTimer) {
+        if (KMD_PROFILING) {
            SYSTEM_ENTER()
            NTSTATUS Status;
            Status = mFunc(param);
--- a/runtime/platform/platform.cpp
+++ b/runtime/platform/platform.cpp
@@ -12,6 +12,7 @@
 #include "core/gmm_helper/gmm_helper.h"
 #include "core/helpers/debug_helpers.h"
 #include "core/helpers/hw_helper.h"
+#include "core/helpers/options.h"
 #include "core/helpers/string.h"
 #include "runtime/api/api.h"
 #include "runtime/command_stream/command_stream_receiver.h"
@@ -21,7 +22,6 @@
 #include "runtime/gtpin/gtpin_notify.h"
 #include "runtime/helpers/built_ins_helper.h"
 #include "runtime/helpers/get_info.h"
-#include "runtime/helpers/options.h"
 #include "runtime/os_interface/debug_settings_manager.h"
 #include "runtime/os_interface/device_factory.h"
 #include "runtime/os_interface/os_interface.h"
--- a/runtime/utilities/api_intercept.h
+++ b/runtime/utilities/api_intercept.h
@@ -16,7 +16,7 @@
 #define WAIT_ENTER()
 #define WAIT_LEAVE()

-#if OCL_RUNTIME_PROFILING == 1
+#if KMD_PROFILING == 1
 #undef API_ENTER
 #undef SYSTEM_ENTER
 #undef SYSTEM_LEAVE
--- a/runtime/utilities/perf_profiler.h
+++ b/runtime/utilities/perf_profiler.h
@@ -6,8 +6,8 @@
 */

 #pragma once
+#include "core/helpers/options.h"
 #include "core/utilities/timer_util.h"
-#include "runtime/helpers/options.h"

 #include <atomic>
 #include <fstream>
@@ -98,7 +98,7 @@ class PerfProfiler {
    std::vector<SystemLog> systemLogs;
 };

-#if OCL_RUNTIME_PROFILING == 1
+#if KMD_PROFILING == 1

 extern thread_local PerfProfiler *gPerfProfiler;

--- a/unit_tests/api/cl_api_tests.cpp
+++ b/unit_tests/api/cl_api_tests.cpp
@@ -7,8 +7,8 @@

 #include "cl_api_tests.h"

+#include "core/helpers/options.h"
 #include "runtime/command_queue/command_queue.h"
-#include "runtime/helpers/options.h"
 #include "unit_tests/mocks/mock_context.h"
 #include "unit_tests/mocks/mock_device.h"
 #include "unit_tests/mocks/mock_kernel.h"
--- a/unit_tests/api/cl_compile_program_tests.inl
+++ b/unit_tests/api/cl_compile_program_tests.inl
@@ -7,8 +7,8 @@

 #include "core/compiler_interface/compiler_interface.h"
 #include "core/helpers/file_io.h"
+#include "core/helpers/options.h"
 #include "runtime/context/context.h"
-#include "runtime/helpers/options.h"
 #include "unit_tests/helpers/kernel_binary_helper.h"
 #include "unit_tests/helpers/test_files.h"

--- a/unit_tests/api/cl_get_kernel_arg_info_tests.inl
+++ b/unit_tests/api/cl_get_kernel_arg_info_tests.inl
@@ -7,9 +7,9 @@

 #include "core/compiler_interface/compiler_interface.h"
 #include "core/helpers/file_io.h"
+#include "core/helpers/options.h"
 #include "runtime/context/context.h"
 #include "runtime/device/device.h"
-#include "runtime/helpers/options.h"
 #include "unit_tests/helpers/kernel_binary_helper.h"
 #include "unit_tests/helpers/test_files.h"

--- a/unit_tests/api/cl_get_kernel_info_tests.inl
+++ b/unit_tests/api/cl_get_kernel_info_tests.inl
@@ -7,9 +7,9 @@

 #include "core/compiler_interface/compiler_interface.h"
 #include "core/helpers/file_io.h"
+#include "core/helpers/options.h"
 #include "runtime/context/context.h"
 #include "runtime/device/device.h"
-#include "runtime/helpers/options.h"
 #include "unit_tests/helpers/kernel_binary_helper.h"
 #include "unit_tests/helpers/test_files.h"

--- a/unit_tests/api/cl_get_kernel_work_group_info_tests.inl
+++ b/unit_tests/api/cl_get_kernel_work_group_info_tests.inl
@@ -7,8 +7,8 @@

 #include "core/compiler_interface/compiler_interface.h"
 #include "core/helpers/file_io.h"
+#include "core/helpers/options.h"
 #include "runtime/device/device.h"
-#include "runtime/helpers/options.h"
 #include "unit_tests/helpers/kernel_binary_helper.h"
 #include "unit_tests/helpers/test_files.h"
 #include "unit_tests/mocks/mock_kernel.h"
--- a/unit_tests/api/cl_get_mem_object_info_tests.inl
+++ b/unit_tests/api/cl_get_mem_object_info_tests.inl
@@ -7,9 +7,9 @@

 #include "core/compiler_interface/compiler_interface.h"
 #include "core/helpers/file_io.h"
+#include "core/helpers/options.h"
 #include "runtime/context/context.h"
 #include "runtime/device/device.h"
-#include "runtime/helpers/options.h"
 #include "unit_tests/helpers/test_files.h"

 #include "cl_api_tests.h"
--- a/unit_tests/api/cl_get_platform_info_tests.inl
+++ b/unit_tests/api/cl_get_platform_info_tests.inl
@@ -5,8 +5,8 @@
 *
 */

+#include "core/helpers/options.h"
 #include "runtime/device/device.h"
-#include "runtime/helpers/options.h"
 #include "runtime/os_interface/debug_settings_manager.h"
 #include "runtime/platform/platform.h"
 #include "test.h"
--- a/unit_tests/api/cl_get_program_build_info_tests.inl
+++ b/unit_tests/api/cl_get_program_build_info_tests.inl
@@ -7,9 +7,9 @@

 #include "core/compiler_interface/compiler_interface.h"
 #include "core/helpers/file_io.h"
+#include "core/helpers/options.h"
 #include "runtime/context/context.h"
 #include "runtime/device/device.h"
-#include "runtime/helpers/options.h"
 #include "unit_tests/elflib/elf_binary_simulator.h"
 #include "unit_tests/helpers/kernel_binary_helper.h"
 #include "unit_tests/helpers/test_files.h"
--- a/unit_tests/api/cl_get_program_info_tests.inl
+++ b/unit_tests/api/cl_get_program_info_tests.inl
@@ -7,9 +7,9 @@

 #include "core/compiler_interface/compiler_interface.h"
 #include "core/helpers/file_io.h"
+#include "core/helpers/options.h"
 #include "runtime/context/context.h"
 #include "runtime/device/device.h"
-#include "runtime/helpers/options.h"
 #include "unit_tests/helpers/kernel_binary_helper.h"
 #include "unit_tests/helpers/test_files.h"

--- a/unit_tests/api/cl_link_program_tests.inl
+++ b/unit_tests/api/cl_link_program_tests.inl
@@ -7,8 +7,8 @@

 #include "core/compiler_interface/compiler_interface.h"
 #include "core/helpers/file_io.h"
+#include "core/helpers/options.h"
 #include "runtime/context/context.h"
-#include "runtime/helpers/options.h"
 #include "unit_tests/helpers/test_files.h"

 #include "cl_api_tests.h"
--- a/unit_tests/api/gl/cl_get_gl_context_info_khr_tests.cpp
+++ b/unit_tests/api/gl/cl_get_gl_context_info_khr_tests.cpp
@@ -6,8 +6,8 @@
 */

 #include "core/helpers/hw_info.h"
+#include "core/helpers/options.h"
 #include "runtime/device/device.h"
-#include "runtime/helpers/options.h"
 #include "unit_tests/api/cl_api_tests.h"
 #include "unit_tests/os_interface/windows/gl/gl_dll_helper.h"

--- a/unit_tests/aub/aub_center_tests.cpp
+++ b/unit_tests/aub/aub_center_tests.cpp
@@ -7,8 +7,8 @@

 #include "core/helpers/basic_math.h"
 #include "core/helpers/hw_info.h"
+#include "core/helpers/options.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
-#include "runtime/helpers/options.h"
 #include "runtime/os_interface/debug_settings_manager.h"
 #include "unit_tests/mocks/mock_aub_center.h"
 #include "unit_tests/mocks/mock_aub_manager.h"
--- a/unit_tests/aub/aub_center_using_aubstream_stubs_tests.cpp
+++ b/unit_tests/aub/aub_center_using_aubstream_stubs_tests.cpp
@@ -6,8 +6,8 @@
 */

 #include "core/helpers/hw_info.h"
+#include "core/helpers/options.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
-#include "runtime/helpers/options.h"
 #include "runtime/os_interface/debug_settings_manager.h"
 #include "unit_tests/helpers/variable_backup.h"
 #include "unit_tests/mocks/mock_aub_center.h"
--- a/unit_tests/aub_tests/command_queue/enqueue_copy_buffer_aub_tests.cpp
+++ b/unit_tests/aub_tests/command_queue/enqueue_copy_buffer_aub_tests.cpp
@@ -5,9 +5,9 @@
 *
 */

+#include "core/helpers/options.h"
 #include "core/helpers/ptr_math.h"
 #include "runtime/command_stream/command_stream_receiver.h"
-#include "runtime/helpers/options.h"
 #include "runtime/mem_obj/buffer.h"
 #include "test.h"
 #include "unit_tests/aub_tests/command_queue/command_enqueue_fixture.h"
--- a/unit_tests/aub_tests/command_queue/enqueue_copy_buffer_rect_aub_tests.cpp
+++ b/unit_tests/aub_tests/command_queue/enqueue_copy_buffer_rect_aub_tests.cpp
@@ -5,9 +5,9 @@
 *
 */

+#include "core/helpers/options.h"
 #include "core/helpers/ptr_math.h"
 #include "runtime/command_stream/command_stream_receiver.h"
-#include "runtime/helpers/options.h"
 #include "runtime/mem_obj/buffer.h"
 #include "test.h"
 #include "unit_tests/aub_tests/command_queue/command_enqueue_fixture.h"
--- a/unit_tests/aub_tests/command_queue/enqueue_fill_buffer_aub_tests.cpp
+++ b/unit_tests/aub_tests/command_queue/enqueue_fill_buffer_aub_tests.cpp
@@ -5,10 +5,10 @@
 *
 */

+#include "core/helpers/options.h"
 #include "core/helpers/ptr_math.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
 #include "runtime/command_stream/command_stream_receiver.h"
-#include "runtime/helpers/options.h"
 #include "runtime/mem_obj/buffer.h"
 #include "test.h"
 #include "unit_tests/aub_tests/command_queue/command_enqueue_fixture.h"
--- a/unit_tests/aub_tests/command_queue/enqueue_read_buffer_aub_tests.cpp
+++ b/unit_tests/aub_tests/command_queue/enqueue_read_buffer_aub_tests.cpp
@@ -5,9 +5,9 @@
 *
 */

+#include "core/helpers/options.h"
 #include "core/helpers/ptr_math.h"
 #include "runtime/command_stream/command_stream_receiver.h"
-#include "runtime/helpers/options.h"
 #include "runtime/mem_obj/buffer.h"
 #include "test.h"
 #include "unit_tests/aub_tests/aub_tests_configuration.h"
--- a/unit_tests/aub_tests/command_queue/enqueue_read_buffer_rect_aub_tests.cpp
+++ b/unit_tests/aub_tests/command_queue/enqueue_read_buffer_rect_aub_tests.cpp
@@ -6,9 +6,9 @@
 */

 #include "core/helpers/aligned_memory.h"
+#include "core/helpers/options.h"
 #include "core/helpers/ptr_math.h"
 #include "runtime/command_stream/command_stream_receiver.h"
-#include "runtime/helpers/options.h"
 #include "runtime/mem_obj/buffer.h"
 #include "test.h"
 #include "unit_tests/aub_tests/command_queue/command_enqueue_fixture.h"
--- a/unit_tests/aub_tests/command_queue/enqueue_write_buffer_aub_tests.cpp
+++ b/unit_tests/aub_tests/command_queue/enqueue_write_buffer_aub_tests.cpp
@@ -5,10 +5,10 @@
 *
 */

+#include "core/helpers/options.h"
 #include "core/helpers/ptr_math.h"
 #include "runtime/command_stream/command_stream_receiver.h"
 #include "runtime/device/device.h"
-#include "runtime/helpers/options.h"
 #include "runtime/mem_obj/buffer.h"
 #include "test.h"
 #include "unit_tests/aub_tests/command_queue/command_enqueue_fixture.h"
--- a/unit_tests/aub_tests/command_queue/enqueue_write_buffer_rect_aub_tests.cpp
+++ b/unit_tests/aub_tests/command_queue/enqueue_write_buffer_rect_aub_tests.cpp
@@ -6,10 +6,10 @@
 */

 #include "core/helpers/aligned_memory.h"
+#include "core/helpers/options.h"
 #include "core/helpers/ptr_math.h"
 #include "runtime/command_stream/command_stream_receiver.h"
 #include "runtime/device/device.h"
-#include "runtime/helpers/options.h"
 #include "runtime/mem_obj/buffer.h"
 #include "test.h"
 #include "unit_tests/aub_tests/command_queue/command_enqueue_fixture.h"
--- a/unit_tests/aub_tests/command_queue/enqueue_write_copy_read_buffer_aub_tests.h
+++ b/unit_tests/aub_tests/command_queue/enqueue_write_copy_read_buffer_aub_tests.h
@@ -5,9 +5,9 @@
 *
 */

+#include "core/helpers/options.h"
 #include "core/helpers/ptr_math.h"
 #include "runtime/command_stream/command_stream_receiver.h"
-#include "runtime/helpers/options.h"
 #include "runtime/mem_obj/buffer.h"
 #include "unit_tests/aub_tests/fixtures/aub_fixture.h"

--- a/unit_tests/aub_tests/command_stream/aub_mem_dump_tests.h
+++ b/unit_tests/aub_tests/command_stream/aub_mem_dump_tests.h
@@ -7,12 +7,12 @@

 #pragma once
 #include "core/helpers/aligned_memory.h"
+#include "core/helpers/options.h"
 #include "core/helpers/ptr_math.h"
 #include "runtime/aub_mem_dump/aub_mem_dump.h"
 #include "runtime/command_stream/aub_command_stream_receiver_hw.h"
 #include "runtime/device/device.h"
 #include "runtime/gen_common/aub_mapper.h"
-#include "runtime/helpers/options.h"
 #include "test.h"

 namespace Os {
--- a/unit_tests/built_ins/sip_tests.cpp
+++ b/unit_tests/built_ins/sip_tests.cpp
@@ -5,9 +5,9 @@
 *
 */

+#include "core/helpers/options.h"
 #include "runtime/built_ins/built_ins.h"
 #include "runtime/built_ins/sip.h"
-#include "runtime/helpers/options.h"
 #include "test.h"
 #include "unit_tests/global_environment.h"
 #include "unit_tests/helpers/test_files.h"
--- a/unit_tests/command_queue/command_queue_tests.cpp
+++ b/unit_tests/command_queue/command_queue_tests.cpp
@@ -6,12 +6,12 @@
 */

 #include "core/helpers/basic_math.h"
+#include "core/helpers/options.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
 #include "runtime/command_queue/command_queue_hw.h"
 #include "runtime/command_stream/command_stream_receiver.h"
 #include "runtime/event/event.h"
 #include "runtime/helpers/hardware_commands_helper.h"
-#include "runtime/helpers/options.h"
 #include "runtime/helpers/timestamp_packet.h"
 #include "runtime/memory_manager/internal_allocation_storage.h"
 #include "runtime/memory_manager/memory_manager.h"
--- a/unit_tests/command_queue/local_work_size_tests.cpp
+++ b/unit_tests/command_queue/local_work_size_tests.cpp
@@ -5,9 +5,9 @@
 *
 */

+#include "core/helpers/options.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
 #include "runtime/command_queue/gpgpu_walker.h"
-#include "runtime/helpers/options.h"
 #include "unit_tests/mocks/mock_device.h"
 #include "unit_tests/mocks/mock_kernel.h"

--- a/unit_tests/command_stream/create_command_stream_receiver_tests.cpp
+++ b/unit_tests/command_stream/create_command_stream_receiver_tests.cpp
@@ -5,11 +5,11 @@
 *
 */

+#include "core/helpers/options.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
 #include "runtime/command_stream/command_stream_receiver.h"
 #include "runtime/command_stream/command_stream_receiver_with_aub_dump.h"
 #include "runtime/execution_environment/execution_environment.h"
-#include "runtime/helpers/options.h"
 #include "runtime/memory_manager/os_agnostic_memory_manager.h"
 #include "test.h"
 #include "unit_tests/fixtures/mock_aub_center_fixture.h"
--- a/unit_tests/command_stream/get_devices_tests.cpp
+++ b/unit_tests/command_stream/get_devices_tests.cpp
@@ -5,10 +5,10 @@
 *
 */

+#include "core/helpers/options.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
 #include "runtime/command_stream/command_stream_receiver.h"
 #include "runtime/execution_environment/execution_environment.h"
-#include "runtime/helpers/options.h"
 #include "runtime/memory_manager/os_agnostic_memory_manager.h"
 #include "runtime/os_interface/device_factory.h"
 #include "runtime/os_interface/hw_info_config.h"
--- a/unit_tests/context/context_get_info_tests.cpp
+++ b/unit_tests/context/context_get_info_tests.cpp
@@ -5,7 +5,7 @@
 *
 */

-#include "runtime/helpers/options.h"
+#include "core/helpers/options.h"
 #include "unit_tests/fixtures/context_fixture.h"
 #include "unit_tests/fixtures/platform_fixture.h"
 #include "unit_tests/mocks/mock_context.h"
--- a/unit_tests/context/context_tests.cpp
+++ b/unit_tests/context/context_tests.cpp
@@ -5,12 +5,12 @@
 *
 */

+#include "core/helpers/options.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
 #include "runtime/command_queue/command_queue.h"
 #include "runtime/context/context.inl"
 #include "runtime/device/device.h"
 #include "runtime/device_queue/device_queue.h"
-#include "runtime/helpers/options.h"
 #include "runtime/sharings/sharing.h"
 #include "unit_tests/fixtures/platform_fixture.h"
 #include "unit_tests/helpers/variable_backup.h"
--- a/unit_tests/context/driver_diagnostics_tests.h
+++ b/unit_tests/context/driver_diagnostics_tests.h
@@ -7,9 +7,9 @@

 #pragma once
 #include "core/helpers/aligned_memory.h"
+#include "core/helpers/options.h"
 #include "runtime/command_queue/gpgpu_walker.h"
 #include "runtime/context/context.h"
-#include "runtime/helpers/options.h"
 #include "runtime/kernel/kernel.h"
 #include "runtime/mem_obj/buffer.h"
 #include "unit_tests/command_queue/command_queue_fixture.h"
--- a/unit_tests/context/get_supported_image_formats_tests.cpp
+++ b/unit_tests/context/get_supported_image_formats_tests.cpp
@@ -5,7 +5,7 @@
 *
 */

-#include "runtime/helpers/options.h"
+#include "core/helpers/options.h"
 #include "runtime/helpers/surface_formats.h"
 #include "runtime/mem_obj/image.h"
 #include "unit_tests/fixtures/context_fixture.h"
--- a/unit_tests/context/gl/context_gl_tests.cpp
+++ b/unit_tests/context/gl/context_gl_tests.cpp
@@ -5,11 +5,11 @@
 *
 */

+#include "core/helpers/options.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
 #include "runtime/context/context.h"
 #include "runtime/device/device.h"
 #include "runtime/device_queue/device_queue.h"
-#include "runtime/helpers/options.h"
 #include "runtime/os_interface/windows/gl/gl_sharing_os.h"
 #include "runtime/sharings/gl/gl_sharing.h"
 #include "unit_tests/fixtures/platform_fixture.h"
--- a/unit_tests/d3d_sharing/d3d9_tests.cpp
+++ b/unit_tests/d3d_sharing/d3d9_tests.cpp
@@ -5,9 +5,9 @@
 *
 */

+#include "core/helpers/options.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
 #include "runtime/api/api.h"
-#include "runtime/helpers/options.h"
 #include "runtime/mem_obj/image.h"
 #include "runtime/memory_manager/os_agnostic_memory_manager.h"
 #include "runtime/os_interface/windows/d3d_sharing_functions.h"
--- a/unit_tests/d3d_sharing/d3d_aux_tests.cpp
+++ b/unit_tests/d3d_sharing/d3d_aux_tests.cpp
@@ -5,9 +5,9 @@
 *
 */

+#include "core/helpers/options.h"
 #include "core/utilities/arrayref.h"
 #include "runtime/api/api.h"
-#include "runtime/helpers/options.h"
 #include "runtime/mem_obj/image.h"
 #include "runtime/memory_manager/os_agnostic_memory_manager.h"
 #include "runtime/platform/platform.h"
--- a/unit_tests/d3d_sharing/d3d_tests_part1.cpp
+++ b/unit_tests/d3d_sharing/d3d_tests_part1.cpp
@@ -5,10 +5,10 @@
 *
 */

+#include "core/helpers/options.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
 #include "core/utilities/arrayref.h"
 #include "runtime/api/api.h"
-#include "runtime/helpers/options.h"
 #include "runtime/mem_obj/image.h"
 #include "runtime/memory_manager/os_agnostic_memory_manager.h"
 #include "runtime/platform/platform.h"
--- a/unit_tests/d3d_sharing/d3d_tests_part2.cpp
+++ b/unit_tests/d3d_sharing/d3d_tests_part2.cpp
@@ -5,10 +5,10 @@
 *
 */

+#include "core/helpers/options.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
 #include "core/utilities/arrayref.h"
 #include "runtime/api/api.h"
-#include "runtime/helpers/options.h"
 #include "runtime/mem_obj/image.h"
 #include "runtime/memory_manager/os_agnostic_memory_manager.h"
 #include "runtime/platform/platform.h"
--- a/unit_tests/device/device_tests.cpp
+++ b/unit_tests/device/device_tests.cpp
@@ -6,11 +6,11 @@
 */

 #include "core/helpers/hw_helper.h"
+#include "core/helpers/options.h"
 #include "core/indirect_heap/indirect_heap.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
 #include "runtime/device/device.h"
 #include "runtime/helpers/device_helpers.h"
-#include "runtime/helpers/options.h"
 #include "runtime/os_interface/os_context.h"
 #include "runtime/platform/platform.h"
 #include "test.h"
--- a/unit_tests/device/gl/device_caps_gl_tests.cpp
+++ b/unit_tests/device/gl/device_caps_gl_tests.cpp
@@ -7,8 +7,8 @@

 #include "core/helpers/basic_math.h"
 #include "core/helpers/hw_info.h"
+#include "core/helpers/options.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
-#include "runtime/helpers/options.h"
 #include "runtime/memory_manager/os_agnostic_memory_manager.h"
 #include "runtime/os_interface/debug_settings_manager.h"
 #include "test.h"
--- a/unit_tests/device_queue/device_queue_hw_tests.cpp
+++ b/unit_tests/device_queue/device_queue_hw_tests.cpp
@@ -6,10 +6,10 @@
 */

 #include "core/helpers/hw_cmds.h"
+#include "core/helpers/options.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
 #include "runtime/command_queue/gpgpu_walker.h"
 #include "runtime/helpers/hardware_commands_helper.h"
-#include "runtime/helpers/options.h"
 #include "runtime/utilities/tag_allocator.h"
 #include "unit_tests/fixtures/device_host_queue_fixture.h"
 #include "unit_tests/fixtures/execution_model_fixture.h"
--- a/unit_tests/execution_environment/execution_environment_tests.cpp
+++ b/unit_tests/execution_environment/execution_environment_tests.cpp
@@ -9,13 +9,13 @@
 #include "core/compiler_interface/compiler_interface.h"
 #include "core/gmm_helper/gmm_helper.h"
 #include "core/helpers/hw_helper.h"
+#include "core/helpers/options.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
 #include "core/unit_tests/utilities/destructor_counted.h"
 #include "runtime/aub/aub_center.h"
 #include "runtime/built_ins/built_ins.h"
 #include "runtime/device/device.h"
 #include "runtime/execution_environment/execution_environment.h"
-#include "runtime/helpers/options.h"
 #include "runtime/memory_manager/os_agnostic_memory_manager.h"
 #include "runtime/os_interface/os_interface.h"
 #include "runtime/platform/platform.h"
--- a/unit_tests/fixtures/image_fixture.h
+++ b/unit_tests/fixtures/image_fixture.h
@@ -7,9 +7,9 @@

 #pragma once
 #include "core/helpers/hw_info.h"
+#include "core/helpers/options.h"
 #include "runtime/execution_environment/execution_environment.h"
 #include "runtime/helpers/memory_properties_flags_helpers.h"
-#include "runtime/helpers/options.h"
 #include "runtime/mem_obj/image.h"
 #include "runtime/platform/platform.h"
 #include "test.h"
--- a/unit_tests/fixtures/memory_management_fixture.cpp
+++ b/unit_tests/fixtures/memory_management_fixture.cpp
@@ -7,9 +7,9 @@

 #include "unit_tests/fixtures/memory_management_fixture.h"

+#include "core/helpers/options.h"
 #include "core/unit_tests/helpers/memory_leak_listener.h"
 #include "core/unit_tests/helpers/memory_management.h"
-#include "runtime/helpers/options.h"

 #include <cinttypes>
 #if defined(__linux__)
--- a/unit_tests/fixtures/memory_manager_fixture.h
+++ b/unit_tests/fixtures/memory_manager_fixture.h
@@ -6,8 +6,8 @@
 */

 #pragma once
+#include "core/helpers/options.h"
 #include "runtime/execution_environment/execution_environment.h"
-#include "runtime/helpers/options.h"

 using namespace NEO;

--- a/unit_tests/fixtures/scenario_test_fixture.h
+++ b/unit_tests/fixtures/scenario_test_fixture.h
@@ -7,8 +7,8 @@

 #pragma once

+#include "core/helpers/options.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
-#include "runtime/helpers/options.h"
 #include "test.h"
 #include "unit_tests/fixtures/platform_fixture.h"
 #include "unit_tests/mocks/mock_command_queue.h"
--- a/unit_tests/fixtures/templated_fixture_tests.cpp
+++ b/unit_tests/fixtures/templated_fixture_tests.cpp
@@ -5,8 +5,8 @@
 *
 */

+#include "core/helpers/options.h"
 #include "runtime/helpers/hardware_commands_helper.h"
-#include "runtime/helpers/options.h"
 #include "test.h"

 namespace NEO {
--- a/unit_tests/gen11/test_platform_caps_gen11.cpp
+++ b/unit_tests/gen11/test_platform_caps_gen11.cpp
@@ -5,7 +5,7 @@
 *
 */

-#include "runtime/helpers/options.h"
+#include "core/helpers/options.h"
 #include "test.h"
 #include "unit_tests/fixtures/platform_fixture.h"

--- a/unit_tests/gen12lp/test_platform_caps_gen12lp.inl
+++ b/unit_tests/gen12lp/test_platform_caps_gen12lp.inl
@@ -5,7 +5,7 @@
 *
 */

-#include "runtime/helpers/options.h"
+#include "core/helpers/options.h"
 #include "test.h"
 #include "unit_tests/fixtures/platform_fixture.h"

--- a/unit_tests/gen8/test_platform_caps_gen8.cpp
+++ b/unit_tests/gen8/test_platform_caps_gen8.cpp
@@ -5,7 +5,7 @@
 *
 */

-#include "runtime/helpers/options.h"
+#include "core/helpers/options.h"
 #include "test.h"
 #include "unit_tests/fixtures/platform_fixture.h"

--- a/unit_tests/gen9/test_platform_caps_gen9.cpp
+++ b/unit_tests/gen9/test_platform_caps_gen9.cpp
@@ -5,8 +5,8 @@
 *
 */

+#include "core/helpers/options.h"
 #include "runtime/device/device.h"
-#include "runtime/helpers/options.h"
 #include "test.h"
 #include "unit_tests/fixtures/platform_fixture.h"

--- a/unit_tests/gmm_helper/gmm_helper_tests.cpp
+++ b/unit_tests/gmm_helper/gmm_helper_tests.cpp
@@ -7,11 +7,11 @@

 #include "core/gmm_helper/gmm_helper.h"
 #include "core/helpers/hw_info.h"
+#include "core/helpers/options.h"
 #include "core/helpers/ptr_math.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
 #include "runtime/gmm_helper/gmm.h"
 #include "runtime/gmm_helper/gmm_types_converter.h"
-#include "runtime/helpers/options.h"
 #include "runtime/memory_manager/os_agnostic_memory_manager.h"
 #include "runtime/platform/platform.h"
 #include "unit_tests/helpers/variable_backup.h"
--- a/unit_tests/gtpin/gtpin_tests.cpp
+++ b/unit_tests/gtpin/gtpin_tests.cpp
@@ -8,6 +8,7 @@
 #include "core/helpers/basic_math.h"
 #include "core/helpers/file_io.h"
 #include "core/helpers/hash.h"
+#include "core/helpers/options.h"
 #include "runtime/api/api.h"
 #include "runtime/compiler_interface/patchtokens_decoder.h"
 #include "runtime/context/context.h"
@@ -17,7 +18,6 @@
 #include "runtime/gtpin/gtpin_hw_helper.h"
 #include "runtime/gtpin/gtpin_init.h"
 #include "runtime/gtpin/gtpin_notify.h"
-#include "runtime/helpers/options.h"
 #include "runtime/kernel/kernel.h"
 #include "runtime/mem_obj/buffer.h"
 #include "runtime/memory_manager/surface.h"
--- a/unit_tests/helpers/hw_helper_tests.cpp
+++ b/unit_tests/helpers/hw_helper_tests.cpp
@@ -9,6 +9,7 @@

 #include "core/gmm_helper/gmm_helper.h"
 #include "core/helpers/aligned_memory.h"
+#include "core/helpers/options.h"
 #include "core/helpers/string.h"
 #include "core/memory_manager/graphics_allocation.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
@@ -16,7 +17,6 @@
 #include "runtime/gmm_helper/resource_info.h"
 #include "runtime/helpers/dispatch_info.h"
 #include "runtime/helpers/hardware_commands_helper.h"
-#include "runtime/helpers/options.h"
 #include "runtime/mem_obj/image.h"
 #include "runtime/os_interface/hw_info_config.h"
 #include "runtime/os_interface/os_interface.h"
--- a/unit_tests/helpers/linux/kmd_notify_linux_tests.cpp
+++ b/unit_tests/helpers/linux/kmd_notify_linux_tests.cpp
@@ -6,7 +6,7 @@
 */

 #include "core/helpers/kmd_notify_properties.h"
-#include "runtime/helpers/options.h"
+#include "core/helpers/options.h"
 #include "test.h"

 namespace NEO {
--- a/unit_tests/helpers/timestamp_packet_tests.cpp
+++ b/unit_tests/helpers/timestamp_packet_tests.cpp
@@ -5,12 +5,12 @@
 *
 */

+#include "core/helpers/options.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
 #include "core/unit_tests/utilities/base_object_utils.h"
 #include "runtime/command_queue/gpgpu_walker.h"
 #include "runtime/command_queue/hardware_interface.h"
 #include "runtime/event/user_event.h"
-#include "runtime/helpers/options.h"
 #include "runtime/helpers/timestamp_packet.h"
 #include "runtime/platform/platform.h"
 #include "runtime/utilities/tag_allocator.h"
--- a/Show More
+++ b/Show More