diff --git a/shared/source/gen12lp/hw_info_adln.cpp b/shared/source/gen12lp/hw_info_adln.cpp index 78e762cab3..03a118128d 100644 --- a/shared/source/gen12lp/hw_info_adln.cpp +++ b/shared/source/gen12lp/hw_info_adln.cpp @@ -41,7 +41,7 @@ const RuntimeCapabilityTable ADLN::capabilityTable{ MemoryConstants::pageSize, // requiredPreemptionSurfaceSize "", // deviceName nullptr, // preferredPlatformName - PreemptionMode::MidThread, // defaultPreemptionMode + PreemptionMode::ThreadGroup, // defaultPreemptionMode aub_stream::ENGINE_RCS, // defaultEngineType 0, // maxRenderFrequency 30, // clVersionSupport diff --git a/shared/source/gen12lp/hw_info_adlp.cpp b/shared/source/gen12lp/hw_info_adlp.cpp index 6608cd79f2..b70f44e9fc 100644 --- a/shared/source/gen12lp/hw_info_adlp.cpp +++ b/shared/source/gen12lp/hw_info_adlp.cpp @@ -41,7 +41,7 @@ const RuntimeCapabilityTable ADLP::capabilityTable{ MemoryConstants::pageSize, // requiredPreemptionSurfaceSize "", // deviceName nullptr, // preferredPlatformName - PreemptionMode::MidThread, // defaultPreemptionMode + PreemptionMode::ThreadGroup, // defaultPreemptionMode aub_stream::ENGINE_RCS, // defaultEngineType 0, // maxRenderFrequency 30, // clVersionSupport diff --git a/shared/source/gen12lp/hw_info_adls.cpp b/shared/source/gen12lp/hw_info_adls.cpp index 2c0e3ca5f8..12008318e5 100644 --- a/shared/source/gen12lp/hw_info_adls.cpp +++ b/shared/source/gen12lp/hw_info_adls.cpp @@ -41,7 +41,7 @@ const RuntimeCapabilityTable ADLS::capabilityTable{ MemoryConstants::pageSize, // requiredPreemptionSurfaceSize "", // deviceName nullptr, // preferredPlatformName - PreemptionMode::MidThread, // defaultPreemptionMode + PreemptionMode::ThreadGroup, // defaultPreemptionMode aub_stream::ENGINE_RCS, // defaultEngineType 0, // maxRenderFrequency 30, // clVersionSupport diff --git a/shared/source/gen12lp/hw_info_dg1.cpp b/shared/source/gen12lp/hw_info_dg1.cpp index 1242f07e7a..9030637474 100644 --- a/shared/source/gen12lp/hw_info_dg1.cpp +++ b/shared/source/gen12lp/hw_info_dg1.cpp @@ -41,7 +41,7 @@ const RuntimeCapabilityTable DG1::capabilityTable{ MemoryConstants::pageSize, // requiredPreemptionSurfaceSize "", // deviceName nullptr, // preferredPlatformName - PreemptionMode::MidThread, // defaultPreemptionMode + PreemptionMode::ThreadGroup, // defaultPreemptionMode aub_stream::ENGINE_RCS, // defaultEngineType 0, // maxRenderFrequency 30, // clVersionSupport diff --git a/shared/source/gen12lp/hw_info_rkl.cpp b/shared/source/gen12lp/hw_info_rkl.cpp index ecc32a53a7..e5b614fcac 100644 --- a/shared/source/gen12lp/hw_info_rkl.cpp +++ b/shared/source/gen12lp/hw_info_rkl.cpp @@ -41,7 +41,7 @@ const RuntimeCapabilityTable RKL::capabilityTable{ MemoryConstants::pageSize, // requiredPreemptionSurfaceSize "", // deviceName nullptr, // preferredPlatformName - PreemptionMode::MidThread, // defaultPreemptionMode + PreemptionMode::ThreadGroup, // defaultPreemptionMode aub_stream::ENGINE_RCS, // defaultEngineType 0, // maxRenderFrequency 30, // clVersionSupport diff --git a/shared/source/gen12lp/hw_info_tgllp.cpp b/shared/source/gen12lp/hw_info_tgllp.cpp index ded0e23d77..4f944a11a8 100644 --- a/shared/source/gen12lp/hw_info_tgllp.cpp +++ b/shared/source/gen12lp/hw_info_tgllp.cpp @@ -41,7 +41,7 @@ const RuntimeCapabilityTable TGLLP::capabilityTable{ MemoryConstants::pageSize, // requiredPreemptionSurfaceSize "", // deviceName nullptr, // preferredPlatformName - PreemptionMode::MidThread, // defaultPreemptionMode + PreemptionMode::ThreadGroup, // defaultPreemptionMode aub_stream::ENGINE_RCS, // defaultEngineType 0, // maxRenderFrequency 30, // clVersionSupport diff --git a/shared/source/gen12lp/preemption_gen12lp.cpp b/shared/source/gen12lp/preemption_gen12lp.cpp index b87124e04e..1ede839aa3 100644 --- a/shared/source/gen12lp/preemption_gen12lp.cpp +++ b/shared/source/gen12lp/preemption_gen12lp.cpp @@ -13,6 +13,14 @@ namespace NEO { using GfxFamily = Gen12LpFamily; +template <> +void PreemptionHelper::programCsrBaseAddress(LinearStream &preambleCmdStream, Device &device, const GraphicsAllocation *preemptionCsr) {} + +template <> +size_t PreemptionHelper::getRequiredPreambleSize(const Device &device) { + return 0; +} + template void PreemptionHelper::programCmdStream(LinearStream &cmdStream, PreemptionMode newPreemptionMode, PreemptionMode oldPreemptionMode, GraphicsAllocation *preemptionCsr); template size_t PreemptionHelper::getRequiredPreambleSize(const Device &device); diff --git a/shared/test/unit_test/gen12lp/test_device_caps_gen12lp.inl b/shared/test/unit_test/gen12lp/test_device_caps_gen12lp.inl index 0b39167f7c..1473865e26 100644 --- a/shared/test/unit_test/gen12lp/test_device_caps_gen12lp.inl +++ b/shared/test/unit_test/gen12lp/test_device_caps_gen12lp.inl @@ -15,7 +15,7 @@ using namespace NEO; using Gen12LpDeviceCaps = Test; GEN12LPTEST_F(Gen12LpDeviceCaps, GivenDefaultWhenCheckingPreemptionModeThenMidThreadIsReported) { - EXPECT_EQ(PreemptionMode::MidThread, pDevice->getHardwareInfo().capabilityTable.defaultPreemptionMode); + EXPECT_EQ(PreemptionMode::ThreadGroup, pDevice->getHardwareInfo().capabilityTable.defaultPreemptionMode); } GEN12LPTEST_F(Gen12LpDeviceCaps, WhenCheckingCapsThenKmdNotifyMechanismIsCorrectlyReported) { @@ -90,4 +90,4 @@ GEN12LPTEST_F(Gen12LpDeviceCaps, givenGen12LpWhenCheckingFloatAtomicsSupportThen GEN12LPTEST_F(Gen12LpDeviceCaps, givenGen12LpWhenCheckingCxlTypeThenReturnZero) { EXPECT_EQ(0u, pDevice->getHardwareInfo().capabilityTable.cxlType); -} \ No newline at end of file +} diff --git a/shared/test/unit_test/gen12lp/test_preemption_gen12lp.cpp b/shared/test/unit_test/gen12lp/test_preemption_gen12lp.cpp index 1c7faf18e4..65bf686773 100644 --- a/shared/test/unit_test/gen12lp/test_preemption_gen12lp.cpp +++ b/shared/test/unit_test/gen12lp/test_preemption_gen12lp.cpp @@ -29,28 +29,6 @@ PreemptionTestHwDetails getPreemptionTestHwDetails() { using Gen12LpPreemptionTests = DevicePreemptionTests; -GEN12LPTEST_F(Gen12LpPreemptionTests, whenProgramStateSipIsCalledThenStateSipCmdIsAddedToStream) { - size_t requiredSize = PreemptionHelper::getRequiredStateSipCmdSize(*device, false); - StackVec streamStorage(1024); - LinearStream cmdStream{streamStorage.begin(), streamStorage.size()}; - - EXPECT_NE(0U, requiredSize); - PreemptionHelper::programStateSip(cmdStream, *device, nullptr); - EXPECT_NE(0U, cmdStream.getUsed()); -} - -GEN12LPTEST_F(Gen12LpPreemptionTests, givenInterfaceDescriptorDataWhenMidThreadPreemptionModeThenSetDisableThreadPreemptionBitToDisable) { - using INTERFACE_DESCRIPTOR_DATA = typename FamilyType::INTERFACE_DESCRIPTOR_DATA; - - INTERFACE_DESCRIPTOR_DATA iddArg; - iddArg = FamilyType::cmdInitInterfaceDescriptorData; - - iddArg.setThreadPreemptionDisable(INTERFACE_DESCRIPTOR_DATA::THREAD_PREEMPTION_DISABLE_ENABLE); - - PreemptionHelper::programInterfaceDescriptorDataPreemption(&iddArg, PreemptionMode::MidThread); - EXPECT_EQ(INTERFACE_DESCRIPTOR_DATA::THREAD_PREEMPTION_DISABLE_DISABLE, iddArg.getThreadPreemptionDisable()); -} - GEN12LPTEST_F(Gen12LpPreemptionTests, givenInterfaceDescriptorDataWhenNoMidThreadPreemptionModeThenSetDisableThreadPreemptionBitToEnable) { using INTERFACE_DESCRIPTOR_DATA = typename FamilyType::INTERFACE_DESCRIPTOR_DATA;