Program media sampler

Remove not needed includes in unit_tests/libult/genX.cpp files

Change-Id: Iac9957d0b148f80ba9432cabb881c3560d77702f

runtime/command_stream/command_stream_receiver.h

@@ -132,6 +132,7 @@ class CommandStreamReceiver {
     bool isPreambleSent = false;
     bool GSBAFor32BitProgrammed = false;
     bool mediaVfeStateDirty = true;
+    bool lastVmeSubslicesConfig = false;
 
     uint32_t lastSentL3Config = 0;
     int8_t lastSentCoherencyRequest = -1;

runtime/command_stream/command_stream_receiver_hw.h

@@ -63,6 +63,7 @@ class CommandStreamReceiverHw : public CommandStreamReceiver {
 
     size_t getRequiredCmdStreamSize(const DispatchFlags &dispatchFlags);
     size_t getCmdSizeForCoherency();
+    size_t getCmdSizeForMediaSampler(bool mediaSamplerRequired) const;
     void programCoherency(LinearStream &csr, DispatchFlags &dispatchFlags);
 
     void waitForTaskCountWithKmdNotifyFallback(uint32_t taskCountToWait, FlushStamp flushStampToWait) override;
@@ -72,6 +73,7 @@ class CommandStreamReceiverHw : public CommandStreamReceiver {
     void programL3(LinearStream &csr, DispatchFlags &dispatchFlags, uint32_t &newL3Config);
     void programPreamble(LinearStream &csr, DispatchFlags &dispatchFlags, uint32_t &newL3Config);
     void programPipelineSelect(LinearStream &csr, DispatchFlags &dispatchFlags);
+    void programMediaSampler(LinearStream &csr, DispatchFlags &dispatchFlags);
     virtual void programVFEState(LinearStream &csr, DispatchFlags &dispatchFlags);
     virtual void initPageTableManagerRegisters(LinearStream &csr){};
 

runtime/command_stream/command_stream_receiver_hw.inl

@@ -181,6 +181,7 @@ CompletionStamp CommandStreamReceiverHw<GfxFamily>::flushTask(
     programL3(commandStreamCSR, dispatchFlags, newL3Config);
     programPipelineSelect(commandStreamCSR, dispatchFlags);
     programPreamble(commandStreamCSR, dispatchFlags, newL3Config);
+    programMediaSampler(commandStreamCSR, dispatchFlags);
 
     size_t requiredScratchSizeInBytes = requiredScratchSize * (hwInfo.pSysInfo->MaxSubSlicesSupported * hwInfo.pSysInfo->MaxEuPerSubSlice * hwInfo.pSysInfo->ThreadCount / hwInfo.pSysInfo->EUCount);
 
@@ -503,6 +504,7 @@ size_t CommandStreamReceiverHw<GfxFamily>::getRequiredCmdStreamSize(const Dispat
         size += sizeof(typename GfxFamily::PIPE_CONTROL);
     }
     size += getCmdSizeForCoherency();
+    size += getCmdSizeForMediaSampler(dispatchFlags.mediaSamplerRequired);
 
     size += PreemptionHelper::getRequiredCmdStreamSize<GfxFamily>(dispatchFlags.preemptionMode, this->lastPreemptionMode);
 
@@ -569,4 +571,13 @@ inline void CommandStreamReceiverHw<GfxFamily>::programVFEState(LinearStream &cs
         overrideMediaVFEStateDirty(false);
     }
 }
+
+template <typename GfxFamily>
+void CommandStreamReceiverHw<GfxFamily>::programMediaSampler(LinearStream &commandStream, DispatchFlags &dispatchFlags) {
+}
+
+template <typename GfxFamily>
+size_t CommandStreamReceiverHw<GfxFamily>::getCmdSizeForMediaSampler(bool mediaSamplerRequired) const {
+    return 0;
+}
 } // namespace OCLRT

unit_tests/gen8/enqueue_media_kernel.cpp

@@ -36,3 +36,29 @@ GEN8TEST_F(MediaKernelTest, givenGen8CSRWhenEnqueueVmeKernelThenProgramOnlyPipel
     EXPECT_EQ(expectedMask, pCmd->getMaskBits());
     EXPECT_EQ(expectedPipelineSelection, pCmd->getPipelineSelection());
 }
+
+GEN8TEST_F(MediaKernelTest, givenGen8CsrWhenEnqueueVmeKernelThenVmeSubslicesConfigDoesntChangeToFalse) {
+    auto csr = static_cast<UltCommandStreamReceiver<FamilyType> *>(&pDevice->getCommandStreamReceiver());
+    csr->lastVmeSubslicesConfig = true;
+    enqueueVmeKernel<FamilyType>();
+    EXPECT_TRUE(csr->lastVmeSubslicesConfig);
+}
+
+GEN8TEST_F(MediaKernelTest, givenGen8CsrWhenEnqueueVmeKernelThenVmeSubslicesConfigDoesntChangeToTrue) {
+    auto csr = static_cast<UltCommandStreamReceiver<FamilyType> *>(&pDevice->getCommandStreamReceiver());
+    csr->lastVmeSubslicesConfig = false;
+    enqueueVmeKernel<FamilyType>();
+    EXPECT_FALSE(csr->lastVmeSubslicesConfig);
+}
+
+GEN8TEST_F(MediaKernelTest, gen8CmdSizeForMediaSampler) {
+    auto csr = static_cast<UltCommandStreamReceiver<FamilyType> *>(&pDevice->getCommandStreamReceiver());
+
+    csr->lastVmeSubslicesConfig = false;
+    EXPECT_EQ(0u, csr->getCmdSizeForMediaSampler(false));
+    EXPECT_EQ(0u, csr->getCmdSizeForMediaSampler(true));
+
+    csr->lastVmeSubslicesConfig = true;
+    EXPECT_EQ(0u, csr->getCmdSizeForMediaSampler(false));
+    EXPECT_EQ(0u, csr->getCmdSizeForMediaSampler(true));
+}

unit_tests/gen9/enqueue_media_kernel.cpp

@@ -27,7 +27,7 @@
 using namespace OCLRT;
 typedef MediaKernelFixture<HelloWorldFixtureFactory> MediaKernelTest;
 
-GEN9TEST_F(MediaKernelTest, givenGen9CSRWhenEnqueueVmeKernelFirstTimeThenProgramPipelineSelectionAndMediaSampler) {
+GEN9TEST_F(MediaKernelTest, givenGen9CsrWhenEnqueueVmeKernelFirstTimeThenProgramPipelineSelectionAndMediaSampler) {
     typedef typename SKLFamily::PIPELINE_SELECT PIPELINE_SELECT;
     enqueueVmeKernel<SKLFamily>();
 
@@ -42,7 +42,7 @@ GEN9TEST_F(MediaKernelTest, givenGen9CSRWhenEnqueueVmeKernelFirstTimeThenProgram
     EXPECT_FALSE(pCmd->getMediaSamplerDopClockGateEnable());
 }
 
-GEN9TEST_F(MediaKernelTest, givenGen9CSRWhenEnqueueNonVmeKernelFirstTimeThenProgramPipelineSelectionAndMediaSampler) {
+GEN9TEST_F(MediaKernelTest, givenGen9CsrWhenEnqueueNonVmeKernelFirstTimeThenProgramPipelineSelectionAndMediaSampler) {
     typedef typename SKLFamily::PIPELINE_SELECT PIPELINE_SELECT;
     enqueueRegularKernel<SKLFamily>();
 
@@ -57,21 +57,21 @@ GEN9TEST_F(MediaKernelTest, givenGen9CSRWhenEnqueueNonVmeKernelFirstTimeThenProg
     EXPECT_TRUE(pCmd->getMediaSamplerDopClockGateEnable());
 }
 
-GEN9TEST_F(MediaKernelTest, givenGen9CSRWhenEnqueueVmeKernelTwiceThenProgramPipelineSelectOnce) {
+GEN9TEST_F(MediaKernelTest, givenGen9CsrWhenEnqueueVmeKernelTwiceThenProgramPipelineSelectOnce) {
     typedef typename SKLFamily::PIPELINE_SELECT PIPELINE_SELECT;
     enqueueVmeKernel<SKLFamily>();
     auto numCommands = getCommandsList<PIPELINE_SELECT>().size();
     EXPECT_EQ(1u, numCommands);
 }
 
-GEN9TEST_F(MediaKernelTest, givenGen9CSRWhenEnqueueNonVmeKernelTwiceThenProgramPipelineSelectOnce) {
+GEN9TEST_F(MediaKernelTest, givenGen9CsrWhenEnqueueNonVmeKernelTwiceThenProgramPipelineSelectOnce) {
     typedef typename SKLFamily::PIPELINE_SELECT PIPELINE_SELECT;
     enqueueVmeKernel<SKLFamily>();
     auto numCommands = getCommandsList<PIPELINE_SELECT>().size();
     EXPECT_EQ(1u, numCommands);
 }
 
-GEN9TEST_F(MediaKernelTest, givenGen9CSRWhenEnqueueVmeKernelAfterNonVmeKernelThenProgramPipelineSelectionAndMediaSamplerTwice) {
+GEN9TEST_F(MediaKernelTest, givenGen9CsrWhenEnqueueVmeKernelAfterNonVmeKernelThenProgramPipelineSelectionAndMediaSamplerTwice) {
     typedef typename SKLFamily::PIPELINE_SELECT PIPELINE_SELECT;
     enqueueRegularKernel<SKLFamily>();
     enqueueVmeKernel<SKLFamily>();
@@ -86,7 +86,7 @@ GEN9TEST_F(MediaKernelTest, givenGen9CSRWhenEnqueueVmeKernelAfterNonVmeKernelThe
     EXPECT_FALSE(pCmd->getMediaSamplerDopClockGateEnable());
 }
 
-GEN9TEST_F(MediaKernelTest, givenGen9CSRWhenEnqueueNonVmeKernelAfterVmeKernelThenProgramProgramPipelineSelectionAndMediaSamplerTwice) {
+GEN9TEST_F(MediaKernelTest, givenGen9CsrWhenEnqueueNonVmeKernelAfterVmeKernelThenProgramProgramPipelineSelectionAndMediaSamplerTwice) {
     typedef typename SKLFamily::PIPELINE_SELECT PIPELINE_SELECT;
     enqueueVmeKernel<SKLFamily>();
     enqueueRegularKernel<SKLFamily>();
@@ -100,3 +100,29 @@ GEN9TEST_F(MediaKernelTest, givenGen9CSRWhenEnqueueNonVmeKernelAfterVmeKernelThe
     EXPECT_EQ(expectedMask, pCmd->getMaskBits());
     EXPECT_TRUE(pCmd->getMediaSamplerDopClockGateEnable());
 }
+
+GEN9TEST_F(MediaKernelTest, givenGen9CsrWhenEnqueueVmeKernelThenVmeSubslicesConfigDoesntChangeToFalse) {
+    auto csr = static_cast<UltCommandStreamReceiver<FamilyType> *>(&pDevice->getCommandStreamReceiver());
+    csr->lastVmeSubslicesConfig = true;
+    enqueueVmeKernel<FamilyType>();
+    EXPECT_TRUE(csr->lastVmeSubslicesConfig);
+}
+
+GEN9TEST_F(MediaKernelTest, givenGen9CsrWhenEnqueueVmeKernelThenVmeSubslicesConfigDoesntChangeToTrue) {
+    auto csr = static_cast<UltCommandStreamReceiver<FamilyType> *>(&pDevice->getCommandStreamReceiver());
+    csr->lastVmeSubslicesConfig = false;
+    enqueueVmeKernel<FamilyType>();
+    EXPECT_FALSE(csr->lastVmeSubslicesConfig);
+}
+
+GEN9TEST_F(MediaKernelTest, gen9CmdSizeForMediaSampler) {
+    auto csr = static_cast<UltCommandStreamReceiver<FamilyType> *>(&pDevice->getCommandStreamReceiver());
+
+    csr->lastVmeSubslicesConfig = false;
+    EXPECT_EQ(0u, csr->getCmdSizeForMediaSampler(false));
+    EXPECT_EQ(0u, csr->getCmdSizeForMediaSampler(true));
+
+    csr->lastVmeSubslicesConfig = true;
+    EXPECT_EQ(0u, csr->getCmdSizeForMediaSampler(false));
+    EXPECT_EQ(0u, csr->getCmdSizeForMediaSampler(true));
+}

unit_tests/libult/gen8.cpp

@@ -20,10 +20,7 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "hw_cmds.h"
+#include "runtime/helpers/base_object.h"
-#include "runtime/command_stream/command_stream_receiver_hw.inl"
-#include "runtime/memory_manager/memory_manager.h"
-#include "runtime/command_stream/device_command_stream.h"
 #include "unit_tests/libult/ult_command_stream_receiver.h"
 
 namespace OCLRT {

unit_tests/libult/gen9.cpp

@@ -20,10 +20,7 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "hw_cmds.h"
+#include "runtime/helpers/base_object.h"
-#include "runtime/command_stream/command_stream_receiver_hw.inl"
-#include "runtime/memory_manager/memory_manager.h"
-#include "runtime/command_stream/device_command_stream.h"
 #include "unit_tests/libult/ult_command_stream_receiver.h"
 
 namespace OCLRT {

unit_tests/libult/ult_command_stream_receiver.h

@@ -50,6 +50,7 @@ class UltCommandStreamReceiver : public CommandStreamReceiverHw<GfxFamily> {
     using BaseClass::CommandStreamReceiver::latestSentStatelessMocsConfig;
     using BaseClass::CommandStreamReceiver::lastMediaSamplerConfig;
     using BaseClass::CommandStreamReceiver::lastPreemptionMode;
+    using BaseClass::CommandStreamReceiver::lastVmeSubslicesConfig;
     using BaseClass::CommandStreamReceiver::taskCount;
     using BaseClass::CommandStreamReceiver::taskLevel;