From 6f84496e78c62b07e30379133bbe0418cde4b0a3 Mon Sep 17 00:00:00 2001
From: Piotr Fusik <piotr.fusik@intel.com>
Date: Fri, 22 Mar 2019 13:23:02 +0100
Subject: [PATCH] Move duplicate code to the base class.

Change-Id: I117a6e55fc51bf3ede3a69dbb8a874e71e74ddf9
Signed-off-by: Piotr Fusik <piotr.fusik@intel.com>
---
 .../aub_command_stream_receiver_hw.h          |  2 --
 .../aub_command_stream_receiver_hw.inl        | 21 +++----------------
 ...mand_stream_receiver_simulated_common_hw.h |  2 ++
 ...nd_stream_receiver_simulated_common_hw.inl | 16 ++++++++++++++
 .../tbx_command_stream_receiver_hw.inl        | 12 +----------
 .../windows/wddm_device_command_stream.inl    |  2 --
 6 files changed, 22 insertions(+), 33 deletions(-)

diff --git a/runtime/command_stream/aub_command_stream_receiver_hw.h b/runtime/command_stream/aub_command_stream_receiver_hw.h
index d0a150de7d..bda735e091 100644
--- a/runtime/command_stream/aub_command_stream_receiver_hw.h
+++ b/runtime/command_stream/aub_command_stream_receiver_hw.h
@@ -10,7 +10,6 @@
 #include "runtime/command_stream/aub_command_stream_receiver.h"
 #include "runtime/gen_common/aub_mapper.h"
 #include "runtime/helpers/array_count.h"
-#include "runtime/memory_manager/address_mapper.h"
 #include "runtime/memory_manager/os_agnostic_memory_manager.h"
 #include "runtime/memory_manager/page_table.h"
 #include "runtime/memory_manager/physical_address_allocator.h"
@@ -84,7 +83,6 @@ class AUBCommandStreamReceiverHw : public CommandStreamReceiverSimulatedHw<GfxFa
     MOCKABLE_VIRTUAL const std::string getFileName();
 
     MOCKABLE_VIRTUAL void initializeEngine();
-    void freeEngineInfo();
     AubSubCaptureManager *subCaptureManager = nullptr;
     uint32_t aubDeviceId;
     bool standalone;
diff --git a/runtime/command_stream/aub_command_stream_receiver_hw.inl b/runtime/command_stream/aub_command_stream_receiver_hw.inl
index 51a0e57ee7..50a54fa9c1 100644
--- a/runtime/command_stream/aub_command_stream_receiver_hw.inl
+++ b/runtime/command_stream/aub_command_stream_receiver_hw.inl
@@ -82,7 +82,7 @@ AUBCommandStreamReceiverHw<GfxFamily>::~AUBCommandStreamReceiverHw() {
     if (osContext) {
         pollForCompletion();
     }
-    freeEngineInfo();
+    this->freeEngineInfo(*gttRemap);
 }
 
 template <typename GfxFamily>
