Call submitBatchBuffer on HardwareContext

Related-To: NEO-3052

Change-Id: I51cae4d953260c0b6a49c40b8a8771630c721731
Signed-off-by: Mateusz Hoppe <[email protected]>

Author: HoppeMateusz

runtime/helpers/hardware_context_controller.cpp

@@ -7,6 +7,7 @@
 
 #include "runtime/helpers/hardware_context_controller.h"
 
+#include "runtime/aub_mem_dump/aub_mem_dump.h"
 #include "runtime/memory_manager/memory_constants.h"
 #include "runtime/os_interface/os_context.h"
 
@@ -42,7 +43,7 @@ void HardwareContextController::expectMemory(uint64_t gfxAddress, const void *sr
 void HardwareContextController::submit(uint64_t batchBufferGpuAddress, const void *batchBuffer, size_t batchBufferSize,
                                        uint32_t memoryBank, uint64_t entryBits) {
     for (auto &hardwareContext : hardwareContexts) {
-        hardwareContext->writeAndSubmitBatchBuffer(batchBufferGpuAddress, batchBuffer, batchBufferSize, memoryBank, MemoryConstants::pageSize64k);
+        hardwareContext->submitBatchBuffer(batchBufferGpuAddress);
     }
 }
 

unit_tests/command_stream/aub_command_stream_receiver_1_tests.cpp

@@ -1120,6 +1120,24 @@ TEST_F(HardwareContextContainerTests, givenOsContextWithMultipleDevicesSupported
     EXPECT_EQ(1u, mockHwContext1->deviceIndex);
 }
 
+TEST_F(HardwareContextContainerTests, givenSingleHwContextWhenSubmitMethodIsCalledOnHwContextControllerThenSubmitIsCalled) {
+    MockAubManager aubManager;
+    MockOsContext osContext(1, getDeviceBitfieldForNDevices(1), aub_stream::ENGINE_RCS, PreemptionMode::Disabled, false);
+    HardwareContextController hwContextContainer(aubManager, osContext, 0);
+    EXPECT_EQ(1u, hwContextContainer.hardwareContexts.size());
+
+    auto mockHwContext0 = static_cast<MockHardwareContext *>(hwContextContainer.hardwareContexts[0].get());
+
+    EXPECT_FALSE(mockHwContext0->writeAndSubmitCalled);
+    EXPECT_FALSE(mockHwContext0->writeMemoryCalled);
+
+    hwContextContainer.submit(1, reinterpret_cast<const void *>(0x123), 2, 0, 1);
+
+    EXPECT_TRUE(mockHwContext0->submitCalled);
+    EXPECT_FALSE(mockHwContext0->writeAndSubmitCalled);
+    EXPECT_FALSE(mockHwContext0->writeMemoryCalled);
+}
+
 TEST_F(HardwareContextContainerTests, givenMultipleHwContextWhenSingleMethodIsCalledThenUseAllContexts) {
     MockAubManager aubManager;
     MockOsContext osContext(1, getDeviceBitfieldForNDevices(2), aub_stream::ENGINE_RCS, PreemptionMode::Disabled, false);

unit_tests/command_stream/aub_file_stream_tests.cpp

@@ -549,6 +549,7 @@ HWTEST_F(AubFileStreamTests, givenAubCommandStreamReceiverWhenFlushIsCalledThenI
 
     EXPECT_TRUE(mockHardwareContext->initializeCalled);
     EXPECT_TRUE(mockHardwareContext->submitCalled);
+    EXPECT_FALSE(mockHardwareContext->writeAndSubmitCalled);
     EXPECT_FALSE(mockHardwareContext->pollForCompletionCalled);
 
     EXPECT_TRUE(aubCsr.writeMemoryWithAubManagerCalled);
@@ -570,6 +571,7 @@ HWTEST_F(AubFileStreamTests, givenAubCommandStreamReceiverWhenFlushIsCalledWithZ
 
     aubCsr.flush(batchBuffer, allocationsForResidency);
 
+    EXPECT_FALSE(mockHardwareContext->writeAndSubmitCalled);
     EXPECT_FALSE(mockHardwareContext->submitCalled);
     pDevice->executionEnvironment->memoryManager->freeGraphicsMemory(commandBuffer);
 }

unit_tests/command_stream/tbx_command_stream_tests.cpp

@@ -420,6 +420,7 @@ HWTEST_F(TbxCommandStreamTests, givenTbxCommandStreamReceiverWhenFlushIsCalledTh
     tbxCsr.flush(batchBuffer, allocationsForResidency);
 
     EXPECT_TRUE(mockHardwareContext->initializeCalled);
+    EXPECT_FALSE(mockHardwareContext->writeAndSubmitCalled);
     EXPECT_TRUE(mockHardwareContext->submitCalled);
     EXPECT_FALSE(mockHardwareContext->pollForCompletionCalled);
 

unit_tests/mocks/mock_aub_manager.h

@@ -19,8 +19,8 @@ struct MockHardwareContext : public aub_stream::HardwareContext {
 
     void initialize() override { initializeCalled = true; }
     void pollForCompletion() override { pollForCompletionCalled = true; }
-    void writeAndSubmitBatchBuffer(uint64_t gfxAddress, const void *batchBuffer, size_t size, uint32_t memoryBank, size_t pageSize = 65536) override { submitCalled = true; }
-    void submitBatchBuffer(uint64_t gfxAddress) override {}
+    void writeAndSubmitBatchBuffer(uint64_t gfxAddress, const void *batchBuffer, size_t size, uint32_t memoryBank, size_t pageSize = 65536) override { writeAndSubmitCalled = true; }
+    void submitBatchBuffer(uint64_t gfxAddress) override { submitCalled = true; }
     void writeMemory(uint64_t gfxAddress, const void *memory, size_t size, uint32_t memoryBanks, int hint, size_t pageSize = 65536) override { writeMemoryCalled = true; }
     void freeMemory(uint64_t gfxAddress, size_t size) override { freeMemoryCalled = true; }
     void expectMemory(uint64_t gfxAddress, const void *memory, size_t size, uint32_t compareOperation) override { expectMemoryCalled = true; }
@@ -30,6 +30,7 @@ struct MockHardwareContext : public aub_stream::HardwareContext {
 
     bool initializeCalled = false;
     bool pollForCompletionCalled = false;
+    bool writeAndSubmitCalled = false;
     bool submitCalled = false;
     bool writeMemoryCalled = false;
     bool freeMemoryCalled = false;
@@ -85,6 +86,7 @@ class MockAubManager : public aub_stream::AubManager {
 
     void writeMemory(uint64_t gfxAddress, const void *memory, size_t size, uint32_t memoryBanks, int hint, size_t pageSize = 65536) override {
         writeMemoryCalled = true;
+        hintToWriteMemory = hint;
     }
 
     uint32_t openCalledCnt = 0;
@@ -96,6 +98,7 @@ class MockAubManager : public aub_stream::AubManager {
     std::string receivedComment = "";
     bool writeMemoryCalled = false;
     uint32_t contextFlags = 0;
+    int hintToWriteMemory = 0;
 
     struct MockAubManagerParams {
         uint32_t productFamily = 0;