Print slice index in printImageBlitBlockCopyCommand function

Signed-off-by: Rafal Maziejuk <rafal.maziejuk@intel.com>
This commit is contained in:
Rafal Maziejuk
2022-04-11 11:08:29 +00:00
committed by Compute-Runtime-Automation
parent 5f37aa4ba4
commit a970622cc1
6 changed files with 12 additions and 10 deletions

View File

@@ -156,7 +156,7 @@ struct BlitCommandsHelper {
static void appendTilingEnable(typename GfxFamily::XY_COLOR_BLT &blitCmd);
static void appendTilingType(const GMM_TILE_TYPE srcTilingType, const GMM_TILE_TYPE dstTilingType, typename GfxFamily::XY_BLOCK_COPY_BLT &blitCmd);
static void appendSliceOffsets(const BlitProperties &blitProperties, typename GfxFamily::XY_BLOCK_COPY_BLT &blitCmd, uint32_t sliceIndex, const RootDeviceEnvironment &rootDeviceEnvironment, uint32_t srcSlicePitch, uint32_t dstSlicePitch);
static void appendBaseAddressOffset(const BlitProperties &blitProperties, typename GfxFamily::XY_BLOCK_COPY_BLT &blitCmd, uint32_t &sliceIndex, const bool isSource);
static void appendBaseAddressOffset(const BlitProperties &blitProperties, typename GfxFamily::XY_BLOCK_COPY_BLT &blitCmd, const uint32_t originalSliceIndex, const bool isSource);
static void getBlitAllocationProperties(const GraphicsAllocation &allocation, uint32_t &pitch, uint32_t &qPitch, GMM_TILE_TYPE &tileType, uint32_t &mipTailLod, uint32_t &compressionDetails, const RootDeviceEnvironment &rootDeviceEnvironment);
static void dispatchDebugPauseCommands(LinearStream &commandStream, uint64_t debugPauseStateGPUAddress, DebugPauseState confirmationTrigger,
DebugPauseState waitCondition, const HardwareInfo &hwInfo);
@@ -168,7 +168,7 @@ struct BlitCommandsHelper {
static bool miArbCheckWaRequired();
static bool preBlitCommandWARequired();
static void appendClearColor(const BlitProperties &blitProperties, typename GfxFamily::XY_BLOCK_COPY_BLT &blitCmd);
static void printImageBlitBlockCopyCommand(const typename GfxFamily::XY_BLOCK_COPY_BLT &blitCmd);
static void printImageBlitBlockCopyCommand(const typename GfxFamily::XY_BLOCK_COPY_BLT &blitCmd, const uint32_t sliceIndex);
static void encodeProfilingStartMmios(LinearStream &cmdStream, const TagNodeBase &timestampPacketNode);
static void encodeProfilingEndMmios(LinearStream &cmdStream, const TagNodeBase &timestampPacketNode);

View File

@@ -298,7 +298,7 @@ void BlitCommandsHelper<GfxFamily>::dispatchBlitCommandsForImageRegion(const Bli
appendSliceOffsets(blitProperties, bltCmd, i, rootDeviceEnvironment, srcSlicePitch, dstSlicePitch);
if (DebugManager.flags.PrintImageBlitBlockCopyCmdDetails.get()) {
printImageBlitBlockCopyCommand(bltCmd);
printImageBlitBlockCopyCommand(bltCmd, i);
}
auto cmd = linearStream.getSpaceForCmd<typename GfxFamily::XY_BLOCK_COPY_BLT>();
@@ -508,5 +508,5 @@ size_t BlitCommandsHelper<GfxFamily>::getProfilingMmioCmdsSize() {
}
template <typename GfxFamily>
void BlitCommandsHelper<GfxFamily>::appendBaseAddressOffset(const BlitProperties &blitProperties, typename GfxFamily::XY_BLOCK_COPY_BLT &blitCmd, uint32_t &sliceIndex, const bool isSource) {}
void BlitCommandsHelper<GfxFamily>::appendBaseAddressOffset(const BlitProperties &blitProperties, typename GfxFamily::XY_BLOCK_COPY_BLT &blitCmd, const uint32_t originalSliceIndex, const bool isSource) {}
} // namespace NEO

View File

@@ -96,6 +96,6 @@ void BlitCommandsHelper<GfxFamily>::appendClearColor(const BlitProperties &blitP
}
template <typename GfxFamily>
void BlitCommandsHelper<GfxFamily>::printImageBlitBlockCopyCommand(const typename GfxFamily::XY_BLOCK_COPY_BLT &blitCmd) {}
void BlitCommandsHelper<GfxFamily>::printImageBlitBlockCopyCommand(const typename GfxFamily::XY_BLOCK_COPY_BLT &blitCmd, const uint32_t sliceIndex) {}
} // namespace NEO

View File

@@ -387,7 +387,8 @@ void BlitCommandsHelper<GfxFamily>::appendClearColor(const BlitProperties &blitP
}
template <typename GfxFamily>
void BlitCommandsHelper<GfxFamily>::printImageBlitBlockCopyCommand(const typename GfxFamily::XY_BLOCK_COPY_BLT &blitCmd) {
void BlitCommandsHelper<GfxFamily>::printImageBlitBlockCopyCommand(const typename GfxFamily::XY_BLOCK_COPY_BLT &blitCmd, const uint32_t sliceIndex) {
printf("Slice index: %u\n", sliceIndex);
printf("ColorDepth: %u\n", blitCmd.getColorDepth());
printf("SourcePitch: %u\n", blitCmd.getSourcePitch());
printf("SourceTiling: %u\n", blitCmd.getSourceTiling());
@@ -424,7 +425,7 @@ void BlitCommandsHelper<GfxFamily>::printImageBlitBlockCopyCommand(const typenam
printf("DestinationSurfaceDepth: %u\n", blitCmd.getDestinationSurfaceDepth());
printf("DestinationHorizontalAlign: %u\n", blitCmd.getDestinationHorizontalAlign());
printf("DestinationVerticalAlign: %u\n", blitCmd.getDestinationVerticalAlign());
printf("DestinationArrayIndex: %u\n", blitCmd.getDestinationArrayIndex());
printf("DestinationArrayIndex: %u\n\n", blitCmd.getDestinationArrayIndex());
}
} // namespace NEO

View File

@@ -507,7 +507,7 @@ HWTEST2_F(BlitTests, whenPrintImageBlitBlockCopyCommandIsCalledThenCmdDetailsAre
auto bltCmd = FamilyType::cmdInitXyBlockCopyBlt;
testing::internal::CaptureStdout();
NEO::BlitCommandsHelper<FamilyType>::printImageBlitBlockCopyCommand(bltCmd);
NEO::BlitCommandsHelper<FamilyType>::printImageBlitBlockCopyCommand(bltCmd, 0);
std::string output = testing::internal::GetCapturedStdout();
std::string expectedOutput("");

View File

@@ -1008,7 +1008,8 @@ HWTEST2_F(BlitTests, givenDebugVariableWhenDispatchBlitCommandsForImageRegionIsC
std::string output = testing::internal::GetCapturedStdout();
std::stringstream expectedOutput;
expectedOutput << "ColorDepth: 0\n"
expectedOutput << "Slice index: 0\n"
<< "ColorDepth: 0\n"
<< "SourcePitch: 1\n"
<< "SourceTiling: 0\n"
<< "SourceX1Coordinate_Left: 0\n"
@@ -1044,6 +1045,6 @@ HWTEST2_F(BlitTests, givenDebugVariableWhenDispatchBlitCommandsForImageRegionIsC
<< "DestinationSurfaceDepth: 1\n"
<< "DestinationHorizontalAlign: 0\n"
<< "DestinationVerticalAlign: 0\n"
<< "DestinationArrayIndex: 1\n";
<< "DestinationArrayIndex: 1\n\n";
EXPECT_EQ(expectedOutput.str(), output);
}