Move state_base_address to core

BartoszDunajski · Compute-Runtime-Automation · commit 566b845bbc1b · 2019-12-06T09:01:24.000+01:00
Change-Id: I2b64fff4eed31054ae29b7b14ecb9f147914049a
Signed-off-by: Dunajski, Bartosz &lt;bartosz.dunajski@intel.com&gt;
diff --git 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/core/helpers/state_base_address.h b/core/helpers/state_base_address.h
diff --git a/core/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 <typename GfxFamily>
diff --git a/core/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
@@ -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
@@ -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<ICLFamily>;
diff --git 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<TGLLPFamily>;
diff --git 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<BDWFamily>;
diff --git 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<SKLFamily>;
diff --git 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
@@ -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
@@ -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"

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`*`
`6`	`6`	`*/`
`7`	`7`
`8`		`-#include "runtime/helpers/state_base_address_base.inl"`
	`8`	`+#include "core/helpers/state_base_address_base.inl"`
`9`	`9`
`10`	`10`	`namespace NEO {`
`11`	`11`
Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,8 @@`
`5`	`5`	`*`
`6`	`6`	`*/`
`7`	`7`
`8`		`-#include "runtime/helpers/state_base_address.h"`
`9`		`-#include "runtime/helpers/state_base_address_bdw_plus.inl"`
	`8`	`+#include "core/helpers/state_base_address.h"`
	`9`	`+#include "core/helpers/state_base_address_bdw_plus.inl"`
`10`	`10`
`11`	`11`	`namespace NEO {`
`12`	`12`	`template struct StateBaseAddressHelper<ICLFamily>;`