Add getter of Scratch Controller to the CommandStreamReceiver class

Change-Id: Iba0a9d7e4a9f141e1e31de428d50e7c745ad993a
Signed-off-by: Zbigniew Zdanowicz <[email protected]>

Author: zzdanowicz

runtime/command_stream/command_stream_receiver.h

@@ -178,6 +178,10 @@ class CommandStreamReceiver {
                          BlitterConstants::BlitWithHostPtrDirection copyDirection, CsrDependencies &csrDependencies);
     virtual void blitBuffer(Buffer &dstBuffer, Buffer &srcBuffer, uint64_t sourceSize, CsrDependencies &csrDependencies) = 0;
 
+    ScratchSpaceController *getScratchSpaceController() const {
+        return scratchSpaceController.get();
+    }
+
   protected:
     void cleanupResources();
 

unit_tests/command_stream/command_stream_receiver_hw_tests.cpp

@@ -231,7 +231,7 @@ HWCMDTEST_F(IGFX_GEN8_CORE, CommandStreamReceiverHwTest, WhenCommandStreamReceiv
 
 HWTEST_F(CommandStreamReceiverHwTest, WhenScratchSpaceIsNotRequiredThenScratchAllocationIsNotCreated) {
     auto commandStreamReceiver = std::make_unique<MockCsrHw<FamilyType>>(*pDevice->executionEnvironment);
-    auto scratchController = commandStreamReceiver->scratchSpaceController.get();
+    auto scratchController = commandStreamReceiver->getScratchSpaceController();
 
     bool stateBaseAddressDirty = false;
     bool cfeStateDirty = false;
@@ -243,7 +243,7 @@ HWTEST_F(CommandStreamReceiverHwTest, WhenScratchSpaceIsNotRequiredThenScratchAl
 
 HWTEST_F(CommandStreamReceiverHwTest, WhenScratchSpaceIsRequiredThenCorrectAddressIsReturned) {
     auto commandStreamReceiver = std::make_unique<MockCsrHw<FamilyType>>(*pDevice->executionEnvironment);
-    auto scratchController = commandStreamReceiver->scratchSpaceController.get();
+    auto scratchController = commandStreamReceiver->getScratchSpaceController();
 
     bool cfeStateDirty = false;
     bool stateBaseAddressDirty = false;

unit_tests/libult/ult_command_stream_receiver.h

@@ -26,6 +26,7 @@ class UltCommandStreamReceiver : public CommandStreamReceiverHw<GfxFamily>, publ
     using BaseClass::deviceIndex;
     using BaseClass::dshState;
     using BaseClass::getScratchPatchAddress;
+    using BaseClass::getScratchSpaceController;
     using BaseClass::indirectHeap;
     using BaseClass::iohState;
     using BaseClass::programPreamble;
@@ -58,7 +59,6 @@ class UltCommandStreamReceiver : public CommandStreamReceiverHw<GfxFamily>, publ
     using BaseClass::CommandStreamReceiver::requiredScratchSize;
     using BaseClass::CommandStreamReceiver::requiredThreadArbitrationPolicy;
     using BaseClass::CommandStreamReceiver::samplerCacheFlushRequired;
-    using BaseClass::CommandStreamReceiver::scratchSpaceController;
     using BaseClass::CommandStreamReceiver::stallingPipeControlOnNextFlushRequired;
     using BaseClass::CommandStreamReceiver::submissionAggregator;
     using BaseClass::CommandStreamReceiver::taskCount;