From c878590162c96cf823e49c01ac3856c50c892c2c Mon Sep 17 00:00:00 2001
From: "Dunajski, Bartosz" <bartosz.dunajski@intel.com>
Date: Mon, 28 Jan 2019 14:20:58 +0100
Subject: [PATCH] Remove EngineInstance parameter from pollForCompletion call

Change-Id: I07652db2de656032cdb3452239b671edbe876b75
Signed-off-by: Dunajski, Bartosz <bartosz.dunajski@intel.com>
---
 runtime/command_stream/aub_command_stream_receiver_hw.h     | 2 +-
 runtime/command_stream/aub_command_stream_receiver_hw.inl   | 6 +++---
 runtime/command_stream/tbx_command_stream_receiver_hw.h     | 2 +-
 runtime/command_stream/tbx_command_stream_receiver_hw.inl   | 6 +++---
 .../aub_tests/command_stream/aub_command_stream_fixture.h   | 2 +-
 unit_tests/mocks/mock_aub_csr.h                             | 4 ++--
 unit_tests/mocks/mock_tbx_csr.h                             | 4 ++--
 7 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/runtime/command_stream/aub_command_stream_receiver_hw.h b/runtime/command_stream/aub_command_stream_receiver_hw.h
index f86c8f89a3..ae8a24e1f7 100644
--- a/runtime/command_stream/aub_command_stream_receiver_hw.h
+++ b/runtime/command_stream/aub_command_stream_receiver_hw.h
@@ -60,7 +60,7 @@ class AUBCommandStreamReceiverHw : public CommandStreamReceiverSimulatedHw<GfxFa
 
     // Family specific version
     MOCKABLE_VIRTUAL void submitBatchBuffer(size_t engineIndex, uint64_t batchBufferGpuAddress, const void *batchBuffer, size_t batchBufferSize, uint32_t memoryBank, uint64_t entryBits);
-    MOCKABLE_VIRTUAL void pollForCompletion(EngineInstanceT engineInstance);
+    MOCKABLE_VIRTUAL void pollForCompletion();
 
     uint32_t getDumpHandle();
     MOCKABLE_VIRTUAL void addContextToken(uint32_t dumpHandle);
