Correct unit tests

Signed-off-by: Kamil Kopryk <kamil.kopryk@intel.com>
This commit is contained in:
Kamil Kopryk
2022-01-31 21:13:29 +00:00
committed by Compute-Runtime-Automation
parent 678ce2ec57
commit c98e253377
2 changed files with 12 additions and 10 deletions

View File

@ -889,7 +889,7 @@ HWTEST_F(BcsTests, givenTimestampPacketWriteRequestWhenEstimatingSizeForCommands
expectedBaseSize += EncodeMiFlushDW<FamilyType>::getMiFlushDwCmdSizeForDataWrite(); expectedBaseSize += EncodeMiFlushDW<FamilyType>::getMiFlushDwCmdSizeForDataWrite();
} }
auto expectedSizeWithTimestampPacketWriteAndProfiling = expectedBaseSize + 4 * sizeof(typename FamilyType::MI_STORE_REGISTER_MEM); auto expectedSizeWithTimestampPacketWriteAndProfiling = expectedBaseSize + BlitCommandsHelper<FamilyType>::getProfilingMmioCmdsSize();
auto estimatedSizeWithTimestampPacketWrite = BlitCommandsHelper<FamilyType>::estimateBlitCommandsSize( auto estimatedSizeWithTimestampPacketWrite = BlitCommandsHelper<FamilyType>::estimateBlitCommandsSize(
{1, 1, 1}, csrDependencies, true, false, pClDevice->getRootDeviceEnvironment()); {1, 1, 1}, csrDependencies, true, false, pClDevice->getRootDeviceEnvironment());

View File

