Refactor hardware context programming

- expose programHardwareContext in CSR

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

Author: HoppeMateusz

opencl/test/unit_test/kernel/kernel_tests.cpp

@@ -530,6 +530,10 @@ class CommandStreamReceiverMock : public CommandStreamReceiver {
         return CommandStreamReceiverType::CSR_HW;
     }
 
+    void programHardwareContext() override {}
+    size_t getCmdsSizeForHardwareContext() const override {
+        return 0;
+    }
     std::map<const void *, size_t> residency;
     bool passResidencyCallToBaseClass = true;
     std::unique_ptr<ExecutionEnvironment> mockExecutionEnvironment;

shared/source/command_stream/command_stream_receiver.h

@@ -82,6 +82,8 @@ class CommandStreamReceiver {
 
     virtual bool flushBatchedSubmissions() = 0;
     bool submitBatchBuffer(BatchBuffer &batchBuffer, ResidencyContainer &allocationsForResidency);
+    virtual void programHardwareContext() = 0;
+    virtual size_t getCmdsSizeForHardwareContext() const = 0;
 
     MOCKABLE_VIRTUAL void makeResident(GraphicsAllocation &gfxAllocation);
     virtual void makeNonResident(GraphicsAllocation &gfxAllocation);

shared/source/command_stream/command_stream_receiver_hw.h

@@ -40,6 +40,8 @@ class CommandStreamReceiverHw : public CommandStreamReceiver {
                               uint32_t taskLevel, DispatchFlags &dispatchFlags, Device &device) override;
 
     bool flushBatchedSubmissions() override;
+    void programHardwareContext() override;
+    size_t getCmdsSizeForHardwareContext() const override;
 
     static void addBatchBufferEnd(LinearStream &commandStream, void **patchLocation);
     void programEndingCmd(LinearStream &commandStream, void **patchLocation, bool directSubmissionEnabled);
@@ -109,7 +111,7 @@ class CommandStreamReceiverHw : public CommandStreamReceiver {
     void programEngineModeEpliogue(LinearStream &csr, const DispatchFlags &dispatchFlags);
 
     void programEnginePrologue(LinearStream &csr);
-    size_t getCmdSizeForPrologue(const DispatchFlags &dispatchFlags) const;
+    size_t getCmdSizeForPrologue() const;
 
     void addClearSLMWorkAround(typename GfxFamily::PIPE_CONTROL *pCmd);
     void addPipeControlCmd(LinearStream &commandStream, PipeControlArgs &args);

shared/source/command_stream/command_stream_receiver_hw_base.inl

@@ -142,6 +142,16 @@ inline void CommandStreamReceiverHw<GfxFamily>::addPipeControlCmd(
     MemorySynchronizationCommands<GfxFamily>::addPipeControl(commandStream, args);
 }
 
+template <typename GfxFamily>
+void CommandStreamReceiverHw<GfxFamily>::programHardwareContext() {
+    programEnginePrologue(commandStream);
+}
+
+template <typename GfxFamily>
+size_t CommandStreamReceiverHw<GfxFamily>::getCmdsSizeForHardwareContext() const {
+    return getCmdSizeForPrologue();
+}
+
 template <typename GfxFamily>
 CompletionStamp CommandStreamReceiverHw<GfxFamily>::flushTask(
     LinearStream &commandStreamTask,
@@ -283,7 +293,8 @@ CompletionStamp CommandStreamReceiverHw<GfxFamily>::flushTask(
     if (executionEnvironment.rootDeviceEnvironments[device.getRootDeviceIndex()]->pageTableManager.get() && !pageTableManagerInitialized) {
         pageTableManagerInitialized = executionEnvironment.rootDeviceEnvironments[device.getRootDeviceIndex()]->pageTableManager->initPageTableManagerRegisters(this);
     }
-    programEnginePrologue(commandStreamCSR);
+
+    programHardwareContext();
     programComputeMode(commandStreamCSR, dispatchFlags);
     programPipelineSelect(commandStreamCSR, dispatchFlags.pipelineSelectArgs);
     programL3(commandStreamCSR, dispatchFlags, newL3Config);
@@ -674,7 +685,7 @@ size_t CommandStreamReceiverHw<GfxFamily>::getRequiredCmdStreamSize(const Dispat
     size += getCmdSizeForPipelineSelect();
     size += getCmdSizeForPreemption(dispatchFlags);
     size += getCmdSizeForEpilogue(dispatchFlags);
-    size += getCmdSizeForPrologue(dispatchFlags);
+    size += getCmdsSizeForHardwareContext();
 
     if (executionEnvironment.rootDeviceEnvironments[rootDeviceIndex]->getHardwareInfo()->workaroundTable.waSamplerCacheFlushBetweenRedescribedSurfaceReads) {
         if (this->samplerCacheFlushRequired != SamplerCacheFlushState::samplerCacheFlushNotRequired) {
@@ -959,7 +970,7 @@ inline void CommandStreamReceiverHw<GfxFamily>::programEnginePrologue(LinearStre
 }
 
 template <typename GfxFamily>
-inline size_t CommandStreamReceiverHw<GfxFamily>::getCmdSizeForPrologue(const DispatchFlags &dispatchFlags) const {
+inline size_t CommandStreamReceiverHw<GfxFamily>::getCmdSizeForPrologue() const {
     return 0u;
 }
 

shared/test/unit_test/mocks/mock_command_stream_receiver.h

@@ -75,4 +75,9 @@ class MockCommandStreamReceiver : public CommandStreamReceiver {
     void downloadAllocations() override {
         downloadAllocationsCalled = true;
     }
+
+    void programHardwareContext() override {}
+    size_t getCmdsSizeForHardwareContext() const override {
+        return 0;
+    }
 };