From 566b845bbc1b479b39347ff66a8418ae97c934aa Mon Sep 17 00:00:00 2001 From: "Dunajski, Bartosz" Date: Wed, 4 Dec 2019 15:44:01 +0100 Subject: [PATCH] Move state_base_address to core Change-Id: I2b64fff4eed31054ae29b7b14ecb9f147914049a Signed-off-by: Dunajski, Bartosz --- core/helpers/CMakeLists.txt | 3 +++ {runtime => core}/helpers/state_base_address.h | 0 {runtime => core}/helpers/state_base_address_base.inl | 2 +- {runtime => core}/helpers/state_base_address_bdw_plus.inl | 2 +- runtime/command_stream/command_stream_receiver_hw_base.inl | 2 +- runtime/gen11/state_base_address_gen11.cpp | 4 ++-- runtime/gen12lp/state_base_address_gen12lp.cpp | 4 ++-- runtime/gen8/state_base_address_gen8.cpp | 4 ++-- runtime/gen9/state_base_address_gen9.cpp | 4 ++-- runtime/helpers/CMakeLists.txt | 3 --- unit_tests/api/cl_mem_locally_uncached_resource_tests.cpp | 2 +- .../command_stream_receiver_flush_task_2_tests.cpp | 2 +- 12 files changed, 16 insertions(+), 16 deletions(-) rename {runtime => core}/helpers/state_base_address.h (100%) rename {runtime => core}/helpers/state_base_address_base.inl (98%) rename {runtime => core}/helpers/state_base_address_bdw_plus.inl (94%) diff --git a/core/helpers/CMakeLists.txt b/core/helpers/CMakeLists.txt index 5926cf956a..20a32b7a53 100644 --- a/core/helpers/CMakeLists.txt +++ b/core/helpers/CMakeLists.txt @@ -41,6 +41,9 @@ set(NEO_CORE_HELPERS ${CMAKE_CURRENT_SOURCE_DIR}/ptr_math.h ${CMAKE_CURRENT_SOURCE_DIR}/register_offsets.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 + ${CMAKE_CURRENT_SOURCE_DIR}/state_base_address_bdw_plus.inl ${CMAKE_CURRENT_SOURCE_DIR}/stdio.h ${CMAKE_CURRENT_SOURCE_DIR}/string.h ${CMAKE_CURRENT_SOURCE_DIR}/vec.h diff --git a/runtime/helpers/state_base_address.h b/core/helpers/state_base_address.h similarity index 100% rename from runtime/helpers/state_base_address.h rename to core/helpers/state_base_address.h diff --git a/runtime/helpers/state_base_address_base.inl b/core/helpers/state_base_address_base.inl similarity index 98% rename from runtime/helpers/state_base_address_base.inl rename to core/helpers/state_base_address_base.inl index a650d31770..2e1555c11b 100644 --- a/runtime/helpers/state_base_address_base.inl +++ b/core/helpers/state_base_address_base.inl @@ -8,9 +8,9 @@ #include "core/gmm_helper/gmm_helper.h" #include "core/helpers/cache_policy.h" #include "core/helpers/hw_cmds.h" +#include "core/helpers/state_base_address.h" #include "core/indirect_heap/indirect_heap.h" #include "core/memory_manager/memory_constants.h" -#include "runtime/helpers/state_base_address.h" namespace NEO { template diff --git a/runtime/helpers/state_base_address_bdw_plus.inl b/core/helpers/state_base_address_bdw_plus.inl similarity index 94% rename from runtime/helpers/state_base_address_bdw_plus.inl rename to core/helpers/state_base_address_bdw_plus.inl index ac3759fd1f..6974500859 100644 --- a/runtime/helpers/state_base_address_bdw_plus.inl +++ b/core/helpers/state_base_address_bdw_plus.inl @@ -5,7 +5,7 @@ * */ -#include "runtime/helpers/state_base_address_base.inl" +#include "core/helpers/state_base_address_base.inl" namespace NEO { diff --git a/runtime/command_stream/command_stream_receiver_hw_base.inl b/runtime/command_stream/command_stream_receiver_hw_base.inl index 52b132dc71..352fda8c9a 100644 --- a/runtime/command_stream/command_stream_receiver_hw_base.inl +++ b/runtime/command_stream/command_stream_receiver_hw_base.inl @@ -11,6 +11,7 @@ #include "core/helpers/hw_helper.h" #include "core/helpers/preamble.h" #include "core/helpers/ptr_math.h" +#include "core/helpers/state_base_address.h" #include "core/indirect_heap/indirect_heap.h" #include "runtime/command_queue/gpgpu_walker.h" #include "runtime/command_stream/command_stream_receiver_hw.h" @@ -23,7 +24,6 @@ #include "runtime/helpers/flat_batch_buffer_helper_hw.h" #include "runtime/helpers/flush_stamp.h" #include "runtime/helpers/options.h" -#include "runtime/helpers/state_base_address.h" #include "runtime/helpers/state_compute_mode_helper.h" #include "runtime/helpers/timestamp_packet.h" #include "runtime/memory_manager/internal_allocation_storage.h" diff --git a/runtime/gen11/state_base_address_gen11.cpp b/runtime/gen11/state_base_address_gen11.cpp index 33c9dc48d2..5a266c6bfa 100644 --- a/runtime/gen11/state_base_address_gen11.cpp +++ b/runtime/gen11/state_base_address_gen11.cpp @@ -5,8 +5,8 @@ * */ -#include "runtime/helpers/state_base_address.h" -#include "runtime/helpers/state_base_address_bdw_plus.inl" +#include "core/helpers/state_base_address.h" +#include "core/helpers/state_base_address_bdw_plus.inl" namespace NEO { template struct StateBaseAddressHelper; diff --git a/runtime/gen12lp/state_base_address_gen12lp.cpp b/runtime/gen12lp/state_base_address_gen12lp.cpp index 04e9579c71..1eba4c267b 100644 --- a/runtime/gen12lp/state_base_address_gen12lp.cpp +++ b/runtime/gen12lp/state_base_address_gen12lp.cpp @@ -5,8 +5,8 @@ * */ -#include "runtime/helpers/state_base_address.h" -#include "runtime/helpers/state_base_address_bdw_plus.inl" +#include "core/helpers/state_base_address.h" +#include "core/helpers/state_base_address_bdw_plus.inl" namespace NEO { template struct StateBaseAddressHelper; diff --git a/runtime/gen8/state_base_address_gen8.cpp b/runtime/gen8/state_base_address_gen8.cpp index 56e69a12b3..d6acabb31b 100644 --- a/runtime/gen8/state_base_address_gen8.cpp +++ b/runtime/gen8/state_base_address_gen8.cpp @@ -5,8 +5,8 @@ * */ -#include "runtime/helpers/state_base_address.h" -#include "runtime/helpers/state_base_address_bdw_plus.inl" +#include "core/helpers/state_base_address.h" +#include "core/helpers/state_base_address_bdw_plus.inl" namespace NEO { template struct StateBaseAddressHelper; diff --git a/runtime/gen9/state_base_address_gen9.cpp b/runtime/gen9/state_base_address_gen9.cpp index 76b00e13ac..a85104ef30 100644 --- a/runtime/gen9/state_base_address_gen9.cpp +++ b/runtime/gen9/state_base_address_gen9.cpp @@ -5,8 +5,8 @@ * */ -#include "runtime/helpers/state_base_address.h" -#include "runtime/helpers/state_base_address_bdw_plus.inl" +#include "core/helpers/state_base_address.h" +#include "core/helpers/state_base_address_bdw_plus.inl" namespace NEO { template struct StateBaseAddressHelper; diff --git a/runtime/helpers/CMakeLists.txt b/runtime/helpers/CMakeLists.txt index 0f87d44958..37b685ce16 100644 --- a/runtime/helpers/CMakeLists.txt +++ b/runtime/helpers/CMakeLists.txt @@ -61,9 +61,6 @@ set(RUNTIME_SRCS_HELPERS_BASE ${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_base_address.h - ${CMAKE_CURRENT_SOURCE_DIR}/state_base_address_base.inl - ${CMAKE_CURRENT_SOURCE_DIR}/state_base_address_bdw_plus.inl ${CMAKE_CURRENT_SOURCE_DIR}/state_compute_mode_helper.h ${CMAKE_CURRENT_SOURCE_DIR}/string_helpers.h ${CMAKE_CURRENT_SOURCE_DIR}/surface_formats.cpp diff --git a/unit_tests/api/cl_mem_locally_uncached_resource_tests.cpp b/unit_tests/api/cl_mem_locally_uncached_resource_tests.cpp index 6b801d7549..16c5f6f833 100644 --- a/unit_tests/api/cl_mem_locally_uncached_resource_tests.cpp +++ b/unit_tests/api/cl_mem_locally_uncached_resource_tests.cpp @@ -7,13 +7,13 @@ #include "core/gmm_helper/gmm_helper.h" #include "core/helpers/hw_cmds.h" +#include "core/helpers/state_base_address.h" #include "core/unit_tests/utilities/base_object_utils.h" #include "public/cl_ext_private.h" #include "runtime/api/api.h" #include "runtime/command_queue/command_queue_hw.h" #include "runtime/command_stream/command_stream_receiver.h" #include "runtime/device/device.h" -#include "runtime/helpers/state_base_address.h" #include "runtime/kernel/kernel.h" #include "test.h" #include "unit_tests/fixtures/hello_world_fixture.h" diff --git a/unit_tests/command_stream/command_stream_receiver_flush_task_2_tests.cpp b/unit_tests/command_stream/command_stream_receiver_flush_task_2_tests.cpp index 315eae7dee..fa76190b30 100644 --- a/unit_tests/command_stream/command_stream_receiver_flush_task_2_tests.cpp +++ b/unit_tests/command_stream/command_stream_receiver_flush_task_2_tests.cpp @@ -7,11 +7,11 @@ #include "core/gmm_helper/gmm_helper.h" #include "core/helpers/hw_helper.h" +#include "core/helpers/state_base_address.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/command_stream/csr_definitions.h" #include "runtime/command_stream/scratch_space_controller.h" #include "runtime/helpers/hardware_commands_helper.h" -#include "runtime/helpers/state_base_address.h" #include "runtime/memory_manager/internal_allocation_storage.h" #include "runtime/os_interface/os_context.h" #include "test.h"