From 8ed99919100003bdb610821d206104dffbef7ba5 Mon Sep 17 00:00:00 2001
From: Mateusz Jablonski <mateusz.jablonski@intel.com>
Date: Fri, 20 Jul 2018 15:03:57 +0200
Subject: [PATCH] Remove not used function, unify gmm interface filenames

Change-Id: I017697ec4076ddd47f2039f71805a895d687c8a9
---
 runtime/gmm_helper/gmm_memory_base.cpp                    | 5 -----
 runtime/gmm_helper/gmm_memory_base.h                      | 2 --
 runtime/os_interface/linux/CMakeLists.txt                 | 4 ++--
 ..._linux_dynamic.cpp => gmm_interface_dynamic_linux.cpp} | 0
 ...ce_linux_static.cpp => gmm_interface_static_linux.cpp} | 0
 unit_tests/mocks/mock_gmm_memory_base.h                   | 8 --------
 6 files changed, 2 insertions(+), 17 deletions(-)
 rename runtime/os_interface/linux/{gmm_interface_linux_dynamic.cpp => gmm_interface_dynamic_linux.cpp} (100%)
 rename runtime/os_interface/linux/{gmm_interface_linux_static.cpp => gmm_interface_static_linux.cpp} (100%)

diff --git a/runtime/gmm_helper/gmm_memory_base.cpp b/runtime/gmm_helper/gmm_memory_base.cpp
index 916c9f3586..e659b25418 100644
--- a/runtime/gmm_helper/gmm_memory_base.cpp
+++ b/runtime/gmm_helper/gmm_memory_base.cpp
@@ -51,9 +51,4 @@ bool GmmMemoryBase::configureDeviceAddressSpace(GMM_ESCAPE_HANDLE hAdapter,
                SizeOverride,
                SlmGfxSpaceReserve) != 0;
 }
-
-uintptr_t GmmMemoryBase::getInternalGpuVaRangeLimit() {
-    ensureClientContext();
-    return static_cast<uintptr_t>(clientContext->GetInternalGpuVaRangeLimit());
-}
 }; // namespace OCLRT
diff --git a/runtime/gmm_helper/gmm_memory_base.h b/runtime/gmm_helper/gmm_memory_base.h
index c506c0b7cf..c73da51021 100644
--- a/runtime/gmm_helper/gmm_memory_base.h
+++ b/runtime/gmm_helper/gmm_memory_base.h
@@ -39,8 +39,6 @@ class GmmMemoryBase {
                                                       GMM_GFX_SIZE_T SizeOverride,
                                                       GMM_GFX_SIZE_T SlmGfxSpaceReserve);
 
-    MOCKABLE_VIRTUAL uintptr_t getInternalGpuVaRangeLimit();
-
   protected:
     GmmMemoryBase() = default;
     void ensureClientContext();
diff --git a/runtime/os_interface/linux/CMakeLists.txt b/runtime/os_interface/linux/CMakeLists.txt
index e8ff541bb2..599f18fefd 100644
--- a/runtime/os_interface/linux/CMakeLists.txt
+++ b/runtime/os_interface/linux/CMakeLists.txt
@@ -19,9 +19,9 @@
 # OTHER DEALINGS IN THE SOFTWARE.
 
 if(USE_STATIC_GMM)
-  set(GMM_INTERFACE_FILE_LINUX ${CMAKE_CURRENT_SOURCE_DIR}/gmm_interface_linux_static.cpp)
+  set(GMM_INTERFACE_FILE_LINUX ${CMAKE_CURRENT_SOURCE_DIR}/gmm_interface_static_linux.cpp)
 else()
-  set(GMM_INTERFACE_FILE_LINUX ${CMAKE_CURRENT_SOURCE_DIR}/gmm_interface_linux_dynamic.cpp)
+  set(GMM_INTERFACE_FILE_LINUX ${CMAKE_CURRENT_SOURCE_DIR}/gmm_interface_dynamic_linux.cpp)
 endif()
 set(RUNTIME_SRCS_OS_INTERFACE_LINUX
   ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
diff --git a/runtime/os_interface/linux/gmm_interface_linux_dynamic.cpp b/runtime/os_interface/linux/gmm_interface_dynamic_linux.cpp
similarity index 100%
rename from runtime/os_interface/linux/gmm_interface_linux_dynamic.cpp
rename to runtime/os_interface/linux/gmm_interface_dynamic_linux.cpp
diff --git a/runtime/os_interface/linux/gmm_interface_linux_static.cpp b/runtime/os_interface/linux/gmm_interface_static_linux.cpp
similarity index 100%
rename from runtime/os_interface/linux/gmm_interface_linux_static.cpp
rename to runtime/os_interface/linux/gmm_interface_static_linux.cpp
diff --git a/unit_tests/mocks/mock_gmm_memory_base.h b/unit_tests/mocks/mock_gmm_memory_base.h
index 0dc05ba379..3c3344e50c 100644
--- a/unit_tests/mocks/mock_gmm_memory_base.h
+++ b/unit_tests/mocks/mock_gmm_memory_base.h
@@ -44,10 +44,6 @@ class MockGmmMemoryBase : public GmmMemory {
                                      GMM_GFX_SIZE_T SlmGfxSpaceReserve) override {
         return true;
     }
-
-    uintptr_t getInternalGpuVaRangeLimit() override {
-        return OCLRT::windowsMinAddress;
-    }
 };
 
 class GmockGmmMemoryBase : public GmmMemory {
@@ -66,9 +62,5 @@ class GmockGmmMemoryBase : public GmmMemory {
                       BOOLEAN BDWL3Coherency,
                       GMM_GFX_SIZE_T SizeOverride,
                       GMM_GFX_SIZE_T SlmGfxSpaceReserve));
-
-    uintptr_t getInternalGpuVaRangeLimit() override {
-        return OCLRT::windowsMinAddress;
-    }
 };
 } // namespace OCLRT