diff --git a/runtime/command_stream/aub_command_stream_receiver_hw.inl b/runtime/command_stream/aub_command_stream_receiver_hw.inl
index 108dd0c052..6349d80476 100644
--- a/runtime/command_stream/aub_command_stream_receiver_hw.inl
+++ b/runtime/command_stream/aub_command_stream_receiver_hw.inl
@@ -345,7 +345,7 @@ FlushStamp AUBCommandStreamReceiverHw<GfxFamily>::flush(BatchBuffer &batchBuffer
     submitBatchBuffer(engineIndex, batchBufferGpuAddress, pBatchBuffer, sizeBatchBuffer, this->getMemoryBank(batchBuffer.commandBufferAllocation), this->getPPGTTAdditionalBits(batchBuffer.commandBufferAllocation));
 
     if (!DebugManager.flags.AUBDumpConcurrentCS.get()) {
-        pollForCompletion(osContext->getEngineType());
+        pollForCompletion();
     }
 
     if (this->standalone) {
@@ -563,13 +563,13 @@ void AUBCommandStreamReceiverHw<GfxFamily>::submitBatchBuffer(size_t engineIndex
 }
 
 template <typename GfxFamily>
-void AUBCommandStreamReceiverHw<GfxFamily>::pollForCompletion(EngineInstanceT engineInstance) {
+void AUBCommandStreamReceiverHw<GfxFamily>::pollForCompletion() {
     if (hardwareContext) {
         hardwareContext->pollForCompletion();
         return;
     }
 
-    const auto mmioBase = this->getCsTraits(engineInstance).mmioBase;
+    const auto mmioBase = this->getCsTraits(osContext->getEngineType()).mmioBase;
     const bool pollNotEqual = false;
     const uint32_t mask = getMaskAndValueForPollForCompletion();
     const uint32_t value = mask;
diff --git a/runtime/command_stream/tbx_command_stream_receiver_hw.h b/runtime/command_stream/tbx_command_stream_receiver_hw.h
index 67a46283a9..50499a17f3 100644
--- a/runtime/command_stream/tbx_command_stream_receiver_hw.h
+++ b/runtime/command_stream/tbx_command_stream_receiver_hw.h
@@ -49,7 +49,7 @@ class TbxCommandStreamReceiverHw : public CommandStreamReceiverSimulatedHw<GfxFa
 
     // Family specific version
     MOCKABLE_VIRTUAL void submitBatchBuffer(size_t engineIndex, uint64_t batchBufferGpuAddress, const void *batchBuffer, size_t batchBufferSize, uint32_t memoryBank, uint64_t entryBits);
-    MOCKABLE_VIRTUAL void pollForCompletion(EngineInstanceT engineInstance);
+    MOCKABLE_VIRTUAL void pollForCompletion();
 
     static CommandStreamReceiver *create(const HardwareInfo &hwInfoIn, bool withAubDump, ExecutionEnvironment &executionEnvironment);
 
diff --git a/runtime/command_stream/tbx_command_stream_receiver_hw.inl b/runtime/command_stream/tbx_command_stream_receiver_hw.inl
index b663dc6e4d..7da9c90f02 100644
--- a/runtime/command_stream/tbx_command_stream_receiver_hw.inl
+++ b/runtime/command_stream/tbx_command_stream_receiver_hw.inl
@@ -210,7 +210,7 @@ FlushStamp TbxCommandStreamReceiverHw<GfxFamily>::flush(BatchBuffer &batchBuffer
 
     submitBatchBuffer(engineIndex, batchBufferGpuAddress, pBatchBuffer, sizeBatchBuffer, this->getMemoryBank(batchBuffer.commandBufferAllocation), this->getPPGTTAdditionalBits(batchBuffer.commandBufferAllocation));
 
-    pollForCompletion(osContext->getEngineType());
+    pollForCompletion();
     return 0;
 }
 
@@ -344,7 +344,7 @@ void TbxCommandStreamReceiverHw<GfxFamily>::submitBatchBuffer(size_t engineIndex
 }
 
 template <typename GfxFamily>
-void TbxCommandStreamReceiverHw<GfxFamily>::pollForCompletion(EngineInstanceT engineInstance) {
+void TbxCommandStreamReceiverHw<GfxFamily>::pollForCompletion() {
     if (hardwareContext) {
         hardwareContext->pollForCompletion();
         return;
@@ -352,7 +352,7 @@ void TbxCommandStreamReceiverHw<GfxFamily>::pollForCompletion(EngineInstanceT en
 
     typedef typename AubMemDump::CmdServicesMemTraceRegisterPoll CmdServicesMemTraceRegisterPoll;
 
-    auto mmioBase = this->getCsTraits(engineInstance).mmioBase;
+    auto mmioBase = this->getCsTraits(osContext->getEngineType()).mmioBase;
     bool pollNotEqual = false;
     tbxStream.registerPoll(
         AubMemDump::computeRegisterOffset(mmioBase, 0x2234), //EXECLIST_STATUS
diff --git a/unit_tests/aub_tests/command_stream/aub_command_stream_fixture.h b/unit_tests/aub_tests/command_stream/aub_command_stream_fixture.h
index 9618a43be6..1385adada8 100644
--- a/unit_tests/aub_tests/command_stream/aub_command_stream_fixture.h
+++ b/unit_tests/aub_tests/command_stream/aub_command_stream_fixture.h
@@ -84,7 +84,7 @@ class AUBCommandStreamFixture : public CommandStreamFixture {
         }
 
         auto aubCsr = reinterpret_cast<AUBCommandStreamReceiverHw<FamilyType> *>(csr);
-        aubCsr->pollForCompletion(csr->getOsContext().getEngineType());
+        aubCsr->pollForCompletion();
     }
 
     GraphicsAllocation *createResidentAllocationAndStoreItInCsr(const void *address, size_t size) {
diff --git a/unit_tests/mocks/mock_aub_csr.h b/unit_tests/mocks/mock_aub_csr.h
index 606dfdc8a0..4b9b660fec 100644
--- a/unit_tests/mocks/mock_aub_csr.h
+++ b/unit_tests/mocks/mock_aub_csr.h
@@ -86,8 +86,8 @@ struct MockAubCsr : public AUBCommandStreamReceiverHw<GfxFamily> {
         AUBCommandStreamReceiverHw<GfxFamily>::submitBatchBuffer(engineIndex, batchBufferGpuAddress, batchBuffer, batchBufferSize, memoryBank, entryBits);
         submitBatchBufferCalled = true;
     }
-    void pollForCompletion(EngineInstanceT engineInstance) override {
-        AUBCommandStreamReceiverHw<GfxFamily>::pollForCompletion(engineInstance);
+    void pollForCompletion() override {
+        AUBCommandStreamReceiverHw<GfxFamily>::pollForCompletion();
         pollForCompletionCalled = true;
     }
     void expectMemoryEqual(void *gfxAddress, const void *srcAddress, size_t length) {
diff --git a/unit_tests/mocks/mock_tbx_csr.h b/unit_tests/mocks/mock_tbx_csr.h
index 6f9bd90a71..ca6bad12b3 100644
--- a/unit_tests/mocks/mock_tbx_csr.h
+++ b/unit_tests/mocks/mock_tbx_csr.h
@@ -50,8 +50,8 @@ class MockTbxCsr : public TbxCommandStreamReceiverHw<GfxFamily> {
         TbxCommandStreamReceiverHw<GfxFamily>::submitBatchBuffer(engineIndex, batchBufferGpuAddress, batchBuffer, batchBufferSize, memoryBank, entryBits);
         submitBatchBufferCalled = true;
     }
-    void pollForCompletion(EngineInstanceT engineInstance) override {
-        TbxCommandStreamReceiverHw<GfxFamily>::pollForCompletion(engineInstance);
+    void pollForCompletion() override {
+        TbxCommandStreamReceiverHw<GfxFamily>::pollForCompletion();
         pollForCompletionCalled = true;
     }
     void makeCoherent(GraphicsAllocation &gfxAllocation) override {