intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2025-12-19 06:24:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: bcs mem fill pattern alignment

Browse Source 
Related-To: NEO-13928

Signed-off-by: Bartosz Dunajski <bartosz.dunajski@intel.com>
This commit is contained in:
Bartosz Dunajski
2025-02-03 11:36:01 +00:00
committed by Compute-Runtime-Automation
parent 3bef9f886a
commit dd1e85a3d4
4 changed files with 34 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
shared/source/generated/xe2_hpg_core/hw_cmds_generated_xe2_hpg_core.inl
View File

@@ -4617,7 +4617,7 @@ typedef struct tagXY_FAST_COLOR_BLT {
return static_cast<CLIENT>(TheStructure.Common.Client); return static_cast<CLIENT>(TheStructure.Common.Client);
} }
inline void setDestinationPitch(const uint32_t value) { inline void setDestinationPitch(const uint32_t value) {
UNRECOVERABLE_IF(value > 0x3ffff); UNRECOVERABLE_IF(value > 0x3ffff + 1); // patched
TheStructure.Common.DestinationPitch = value - 1; TheStructure.Common.DestinationPitch = value - 1;
} }
inline uint32_t getDestinationPitch() const { inline uint32_t getDestinationPitch() const {

2
shared/source/generated/xe3_core/hw_cmds_generated_xe3_core.inl
View File

@@ -4605,7 +4605,7 @@ typedef struct tagXY_FAST_COLOR_BLT {
return static_cast<CLIENT>(TheStructure.Common.Client); return static_cast<CLIENT>(TheStructure.Common.Client);
} }
inline void setDestinationPitch(const uint32_t value) { inline void setDestinationPitch(const uint32_t value) {
UNRECOVERABLE_IF(value > 0x3ffff); UNRECOVERABLE_IF(value > 0x3ffff + 1); // patched
TheStructure.Common.DestinationPitch = value - 1; TheStructure.Common.DestinationPitch = value - 1;
} }
inline uint32_t getDestinationPitch() const { inline uint32_t getDestinationPitch() const {

8
shared/source/helpers/blit_commands_helper_base.inl
View File

@@ -264,6 +264,7 @@ void BlitCommandsHelper<GfxFamily>::dispatchBlitMemoryFill(const BlitProperties
const auto maxHeight = getMaxBlitHeight(rootDeviceEnvironment, true); const auto maxHeight = getMaxBlitHeight(rootDeviceEnvironment, true);
auto colorDepth = COLOR_DEPTH::COLOR_DEPTH_128_BIT_COLOR; auto colorDepth = COLOR_DEPTH::COLOR_DEPTH_128_BIT_COLOR;
size_t patternSize = 16;
const LookupArray<size_t, COLOR_DEPTH, 4> colorDepthLookup({{ const LookupArray<size_t, COLOR_DEPTH, 4> colorDepthLookup({{
{1, COLOR_DEPTH::COLOR_DEPTH_8_BIT_COLOR}, {1, COLOR_DEPTH::COLOR_DEPTH_8_BIT_COLOR},
@@ -275,12 +276,13 @@ void BlitCommandsHelper<GfxFamily>::dispatchBlitMemoryFill(const BlitProperties
auto colorDepthV = colorDepthLookup.find(blitProperties.fillPatternSize); auto colorDepthV = colorDepthLookup.find(blitProperties.fillPatternSize);
if (colorDepthV.has_value()) { if (colorDepthV.has_value()) {
colorDepth = *colorDepthV; colorDepth = *colorDepthV;
patternSize = blitProperties.fillPatternSize;
} }
blitCmd.setFillColor(blitProperties.fillPattern); blitCmd.setFillColor(blitProperties.fillPattern);
blitCmd.setColorDepth(colorDepth); blitCmd.setColorDepth(colorDepth);
uint64_t sizeToFill = blitProperties.copySize.x / blitProperties.fillPatternSize; uint64_t sizeToFill = blitProperties.copySize.x / patternSize;
uint64_t offset = blitProperties.dstOffset.x; uint64_t offset = blitProperties.dstOffset.x;
while (sizeToFill != 0) { while (sizeToFill != 0) {
auto tmpCmd = blitCmd; auto tmpCmd = blitCmd;
@@ -299,7 +301,7 @@ void BlitCommandsHelper<GfxFamily>::dispatchBlitMemoryFill(const BlitProperties
} }
tmpCmd.setDestinationX2CoordinateRight(static_cast<uint32_t>(width)); tmpCmd.setDestinationX2CoordinateRight(static_cast<uint32_t>(width));
tmpCmd.setDestinationY2CoordinateBottom(static_cast<uint32_t>(height)); tmpCmd.setDestinationY2CoordinateBottom(static_cast<uint32_t>(height));
tmpCmd.setDestinationPitch(static_cast<uint32_t>(width * blitProperties.fillPatternSize)); tmpCmd.setDestinationPitch(static_cast<uint32_t>(width * patternSize));
appendBlitMemoryOptionsForFillBuffer(blitProperties.dstAllocation, tmpCmd, rootDeviceEnvironment); appendBlitMemoryOptionsForFillBuffer(blitProperties.dstAllocation, tmpCmd, rootDeviceEnvironment);
appendBlitFillCommand(blitProperties, tmpCmd); appendBlitFillCommand(blitProperties, tmpCmd);
@@ -307,7 +309,7 @@ void BlitCommandsHelper<GfxFamily>::dispatchBlitMemoryFill(const BlitProperties
auto cmd = linearStream.getSpaceForCmd<XY_COLOR_BLT>(); auto cmd = linearStream.getSpaceForCmd<XY_COLOR_BLT>();
*cmd = tmpCmd; *cmd = tmpCmd;
auto blitSize = width * height; auto blitSize = width * height;
offset += (blitSize * blitProperties.fillPatternSize); offset += (blitSize * patternSize);
sizeToFill -= blitSize; sizeToFill -= blitSize;
} }
} }

27
shared/test/unit_test/helpers/blit_commands_helper_tests.cpp
View File

@@ -264,6 +264,33 @@ HWTEST_F(BlitTests, givenMemoryWhenFillPatternWithBlitThenCommandIsProgrammed) {
EXPECT_NE(cmdList.end(), itor); EXPECT_NE(cmdList.end(), itor);
} }
HWTEST_F(BlitTests, givenUnalignedPatternSizeWhenDispatchingBlitFillThenSetCorrectColorDepth) {
using XY_COLOR_BLT = typename FamilyType::XY_COLOR_BLT;
uint32_t pattern[4] = {1, 0, 0, 0};
uint32_t streamBuffer[100] = {};
LinearStream stream(streamBuffer, sizeof(streamBuffer));
MockGraphicsAllocation mockAllocation(0, 1u /*num gmms*/, AllocationType::internalHostMemory,
reinterpret_cast<void *>(0x1234), 0x1000, 0, sizeof(uint32_t),
MemoryPool::system4KBPages, MemoryManager::maxOsContextCount);
size_t copySize = 0x800'0000;
auto blitProperties = BlitProperties::constructPropertiesForMemoryFill(&mockAllocation, copySize, pattern, 3, 0);
BlitCommandsHelper<FamilyType>::dispatchBlitMemoryColorFill(blitProperties, stream, pDevice->getRootDeviceEnvironmentRef());
GenCmdList cmdList;
ASSERT_TRUE(FamilyType::Parse::parseCommandBuffer(cmdList, stream.getCpuBase(), stream.getUsed()));
auto itor = find<XY_COLOR_BLT *>(cmdList.begin(), cmdList.end());
ASSERT_NE(cmdList.end(), itor);
auto cmd = genCmdCast<XY_COLOR_BLT *>(*itor);
EXPECT_EQ(cmd->getColorDepth(), XY_COLOR_BLT::COLOR_DEPTH::COLOR_DEPTH_128_BIT_COLOR);
EXPECT_EQ(cmd->getDestinationX2CoordinateRight(), 0x4000u);
EXPECT_EQ(cmd->getDestinationY2CoordinateBottom(), 0x200u);
EXPECT_EQ(cmd->getDestinationPitch(), 0x4000u * 16u);
}
HWTEST_F(BlitTests, givenMemorySizeBiggerThanMaxWidthButLessThanTwiceMaxWidthWhenFillPatternWithBlitThenHeightIsOne) { HWTEST_F(BlitTests, givenMemorySizeBiggerThanMaxWidthButLessThanTwiceMaxWidthWhenFillPatternWithBlitThenHeightIsOne) {
using XY_COLOR_BLT = typename FamilyType::XY_COLOR_BLT; using XY_COLOR_BLT = typename FamilyType::XY_COLOR_BLT;
uint32_t pattern[4] = {1, 0, 0, 0}; uint32_t pattern[4] = {1, 0, 0, 0};