From 6223cd32cb8c19ccb3612aa20148671abcd1a5b3 Mon Sep 17 00:00:00 2001
From: "Mrozek, Michal" <michal.mrozek@intel.com>
Date: Tue, 16 Apr 2019 15:07:27 +0200
Subject: [PATCH] Make sure that TBX requests 1 as preferred tag pool size.

Change-Id: I951117122b3e78cf40d413ce1899cd304f338ef6
Signed-off-by: Mrozek, Michal <michal.mrozek@intel.com>
---
 runtime/command_stream/aub_command_stream_receiver_hw.h       | 2 --
 .../command_stream_receiver_simulated_common_hw.h             | 2 ++
 unit_tests/command_stream/tbx_command_stream_tests.cpp        | 4 ++++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/runtime/command_stream/aub_command_stream_receiver_hw.h b/runtime/command_stream/aub_command_stream_receiver_hw.h
index 03fe3fc2a5..a3aa87e9dc 100644
--- a/runtime/command_stream/aub_command_stream_receiver_hw.h
+++ b/runtime/command_stream/aub_command_stream_receiver_hw.h
@@ -103,8 +103,6 @@ class AUBCommandStreamReceiverHw : public CommandStreamReceiverSimulatedHw<GfxFa
 
     int getAddressSpaceFromPTEBits(uint64_t entryBits) const;
 
-    size_t getPreferredTagPoolSize() const override { return 1; }
-
   protected:
     constexpr static uint32_t getMaskAndValueForPollForCompletion();
 
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 28cf5c18b7..dd1fab0774 100644
--- a/runtime/command_stream/command_stream_receiver_simulated_common_hw.h
+++ b/runtime/command_stream/command_stream_receiver_simulated_common_hw.h
@@ -54,6 +54,8 @@ class CommandStreamReceiverSimulatedCommonHw : public CommandStreamReceiverHw<Gf
     virtual void writeMemory(uint64_t gpuAddress, void *cpuAddress, size_t size, uint32_t memoryBank, uint64_t entryBits) = 0;
     virtual void writeMemoryWithAubManager(GraphicsAllocation &graphicsAllocation) = 0;
 
+    size_t getPreferredTagPoolSize() const override { return 1; }
+
     aub_stream::AubManager *aubManager = nullptr;
     std::unique_ptr<HardwareContextController> hardwareContextController;
 
diff --git a/unit_tests/command_stream/tbx_command_stream_tests.cpp b/unit_tests/command_stream/tbx_command_stream_tests.cpp
index c7d136ba87..ab1ef5a801 100644
--- a/unit_tests/command_stream/tbx_command_stream_tests.cpp
+++ b/unit_tests/command_stream/tbx_command_stream_tests.cpp
@@ -470,6 +470,10 @@ HWTEST_F(TbxCommandStreamTests, givenTbxCsrWhenPollForCompletionImplIsCalledThen
     std::unique_ptr<TbxCommandStreamReceiverHw<FamilyType>> tbxCsr(reinterpret_cast<TbxCommandStreamReceiverHw<FamilyType> *>(TbxCommandStreamReceiver::create("", false, *pDevice->executionEnvironment)));
     tbxCsr->pollForCompletionImpl();
 }
+HWTEST_F(TbxCommandStreamTests, givenTbxCsrWhenItIsQueriedForPreferredTagPoolSizeThenOneIsReturned) {
+    std::unique_ptr<TbxCommandStreamReceiverHw<FamilyType>> tbxCsr(reinterpret_cast<TbxCommandStreamReceiverHw<FamilyType> *>(TbxCommandStreamReceiver::create("", false, *pDevice->executionEnvironment)));
+    EXPECT_EQ(1u, tbxCsr->getPreferredTagPoolSize());
+}
 
 HWTEST_F(TbxCommandStreamTests, givenTbxCsrWhenCreatedWithAubDumpThenFileNameIsExtendedWithSystemInfo) {
     MockExecutionEnvironment executionEnvironment;