Media
/
compute-runtime
mirror of https://github.com/intel/compute-runtime.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: remove msaa w/a for xe3 

Related-To: NEO-13290, NEO-12587
Signed-off-by: Maciej Plewka <maciej.plewka@intel.com>
This commit is contained in:
Maciej Plewka 2025-01-31 14:40:10 +00:00 committed by Compute-Runtime-Automation
parent f2b48b97d2
commit aace15d6bc
20 changed files with 16 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
shared/source/release_helper/release_helper.h
View File

@ -58,7 +58,6 @@ class ReleaseHelper {
virtual uint32_t getAdditionalExtraCaps() const = 0;
virtual uint32_t getStackSizePerRay() const = 0;
virtual bool isLocalOnlyAllowed() const = 0;
virtual bool isDisablingMsaaRequired() const = 0;
virtual bool isDummyBlitWaRequired() const = 0;
virtual const SizeToPreferredSlmValueArray &getSizeToPreferredSlmValue(bool isHeapless) const = 0;
virtual bool isNumRtStacksPerDssFixedValue() const = 0;
@ -100,7 +99,6 @@ class ReleaseHelperHw : public ReleaseHelper {
uint32_t getAdditionalExtraCaps() const override;
uint32_t getStackSizePerRay() const override;
bool isLocalOnlyAllowed() const override;
bool isDisablingMsaaRequired() const override;
bool isDummyBlitWaRequired() const override;
const SizeToPreferredSlmValueArray &getSizeToPreferredSlmValue(bool isHeapless) const override;
bool isNumRtStacksPerDssFixedValue() const override;

5
shared/source/release_helper/release_helper_3000.cpp
View File

@ -37,11 +37,6 @@ bool ReleaseHelperHw<release>::isLocalOnlyAllowed() const {
return false;
}
template <>
bool ReleaseHelperHw<release>::isDisablingMsaaRequired() const {
return (hardwareIpVersion.value == AOT::PTL_H_A0);
}
template <>
uint32_t ReleaseHelperHw<release>::getStackSizePerRay() const {
return 64u;

5
shared/source/release_helper/release_helper_3001.cpp
View File

@ -37,11 +37,6 @@ bool ReleaseHelperHw<release>::isLocalOnlyAllowed() const {
return false;
}
template <>
bool ReleaseHelperHw<release>::isDisablingMsaaRequired() const {
return (hardwareIpVersion.value == AOT::PTL_U_A0);
}
template <>
bool ReleaseHelperHw<release>::isBindlessAddressingDisabled() const {
return false;

7
shared/source/release_helper/release_helper_base.inl
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2023-2024 Intel Corporation
* Copyright (C) 2023-2025 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
@ -137,11 +137,6 @@ bool ReleaseHelperHw<releaseType>::isLocalOnlyAllowed() const {
return true;
}
template <ReleaseType releaseType>
bool ReleaseHelperHw<releaseType>::isDisablingMsaaRequired() const {
return false;
}
template <ReleaseType releaseType>
bool ReleaseHelperHw<releaseType>::isDummyBlitWaRequired() const {
return false;

5
shared/source/xe3_core/command_encoder_xe3_core.cpp
View File

@ -116,10 +116,7 @@ void EncodeMemoryPrefetch<Family>::programMemoryPrefetch(LinearStream &commandSt
template <>
void EncodeSurfaceState<Family>::setAuxParamsForMCSCCS(R_SURFACE_STATE *surfaceState, const ReleaseHelper *releaseHelper) {
UNRECOVERABLE_IF(releaseHelper == nullptr);
if (releaseHelper->isDisablingMsaaRequired()) {
surfaceState->setAuxiliarySurfaceMode(AUXILIARY_SURFACE_MODE::AUXILIARY_SURFACE_MODE_AUX_NONE);
}
surfaceState->setAuxiliarySurfaceMode(AUXILIARY_SURFACE_MODE::AUXILIARY_SURFACE_MODE_AUX_MCS);
}
template <>

3
shared/test/common/mocks/mock_release_helper.h
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2023-2024 Intel Corporation
* Copyright (C) 2023-2025 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
@ -38,7 +38,6 @@ class MockReleaseHelper : public ReleaseHelper {
ADDMETHOD_CONST_NOBASE(getAdditionalExtraCaps, uint32_t, {}, ());
ADDMETHOD_CONST_NOBASE(getStackSizePerRay, uint32_t, {}, ());
ADDMETHOD_CONST_NOBASE(isLocalOnlyAllowed, bool, {}, ());
ADDMETHOD_CONST_NOBASE(isDisablingMsaaRequired, bool, false, ());
ADDMETHOD_CONST_NOBASE(isDummyBlitWaRequired, bool, false, ());
ADDMETHOD_CONST_NOBASE(isNumRtStacksPerDssFixedValue, bool, true, ());
ADDMETHOD_CONST_NOBASE(getFtrXe2Compression, bool, false, ());

3
shared/test/unit_test/release_helper/release_helper_12_55_tests.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2023-2024 Intel Corporation
* Copyright (C) 2023-2025 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
@ -40,7 +40,6 @@ TEST_F(ReleaseHelper1255Tests, whenGettingCapabilitiesThenCorrectPropertiesAreRe
EXPECT_EQ(8u, releaseHelper->getNumThreadsPerEu());
EXPECT_EQ(0u, releaseHelper->getStackSizePerRay());
EXPECT_TRUE(releaseHelper->isRayTracingSupported());
EXPECT_FALSE(releaseHelper->isDisablingMsaaRequired());
EXPECT_TRUE(releaseHelper->isNumRtStacksPerDssFixedValue());
EXPECT_FALSE(releaseHelper->getFtrXe2Compression());
}

3
shared/test/unit_test/release_helper/release_helper_12_56_tests.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2023-2024 Intel Corporation
* Copyright (C) 2023-2025 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
@ -40,7 +40,6 @@ TEST_F(ReleaseHelper1256Tests, whenGettingCapabilitiesThenCorrectPropertiesAreRe
EXPECT_EQ(8u, releaseHelper->getNumThreadsPerEu());
EXPECT_EQ(0u, releaseHelper->getStackSizePerRay());
EXPECT_TRUE(releaseHelper->isRayTracingSupported());
EXPECT_FALSE(releaseHelper->isDisablingMsaaRequired());
EXPECT_TRUE(releaseHelper->isNumRtStacksPerDssFixedValue());
EXPECT_FALSE(releaseHelper->getFtrXe2Compression());
}

3
shared/test/unit_test/release_helper/release_helper_12_57_tests.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2023-2024 Intel Corporation
* Copyright (C) 2023-2025 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
@ -40,7 +40,6 @@ TEST_F(ReleaseHelper1257Tests, whenGettingCapabilitiesThenCorrectPropertiesAreRe
EXPECT_EQ(8u, releaseHelper->getNumThreadsPerEu());
EXPECT_EQ(0u, releaseHelper->getStackSizePerRay());
EXPECT_TRUE(releaseHelper->isRayTracingSupported());
EXPECT_FALSE(releaseHelper->isDisablingMsaaRequired());
EXPECT_TRUE(releaseHelper->isNumRtStacksPerDssFixedValue());
EXPECT_FALSE(releaseHelper->getFtrXe2Compression());
}

3
shared/test/unit_test/release_helper/release_helper_12_60_tests.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2023-2024 Intel Corporation
* Copyright (C) 2023-2025 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
@ -37,7 +37,6 @@ TEST_F(ReleaseHelper1260Tests, whenGettingCapabilitiesThenCorrectPropertiesAreRe
EXPECT_EQ(8u, releaseHelper->getNumThreadsPerEu());
EXPECT_EQ(0u, releaseHelper->getStackSizePerRay());
EXPECT_TRUE(releaseHelper->isRayTracingSupported());
EXPECT_FALSE(releaseHelper->isDisablingMsaaRequired());
EXPECT_TRUE(releaseHelper->isNumRtStacksPerDssFixedValue());
EXPECT_FALSE(releaseHelper->getFtrXe2Compression());
}

3
shared/test/unit_test/release_helper/release_helper_12_61_tests.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2024 Intel Corporation
* Copyright (C) 2024-2025 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
@ -36,7 +36,6 @@ TEST_F(ReleaseHelper1261Tests, whenGettingCapabilitiesThenCorrectPropertiesAreRe
EXPECT_EQ(8u, releaseHelper->getNumThreadsPerEu());
EXPECT_EQ(0u, releaseHelper->getStackSizePerRay());
EXPECT_TRUE(releaseHelper->isRayTracingSupported());
EXPECT_FALSE(releaseHelper->isDisablingMsaaRequired());
EXPECT_TRUE(releaseHelper->isNumRtStacksPerDssFixedValue());
EXPECT_FALSE(releaseHelper->getFtrXe2Compression());
}

3
shared/test/unit_test/release_helper/release_helper_12_70_tests.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2023-2024 Intel Corporation
* Copyright (C) 2023-2025 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
@ -41,7 +41,6 @@ TEST_F(ReleaseHelper1270Tests, whenGettingCapabilitiesThenCorrectPropertiesAreRe
EXPECT_EQ(8u, releaseHelper->getNumThreadsPerEu());
EXPECT_EQ(0u, releaseHelper->getStackSizePerRay());
EXPECT_TRUE(releaseHelper->isRayTracingSupported());
EXPECT_FALSE(releaseHelper->isDisablingMsaaRequired());
EXPECT_TRUE(releaseHelper->isNumRtStacksPerDssFixedValue());
EXPECT_FALSE(releaseHelper->getFtrXe2Compression());
}

3
shared/test/unit_test/release_helper/release_helper_12_71_tests.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2023-2024 Intel Corporation
* Copyright (C) 2023-2025 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
@ -41,7 +41,6 @@ TEST_F(ReleaseHelper1271Tests, whenGettingCapabilitiesThenCorrectPropertiesAreRe
EXPECT_EQ(8u, releaseHelper->getNumThreadsPerEu());
EXPECT_EQ(0u, releaseHelper->getStackSizePerRay());
EXPECT_TRUE(releaseHelper->isRayTracingSupported());
EXPECT_FALSE(releaseHelper->isDisablingMsaaRequired());
EXPECT_TRUE(releaseHelper->isNumRtStacksPerDssFixedValue());
EXPECT_FALSE(releaseHelper->getFtrXe2Compression());
}

3
shared/test/unit_test/release_helper/release_helper_12_74_tests.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2023-2024 Intel Corporation
* Copyright (C) 2023-2025 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
@ -39,7 +39,6 @@ TEST_F(ReleaseHelper1274Tests, whenGettingCapabilitiesThenCorrectPropertiesAreRe
EXPECT_EQ(8u, releaseHelper->getNumThreadsPerEu());
EXPECT_EQ(0u, releaseHelper->getStackSizePerRay());
EXPECT_TRUE(releaseHelper->isRayTracingSupported());
EXPECT_FALSE(releaseHelper->isDisablingMsaaRequired());
EXPECT_TRUE(releaseHelper->isNumRtStacksPerDssFixedValue());
EXPECT_FALSE(releaseHelper->getFtrXe2Compression());
}

3
shared/test/unit_test/release_helper/release_helper_20_01_tests.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2024 Intel Corporation
* Copyright (C) 2024-2025 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
@ -39,7 +39,6 @@ TEST_F(ReleaseHelper2001Tests, whenGettingCapabilitiesThenCorrectPropertiesAreRe
EXPECT_EQ(8u, releaseHelper->getNumThreadsPerEu());
EXPECT_EQ(0u, releaseHelper->getStackSizePerRay());
EXPECT_TRUE(releaseHelper->isRayTracingSupported());
EXPECT_FALSE(releaseHelper->isDisablingMsaaRequired());
EXPECT_TRUE(releaseHelper->isGlobalBindlessAllocatorEnabled());
EXPECT_TRUE(releaseHelper->isNumRtStacksPerDssFixedValue());
}

3
shared/test/unit_test/release_helper/release_helper_20_04_tests.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2024 Intel Corporation
* Copyright (C) 2024-2025 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
@ -40,7 +40,6 @@ TEST_F(ReleaseHelper2004Tests, whenGettingCapabilitiesThenCorrectPropertiesAreRe
EXPECT_EQ(8u, releaseHelper->getNumThreadsPerEu());
EXPECT_EQ(0u, releaseHelper->getStackSizePerRay());
EXPECT_TRUE(releaseHelper->isRayTracingSupported());
EXPECT_FALSE(releaseHelper->isDisablingMsaaRequired());
EXPECT_TRUE(releaseHelper->isGlobalBindlessAllocatorEnabled());
EXPECT_TRUE(releaseHelper->isNumRtStacksPerDssFixedValue());
EXPECT_FALSE(releaseHelper->getFtrXe2Compression());

1
shared/test/unit_test/release_helper/release_helper_30_00_tests.cpp
View File

@ -39,7 +39,6 @@ TEST_F(ReleaseHelper3000Tests, whenGettingCapabilitiesThenCorrectPropertiesAreRe
EXPECT_EQ(10u, releaseHelper->getNumThreadsPerEu());
EXPECT_TRUE(releaseHelper->isRayTracingSupported());
EXPECT_EQ(64u, releaseHelper->getStackSizePerRay());
EXPECT_EQ(revision == 0, releaseHelper->isDisablingMsaaRequired());
EXPECT_TRUE(releaseHelper->isNumRtStacksPerDssFixedValue());
EXPECT_EQ(revision != 0, releaseHelper->getFtrXe2Compression());
}

1
shared/test/unit_test/release_helper/release_helper_30_01_tests.cpp
View File

@ -39,7 +39,6 @@ TEST_F(ReleaseHelper3001Tests, whenGettingCapabilitiesThenCorrectPropertiesAreRe
EXPECT_EQ(10u, releaseHelper->getNumThreadsPerEu());
EXPECT_TRUE(releaseHelper->isRayTracingSupported());
EXPECT_EQ(0u, releaseHelper->getStackSizePerRay());
EXPECT_EQ(revision == 0, releaseHelper->isDisablingMsaaRequired());
EXPECT_TRUE(releaseHelper->isNumRtStacksPerDssFixedValue());
EXPECT_TRUE(releaseHelper->getFtrXe2Compression());
}

6
shared/test/unit_test/xe2_hpg_core/test_encode_xe2_hpg_core.cpp
View File

@ -624,11 +624,7 @@ XE2_HPG_CORETEST_F(EncodeKernelXe2HpgCoreTest, givenSurfaceStateAndAuxSurfaceMod
auto originalAuxMode = surfaceState.getAuxiliarySurfaceMode();
EncodeSurfaceState<FamilyType>::setAuxParamsForMCSCCS(&surfaceState, releaseHelper.get());
if (releaseHelper->isDisablingMsaaRequired()) {
EXPECT_EQ(surfaceState.getAuxiliarySurfaceMode(), EncodeSurfaceState<FamilyType>::AUXILIARY_SURFACE_MODE::AUXILIARY_SURFACE_MODE_AUX_NONE);
} else {
EXPECT_EQ(surfaceState.getAuxiliarySurfaceMode(), originalAuxMode);
}
EXPECT_EQ(surfaceState.getAuxiliarySurfaceMode(), originalAuxMode);
}
XE2_HPG_CORETEST_F(EncodeKernelXe2HpgCoreTest, givenSurfaceStateAndAuxSurfaceModeOverrideRequiredIsTrueWhenAuxParamsForMCSCCSAreSetThenCorrectAuxModeIsSet) {

17
shared/test/unit_test/xe3_core/test_encode_xe3_core.cpp
View File

@ -565,25 +565,12 @@ XE3_CORETEST_F(EncodeKernelXe3CoreTest, givenCommandContainerWhenNumGrfRequiredI
EXPECT_EQ(productHelper.isGrfNumReportedWithScm(), cmd->getLargeGrfMode());
}
XE3_CORETEST_F(CommandEncodeXe3CoreTest, givenSurfaceStateAndIsDisablingMsaaRequiredIsTrueWhenAuxParamsForMCSCCSAreSetThenCorrectAuxModeIsSet) {
XE3_CORETEST_F(CommandEncodeXe3CoreTest, givenSurfaceStateWhenAuxParamsForMCSCCSAreSetThenCorrectAuxModeIsSet) {
auto surfaceState = FamilyType::cmdInitRenderSurfaceState;
auto releaseHelper = std::make_unique<MockReleaseHelper>();
releaseHelper->isDisablingMsaaRequiredResult = true;
EncodeSurfaceState<FamilyType>::setAuxParamsForMCSCCS(&surfaceState, releaseHelper.get());
EXPECT_EQ(surfaceState.getAuxiliarySurfaceMode(), EncodeSurfaceState<FamilyType>::AUXILIARY_SURFACE_MODE::AUXILIARY_SURFACE_MODE_AUX_NONE);
}
XE3_CORETEST_F(CommandEncodeXe3CoreTest, givenSurfaceStateAndIsDisablingMsaaRequiredIsFalseWhenAuxParamsForMCSCCSAreSetThenCorrectAuxModeIsSet) {
auto surfaceState = FamilyType::cmdInitRenderSurfaceState;
auto originalAuxMode = surfaceState.getAuxiliarySurfaceMode();
auto releaseHelper = std::make_unique<MockReleaseHelper>();
releaseHelper->isDisablingMsaaRequiredResult = false;
EncodeSurfaceState<FamilyType>::setAuxParamsForMCSCCS(&surfaceState, releaseHelper.get());
EXPECT_EQ(surfaceState.getAuxiliarySurfaceMode(), originalAuxMode);
EXPECT_EQ(surfaceState.getAuxiliarySurfaceMode(), EncodeSurfaceState<FamilyType>::AUXILIARY_SURFACE_MODE::AUXILIARY_SURFACE_MODE_AUX_MCS);
}
using Xe3SbaTest = SbaTest;