Program Media Sampler DOP Clock Gate Enable on Xe Hp Sdv

remove skipped tests

Related-To: NEO-6466

Signed-off-by: Mateusz Jablonski <[email protected]>

Author: JablonskiMateusz

opencl/test/unit_test/command_queue/CMakeLists.txt

@@ -96,7 +96,6 @@ set(IGDRCL_SRCS_tests_command_queue
 if(TESTS_XEHP_AND_LATER)
   list(APPEND IGDRCL_SRCS_tests_command_queue
        ${CMAKE_CURRENT_SOURCE_DIR}/dispatch_walker_tests_xehp_and_later.cpp
-       ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_media_kernel_xehp_and_later.cpp
        ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_resource_barier_tests_xehp_and_later.cpp
   )
 endif()

opencl/test/unit_test/command_queue/enqueue_media_kernel_xehp_and_later.cpp

@@ -525,11 +525,31 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, RenderSurfaceStateXeHPAndLaterTests, givenSpecificP
     EXPECT_EQ(FamilyType::RENDER_SURFACE_STATE::COHERENCY_TYPE_GPU_COHERENT, rssCmd.getCoherencyType());
 }
 
-HWCMDTEST_F(IGFX_XE_HP_CORE, PreambleFixture, whenCallingIsSpecialPipelineSelectModeChangedThenReturnCorrectValue) {
+using PipelineSelectTest = ::testing::Test;
+
+HWCMDTEST_F(IGFX_XE_HP_CORE, PipelineSelectTest, whenCallingIsSpecialPipelineSelectModeChangedThenReturnCorrectValue) {
     using PIPELINE_SELECT = typename FamilyType::PIPELINE_SELECT;
     bool oldPipelineSelectSpecialMode = true;
     bool newPipelineSelectSpecialMode = false;
 
     auto result = PreambleHelper<FamilyType>::isSpecialPipelineSelectModeChanged(oldPipelineSelectSpecialMode, newPipelineSelectSpecialMode, *defaultHwInfo);
     EXPECT_TRUE(result);
 }
+
+HWCMDTEST_F(IGFX_XE_HP_CORE, PipelineSelectTest, WhenProgramPipelineSelectThenProperMaskIsSet) {
+    using PIPELINE_SELECT = typename FamilyType::PIPELINE_SELECT;
+    PIPELINE_SELECT cmd = FamilyType::cmdInitPipelineSelect;
+    LinearStream pipelineSelectStream(&cmd, sizeof(cmd));
+    PreambleHelper<FamilyType>::programPipelineSelect(&pipelineSelectStream, {}, *defaultHwInfo);
+
+    auto expectedMask = pipelineSelectEnablePipelineSelectMaskBits;
+    if constexpr (FamilyType::isUsingMediaSamplerDopClockGate) {
+        expectedMask |= pipelineSelectMediaSamplerDopClockGateMaskBits;
+    }
+
+    if (PreambleHelper<FamilyType>::isSystolicModeConfigurable(*defaultHwInfo)) {
+        expectedMask |= pipelineSelectSystolicModeEnableMaskBits;
+    }
+
+    EXPECT_EQ(expectedMask, cmd.getMaskBits());
+}

opencl/test/unit_test/helpers/test_preamble_xehp_and_later.cpp

@@ -44,7 +44,7 @@ void PreambleHelper<Family>::appendProgramPipelineSelect(void *cmd, bool isSpeci
     command->setMaskBits(mask);
 }
 
-template <>
+template <typename Family>
 void PreambleHelper<Family>::programPipelineSelect(LinearStream *pCommandStream,
                                                    const PipelineSelectArgs &pipelineSelectArgs,
                                                    const HardwareInfo &hwInfo) {
@@ -68,8 +68,12 @@ void PreambleHelper<Family>::programPipelineSelect(LinearStream *pCommandStream,
 
     auto mask = pipelineSelectEnablePipelineSelectMaskBits;
 
-    cmd.setMaskBits(mask);
     cmd.setPipelineSelection(PIPELINE_SELECT::PIPELINE_SELECTION_GPGPU);
+    if constexpr (Family::isUsingMediaSamplerDopClockGate) {
+        mask |= pipelineSelectMediaSamplerDopClockGateMaskBits;
+        cmd.setMediaSamplerDopClockGateEnable(!pipelineSelectArgs.mediaSamplerRequired);
+    }
+    cmd.setMaskBits(mask);
 
     appendProgramPipelineSelect(&cmd, pipelineSelectArgs.specialPipelineSelectMode, hwInfo);
 

shared/source/helpers/preamble_xehp_and_later.inl

@@ -28,6 +28,7 @@ struct XeHpCore {
     static constexpr uint32_t stateComputeModeForceDisableSupportMultiGpuAtomics = (1u << 1);
 
     static constexpr bool isUsingL3Control = true;
+    static constexpr bool isUsingMediaSamplerDopClockGate = true;
 
     struct DataPortBindlessSurfaceExtendedMessageDescriptor {
         union {

shared/source/xe_hp_core/hw_cmds_base.h

@@ -34,6 +34,7 @@ struct XE_HPC_CORE {
     static constexpr uint32_t pvcXtTemporaryDeviceId = 0x0BE5;
 
     static constexpr bool isUsingL3Control = false;
+    static constexpr bool isUsingMediaSamplerDopClockGate = false;
 
     static bool isXlA0(const HardwareInfo &hwInfo) {
         auto revId = hwInfo.platform.usRevId & pvcSteppingBits;

shared/source/xe_hpc_core/hw_cmds_base.h

@@ -28,6 +28,7 @@ struct XE_HPG_CORE {
     static constexpr uint32_t stateComputeModeLargeGrfModeMask = (1u << 15);
 
     static constexpr bool isUsingL3Control = true;
+    static constexpr bool isUsingMediaSamplerDopClockGate = false;
 
     struct DataPortBindlessSurfaceExtendedMessageDescriptor {
         union {

shared/source/xe_hpg_core/hw_cmds_base.h

@@ -125,3 +125,15 @@ XEHPTEST_F(XeHPPipelineSelect, WhenAppendProgramPipelineSelectThenCorrectValuesS
     EXPECT_FALSE(cmd.getSystolicModeEnable());
     EXPECT_EQ(pipelineSelectSystolicModeEnableMaskBits, cmd.getMaskBits());
 }
+
+XEHPTEST_F(XeHPPipelineSelect, WhenProgramPipelineSelectThenProgramMediaSamplerDopClockGateEnable) {
+    using PIPELINE_SELECT = typename FamilyType::PIPELINE_SELECT;
+    PIPELINE_SELECT cmd = FamilyType::cmdInitPipelineSelect;
+    LinearStream pipelineSelectStream(&cmd, sizeof(cmd));
+    PreambleHelper<FamilyType>::programPipelineSelect(&pipelineSelectStream, {}, *defaultHwInfo);
+
+    auto expectedSubMask = pipelineSelectMediaSamplerDopClockGateMaskBits;
+
+    EXPECT_TRUE(cmd.getMediaSamplerDopClockGateEnable());
+    EXPECT_EQ(expectedSubMask, (cmd.getMaskBits() & expectedSubMask));
+}