From 350eb83f025cbf402a9b482d03c4c14a504e80e9 Mon Sep 17 00:00:00 2001
From: kamdiedrich <kamil.diedrich@intel.com>
Date: Mon, 30 Dec 2019 16:41:41 +0100
Subject: [PATCH] Move helpers files to core folder

Change-Id: I7cd2f4afd86adc5296103f61653c6d760b4e80f5
---
 core/gen11/preamble_gen11.cpp                      | 2 +-
 core/helpers/CMakeLists.txt                        | 1 +
 {runtime => core}/helpers/pipeline_select_helper.h | 0
 core/helpers/preamble.h                            | 2 +-
 runtime/helpers/CMakeLists.txt                     | 1 -
 unit_tests/gen11/enqueue_media_kernel_gen11.cpp    | 2 +-
 unit_tests/gen11/icllp/test_media_kernel_icllp.cpp | 2 +-
 unit_tests/helpers/hw_parse.h                      | 2 +-
 8 files changed, 6 insertions(+), 6 deletions(-)
 rename {runtime => core}/helpers/pipeline_select_helper.h (100%)

diff --git a/core/gen11/preamble_gen11.cpp b/core/gen11/preamble_gen11.cpp
index 1ea7ea89bb..0e7bd5ca56 100644
--- a/core/gen11/preamble_gen11.cpp
+++ b/core/gen11/preamble_gen11.cpp
@@ -5,9 +5,9 @@
  *
  */
 
+#include "core/helpers/pipeline_select_helper.h"
 #include "core/helpers/preamble_bdw_plus.inl"
 #include "runtime/command_stream/csr_definitions.h"
-#include "runtime/helpers/pipeline_select_helper.h"
 
 #include "reg_configs_common.h"
 
diff --git a/core/helpers/CMakeLists.txt b/core/helpers/CMakeLists.txt
index 06508e4f60..473aaf3b28 100644
--- a/core/helpers/CMakeLists.txt
+++ b/core/helpers/CMakeLists.txt
@@ -39,6 +39,7 @@ set(NEO_CORE_HELPERS
   ${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}/pipeline_select_helper.h
   ${CMAKE_CURRENT_SOURCE_DIR}/preamble.h
   ${CMAKE_CURRENT_SOURCE_DIR}/preamble_base.inl
   ${CMAKE_CURRENT_SOURCE_DIR}/preamble_bdw_plus.inl
diff --git a/runtime/helpers/pipeline_select_helper.h b/core/helpers/pipeline_select_helper.h
similarity index 100%
rename from runtime/helpers/pipeline_select_helper.h
rename to core/helpers/pipeline_select_helper.h
diff --git a/core/helpers/preamble.h b/core/helpers/preamble.h
index 25cf9a210c..e137643009 100644
--- a/core/helpers/preamble.h
+++ b/core/helpers/preamble.h
@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "runtime/helpers/pipeline_select_helper.h"
+#include "core/helpers/pipeline_select_helper.h"
 
 #include "igfxfmid.h"
 
diff --git a/runtime/helpers/CMakeLists.txt b/runtime/helpers/CMakeLists.txt
index 816e16fb54..ae4ed948ab 100644
--- a/runtime/helpers/CMakeLists.txt
+++ b/runtime/helpers/CMakeLists.txt
@@ -50,7 +50,6 @@ set(RUNTIME_SRCS_HELPERS_BASE
   ${CMAKE_CURRENT_SOURCE_DIR}/mipmap.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
   ${CMAKE_CURRENT_SOURCE_DIR}/properties_helper.h
   ${CMAKE_CURRENT_SOURCE_DIR}/properties_helper.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/queue_helpers.cpp
diff --git a/unit_tests/gen11/enqueue_media_kernel_gen11.cpp b/unit_tests/gen11/enqueue_media_kernel_gen11.cpp
index a2d07948d8..036f9ffb44 100644
--- a/unit_tests/gen11/enqueue_media_kernel_gen11.cpp
+++ b/unit_tests/gen11/enqueue_media_kernel_gen11.cpp
@@ -5,8 +5,8 @@
  *
  */
 
+#include "core/helpers/pipeline_select_helper.h"
 #include "core/helpers/preamble.h"
-#include "runtime/helpers/pipeline_select_helper.h"
 #include "test.h"
 #include "unit_tests/fixtures/media_kernel_fixture.h"
 
diff --git a/unit_tests/gen11/icllp/test_media_kernel_icllp.cpp b/unit_tests/gen11/icllp/test_media_kernel_icllp.cpp
index bb6990e51c..9ef55b1604 100644
--- a/unit_tests/gen11/icllp/test_media_kernel_icllp.cpp
+++ b/unit_tests/gen11/icllp/test_media_kernel_icllp.cpp
@@ -5,8 +5,8 @@
  *
  */
 
+#include "core/helpers/pipeline_select_helper.h"
 #include "core/helpers/preamble.h"
-#include "runtime/helpers/pipeline_select_helper.h"
 #include "test.h"
 #include "unit_tests/fixtures/media_kernel_fixture.h"
 
diff --git a/unit_tests/helpers/hw_parse.h b/unit_tests/helpers/hw_parse.h
index 492cb5fac3..3ed49667df 100644
--- a/unit_tests/helpers/hw_parse.h
+++ b/unit_tests/helpers/hw_parse.h
@@ -7,10 +7,10 @@
 
 #pragma once
 #include "core/command_stream/linear_stream.h"
+#include "core/helpers/pipeline_select_helper.h"
 #include "core/helpers/ptr_math.h"
 #include "runtime/command_queue/command_queue.h"
 #include "runtime/command_stream/command_stream_receiver.h"
-#include "runtime/helpers/pipeline_select_helper.h"
 #include "runtime/kernel/kernel.h"
 #include "unit_tests/gen_common/gen_cmd_parse.h"