@@ -98,7 +98,7 @@ bool AUBCommandStreamReceiverHw<GfxFamily>::reopenFile(const std::string &fileNa
     if (isFileOpen()) {
         if (fileName != getFileName()) {
             closeFile();
-            freeEngineInfo();
+            this->freeEngineInfo(*gttRemap);
         }
     }
     if (!isFileOpen()) {
@@ -267,21 +267,6 @@ void AUBCommandStreamReceiverHw<GfxFamily>::initializeEngine() {
     DEBUG_BREAK_IF(!engineInfo.pLRCA);
 }
 
-template <typename GfxFamily>
-void AUBCommandStreamReceiverHw<GfxFamily>::freeEngineInfo() {
-    alignedFree(engineInfo.pLRCA);
-    gttRemap->unmap(engineInfo.pLRCA);
-    engineInfo.pLRCA = nullptr;
-
-    alignedFree(engineInfo.pGlobalHWStatusPage);
-    gttRemap->unmap(engineInfo.pGlobalHWStatusPage);
-    engineInfo.pGlobalHWStatusPage = nullptr;
-
-    alignedFree(engineInfo.pRingBuffer);
-    gttRemap->unmap(engineInfo.pRingBuffer);
-    engineInfo.pRingBuffer = nullptr;
-}
-
 template <typename GfxFamily>
 CommandStreamReceiver *AUBCommandStreamReceiverHw<GfxFamily>::create(const std::string &fileName, bool standalone, ExecutionEnvironment &executionEnvironment) {
     auto csr = new AUBCommandStreamReceiverHw<GfxFamily>(fileName, standalone, executionEnvironment);
@@ -678,7 +663,7 @@ void AUBCommandStreamReceiverHw<GfxFamily>::expectMemory(const void *gfxAddress,
         UNRECOVERABLE_IF(offset > length);
 
         this->getAubStream()->expectMemory(physAddress,
-                                           reinterpret_cast<void *>(reinterpret_cast<uintptr_t>(srcAddress) + offset),
+                                           ptrOffset(srcAddress, offset),
                                            size,
                                            this->getAddressSpaceFromPTEBits(entryBits),
                                            compareOperation);
diff --git a/runtime/command_stream/command_stream_receiver_simulated_common_hw.h b/runtime/command_stream/command_stream_receiver_simulated_common_hw.h
index cb2ed025bf..2f5857acb4 100644
--- a/runtime/command_stream/command_stream_receiver_simulated_common_hw.h
+++ b/runtime/command_stream/command_stream_receiver_simulated_common_hw.h
@@ -18,6 +18,7 @@ struct AubStream;
 } // namespace aub_stream
 
 namespace OCLRT {
+class AddressMapper;
 class GraphicsAllocation;
 class HardwareContextController;
 template <typename GfxFamily>
@@ -30,6 +31,7 @@ class CommandStreamReceiverSimulatedCommonHw : public CommandStreamReceiverHw<Gf
     using MiContextDescriptorReg = typename AUB::MiContextDescriptorReg;
 
     bool getParametersForWriteMemory(GraphicsAllocation &graphicsAllocation, uint64_t &gpuAddress, void *&cpuAddress, size_t &size) const;
+    void freeEngineInfo(AddressMapper &gttRemap);
 
   public:
     uint64_t getGTTBits() const {
diff --git a/runtime/command_stream/command_stream_receiver_simulated_common_hw.inl b/runtime/command_stream/command_stream_receiver_simulated_common_hw.inl
index bb501cdfc9..7dfc3b258e 100644
--- a/runtime/command_stream/command_stream_receiver_simulated_common_hw.inl
+++ b/runtime/command_stream/command_stream_receiver_simulated_common_hw.inl
@@ -12,6 +12,7 @@
 #include "runtime/gmm_helper/gmm_helper.h"
 #include "runtime/gmm_helper/resource_info.h"
 #include "runtime/helpers/hardware_context_controller.h"
+#include "runtime/memory_manager/address_mapper.h"
 #include "runtime/memory_manager/memory_manager.h"
 #include "runtime/os_interface/debug_settings_manager.h"
 #include "runtime/os_interface/os_context.h"
@@ -121,4 +122,19 @@ void CommandStreamReceiverSimulatedCommonHw<GfxFamily>::expectMemoryNotEqual(voi
                        AubMemDump::CmdServicesMemTraceMemoryCompare::CompareOperationValues::CompareNotEqual);
 }
 
+template <typename GfxFamily>
+void CommandStreamReceiverSimulatedCommonHw<GfxFamily>::freeEngineInfo(AddressMapper &gttRemap) {
+    alignedFree(engineInfo.pLRCA);
+    gttRemap.unmap(engineInfo.pLRCA);
+    engineInfo.pLRCA = nullptr;
+
+    alignedFree(engineInfo.pGlobalHWStatusPage);
+    gttRemap.unmap(engineInfo.pGlobalHWStatusPage);
+    engineInfo.pGlobalHWStatusPage = nullptr;
+
+    alignedFree(engineInfo.pRingBuffer);
+    gttRemap.unmap(engineInfo.pRingBuffer);
+    engineInfo.pRingBuffer = nullptr;
+}
+
 } // namespace OCLRT
diff --git a/runtime/command_stream/tbx_command_stream_receiver_hw.inl b/runtime/command_stream/tbx_command_stream_receiver_hw.inl
index 2aa6949b0a..1644099211 100644
--- a/runtime/command_stream/tbx_command_stream_receiver_hw.inl
+++ b/runtime/command_stream/tbx_command_stream_receiver_hw.inl
@@ -56,17 +56,7 @@ TbxCommandStreamReceiverHw<GfxFamily>::~TbxCommandStreamReceiverHw() {
         tbxStream.close();
     }
 
-    alignedFree(engineInfo.pLRCA);
-    gttRemap.unmap(engineInfo.pLRCA);
-    engineInfo.pLRCA = nullptr;
-
-    alignedFree(engineInfo.pGlobalHWStatusPage);
-    gttRemap.unmap(engineInfo.pGlobalHWStatusPage);
-    engineInfo.pGlobalHWStatusPage = nullptr;
-
-    alignedFree(engineInfo.pRingBuffer);
-    gttRemap.unmap(engineInfo.pRingBuffer);
-    engineInfo.pRingBuffer = nullptr;
+    this->freeEngineInfo(gttRemap);
 }
 
 template <typename GfxFamily>
diff --git a/runtime/os_interface/windows/wddm_device_command_stream.inl b/runtime/os_interface/windows/wddm_device_command_stream.inl
index 8bd58ce24e..0444ba5a22 100644
--- a/runtime/os_interface/windows/wddm_device_command_stream.inl
+++ b/runtime/os_interface/windows/wddm_device_command_stream.inl
@@ -22,8 +22,6 @@
 #include "hw_cmds.h"
 #pragma warning(pop)
 
-#undef max
-
 #include "runtime/os_interface/windows/gdi_interface.h"
 #include "runtime/os_interface/windows/os_context_win.h"
 #include "runtime/os_interface/windows/os_interface.h"