From fab659f4a9db29b29c414eaa7e7b72d82d4bc1f3 Mon Sep 17 00:00:00 2001
From: "Jobczyk, Lukasz" <lukasz.jobczyk@intel.com>
Date: Tue, 10 Sep 2019 08:18:43 +0200
Subject: [PATCH] Move residency to the core dir

Related-To: NEO-3677

Change-Id: Ib4aaa7dcfc46d9bb515c4881ddb6adb974990ca9
Signed-off-by: Jobczyk, Lukasz <lukasz.jobczyk@intel.com>
---
 core/memory_manager/CMakeLists.txt             | 2 ++
 {runtime => core}/memory_manager/residency.cpp | 2 +-
 {runtime => core}/memory_manager/residency.h   | 0
 runtime/memory_manager/CMakeLists.txt          | 2 --
 runtime/memory_manager/host_ptr_defines.h      | 2 +-
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename {runtime => core}/memory_manager/residency.cpp (88%)
 rename {runtime => core}/memory_manager/residency.h (100%)

diff --git a/core/memory_manager/CMakeLists.txt b/core/memory_manager/CMakeLists.txt
index e03a1d40c1..10522e8418 100644
--- a/core/memory_manager/CMakeLists.txt
+++ b/core/memory_manager/CMakeLists.txt
@@ -13,6 +13,8 @@ set(NEO_CORE_MEMORY_MANAGER
   ${CMAKE_CURRENT_SOURCE_DIR}/memory_constants.h
   ${CMAKE_CURRENT_SOURCE_DIR}/memory_operations_handler.h
   ${CMAKE_CURRENT_SOURCE_DIR}/memory_operations_status.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/residency.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/residency.h
 )
 
 set_property(GLOBAL PROPERTY NEO_CORE_MEMORY_MANAGER ${NEO_CORE_MEMORY_MANAGER})
diff --git a/runtime/memory_manager/residency.cpp b/core/memory_manager/residency.cpp
similarity index 88%
rename from runtime/memory_manager/residency.cpp
rename to core/memory_manager/residency.cpp
index b7e40512aa..bdb7162b4f 100644
--- a/runtime/memory_manager/residency.cpp
+++ b/core/memory_manager/residency.cpp
@@ -5,7 +5,7 @@
  *
  */
 
-#include "runtime/memory_manager/residency.h"
+#include "core/memory_manager/residency.h"
 
 using namespace NEO;
 
diff --git a/runtime/memory_manager/residency.h b/core/memory_manager/residency.h
similarity index 100%
rename from runtime/memory_manager/residency.h
rename to core/memory_manager/residency.h
diff --git a/runtime/memory_manager/CMakeLists.txt b/runtime/memory_manager/CMakeLists.txt
index 33ef9a743f..4a6e754720 100644
--- a/runtime/memory_manager/CMakeLists.txt
+++ b/runtime/memory_manager/CMakeLists.txt
@@ -40,8 +40,6 @@ set(RUNTIME_SRCS_MEMORY_MANAGER
   ${CMAKE_CURRENT_SOURCE_DIR}/page_table.h
   ${CMAKE_CURRENT_SOURCE_DIR}/page_table.inl
   ${CMAKE_CURRENT_SOURCE_DIR}/physical_address_allocator.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/residency.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/residency.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/residency_container.h
   ${CMAKE_CURRENT_SOURCE_DIR}/surface.h
   ${CMAKE_CURRENT_SOURCE_DIR}/unified_memory_manager.cpp
diff --git a/runtime/memory_manager/host_ptr_defines.h b/runtime/memory_manager/host_ptr_defines.h
index 0fe110b9c9..75370529e3 100644
--- a/runtime/memory_manager/host_ptr_defines.h
+++ b/runtime/memory_manager/host_ptr_defines.h
@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "runtime/memory_manager/residency.h"
+#include "core/memory_manager/residency.h"
 
 #include <cinttypes>
 #include <cstdlib>