intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2026-01-04 07:14:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Unify blitter copy property construction methods

Browse Source 
Signed-off-by: Bellekallu Rajkiran <bellekallu.rajkiran@intel.com>
This commit is contained in:
Bellekallu Rajkiran
2025-09-10 10:38:34 +00:00
committed by Compute-Runtime-Automation
parent 6b70b2ba1f
commit dfe623da1f
23 changed files with 344 additions and 374 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
opencl/source/helpers/cl_blit_properties.h
View File

@@ -43,13 +43,14 @@ struct ClBlitProperties {
srcOffset += ptrDiff(builtinOpParams.srcPtr, srcAllocation->getGpuAddress());
}
blitProperties = BlitProperties::constructPropertiesForCopy(dstAllocation,
srcAllocation,
{dstOffset, builtinOpParams.dstOffset.y, builtinOpParams.dstOffset.z},
{srcOffset, builtinOpParams.srcOffset.y, builtinOpParams.srcOffset.z},
builtinOpParams.size,
builtinOpParams.srcRowPitch, builtinOpParams.srcSlicePitch,
builtinOpParams.dstRowPitch, builtinOpParams.dstSlicePitch, clearColorAllocation);
blitProperties = BlitProperties::constructPropertiesForCopy(
dstAllocation, 0,
srcAllocation, 0,
{dstOffset, builtinOpParams.dstOffset.y, builtinOpParams.dstOffset.z},
{srcOffset, builtinOpParams.srcOffset.y, builtinOpParams.srcOffset.z},
builtinOpParams.size,
builtinOpParams.srcRowPitch, builtinOpParams.srcSlicePitch,
builtinOpParams.dstRowPitch, builtinOpParams.dstSlicePitch, clearColorAllocation);
if (BlitterConstants::BlitDirection::imageToImage == blitDirection) {
blitProperties.blitDirection = blitDirection;
setBlitPropertiesForImage(blitProperties, builtinOpParams);

72
opencl/test/unit_test/aub_tests/command_stream/copy_engine_aub_tests_xehp_and_later.h
View File

@@ -185,19 +185,22 @@ void CopyEngineXeHPAndLater<numTiles, testLocalMemory>::givenNotCompressedBuffer
auto dstResolvedBuffer = createBuffer(false, testLocalMemory, nullptr);
// Buffer to Buffer - uncompressed HBM -> compressed HBM
auto blitProperties = BlitProperties::constructPropertiesForCopy(dstCompressedBuffer->getGraphicsAllocation(rootDeviceIndex),
srcNotCompressedBuffer->getGraphicsAllocation(rootDeviceIndex),
{dstCompressedBuffer->getOffset(), 0, 0}, {srcNotCompressedBuffer->getOffset(), 0, 0}, {bufferSize, 1, 1}, 0, 0, 0, 0, bcsCsr->getClearColorAllocation());
auto blitProperties = BlitProperties::constructPropertiesForCopy(
dstCompressedBuffer->getGraphicsAllocation(rootDeviceIndex), 0,
srcNotCompressedBuffer->getGraphicsAllocation(rootDeviceIndex), 0,
{dstCompressedBuffer->getOffset(), 0, 0}, {srcNotCompressedBuffer->getOffset(), 0, 0}, {bufferSize, 1, 1}, 0, 0, 0, 0, bcsCsr->getClearColorAllocation());
executeBlitCommand(blitProperties, true);
// Buffer to Buffer - uncompressed HBM -> uncompressed HBM
blitProperties = BlitProperties::constructPropertiesForCopy(dstNotCompressedBuffer->getGraphicsAllocation(rootDeviceIndex),
srcNotCompressedBuffer->getGraphicsAllocation(rootDeviceIndex),
{dstNotCompressedBuffer->getOffset(), 0, 0}, {srcNotCompressedBuffer->getOffset(), 0, 0}, {bufferSize, 1, 1}, 0, 0, 0, 0, bcsCsr->getClearColorAllocation());
blitProperties = BlitProperties::constructPropertiesForCopy(
dstNotCompressedBuffer->getGraphicsAllocation(rootDeviceIndex), 0,
srcNotCompressedBuffer->getGraphicsAllocation(rootDeviceIndex), 0,
{dstNotCompressedBuffer->getOffset(), 0, 0}, {srcNotCompressedBuffer->getOffset(), 0, 0}, {bufferSize, 1, 1}, 0, 0, 0, 0, bcsCsr->getClearColorAllocation());
executeBlitCommand(blitProperties, true);
// Buffer to Buffer - compressed HBM -> uncompressed HBM
blitProperties = BlitProperties::constructPropertiesForCopy(dstResolvedBuffer->getGraphicsAllocation(rootDeviceIndex),
dstCompressedBuffer->getGraphicsAllocation(rootDeviceIndex),
{dstResolvedBuffer->getOffset(), 0, 0}, {dstCompressedBuffer->getOffset(), 0, 0}, {bufferSize, 1, 1}, 0, 0, 0, 0, bcsCsr->getClearColorAllocation());
blitProperties = BlitProperties::constructPropertiesForCopy(
dstResolvedBuffer->getGraphicsAllocation(rootDeviceIndex), 0,
dstCompressedBuffer->getGraphicsAllocation(rootDeviceIndex), 0,
{dstResolvedBuffer->getOffset(), 0, 0}, {dstCompressedBuffer->getOffset(), 0, 0}, {bufferSize, 1, 1}, 0, 0, 0, 0, bcsCsr->getClearColorAllocation());
executeBlitCommand(blitProperties, true);
blitProperties = BlitProperties::constructPropertiesForReadWrite(BlitterConstants::BlitDirection::bufferToHostPtr, *bcsCsr,
@@ -354,9 +357,10 @@ void CopyEngineXeHPAndLater<numTiles, testLocalMemory>::givenOffsetsWhenBltExecu
auto srcBuffer = createBuffer(false, testLocalMemory, writePattern.get());
auto dstBuffer = createBuffer(false, testLocalMemory, nullptr);
auto blitProperties = BlitProperties::constructPropertiesForCopy(dstBuffer->getGraphicsAllocation(rootDeviceIndex),
srcBuffer->getGraphicsAllocation(rootDeviceIndex),
{offset + dstBuffer->getOffset(), 0, 0}, {srcBuffer->getOffset(), 0, 0}, {copiedSize, 1, 1}, 0, 0, 0, 0, bcsCsr->getClearColorAllocation());
auto blitProperties = BlitProperties::constructPropertiesForCopy(
dstBuffer->getGraphicsAllocation(rootDeviceIndex), 0,
srcBuffer->getGraphicsAllocation(rootDeviceIndex), 0,
{offset + dstBuffer->getOffset(), 0, 0}, {srcBuffer->getOffset(), 0, 0}, {copiedSize, 1, 1}, 0, 0, 0, 0, bcsCsr->getClearColorAllocation());
executeBlitCommand(blitProperties, true);
@@ -383,9 +387,10 @@ void CopyEngineXeHPAndLater<numTiles, testLocalMemory>::givenSrcCompressedBuffer
auto dstBuffer = createBuffer(true, testLocalMemory, nullptr);
// Buffer to Buffer - compressed HBM -> compressed HBM
blitProperties = BlitProperties::constructPropertiesForCopy(dstBuffer->getGraphicsAllocation(rootDeviceIndex),
srcBuffer->getGraphicsAllocation(rootDeviceIndex),
0, 0, {bufferSize, 1, 1}, 0, 0, 0, 0, bcsCsr->getClearColorAllocation());
blitProperties = BlitProperties::constructPropertiesForCopy(
dstBuffer->getGraphicsAllocation(rootDeviceIndex), 0,
srcBuffer->getGraphicsAllocation(rootDeviceIndex), 0,
0, 0, {bufferSize, 1, 1}, 0, 0, 0, 0, bcsCsr->getClearColorAllocation());
executeBlitCommand(blitProperties, true);
@@ -447,9 +452,10 @@ void CopyEngineXeHPAndLater<numTiles, testLocalMemory>::givenSrcSystemBufferWhen
auto dstBuffer = createBuffer(false, false, nullptr);
// Buffer to Buffer - System -> System
auto blitProperties = BlitProperties::constructPropertiesForCopy(dstBuffer->getGraphicsAllocation(rootDeviceIndex),
srcBuffer->getGraphicsAllocation(rootDeviceIndex),
0, 0, {bufferSize, 1, 1}, 0, 0, 0, 0, bcsCsr->getClearColorAllocation());
auto blitProperties = BlitProperties::constructPropertiesForCopy(
dstBuffer->getGraphicsAllocation(rootDeviceIndex), 0,
srcBuffer->getGraphicsAllocation(rootDeviceIndex), 0,
0, 0, {bufferSize, 1, 1}, 0, 0, 0, 0, bcsCsr->getClearColorAllocation());
executeBlitCommand(blitProperties, true);
@@ -598,16 +604,11 @@ void CopyEngineXeHPAndLater<numTiles, testLocalMemory>::givenCopyBufferRectWithO
size_t dstSlicePitch = dstRowPitch * region[1];
auto copySize = region[0] * region[1] * region[2];
auto blitProperties = BlitProperties::constructPropertiesForCopy(dstBuffer->getGraphicsAllocation(rootDeviceIndex), // dstAllocation
srcBuffer->getGraphicsAllocation(rootDeviceIndex), // srcAllocation
dstOrigin, // dstOffset
srcOrigin, // srcOffset
region, // copySize
srcRowPitch, // srcRowPitch
srcSlicePitch, // srcSlicePitch
dstRowPitch, // dstRowPitch
dstSlicePitch, // dstSlicePitch
clearColorAllocation); // clearColorAllocation
auto blitProperties = BlitProperties::constructPropertiesForCopy(
dstBuffer->getGraphicsAllocation(rootDeviceIndex), 0,
srcBuffer->getGraphicsAllocation(rootDeviceIndex), 0,
dstOrigin, srcOrigin, region,
srcRowPitch, srcSlicePitch, dstRowPitch, dstSlicePitch, clearColorAllocation);
executeBlitCommand(blitProperties, false);
@@ -649,16 +650,11 @@ void CopyEngineXeHPAndLater<numTiles, testLocalMemory>::givenCopyBufferRectWithB
size_t dstSlicePitch = dstRowPitch * region[1];
auto copySize = region[0] * region[1] * region[2];
auto blitProperties = BlitProperties::constructPropertiesForCopy(dstBuffer->getGraphicsAllocation(rootDeviceIndex), // dstAllocation
srcBuffer->getGraphicsAllocation(rootDeviceIndex), // srcAllocation
dstOrigin, // dstOffset
srcOrigin, // srcOffset
region, // copySize
srcRowPitch, // srcRowPitch
srcSlicePitch, // srcSlicePitch
dstRowPitch, // dstRowPitch
dstSlicePitch, // dstSlicePitch
clearColorAllocation); // clearColorAllocation
auto blitProperties = BlitProperties::constructPropertiesForCopy(
dstBuffer->getGraphicsAllocation(rootDeviceIndex), 0,
srcBuffer->getGraphicsAllocation(rootDeviceIndex), 0,
dstOrigin, srcOrigin, region,
srcRowPitch, srcSlicePitch, dstRowPitch, dstSlicePitch, clearColorAllocation);
executeBlitCommand(blitProperties, false);
bcsCsr->waitForTaskCountWithKmdNotifyFallback(0, 0, false, QueueThrottle::MEDIUM);

23
opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_2_tests.cpp
View File

@@ -1253,17 +1253,10 @@ HWTEST_TEMPLATED_F(CommandStreamReceiverFlushTaskTestsWithMockCsrHw2, givenPageT
EXPECT_FALSE(bcsCsr->pageTableManagerInitialized);
EXPECT_FALSE(bcsCsr2->pageTableManagerInitialized);
auto blitProperties = BlitProperties::constructPropertiesForCopy(graphicsAllocation, // dstAllocation
graphicsAllocation, // srcAllocation
0, // dstOffset
0, // srcOffset
0, // copySize
0, // srcRowPitch
0, // srcSlicePitch
0, // dstRowPitch
0, // dstSlicePitch
bcsCsr->getClearColorAllocation() // clearColorAllocation
);
auto blitProperties = BlitProperties::constructPropertiesForCopy(
graphicsAllocation, 0,
graphicsAllocation, 0,
0, 0, 0, 0, 0, 0, 0, bcsCsr->getClearColorAllocation());
BlitPropertiesContainer container;
container.push_back(blitProperties);
@@ -1297,8 +1290,8 @@ HWTEST_TEMPLATED_F(CommandStreamReceiverFlushTaskTestsWithMockCsrHw2, givenPageT
EXPECT_FALSE(bcsCsr->pageTableManagerInitialized);
auto blitProperties = BlitProperties::constructPropertiesForCopy(graphicsAllocation, // dstAllocation
graphicsAllocation, // srcAllocation
auto blitProperties = BlitProperties::constructPropertiesForCopy(graphicsAllocation, 0, // dstAllocation
graphicsAllocation, 0, // srcAllocation
0, // dstOffset
0, // srcOffset
0, // copySize
@@ -1337,8 +1330,8 @@ HWTEST_TEMPLATED_F(CommandStreamReceiverFlushTaskTestsWithMockCsrHw2, givenNullP
EXPECT_FALSE(bcsCsr->pageTableManagerInitialized);
EXPECT_FALSE(bcsCsr2->pageTableManagerInitialized);
auto blitProperties = BlitProperties::constructPropertiesForCopy(graphicsAllocation, // dstAllocation
graphicsAllocation, // srcAllocation
auto blitProperties = BlitProperties::constructPropertiesForCopy(graphicsAllocation, 0, // dstAllocation
graphicsAllocation, 0, // srcAllocation
0, // dstOffset
0, // srcOffset
0, // copySize

16
opencl/test/unit_test/command_stream/command_stream_receiver_hw_1_tests.cpp
View File

@@ -1611,17 +1611,11 @@ HWTEST_P(BcsDetaliedTestsWithParams, givenBltSizeWithLeftoverWhenDispatchedThenP
size_t buffer2SlicePitch = std::get<0>(GetParam()).srcSlicePitch;
auto allocation = buffer1->getGraphicsAllocation(pDevice->getRootDeviceIndex());
auto blitProperties = BlitProperties::constructPropertiesForCopy(allocation, // dstAllocation
allocation, // srcAllocation
buffer1Offset, // dstOffset
buffer2Offset, // srcOffset
bltSize, // copySize
buffer1RowPitch, // srcRowPitch
buffer1SlicePitch, // srcSlicePitch
buffer2RowPitch, // dstRowPitch
buffer2SlicePitch, // dstSlicePitch
csr.getClearColorAllocation() // clearColorAllocation
);
auto blitProperties = BlitProperties::constructPropertiesForCopy(
allocation, 0,
allocation, 0,
buffer1Offset, buffer2Offset, bltSize,
buffer1RowPitch, buffer1SlicePitch, buffer2RowPitch, buffer2SlicePitch, csr.getClearColorAllocation());
flushBcsTask(&csr, blitProperties, true, *pDevice);
HardwareParse hwParser;

8
opencl/test/unit_test/command_stream/command_stream_receiver_hw_2_tests.cpp
View File

@@ -1172,8 +1172,8 @@ HWTEST_F(BcsTests, givenBufferWhenBlitOperationCalledThenProgramCorrectGpuAddres
// Buffer to Buffer
HardwareParse hwParser;
auto offset = csr.commandStream.getUsed();
auto blitProperties = BlitProperties::constructPropertiesForCopy(graphicsAllocation1,
graphicsAllocation2, 0, 0, copySize, 0, 0, 0, 0, csr.getClearColorAllocation());
auto blitProperties = BlitProperties::constructPropertiesForCopy(graphicsAllocation1, 0,
graphicsAllocation2, 0, 0, 0, copySize, 0, 0, 0, 0, csr.getClearColorAllocation());
flushBcsTask(&csr, blitProperties, true, *pDevice);
@@ -1584,8 +1584,8 @@ HWTEST_F(BcsTests, givenBufferWithOffsetWhenBlitOperationCalledThenProgramCorrec
// Buffer to Buffer
HardwareParse hwParser;
auto offset = csr.commandStream.getUsed();
auto blitProperties = BlitProperties::constructPropertiesForCopy(graphicsAllocation1,
graphicsAllocation2,
auto blitProperties = BlitProperties::constructPropertiesForCopy(graphicsAllocation1, 0,
graphicsAllocation2, 0,
{buffer1Offset, 0, 0}, {buffer2Offset, 0, 0}, copySize, 0, 0, 0, 0, csr.getClearColorAllocation());
flushBcsTask(&csr, blitProperties, true, *pDevice);

4
opencl/test/unit_test/command_stream/command_stream_receiver_hw_3_tests.cpp
View File

@@ -196,8 +196,8 @@ HWTEST_F(BcsTests, givenBlitBufferCalledWhenClearColorAllocationIseSetThenItIsMa
csr.storeMakeResidentAllocations = true;
Vec3<size_t> copySize = {1, 1, 1};
auto blitProperties = BlitProperties::constructPropertiesForCopy(&graphicsAllocation1,
&graphicsAllocation2, 0, 0, copySize, 0, 0, 0, 0, &clearColorAllocation);
auto blitProperties = BlitProperties::constructPropertiesForCopy(&graphicsAllocation1, 0,
&graphicsAllocation2, 0, 0, 0, copySize, 0, 0, 0, 0, &clearColorAllocation);
flushBcsTask(&csr, blitProperties, false, *pDevice);
auto iter = csr.makeResidentAllocations.find(&clearColorAllocation);
ASSERT_NE(iter, csr.makeResidentAllocations.end());

72
opencl/test/unit_test/xe2_hpg_core/command_stream_receiver_hw_tests_xe2_hpg_core.cpp
View File

@@ -592,8 +592,10 @@ XE2_HPG_CORETEST_F(Xe2BcsTests, givenBufferInDeviceMemoryWhenStatelessCompressio
auto allocation = buffer->getGraphicsAllocation(pClDevice->getRootDeviceIndex());
EXPECT_TRUE(!MemoryPoolHelper::isSystemMemoryPool(allocation->getMemoryPool()));
auto blitProperties = BlitProperties::constructPropertiesForCopy(allocation, allocation,
0, 0, {BlitterConstants::maxBlitWidth - 1, 1, 1}, 0, 0, 0, 0, &clearColorAlloc);
auto blitProperties = BlitProperties::constructPropertiesForCopy(
allocation, 0,
allocation, 0,
0, 0, {BlitterConstants::maxBlitWidth - 1, 1, 1}, 0, 0, 0, 0, &clearColorAlloc);
auto bltCmd = stream.getSpaceForCmd<MEM_COPY>();
*bltCmd = Xe2HpgCoreFamily::cmdInitXyCopyBlt;
@@ -622,8 +624,10 @@ XE2_HPG_CORETEST_F(Xe2BcsTests, givenDstBufferInDeviceAndSrcInSystemMemoryWhenSt
EXPECT_FALSE(MemoryPoolHelper::isSystemMemoryPool(allocationDst->getMemoryPool()));
EXPECT_TRUE(MemoryPoolHelper::isSystemMemoryPool(allocationSrc->getMemoryPool()));
auto blitProperties = BlitProperties::constructPropertiesForCopy(allocationDst, allocationSrc,
0, 0, {BlitterConstants::maxBlitWidth - 1, 1, 1}, 0, 0, 0, 0, &clearColorAlloc);
auto blitProperties = BlitProperties::constructPropertiesForCopy(
allocationDst, 0,
allocationSrc, 0,
0, 0, {BlitterConstants::maxBlitWidth - 1, 1, 1}, 0, 0, 0, 0, &clearColorAlloc);
auto bltCmd = stream.getSpaceForCmd<MEM_COPY>();
*bltCmd = Xe2HpgCoreFamily::cmdInitXyCopyBlt;
@@ -654,8 +658,10 @@ XE2_HPG_CORETEST_F(Xe2BcsTests, givenCompressibleDstBuffersWhenAppendBlitCommand
auto dstAllocation = dstBuffer->getGraphicsAllocation(pClDevice->getRootDeviceIndex());
EXPECT_TRUE(dstAllocation->getDefaultGmm()->isCompressionEnabled());
auto blitProperties = BlitProperties::constructPropertiesForCopy(dstAllocation, srcAllocation, 0, 0,
{BlitterConstants::maxBlitWidth - 1, 1, 1}, 0, 0, 0, 0, &clearColorAlloc);
auto blitProperties = BlitProperties::constructPropertiesForCopy(
dstAllocation, 0,
srcAllocation, 0,
0, 0, {BlitterConstants::maxBlitWidth - 1, 1, 1}, 0, 0, 0, 0, &clearColorAlloc);
auto bltCmd = stream.getSpaceForCmd<MEM_COPY>();
*bltCmd = FamilyType::cmdInitXyCopyBlt;
@@ -687,8 +693,10 @@ XE2_HPG_CORETEST_F(Xe2BcsTests, givenCompressibleSrcBuffersWhenAppendBlitCommand
auto dstAllocation = dstBuffer->getGraphicsAllocation(pClDevice->getRootDeviceIndex());
dstAllocation->getDefaultGmm()->setCompressionEnabled(false);
auto blitProperties = BlitProperties::constructPropertiesForCopy(dstAllocation, srcAllocation, 0, 0,
{BlitterConstants::maxBlitWidth - 1, 1, 1}, 0, 0, 0, 0, &clearColorAlloc);
auto blitProperties = BlitProperties::constructPropertiesForCopy(
dstAllocation, 0,
srcAllocation, 0,
0, 0, {BlitterConstants::maxBlitWidth - 1, 1, 1}, 0, 0, 0, 0, &clearColorAlloc);
auto bltCmd = stream.getSpaceForCmd<MEM_COPY>();
*bltCmd = FamilyType::cmdInitXyCopyBlt;
@@ -720,8 +728,10 @@ XE2_HPG_CORETEST_F(Xe2BcsTests, givenCompressibleSrcBuffersWhenAppendBlitCommand
auto dstAllocation = dstBuffer->getGraphicsAllocation(pClDevice->getRootDeviceIndex());
dstAllocation->getDefaultGmm()->setCompressionEnabled(false);
auto blitProperties = BlitProperties::constructPropertiesForCopy(dstAllocation, srcAllocation, 0, 0,
{BlitterConstants::maxBlitWidth - 1, 1, 1}, 0, 0, 0, 0, &clearColorAlloc);
auto blitProperties = BlitProperties::constructPropertiesForCopy(
dstAllocation, 0,
srcAllocation, 0,
0, 0, {BlitterConstants::maxBlitWidth - 1, 1, 1}, 0, 0, 0, 0, &clearColorAlloc);
auto bltCmd = stream.getSpaceForCmd<XY_BLOCK_COPY_BLT>();
*bltCmd = FamilyType::cmdInitXyBlockCopyBlt;
bltCmd->setDestinationX2CoordinateRight(1);
@@ -756,8 +766,10 @@ XE2_HPG_CORETEST_F(Xe2BcsTests, givenCompressibleDstBuffersWhenAppendBlitCommand
auto dstAllocation = dstBuffer->getGraphicsAllocation(pClDevice->getRootDeviceIndex());
EXPECT_TRUE(dstAllocation->getDefaultGmm()->isCompressionEnabled());
auto blitProperties = BlitProperties::constructPropertiesForCopy(dstAllocation, srcAllocation, 0, 0,
{BlitterConstants::maxBlitWidth - 1, 1, 1}, 0, 0, 0, 0, &clearColorAlloc);
auto blitProperties = BlitProperties::constructPropertiesForCopy(
dstAllocation, 0,
srcAllocation, 0,
0, 0, {BlitterConstants::maxBlitWidth - 1, 1, 1}, 0, 0, 0, 0, &clearColorAlloc);
auto bltCmd = stream.getSpaceForCmd<XY_BLOCK_COPY_BLT>();
*bltCmd = FamilyType::cmdInitXyBlockCopyBlt;
bltCmd->setDestinationX2CoordinateRight(1);
@@ -786,8 +798,10 @@ XE2_HPG_CORETEST_F(Xe2BcsTests, givenCompressibleBuffersWhenBufferCompressionFor
auto allocation = buffer->getGraphicsAllocation(pClDevice->getRootDeviceIndex());
EXPECT_TRUE(allocation->getDefaultGmm()->isCompressionEnabled());
auto blitProperties = BlitProperties::constructPropertiesForCopy(allocation, allocation, 0, 0,
{BlitterConstants::maxBlitWidth - 1, 1, 1}, 0, 0, 0, 0, &clearColorAlloc);
auto blitProperties = BlitProperties::constructPropertiesForCopy(
allocation, 0,
allocation, 0,
0, 0, {BlitterConstants::maxBlitWidth - 1, 1, 1}, 0, 0, 0, 0, &clearColorAlloc);
auto bltCmd = stream.getSpaceForCmd<XY_BLOCK_COPY_BLT>();
*bltCmd = FamilyType::cmdInitXyBlockCopyBlt;
bltCmd->setDestinationX2CoordinateRight(1);
@@ -817,8 +831,10 @@ XE2_HPG_CORETEST_F(Xe2BcsTests, givenNotCompressibleBuffersWhenBufferCompression
auto allocation = buffer->getGraphicsAllocation(pClDevice->getRootDeviceIndex());
allocation->getDefaultGmm()->setCompressionEnabled(false);
auto blitProperties = BlitProperties::constructPropertiesForCopy(allocation, allocation, 0, 0,
{BlitterConstants::maxBlitWidth - 1, 1, 1}, 0, 0, 0, 0, &clearColorAlloc);
auto blitProperties = BlitProperties::constructPropertiesForCopy(
allocation, 0,
allocation, 0,
0, 0, {BlitterConstants::maxBlitWidth - 1, 1, 1}, 0, 0, 0, 0, &clearColorAlloc);
auto bltCmd = stream.getSpaceForCmd<XY_BLOCK_COPY_BLT>();
*bltCmd = FamilyType::cmdInitXyBlockCopyBlt;
bltCmd->setDestinationX2CoordinateRight(1);
@@ -847,8 +863,10 @@ XE2_HPG_CORETEST_F(Xe2BcsTests, givenOverriddenBlitterTargetToZeroWhenAppendBlit
auto allocation = buffer->getGraphicsAllocation(pClDevice->getRootDeviceIndex());
auto blitProperties = BlitProperties::constructPropertiesForCopy(allocation, allocation, 0, 0,
{BlitterConstants::maxBlitWidth - 1, 1, 1}, 0, 0, 0, 0, &clearColorAlloc);
auto blitProperties = BlitProperties::constructPropertiesForCopy(
allocation, 0,
allocation, 0,
0, 0, {BlitterConstants::maxBlitWidth - 1, 1, 1}, 0, 0, 0, 0, &clearColorAlloc);
auto bltCmd = stream.getSpaceForCmd<XY_BLOCK_COPY_BLT>();
*bltCmd = FamilyType::cmdInitXyBlockCopyBlt;
bltCmd->setDestinationX2CoordinateRight(1);
@@ -874,8 +892,10 @@ XE2_HPG_CORETEST_F(Xe2BcsTests, givenOverriddenBlitterTargetToOneWhenAppendBlitC
auto allocation = buffer->getGraphicsAllocation(pClDevice->getRootDeviceIndex());
auto blitProperties = BlitProperties::constructPropertiesForCopy(allocation, allocation, 0, 0,
{BlitterConstants::maxBlitWidth - 1, 1, 1}, 0, 0, 0, 0, &clearColorAlloc);
auto blitProperties = BlitProperties::constructPropertiesForCopy(
allocation, 0,
allocation, 0,
0, 0, {BlitterConstants::maxBlitWidth - 1, 1, 1}, 0, 0, 0, 0, &clearColorAlloc);
auto bltCmd = stream.getSpaceForCmd<XY_BLOCK_COPY_BLT>();
*bltCmd = FamilyType::cmdInitXyBlockCopyBlt;
bltCmd->setDestinationX2CoordinateRight(1);
@@ -901,8 +921,10 @@ XE2_HPG_CORETEST_F(Xe2BcsTests, givenOverriddenBlitterTargetToTwoWhenAppendBlitC
auto allocation = buffer->getGraphicsAllocation(pClDevice->getRootDeviceIndex());
auto blitProperties = BlitProperties::constructPropertiesForCopy(allocation, allocation, 0, 0,
{BlitterConstants::maxBlitWidth - 1, 1, 1}, 0, 0, 0, 0, &clearColorAlloc);
auto blitProperties = BlitProperties::constructPropertiesForCopy(
allocation, 0,
allocation, 0,
0, 0, {BlitterConstants::maxBlitWidth - 1, 1, 1}, 0, 0, 0, 0, &clearColorAlloc);
auto bltCmd = stream.getSpaceForCmd<XY_BLOCK_COPY_BLT>();
*bltCmd = FamilyType::cmdInitXyBlockCopyBlt;
bltCmd->setDestinationX2CoordinateRight(1);
@@ -926,8 +948,10 @@ XE2_HPG_CORETEST_F(Xe2BcsTests, givenOverriddenMocksValueWhenAppendBlitCommandsB
auto allocation = buffer->getGraphicsAllocation(pClDevice->getRootDeviceIndex());
auto blitProperties = BlitProperties::constructPropertiesForCopy(allocation, allocation, 0, 0,
{BlitterConstants::maxBlitWidth - 1, 1, 1}, 0, 0, 0, 0, &clearColorAlloc);
auto blitProperties = BlitProperties::constructPropertiesForCopy(
allocation, 0,
allocation, 0,
0, 0, {BlitterConstants::maxBlitWidth - 1, 1, 1}, 0, 0, 0, 0, &clearColorAlloc);
auto bltCmd = stream.getSpaceForCmd<XY_BLOCK_COPY_BLT>();
*bltCmd = FamilyType::cmdInitXyBlockCopyBlt;
bltCmd->setDestinationX2CoordinateRight(1);

12
opencl/test/unit_test/xe2_hpg_core/copy_engine_tests_xe2_hpg_core.cpp
View File

@@ -59,8 +59,8 @@ XE2_HPG_CORETEST_F(BlitXe2HpgCoreTests, givenBufferWhenProgrammingBltCommandThen
cl_int retVal = CL_SUCCESS;
auto buffer = clUniquePtr<Buffer>(Buffer::create(&context, CL_MEM_READ_WRITE, 1, nullptr, retVal));
auto blitProperties = BlitProperties::constructPropertiesForCopy(buffer->getGraphicsAllocation(clDevice->getRootDeviceIndex()),
buffer->getGraphicsAllocation(clDevice->getRootDeviceIndex()),
auto blitProperties = BlitProperties::constructPropertiesForCopy(buffer->getGraphicsAllocation(clDevice->getRootDeviceIndex()), 0,
buffer->getGraphicsAllocation(clDevice->getRootDeviceIndex()), 0,
0, 0, {1, 1, 1}, 0, 0, 0, 0, &clearColorAlloc);
flushBcsTask(csr, blitProperties, true, clDevice->getDevice());
@@ -96,8 +96,8 @@ XE2_HPG_CORETEST_F(BlitXe2HpgCoreTests, givenBufferWhenProgrammingBltCommandThen
cl_int retVal = CL_SUCCESS;
auto buffer = clUniquePtr<Buffer>(Buffer::create(&context, CL_MEM_READ_WRITE, 1, nullptr, retVal));
auto blitProperties = BlitProperties::constructPropertiesForCopy(buffer->getGraphicsAllocation(clDevice->getRootDeviceIndex()),
buffer->getGraphicsAllocation(clDevice->getRootDeviceIndex()),
auto blitProperties = BlitProperties::constructPropertiesForCopy(buffer->getGraphicsAllocation(clDevice->getRootDeviceIndex()), 0,
buffer->getGraphicsAllocation(clDevice->getRootDeviceIndex()), 0,
0, 0, {1, 1, 1}, 0, 0, 0, 0, &clearColorAlloc);
flushBcsTask(csr, blitProperties, true, clDevice->getDevice());
@@ -128,7 +128,7 @@ XE2_HPG_CORETEST_F(BlitXe2HpgCoreTests, given2dBlitCommandWhenDispatchingThenSet
size_t offset = 0;
{
// 1D
auto blitProperties = BlitProperties::constructPropertiesForCopy(allocation, allocation,
auto blitProperties = BlitProperties::constructPropertiesForCopy(allocation, 0, allocation, 0,
0, 0, {BlitterConstants::maxBlitWidth - 1, 1, 1}, 0, 0, 0, 0, &clearColorAlloc);
flushBcsTask(csr, blitProperties, false, clDevice->getDevice());
@@ -148,7 +148,7 @@ XE2_HPG_CORETEST_F(BlitXe2HpgCoreTests, given2dBlitCommandWhenDispatchingThenSet
{
// 2D
auto blitProperties = BlitProperties::constructPropertiesForCopy(allocation, allocation,
auto blitProperties = BlitProperties::constructPropertiesForCopy(allocation, 0, allocation, 0,
0, 0, {(2 * BlitterConstants::maxBlitWidth) + 1, 1, 1}, 0, 0, 0, 0, &clearColorAlloc);
flushBcsTask(csr, blitProperties, false, clDevice->getDevice());

72
opencl/test/unit_test/xe3_core/command_stream_receiver_hw_tests_xe3_core.cpp
View File

@@ -363,8 +363,10 @@ XE3_CORETEST_F(Xe3BcsTests, givenBufferInDeviceMemoryWhenStatelessCompressionIsE
auto allocation = buffer->getGraphicsAllocation(pClDevice->getRootDeviceIndex());
EXPECT_TRUE(!MemoryPoolHelper::isSystemMemoryPool(allocation->getMemoryPool()));
auto blitProperties = BlitProperties::constructPropertiesForCopy(allocation, allocation,
0, 0, {BlitterConstants::maxBlitWidth - 1, 1, 1}, 0, 0, 0, 0, &clearColorAlloc);
auto blitProperties = BlitProperties::constructPropertiesForCopy(
allocation, 0,
allocation, 0,
0, 0, {BlitterConstants::maxBlitWidth - 1, 1, 1}, 0, 0, 0, 0, &clearColorAlloc);
auto bltCmd = stream.getSpaceForCmd<MEM_COPY>();
*bltCmd = Xe3CoreFamily::cmdInitXyCopyBlt;
@@ -393,8 +395,10 @@ XE3_CORETEST_F(Xe3BcsTests, givenDstBufferInDeviceAndSrcInSystemMemoryWhenStatel
EXPECT_FALSE(MemoryPoolHelper::isSystemMemoryPool(allocationDst->getMemoryPool()));
EXPECT_TRUE(MemoryPoolHelper::isSystemMemoryPool(allocationSrc->getMemoryPool()));
auto blitProperties = BlitProperties::constructPropertiesForCopy(allocationDst, allocationSrc,
0, 0, {BlitterConstants::maxBlitWidth - 1, 1, 1}, 0, 0, 0, 0, &clearColorAlloc);
auto blitProperties = BlitProperties::constructPropertiesForCopy(
allocationDst, 0,
allocationSrc, 0,
0, 0, {BlitterConstants::maxBlitWidth - 1, 1, 1}, 0, 0, 0, 0, &clearColorAlloc);
auto bltCmd = stream.getSpaceForCmd<MEM_COPY>();
*bltCmd = Xe3CoreFamily::cmdInitXyCopyBlt;
@@ -425,8 +429,10 @@ XE3_CORETEST_F(Xe3BcsTests, givenCompressibleDstBuffersWhenAppendBlitCommandsFor
auto dstAllocation = dstBuffer->getGraphicsAllocation(pClDevice->getRootDeviceIndex());
EXPECT_TRUE(dstAllocation->getDefaultGmm()->isCompressionEnabled());
auto blitProperties = BlitProperties::constructPropertiesForCopy(dstAllocation, srcAllocation, 0, 0,
{BlitterConstants::maxBlitWidth - 1, 1, 1}, 0, 0, 0, 0, &clearColorAlloc);
auto blitProperties = BlitProperties::constructPropertiesForCopy(
dstAllocation, 0,
srcAllocation, 0,
0, 0, {BlitterConstants::maxBlitWidth - 1, 1, 1}, 0, 0, 0, 0, &clearColorAlloc);
auto bltCmd = stream.getSpaceForCmd<MEM_COPY>();
*bltCmd = FamilyType::cmdInitXyCopyBlt;
@@ -458,8 +464,10 @@ XE3_CORETEST_F(Xe3BcsTests, givenCompressibleSrcBuffersWhenAppendBlitCommandsFor
auto dstAllocation = dstBuffer->getGraphicsAllocation(pClDevice->getRootDeviceIndex());
dstAllocation->getDefaultGmm()->setCompressionEnabled(false);
auto blitProperties = BlitProperties::constructPropertiesForCopy(dstAllocation, srcAllocation, 0, 0,
{BlitterConstants::maxBlitWidth - 1, 1, 1}, 0, 0, 0, 0, &clearColorAlloc);
auto blitProperties = BlitProperties::constructPropertiesForCopy(
dstAllocation, 0,
srcAllocation, 0,
0, 0, {BlitterConstants::maxBlitWidth - 1, 1, 1}, 0, 0, 0, 0, &clearColorAlloc);
auto bltCmd = stream.getSpaceForCmd<MEM_COPY>();
*bltCmd = FamilyType::cmdInitXyCopyBlt;
@@ -491,8 +499,10 @@ XE3_CORETEST_F(Xe3BcsTests, givenCompressibleSrcBuffersWhenAppendBlitCommandsBlo
auto dstAllocation = dstBuffer->getGraphicsAllocation(pClDevice->getRootDeviceIndex());
dstAllocation->getDefaultGmm()->setCompressionEnabled(false);
auto blitProperties = BlitProperties::constructPropertiesForCopy(dstAllocation, srcAllocation, 0, 0,
{BlitterConstants::maxBlitWidth - 1, 1, 1}, 0, 0, 0, 0, &clearColorAlloc);
auto blitProperties = BlitProperties::constructPropertiesForCopy(
dstAllocation, 0,
srcAllocation, 0,
0, 0, {BlitterConstants::maxBlitWidth - 1, 1, 1}, 0, 0, 0, 0, &clearColorAlloc);
auto bltCmd = stream.getSpaceForCmd<XY_BLOCK_COPY_BLT>();
*bltCmd = FamilyType::cmdInitXyBlockCopyBlt;
bltCmd->setDestinationX2CoordinateRight(1);
@@ -527,8 +537,10 @@ XE3_CORETEST_F(Xe3BcsTests, givenCompressibleDstBuffersWhenAppendBlitCommandsBlo
auto dstAllocation = dstBuffer->getGraphicsAllocation(pClDevice->getRootDeviceIndex());
EXPECT_TRUE(dstAllocation->getDefaultGmm()->isCompressionEnabled());
auto blitProperties = BlitProperties::constructPropertiesForCopy(dstAllocation, srcAllocation, 0, 0,
{BlitterConstants::maxBlitWidth - 1, 1, 1}, 0, 0, 0, 0, &clearColorAlloc);
auto blitProperties = BlitProperties::constructPropertiesForCopy(
dstAllocation, 0,
srcAllocation, 0,
0, 0, {BlitterConstants::maxBlitWidth - 1, 1, 1}, 0, 0, 0, 0, &clearColorAlloc);
auto bltCmd = stream.getSpaceForCmd<XY_BLOCK_COPY_BLT>();
*bltCmd = FamilyType::cmdInitXyBlockCopyBlt;
bltCmd->setDestinationX2CoordinateRight(1);
@@ -557,8 +569,10 @@ XE3_CORETEST_F(Xe3BcsTests, givenCompressibleBuffersWhenBufferCompressionFormatI
auto allocation = buffer->getGraphicsAllocation(pClDevice->getRootDeviceIndex());
EXPECT_TRUE(allocation->getDefaultGmm()->isCompressionEnabled());
auto blitProperties = BlitProperties::constructPropertiesForCopy(allocation, allocation, 0, 0,
{BlitterConstants::maxBlitWidth - 1, 1, 1}, 0, 0, 0, 0, &clearColorAlloc);
auto blitProperties = BlitProperties::constructPropertiesForCopy(
allocation, 0,
allocation, 0,
0, 0, {BlitterConstants::maxBlitWidth - 1, 1, 1}, 0, 0, 0, 0, &clearColorAlloc);
auto bltCmd = stream.getSpaceForCmd<XY_BLOCK_COPY_BLT>();
*bltCmd = FamilyType::cmdInitXyBlockCopyBlt;
bltCmd->setDestinationX2CoordinateRight(1);
@@ -588,8 +602,10 @@ XE3_CORETEST_F(Xe3BcsTests, givenNotCompressibleBuffersWhenBufferCompressionForm
auto allocation = buffer->getGraphicsAllocation(pClDevice->getRootDeviceIndex());
allocation->getDefaultGmm()->setCompressionEnabled(false);
auto blitProperties = BlitProperties::constructPropertiesForCopy(allocation, allocation, 0, 0,
{BlitterConstants::maxBlitWidth - 1, 1, 1}, 0, 0, 0, 0, &clearColorAlloc);
auto blitProperties = BlitProperties::constructPropertiesForCopy(
allocation, 0,
allocation, 0,
0, 0, {BlitterConstants::maxBlitWidth - 1, 1, 1}, 0, 0, 0, 0, &clearColorAlloc);
auto bltCmd = stream.getSpaceForCmd<XY_BLOCK_COPY_BLT>();
*bltCmd = FamilyType::cmdInitXyBlockCopyBlt;
bltCmd->setDestinationX2CoordinateRight(1);
@@ -618,8 +634,10 @@ XE3_CORETEST_F(Xe3BcsTests, givenOverriddenBlitterTargetToZeroWhenAppendBlitComm
auto allocation = buffer->getGraphicsAllocation(pClDevice->getRootDeviceIndex());
auto blitProperties = BlitProperties::constructPropertiesForCopy(allocation, allocation, 0, 0,
{BlitterConstants::maxBlitWidth - 1, 1, 1}, 0, 0, 0, 0, &clearColorAlloc);
auto blitProperties = BlitProperties::constructPropertiesForCopy(
allocation, 0,
allocation, 0,
0, 0, {BlitterConstants::maxBlitWidth - 1, 1, 1}, 0, 0, 0, 0, &clearColorAlloc);
auto bltCmd = stream.getSpaceForCmd<XY_BLOCK_COPY_BLT>();
*bltCmd = FamilyType::cmdInitXyBlockCopyBlt;
bltCmd->setDestinationX2CoordinateRight(1);
@@ -645,8 +663,10 @@ XE3_CORETEST_F(Xe3BcsTests, givenOverriddenBlitterTargetToOneWhenAppendBlitComma
auto allocation = buffer->getGraphicsAllocation(pClDevice->getRootDeviceIndex());
auto blitProperties = BlitProperties::constructPropertiesForCopy(allocation, allocation, 0, 0,
{BlitterConstants::maxBlitWidth - 1, 1, 1}, 0, 0, 0, 0, &clearColorAlloc);
auto blitProperties = BlitProperties::constructPropertiesForCopy(
allocation, 0,
allocation, 0,
0, 0, {BlitterConstants::maxBlitWidth - 1, 1, 1}, 0, 0, 0, 0, &clearColorAlloc);
auto bltCmd = stream.getSpaceForCmd<XY_BLOCK_COPY_BLT>();
*bltCmd = FamilyType::cmdInitXyBlockCopyBlt;
bltCmd->setDestinationX2CoordinateRight(1);
@@ -672,8 +692,10 @@ XE3_CORETEST_F(Xe3BcsTests, givenOverriddenBlitterTargetToTwoWhenAppendBlitComma
auto allocation = buffer->getGraphicsAllocation(pClDevice->getRootDeviceIndex());
auto blitProperties = BlitProperties::constructPropertiesForCopy(allocation, allocation, 0, 0,
{BlitterConstants::maxBlitWidth - 1, 1, 1}, 0, 0, 0, 0, &clearColorAlloc);
auto blitProperties = BlitProperties::constructPropertiesForCopy(
allocation, 0,
allocation, 0,
0, 0, {BlitterConstants::maxBlitWidth - 1, 1, 1}, 0, 0, 0, 0, &clearColorAlloc);
auto bltCmd = stream.getSpaceForCmd<XY_BLOCK_COPY_BLT>();
*bltCmd = FamilyType::cmdInitXyBlockCopyBlt;
bltCmd->setDestinationX2CoordinateRight(1);
@@ -697,8 +719,10 @@ XE3_CORETEST_F(Xe3BcsTests, givenOverriddenMocksValueWhenAppendBlitCommandsBlock
auto allocation = buffer->getGraphicsAllocation(pClDevice->getRootDeviceIndex());
auto blitProperties = BlitProperties::constructPropertiesForCopy(allocation, allocation, 0, 0,
{BlitterConstants::maxBlitWidth - 1, 1, 1}, 0, 0, 0, 0, &clearColorAlloc);
auto blitProperties = BlitProperties::constructPropertiesForCopy(
allocation, 0,
allocation, 0,
0, 0, {BlitterConstants::maxBlitWidth - 1, 1, 1}, 0, 0, 0, 0, &clearColorAlloc);
auto bltCmd = stream.getSpaceForCmd<XY_BLOCK_COPY_BLT>();
*bltCmd = FamilyType::cmdInitXyBlockCopyBlt;
bltCmd->setDestinationX2CoordinateRight(1);

12
opencl/test/unit_test/xe3_core/copy_engine_tests_xe3_core.cpp
View File

@@ -60,8 +60,8 @@ XE3_CORETEST_F(BlitXe3CoreTests, givenBufferWhenProgrammingBltCommandThenSetMocs
cl_int retVal = CL_SUCCESS;
auto buffer = clUniquePtr<Buffer>(Buffer::create(&context, CL_MEM_READ_WRITE, 1, nullptr, retVal));
auto blitProperties = BlitProperties::constructPropertiesForCopy(buffer->getGraphicsAllocation(clDevice->getRootDeviceIndex()),
buffer->getGraphicsAllocation(clDevice->getRootDeviceIndex()),
auto blitProperties = BlitProperties::constructPropertiesForCopy(buffer->getGraphicsAllocation(clDevice->getRootDeviceIndex()), 0,
buffer->getGraphicsAllocation(clDevice->getRootDeviceIndex()), 0,
0, 0, {1, 1, 1}, 0, 0, 0, 0, &clearColorAlloc);
flushBcsTask(csr, blitProperties, true, clDevice->getDevice());
@@ -96,8 +96,8 @@ XE3_CORETEST_F(BlitXe3CoreTests, givenBufferWhenProgrammingBltCommandThenSetMocs
cl_int retVal = CL_SUCCESS;
auto buffer = clUniquePtr<Buffer>(Buffer::create(&context, CL_MEM_READ_WRITE, 1, nullptr, retVal));
auto blitProperties = BlitProperties::constructPropertiesForCopy(buffer->getGraphicsAllocation(clDevice->getRootDeviceIndex()),
buffer->getGraphicsAllocation(clDevice->getRootDeviceIndex()),
auto blitProperties = BlitProperties::constructPropertiesForCopy(buffer->getGraphicsAllocation(clDevice->getRootDeviceIndex()), 0,
buffer->getGraphicsAllocation(clDevice->getRootDeviceIndex()), 0,
0, 0, {1, 1, 1}, 0, 0, 0, 0, &clearColorAlloc);
flushBcsTask(csr, blitProperties, true, clDevice->getDevice());
@@ -128,7 +128,7 @@ XE3_CORETEST_F(BlitXe3CoreTests, given2dBlitCommandWhenDispatchingThenSetValidSu
size_t offset = 0;
{
// 1D
auto blitProperties = BlitProperties::constructPropertiesForCopy(allocation, allocation,
auto blitProperties = BlitProperties::constructPropertiesForCopy(allocation, 0, allocation, 0,
0, 0, {BlitterConstants::maxBlitWidth - 1, 1, 1}, 0, 0, 0, 0, &clearColorAlloc);
flushBcsTask(csr, blitProperties, false, clDevice->getDevice());
@@ -148,7 +148,7 @@ XE3_CORETEST_F(BlitXe3CoreTests, given2dBlitCommandWhenDispatchingThenSetValidSu
{
// 2D
auto blitProperties = BlitProperties::constructPropertiesForCopy(allocation, allocation,
auto blitProperties = BlitProperties::constructPropertiesForCopy(allocation, 0, allocation, 0,
0, 0, {(2 * BlitterConstants::maxBlitWidth) + 1, 1, 1}, 0, 0, 0, 0, &clearColorAlloc);
flushBcsTask(csr, blitProperties, false, clDevice->getDevice());

24
opencl/test/unit_test/xe_hpc_core/copy_engine_tests_xe_hpc_core.cpp
View File

@@ -66,8 +66,8 @@ XE_HPC_CORETEST_F(BlitXeHpcCoreTests, givenCompressedBufferWhenProgrammingBltCom
MockGraphicsAllocation clearColorAlloc;
{
auto blitProperties = BlitProperties::constructPropertiesForCopy(bufferNotCompressed->getGraphicsAllocation(clDevice->getRootDeviceIndex()),
bufferCompressed->getGraphicsAllocation(clDevice->getRootDeviceIndex()),
auto blitProperties = BlitProperties::constructPropertiesForCopy(bufferNotCompressed->getGraphicsAllocation(clDevice->getRootDeviceIndex()), 0,
bufferCompressed->getGraphicsAllocation(clDevice->getRootDeviceIndex()), 0,
0, 0, {2048, 1, 1}, 0, 0, 0, 0, &clearColorAlloc);
flushBcsTask(csr, blitProperties, true, clDevice->getDevice());
@@ -86,8 +86,8 @@ XE_HPC_CORETEST_F(BlitXeHpcCoreTests, givenCompressedBufferWhenProgrammingBltCom
{
auto offset = csr->commandStream.getUsed();
auto blitProperties = BlitProperties::constructPropertiesForCopy(bufferCompressed->getGraphicsAllocation(clDevice->getRootDeviceIndex()),
bufferNotCompressed->getGraphicsAllocation(clDevice->getRootDeviceIndex()),
auto blitProperties = BlitProperties::constructPropertiesForCopy(bufferCompressed->getGraphicsAllocation(clDevice->getRootDeviceIndex()), 0,
bufferNotCompressed->getGraphicsAllocation(clDevice->getRootDeviceIndex()), 0,
0, 0, {2048, 1, 1}, 0, 0, 0, 0, &clearColorAlloc);
flushBcsTask(csr, blitProperties, true, clDevice->getDevice());
@@ -114,8 +114,8 @@ XE_HPC_CORETEST_F(BlitXeHpcCoreTests, givenBufferWhenProgrammingBltCommandThenSe
cl_int retVal = CL_SUCCESS;
auto buffer = clUniquePtr<Buffer>(Buffer::create(&context, CL_MEM_READ_WRITE, 1, nullptr, retVal));
auto blitProperties = BlitProperties::constructPropertiesForCopy(buffer->getGraphicsAllocation(clDevice->getRootDeviceIndex()),
buffer->getGraphicsAllocation(clDevice->getRootDeviceIndex()),
auto blitProperties = BlitProperties::constructPropertiesForCopy(buffer->getGraphicsAllocation(clDevice->getRootDeviceIndex()), 0,
buffer->getGraphicsAllocation(clDevice->getRootDeviceIndex()), 0,
0, 0, {1, 1, 1}, 0, 0, 0, 0, &clearColorAlloc);
flushBcsTask(csr, blitProperties, true, clDevice->getDevice());
@@ -144,8 +144,8 @@ XE_HPC_CORETEST_F(BlitXeHpcCoreTests, givenTransferLargerThenHalfOfL3WhenItIsPro
auto buffer = clUniquePtr<Buffer>(Buffer::create(&context, CL_MEM_READ_WRITE, 1, nullptr, retVal));
size_t transferSize = static_cast<size_t>(clDevice->getHardwareInfo().gtSystemInfo.L3CacheSizeInKb * MemoryConstants::kiloByte / 2 + 1);
auto blitProperties = BlitProperties::constructPropertiesForCopy(buffer->getGraphicsAllocation(clDevice->getRootDeviceIndex()),
buffer->getGraphicsAllocation(clDevice->getRootDeviceIndex()),
auto blitProperties = BlitProperties::constructPropertiesForCopy(buffer->getGraphicsAllocation(clDevice->getRootDeviceIndex()), 0,
buffer->getGraphicsAllocation(clDevice->getRootDeviceIndex()), 0,
0, 0, {transferSize, 1, 1}, 0, 0, 0, 0, &clearColorAlloc);
flushBcsTask(csr, blitProperties, true, clDevice->getDevice());
@@ -175,8 +175,8 @@ XE_HPC_CORETEST_F(BlitXeHpcCoreTests, givenBufferWhenProgrammingBltCommandThenSe
cl_int retVal = CL_SUCCESS;
auto buffer = clUniquePtr<Buffer>(Buffer::create(&context, CL_MEM_READ_WRITE, 1, nullptr, retVal));
auto blitProperties = BlitProperties::constructPropertiesForCopy(buffer->getGraphicsAllocation(clDevice->getRootDeviceIndex()),
buffer->getGraphicsAllocation(clDevice->getRootDeviceIndex()),
auto blitProperties = BlitProperties::constructPropertiesForCopy(buffer->getGraphicsAllocation(clDevice->getRootDeviceIndex()), 0,
buffer->getGraphicsAllocation(clDevice->getRootDeviceIndex()), 0,
0, 0, {1, 1, 1}, 0, 0, 0, 0, &clearColorAlloc);
flushBcsTask(csr, blitProperties, true, clDevice->getDevice());
@@ -234,7 +234,7 @@ XE_HPC_CORETEST_F(BlitXeHpcCoreTests, given2dBlitCommandWhenDispatchingThenSetVa
size_t offset = 0;
{
// 1D
auto blitProperties = BlitProperties::constructPropertiesForCopy(allocation, allocation,
auto blitProperties = BlitProperties::constructPropertiesForCopy(allocation, 0, allocation, 0,
0, 0, {BlitterConstants::maxBlitWidth - 1, 1, 1}, 0, 0, 0, 0, &clearColorAlloc);
flushBcsTask(csr, blitProperties, false, clDevice->getDevice());
@@ -255,7 +255,7 @@ XE_HPC_CORETEST_F(BlitXeHpcCoreTests, given2dBlitCommandWhenDispatchingThenSetVa
{
// 2D
auto blitProperties = BlitProperties::constructPropertiesForCopy(allocation, allocation,
auto blitProperties = BlitProperties::constructPropertiesForCopy(allocation, 0, allocation, 0,
0, 0, {(2 * BlitterConstants::maxBlitWidth) + 1, 1, 1}, 0, 0, 0, 0, &clearColorAlloc);
flushBcsTask(csr, blitProperties, false, clDevice->getDevice());

6
opencl/test/unit_test/xe_hpc_core/pvc/command_stream_receiver_hw_tests_pvc.cpp
View File

@@ -138,7 +138,7 @@ PVCTEST_F(PVcBcsTests, givenCompressibleBuffersWhenStatefulCompressionIsEnabledT
auto dstAllocation = dstBuffer->getGraphicsAllocation(pClDevice->getRootDeviceIndex());
EXPECT_TRUE(dstAllocation->getDefaultGmm()->isCompressionEnabled());
auto blitProperties = BlitProperties::constructPropertiesForCopy(srcAllocation, dstAllocation, 0, 0,
auto blitProperties = BlitProperties::constructPropertiesForCopy(srcAllocation, 0, dstAllocation, 0, 0, 0,
{BlitterConstants::maxBlitWidth - 1, 1, 1}, 0, 0, 0, 0, &clearColorAlloc);
auto bltCmd = stream.getSpaceForCmd<MEM_COPY>();
*bltCmd = FamilyType::cmdInitXyCopyBlt;
@@ -168,7 +168,7 @@ PVCTEST_F(PVcBcsTests, givenBufferInDeviceMemoryWhenStatelessCompressionIsEnable
auto allocation = buffer->getGraphicsAllocation(pClDevice->getRootDeviceIndex());
EXPECT_TRUE(!MemoryPoolHelper::isSystemMemoryPool(allocation->getMemoryPool()));
auto blitProperties = BlitProperties::constructPropertiesForCopy(allocation, allocation,
auto blitProperties = BlitProperties::constructPropertiesForCopy(allocation, 0, allocation, 0,
0, 0, {BlitterConstants::maxBlitWidth - 1, 1, 1}, 0, 0, 0, 0, &clearColorAlloc);
auto bltCmd = stream.getSpaceForCmd<MEM_COPY>();
*bltCmd = FamilyType::cmdInitXyCopyBlt;
@@ -195,7 +195,7 @@ PVCTEST_F(PVcBcsTests, givenBufferInSystemMemoryWhenStatelessCompressionIsEnable
auto allocation = buffer->getGraphicsAllocation(pClDevice->getRootDeviceIndex());
EXPECT_TRUE(MemoryPoolHelper::isSystemMemoryPool(allocation->getMemoryPool()));
auto blitProperties = BlitProperties::constructPropertiesForCopy(allocation, allocation,
auto blitProperties = BlitProperties::constructPropertiesForCopy(allocation, 0, allocation, 0,
0, 0, {BlitterConstants::maxBlitWidth - 1, 1, 1}, 0, 0, 0, 0, &clearColorAlloc);
auto bltCmd = stream.getSpaceForCmd<MEM_COPY>();
*bltCmd = FamilyType::cmdInitXyCopyBlt;

103
opencl/test/unit_test/xe_hpg_core/copy_engine_tests_xe_hpg_core.cpp
View File

@@ -64,9 +64,10 @@ XE_HPG_CORETEST_F(BlitXeHpgCoreTests, givenBufferWhenProgrammingBltCommandThenSe
cl_int retVal = CL_SUCCESS;
auto buffer = clUniquePtr<Buffer>(Buffer::create(&context, CL_MEM_READ_WRITE, 1, nullptr, retVal));
auto blitProperties = BlitProperties::constructPropertiesForCopy(buffer->getGraphicsAllocation(clDevice->getRootDeviceIndex()),
buffer->getGraphicsAllocation(clDevice->getRootDeviceIndex()),
0, 0, {1, 1, 1}, 0, 0, 0, 0, &clearColorAlloc);
auto blitProperties = BlitProperties::constructPropertiesForCopy(
buffer->getGraphicsAllocation(clDevice->getRootDeviceIndex()), 0,
buffer->getGraphicsAllocation(clDevice->getRootDeviceIndex()), 0,
0, 0, {1, 1, 1}, 0, 0, 0, 0, &clearColorAlloc);
flushBcsTask(csr, blitProperties, true, clDevice->getDevice());
@@ -95,9 +96,10 @@ XE_HPG_CORETEST_F(BlitXeHpgCoreTests, givenBufferWhenProgrammingBltCommandThenSe
cl_int retVal = CL_SUCCESS;
auto buffer = clUniquePtr<Buffer>(Buffer::create(&context, CL_MEM_READ_WRITE, 1, nullptr, retVal));
auto blitProperties = BlitProperties::constructPropertiesForCopy(buffer->getGraphicsAllocation(clDevice->getRootDeviceIndex()),
buffer->getGraphicsAllocation(clDevice->getRootDeviceIndex()),
0, 0, {1, 1, 1}, 0, 0, 0, 0, &clearColorAlloc);
auto blitProperties = BlitProperties::constructPropertiesForCopy(
buffer->getGraphicsAllocation(clDevice->getRootDeviceIndex()), 0,
buffer->getGraphicsAllocation(clDevice->getRootDeviceIndex()), 0,
0, 0, {1, 1, 1}, 0, 0, 0, 0, &clearColorAlloc);
flushBcsTask(csr, blitProperties, true, clDevice->getDevice());
@@ -126,8 +128,10 @@ XE_HPG_CORETEST_F(BlitXeHpgCoreTests, given2dBlitCommandWhenDispatchingThenSetVa
size_t offset = 0;
{
// 1D
auto blitProperties = BlitProperties::constructPropertiesForCopy(allocation, allocation,
0, 0, {BlitterConstants::maxBlitWidth - 1, 1, 1}, 0, 0, 0, 0, &clearColorAlloc);
auto blitProperties = BlitProperties::constructPropertiesForCopy(
allocation, 0,
allocation, 0,
0, 0, {BlitterConstants::maxBlitWidth - 1, 1, 1}, 0, 0, 0, 0, &clearColorAlloc);
flushBcsTask(csr, blitProperties, false, clDevice->getDevice());
HardwareParse hwParser;
@@ -150,8 +154,10 @@ XE_HPG_CORETEST_F(BlitXeHpgCoreTests, given2dBlitCommandWhenDispatchingThenSetVa
{
// 2D
auto blitProperties = BlitProperties::constructPropertiesForCopy(allocation, allocation,
0, 0, {(2 * BlitterConstants::maxBlitWidth) + 1, 1, 1}, 0, 0, 0, 0, &clearColorAlloc);
auto blitProperties = BlitProperties::constructPropertiesForCopy(
allocation, 0,
allocation, 0,
0, 0, {(2 * BlitterConstants::maxBlitWidth) + 1, 1, 1}, 0, 0, 0, 0, &clearColorAlloc);
flushBcsTask(csr, blitProperties, false, clDevice->getDevice());
HardwareParse hwParser;
@@ -185,9 +191,10 @@ XE_HPG_CORETEST_F(BlitXeHpgCoreTests, givenBufferWhenProgrammingBltCommandThenSe
EXPECT_FALSE(MemoryPoolHelper::isSystemMemoryPool(bufferInLocalPool->getGraphicsAllocation(clDevice->getRootDeviceIndex())->getMemoryPool()));
{
auto blitProperties = BlitProperties::constructPropertiesForCopy(bufferInSystemPool->getGraphicsAllocation(clDevice->getRootDeviceIndex()),
bufferInLocalPool->getGraphicsAllocation(clDevice->getRootDeviceIndex()),
0, 0, {2048, 1, 1}, 0, 0, 0, 0, &clearColorAlloc);
auto blitProperties = BlitProperties::constructPropertiesForCopy(
bufferInSystemPool->getGraphicsAllocation(clDevice->getRootDeviceIndex()), 0,
bufferInLocalPool->getGraphicsAllocation(clDevice->getRootDeviceIndex()), 0,
0, 0, {2048, 1, 1}, 0, 0, 0, 0, &clearColorAlloc);
flushBcsTask(csr, blitProperties, true, clDevice->getDevice());
@@ -203,9 +210,10 @@ XE_HPG_CORETEST_F(BlitXeHpgCoreTests, givenBufferWhenProgrammingBltCommandThenSe
{
auto offset = csr->commandStream.getUsed();
auto blitProperties = BlitProperties::constructPropertiesForCopy(bufferInLocalPool->getGraphicsAllocation(clDevice->getRootDeviceIndex()),
bufferInSystemPool->getGraphicsAllocation(clDevice->getRootDeviceIndex()),
0, 0, {2048, 1, 1}, 0, 0, 0, 0, &clearColorAlloc);
auto blitProperties = BlitProperties::constructPropertiesForCopy(
bufferInLocalPool->getGraphicsAllocation(clDevice->getRootDeviceIndex()), 0,
bufferInSystemPool->getGraphicsAllocation(clDevice->getRootDeviceIndex()), 0,
0, 0, {2048, 1, 1}, 0, 0, 0, 0, &clearColorAlloc);
flushBcsTask(csr, blitProperties, true, clDevice->getDevice());
@@ -237,9 +245,10 @@ XE_HPG_CORETEST_F(BlitXeHpgCoreTests, givenBufferWhenProgrammingBltCommandThenSe
debugManager.flags.OverrideBlitterTargetMemory.set(0u);
{
auto blitProperties = BlitProperties::constructPropertiesForCopy(bufferInSystemPool->getGraphicsAllocation(clDevice->getRootDeviceIndex()),
bufferInLocalPool->getGraphicsAllocation(clDevice->getRootDeviceIndex()),
0, 0, {2048, 1, 1}, 0, 0, 0, 0, &clearColorAlloc);
auto blitProperties = BlitProperties::constructPropertiesForCopy(
bufferInSystemPool->getGraphicsAllocation(clDevice->getRootDeviceIndex()), 0,
bufferInLocalPool->getGraphicsAllocation(clDevice->getRootDeviceIndex()), 0,
0, 0, {2048, 1, 1}, 0, 0, 0, 0, &clearColorAlloc);
flushBcsTask(csr, blitProperties, true, clDevice->getDevice());
@@ -255,9 +264,10 @@ XE_HPG_CORETEST_F(BlitXeHpgCoreTests, givenBufferWhenProgrammingBltCommandThenSe
debugManager.flags.OverrideBlitterTargetMemory.set(1u);
{
auto offset = csr->commandStream.getUsed();
auto blitProperties = BlitProperties::constructPropertiesForCopy(bufferInLocalPool->getGraphicsAllocation(clDevice->getRootDeviceIndex()),
bufferInSystemPool->getGraphicsAllocation(clDevice->getRootDeviceIndex()),
0, 0, {2048, 1, 1}, 0, 0, 0, 0, &clearColorAlloc);
auto blitProperties = BlitProperties::constructPropertiesForCopy(
bufferInLocalPool->getGraphicsAllocation(clDevice->getRootDeviceIndex()), 0,
bufferInSystemPool->getGraphicsAllocation(clDevice->getRootDeviceIndex()), 0,
0, 0, {2048, 1, 1}, 0, 0, 0, 0, &clearColorAlloc);
flushBcsTask(csr, blitProperties, true, clDevice->getDevice());
@@ -274,9 +284,10 @@ XE_HPG_CORETEST_F(BlitXeHpgCoreTests, givenBufferWhenProgrammingBltCommandThenSe
debugManager.flags.OverrideBlitterTargetMemory.set(2u);
{
auto offset = csr->commandStream.getUsed();
auto blitProperties = BlitProperties::constructPropertiesForCopy(bufferInLocalPool->getGraphicsAllocation(clDevice->getRootDeviceIndex()),
bufferInSystemPool->getGraphicsAllocation(clDevice->getRootDeviceIndex()),
0, 0, {2048, 1, 1}, 0, 0, 0, 0, &clearColorAlloc);
auto blitProperties = BlitProperties::constructPropertiesForCopy(
bufferInLocalPool->getGraphicsAllocation(clDevice->getRootDeviceIndex()), 0,
bufferInSystemPool->getGraphicsAllocation(clDevice->getRootDeviceIndex()), 0,
0, 0, {2048, 1, 1}, 0, 0, 0, 0, &clearColorAlloc);
flushBcsTask(csr, blitProperties, true, clDevice->getDevice());
@@ -308,9 +319,10 @@ HWTEST2_F(BlitXeHpgCoreTests, givenBufferWhenProgrammingBltCommandAndRevisionB0T
EXPECT_FALSE(MemoryPoolHelper::isSystemMemoryPool(bufferInLocalPool->getGraphicsAllocation(clDevice->getRootDeviceIndex())->getMemoryPool()));
{
auto blitProperties = BlitProperties::constructPropertiesForCopy(bufferInSystemPool->getGraphicsAllocation(clDevice->getRootDeviceIndex()),
bufferInLocalPool->getGraphicsAllocation(clDevice->getRootDeviceIndex()),
0, 0, {2048, 1, 1}, 0, 0, 0, 0, &clearColorAlloc);
auto blitProperties = BlitProperties::constructPropertiesForCopy(
bufferInSystemPool->getGraphicsAllocation(clDevice->getRootDeviceIndex()), 0,
bufferInLocalPool->getGraphicsAllocation(clDevice->getRootDeviceIndex()), 0,
0, 0, {2048, 1, 1}, 0, 0, 0, 0, &clearColorAlloc);
flushBcsTask(csr, blitProperties, true, clDevice->getDevice());
@@ -326,9 +338,10 @@ HWTEST2_F(BlitXeHpgCoreTests, givenBufferWhenProgrammingBltCommandAndRevisionB0T
{
auto offset = csr->commandStream.getUsed();
auto blitProperties = BlitProperties::constructPropertiesForCopy(bufferInLocalPool->getGraphicsAllocation(clDevice->getRootDeviceIndex()),
bufferInSystemPool->getGraphicsAllocation(clDevice->getRootDeviceIndex()),
0, 0, {2048, 1, 1}, 0, 0, 0, 0, &clearColorAlloc);
auto blitProperties = BlitProperties::constructPropertiesForCopy(
bufferInLocalPool->getGraphicsAllocation(clDevice->getRootDeviceIndex()), 0,
bufferInSystemPool->getGraphicsAllocation(clDevice->getRootDeviceIndex()), 0,
0, 0, {2048, 1, 1}, 0, 0, 0, 0, &clearColorAlloc);
flushBcsTask(csr, blitProperties, true, clDevice->getDevice());
@@ -413,9 +426,10 @@ XE_HPG_CORETEST_F(BlitXeHpgCoreTests, givenCompressedBufferWhenProgrammingBltCom
uint32_t compressionFormat = gmmHelper->getClientContext()->getSurfaceStateCompressionFormat(GMM_RESOURCE_FORMAT::GMM_FORMAT_GENERIC_8BIT);
{
auto blitProperties = BlitProperties::constructPropertiesForCopy(bufferNotCompressed->getGraphicsAllocation(clDevice->getRootDeviceIndex()),
bufferCompressed->getGraphicsAllocation(clDevice->getRootDeviceIndex()),
0, 0, {2048, 1, 1}, 0, 0, 0, 0, csr->getClearColorAllocation());
auto blitProperties = BlitProperties::constructPropertiesForCopy(
bufferNotCompressed->getGraphicsAllocation(clDevice->getRootDeviceIndex()), 0,
bufferCompressed->getGraphicsAllocation(clDevice->getRootDeviceIndex()), 0,
0, 0, {2048, 1, 1}, 0, 0, 0, 0, csr->getClearColorAllocation());
flushBcsTask(csr, blitProperties, true, clDevice->getDevice());
@@ -435,9 +449,10 @@ XE_HPG_CORETEST_F(BlitXeHpgCoreTests, givenCompressedBufferWhenProgrammingBltCom
{
auto offset = csr->commandStream.getUsed();
auto blitProperties = BlitProperties::constructPropertiesForCopy(bufferCompressed->getGraphicsAllocation(clDevice->getRootDeviceIndex()),
bufferNotCompressed->getGraphicsAllocation(clDevice->getRootDeviceIndex()),
0, 0, {2048, 1, 1}, 0, 0, 0, 0, csr->getClearColorAllocation());
auto blitProperties = BlitProperties::constructPropertiesForCopy(
bufferCompressed->getGraphicsAllocation(clDevice->getRootDeviceIndex()), 0,
bufferNotCompressed->getGraphicsAllocation(clDevice->getRootDeviceIndex()), 0,
0, 0, {2048, 1, 1}, 0, 0, 0, 0, csr->getClearColorAllocation());
flushBcsTask(csr, blitProperties, true, clDevice->getDevice());
HardwareParse hwParser;
@@ -475,9 +490,10 @@ XE_HPG_CORETEST_F(BlitXeHpgCoreTests, givenDebugFlagSetWhenCompressionEnabledThe
}
{
auto blitProperties = BlitProperties::constructPropertiesForCopy(bufferNotCompressed->getGraphicsAllocation(clDevice->getRootDeviceIndex()),
bufferCompressed->getGraphicsAllocation(clDevice->getRootDeviceIndex()),
0, 0, {2048, 1, 1}, 0, 0, 0, 0, csr->getClearColorAllocation());
auto blitProperties = BlitProperties::constructPropertiesForCopy(
bufferNotCompressed->getGraphicsAllocation(clDevice->getRootDeviceIndex()), 0,
bufferCompressed->getGraphicsAllocation(clDevice->getRootDeviceIndex()), 0,
0, 0, {2048, 1, 1}, 0, 0, 0, 0, csr->getClearColorAllocation());
flushBcsTask(csr, blitProperties, true, clDevice->getDevice());
@@ -497,9 +513,10 @@ XE_HPG_CORETEST_F(BlitXeHpgCoreTests, givenDebugFlagSetWhenCompressionEnabledThe
{
auto offset = csr->commandStream.getUsed();
auto blitProperties = BlitProperties::constructPropertiesForCopy(bufferCompressed->getGraphicsAllocation(clDevice->getRootDeviceIndex()),
bufferNotCompressed->getGraphicsAllocation(clDevice->getRootDeviceIndex()),
0, 0, {2048, 1, 1}, 0, 0, 0, 0, csr->getClearColorAllocation());
auto blitProperties = BlitProperties::constructPropertiesForCopy(
bufferCompressed->getGraphicsAllocation(clDevice->getRootDeviceIndex()), 0,
bufferNotCompressed->getGraphicsAllocation(clDevice->getRootDeviceIndex()), 0,
0, 0, {2048, 1, 1}, 0, 0, 0, 0, csr->getClearColorAllocation());
flushBcsTask(csr, blitProperties, true, clDevice->getDevice());
HardwareParse hwParser;