@ -1650,6 +1650,7 @@ HWTEST_F(BcsTests, givenHostPtrToImageWhenBlitBufferIsCalledThenBlitCmdIsFound)
BuiltinOpParams builtinOpParams{}; BuiltinOpParams builtinOpParams{};
builtinOpParams.srcPtr = hostPtr; builtinOpParams.srcPtr = hostPtr;
builtinOpParams.dstMemObj = image.get(); builtinOpParams.dstMemObj = image.get();
builtinOpParams.size = {1, 1, 1};
auto &csr = pDevice->getUltCommandStreamReceiver<FamilyType>(); auto &csr = pDevice->getUltCommandStreamReceiver<FamilyType>();
auto blitProperties = ClBlitProperties::constructProperties(BlitterConstants::BlitDirection::HostPtrToImage, auto blitProperties = ClBlitProperties::constructProperties(BlitterConstants::BlitDirection::HostPtrToImage,
@ -1659,7 +1660,7 @@ HWTEST_F(BcsTests, givenHostPtrToImageWhenBlitBufferIsCalledThenBlitCmdIsFound)
HardwareParse hwParser; HardwareParse hwParser;
hwParser.parseCommands<FamilyType>(csr.commandStream, 0); hwParser.parseCommands<FamilyType>(csr.commandStream, 0);
auto cmdIterator = find<typename FamilyType::XY_COPY_BLT *>(hwParser.cmdList.begin(), hwParser.cmdList.end()); auto cmdIterator = find<typename FamilyType::XY_BLOCK_COPY_BLT *>(hwParser.cmdList.begin(), hwParser.cmdList.end());
EXPECT_NE(hwParser.cmdList.end(), cmdIterator); EXPECT_NE(hwParser.cmdList.end(), cmdIterator);
} }
@ -1687,7 +1688,7 @@ HWTEST_F(BcsTests, given3dImageWhenBlitBufferIsCalledThenBlitCmdIsFoundZtimes) {
uint32_t xyCopyBltCmdFound = 0; uint32_t xyCopyBltCmdFound = 0;
for (auto &cmd : hwParser.cmdList) { for (auto &cmd : hwParser.cmdList) {
if (auto bltCmd = genCmdCast<typename FamilyType::XY_COPY_BLT *>(cmd)) { if (auto bltCmd = genCmdCast<typename FamilyType::XY_BLOCK_COPY_BLT *>(cmd)) {
++xyCopyBltCmdFound; ++xyCopyBltCmdFound;
} }
} }
@ -1706,6 +1707,7 @@ HWTEST_F(BcsTests, givenImageToHostPtrWhenBlitBufferIsCalledThenBlitCmdIsFound)
BuiltinOpParams builtinOpParams{}; BuiltinOpParams builtinOpParams{};
builtinOpParams.dstPtr = hostPtr; builtinOpParams.dstPtr = hostPtr;
builtinOpParams.srcMemObj = image.get(); builtinOpParams.srcMemObj = image.get();
builtinOpParams.size = {1, 1, 1};
auto &csr = pDevice->getUltCommandStreamReceiver<FamilyType>(); auto &csr = pDevice->getUltCommandStreamReceiver<FamilyType>();
auto blitProperties = ClBlitProperties::constructProperties(BlitterConstants::BlitDirection::ImageToHostPtr, auto blitProperties = ClBlitProperties::constructProperties(BlitterConstants::BlitDirection::ImageToHostPtr,
@ -1715,7 +1717,7 @@ HWTEST_F(BcsTests, givenImageToHostPtrWhenBlitBufferIsCalledThenBlitCmdIsFound)
HardwareParse hwParser; HardwareParse hwParser;
hwParser.parseCommands<FamilyType>(csr.commandStream, 0); hwParser.parseCommands<FamilyType>(csr.commandStream, 0);
auto cmdIterator = find<typename FamilyType::XY_COPY_BLT *>(hwParser.cmdList.begin(), hwParser.cmdList.end()); auto cmdIterator = find<typename FamilyType::XY_BLOCK_COPY_BLT *>(hwParser.cmdList.begin(), hwParser.cmdList.end());
EXPECT_NE(hwParser.cmdList.end(), cmdIterator); EXPECT_NE(hwParser.cmdList.end(), cmdIterator);
} }
@ -1745,9 +1747,9 @@ HWTEST_F(BcsTests, givenHostPtrToImageWhenBlitBufferIsCalledThenBlitCmdIsCorrect
HardwareParse hwParser; HardwareParse hwParser;
hwParser.parseCommands<FamilyType>(csr.commandStream, 0); hwParser.parseCommands<FamilyType>(csr.commandStream, 0);
auto cmdIterator = find<typename FamilyType::XY_COPY_BLT *>(hwParser.cmdList.begin(), hwParser.cmdList.end()); auto cmdIterator = find<typename FamilyType::XY_BLOCK_COPY_BLT *>(hwParser.cmdList.begin(), hwParser.cmdList.end());
ASSERT_NE(hwParser.cmdList.end(), cmdIterator); ASSERT_NE(hwParser.cmdList.end(), cmdIterator);
auto bltCmd = genCmdCast<typename FamilyType::XY_COPY_BLT *>(*cmdIterator); auto bltCmd = genCmdCast<typename FamilyType::XY_BLOCK_COPY_BLT *>(*cmdIterator);
auto dstPtr = builtinOpParams.dstMemObj->getGraphicsAllocation(csr.getRootDeviceIndex())->getGpuAddress(); auto dstPtr = builtinOpParams.dstMemObj->getGraphicsAllocation(csr.getRootDeviceIndex())->getGpuAddress();
EXPECT_EQ(blitProperties.srcGpuAddress, bltCmd->getSourceBaseAddress()); EXPECT_EQ(blitProperties.srcGpuAddress, bltCmd->getSourceBaseAddress());
@ -1780,9 +1782,9 @@ HWTEST_F(BcsTests, givenImageToHostPtrWhenBlitBufferIsCalledThenBlitCmdIsCorrect
HardwareParse hwParser; HardwareParse hwParser;
hwParser.parseCommands<FamilyType>(csr.commandStream, 0); hwParser.parseCommands<FamilyType>(csr.commandStream, 0);
auto cmdIterator = find<typename FamilyType::XY_COPY_BLT *>(hwParser.cmdList.begin(), hwParser.cmdList.end()); auto cmdIterator = find<typename FamilyType::XY_BLOCK_COPY_BLT *>(hwParser.cmdList.begin(), hwParser.cmdList.end());
ASSERT_NE(hwParser.cmdList.end(), cmdIterator); ASSERT_NE(hwParser.cmdList.end(), cmdIterator);
auto bltCmd = genCmdCast<typename FamilyType::XY_COPY_BLT *>(*cmdIterator); auto bltCmd = genCmdCast<typename FamilyType::XY_BLOCK_COPY_BLT *>(*cmdIterator);
auto srcPtr = builtinOpParams.srcMemObj->getGraphicsAllocation(csr.getRootDeviceIndex())->getGpuAddress(); auto srcPtr = builtinOpParams.srcMemObj->getGraphicsAllocation(csr.getRootDeviceIndex())->getGpuAddress();
EXPECT_EQ(srcPtr, bltCmd->getSourceBaseAddress()); EXPECT_EQ(srcPtr, bltCmd->getSourceBaseAddress());
@ -1812,9 +1814,9 @@ HWTEST_F(BcsTests, givenImageToImageWhenBlitBufferIsCalledThenBlitCmdIsCorrectly
HardwareParse hwParser; HardwareParse hwParser;
hwParser.parseCommands<FamilyType>(csr.commandStream, 0); hwParser.parseCommands<FamilyType>(csr.commandStream, 0);
auto cmdIterator = find<typename FamilyType::XY_COPY_BLT *>(hwParser.cmdList.begin(), hwParser.cmdList.end()); auto cmdIterator = find<typename FamilyType::XY_BLOCK_COPY_BLT *>(hwParser.cmdList.begin(), hwParser.cmdList.end());
ASSERT_NE(hwParser.cmdList.end(), cmdIterator); ASSERT_NE(hwParser.cmdList.end(), cmdIterator);
auto bltCmd = genCmdCast<typename FamilyType::XY_COPY_BLT *>(*cmdIterator); auto bltCmd = genCmdCast<typename FamilyType::XY_BLOCK_COPY_BLT *>(*cmdIterator);
EXPECT_EQ(blitProperties.srcGpuAddress, bltCmd->getSourceBaseAddress()); EXPECT_EQ(blitProperties.srcGpuAddress, bltCmd->getSourceBaseAddress());
EXPECT_EQ(blitProperties.dstGpuAddress, bltCmd->getDestinationBaseAddress()); EXPECT_EQ(blitProperties.dstGpuAddress, bltCmd->getDestinationBaseAddress());