Encapsulate creation of Scratch Space surface

Change-Id: Ifd1d794e0d8b7053cf5c37bdd867ab64f84241cc
intel · Sep 13, 2018 · 888b067 · 888b067
1 parent 81a1e43
commit 888b067
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/runtime/command_stream/command_stream_receiver_hw.h b/runtime/command_stream/command_stream_receiver_hw.h
@@ -95,6 +95,7 @@ class CommandStreamReceiverHw : public CommandStreamReceiver {
     void programOutOfDeviceWaitlistSemaphores(LinearStream &csr, DispatchFlags &dispatchFlags, Device &currentDevice);
     virtual void programVFEState(LinearStream &csr, DispatchFlags &dispatchFlags);
     virtual void initPageTableManagerRegisters(LinearStream &csr){};
+    void createScratchSpaceAllocation(size_t requiredScratchSizeInBytes);
 
     void addPipeControlWA(LinearStream &commandStream, bool flushDC);
     void addDcFlushToPipeControl(typename GfxFamily::PIPE_CONTROL *pCmd, bool flushDC);

diff --git a/runtime/command_stream/command_stream_receiver_hw.inl b/runtime/command_stream/command_stream_receiver_hw.inl
@@ -252,7 +252,7 @@ CompletionStamp CommandStreamReceiverHw<GfxFamily>::flushTask(
             scratchAllocation->taskCount = this->taskCount;
             getMemoryManager()->storeAllocation(std::unique_ptr<GraphicsAllocation>(scratchAllocation), TEMPORARY_ALLOCATION);
         }
-        scratchAllocation = getMemoryManager()->allocateGraphicsMemoryInPreferredPool(true, nullptr, requiredScratchSizeInBytes, GraphicsAllocation::AllocationType::SCRATCH_SURFACE);
+        createScratchSpaceAllocation(requiredScratchSizeInBytes);
         overrideMediaVFEStateDirty(true);
         if (is64bit && !force32BitAllocations) {
             stateBaseAddressDirty = true;
@@ -800,4 +800,9 @@ void CommandStreamReceiverHw<GfxFamily>::programOutOfDeviceWaitlistSemaphores(Li
         KernelCommandsHelper<GfxFamily>::programMiSemaphoreWait(csr, compareAddress, 1);
     }
 }
+
+template <typename GfxFamily>
+void CommandStreamReceiverHw<GfxFamily>::createScratchSpaceAllocation(size_t requiredScratchSizeInBytes) {
+    scratchAllocation = getMemoryManager()->allocateGraphicsMemoryInPreferredPool(true, nullptr, requiredScratchSizeInBytes, GraphicsAllocation::AllocationType::SCRATCH_SURFACE);
+}
 } // namespace OCLRT
diff --git a/unit_tests/libult/ult_command_stream_receiver.h b/unit_tests/libult/ult_command_stream_receiver.h
@@ -35,7 +35,9 @@ class UltCommandStreamReceiver : public CommandStreamReceiverHw<GfxFamily> {
     using BaseClass = CommandStreamReceiverHw<GfxFamily>;
 
   public:
+    using BaseClass::createScratchSpaceAllocation;
     using BaseClass::dshState;
+    using BaseClass::getScratchPatchAddress;
     using BaseClass::hwInfo;
     using BaseClass::indirectHeap;
     using BaseClass::iohState;
@@ -57,7 +59,9 @@ class UltCommandStreamReceiver : public CommandStreamReceiverHw<GfxFamily> {
     using BaseClass::CommandStreamReceiver::latestFlushedTaskCount;
     using BaseClass::CommandStreamReceiver::latestSentStatelessMocsConfig;
     using BaseClass::CommandStreamReceiver::mediaVfeStateDirty;
+    using BaseClass::CommandStreamReceiver::requiredScratchSize;
     using BaseClass::CommandStreamReceiver::requiredThreadArbitrationPolicy;
+    using BaseClass::CommandStreamReceiver::scratchAllocation;
     using BaseClass::CommandStreamReceiver::submissionAggregator;
     using BaseClass::CommandStreamReceiver::taskCount;
     using BaseClass::CommandStreamReceiver::taskLevel;