Revert "Fix Scratch surface state programming on PVC"

This reverts commit 5b175ebb4a.

Signed-off-by: Compute-Runtime-Validation <compute-runtime-validation@intel.com>
This commit is contained in:
Compute-Runtime-Validation
2022-04-10 16:04:43 +02:00
committed by Compute-Runtime-Automation
parent 34ebcc9520
commit f6f5baf23a
3 changed files with 5 additions and 90 deletions

View File

@ -161,7 +161,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverHwTestXeHPAndLater, whenProgra
EXPECT_EQ(MI_SEMAPHORE_WAIT::REGISTER_POLL_MODE::REGISTER_POLL_MODE_MEMORY_POLL, miSemaphoreWait.getRegisterPollMode());
}
HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverHwTestXeHPAndLater, givenScratchSpaceSurfaceStateEnabledWhenScratchAllocationRequestedThenProgramCfeStateWithScratchAllocation) {
HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverHwTestXeHPAndLater, givenScratchSpaceSurfaceStateEnabledWhenSratchAllocationRequestedThenProgramCfeStateWithScratchAllocation) {
using CFE_STATE = typename FamilyType::CFE_STATE;
using RENDER_SURFACE_STATE = typename FamilyType::RENDER_SURFACE_STATE;
@ -179,10 +179,6 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverHwTestXeHPAndLater, givenScrat
kernel.kernelInfo.kernelDescriptor.kernelAttributes.perThreadScratchSize[0] = 0x1000;
auto &hwHelper = HwHelper::get(hwInfo.platform.eRenderCoreFamily);
uint32_t computeUnits = hwHelper.getComputeUnitsUsedForScratch(&hwInfo);
auto maxSubSlice = HwInfoConfig::get(hwInfo.platform.eProductFamily)->computeMaxNeededSubSliceSpace(hwInfo);
auto maxHwThreadCount = maxSubSlice * hwInfo.gtSystemInfo.MaxEuPerSubSlice * (hwInfo.gtSystemInfo.ThreadCount / hwInfo.gtSystemInfo.EUCount);
size_t scratchSpaceSize = kernel.kernelInfo.kernelDescriptor.kernelAttributes.perThreadScratchSize[0] * computeUnits;
commandQueue.enqueueKernel(kernel, 1, nullptr, &GWS, nullptr, 0, nullptr, nullptr);
@ -203,7 +199,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverHwTestXeHPAndLater, givenScrat
EXPECT_EQ(RENDER_SURFACE_STATE::SURFACE_TYPE_SURFTYPE_SCRATCH, scratchState->getSurfaceType());
SURFACE_STATE_BUFFER_LENGTH length = {0};
length.Length = static_cast<uint32_t>(maxHwThreadCount - 1);
length.Length = static_cast<uint32_t>(computeUnits - 1);
EXPECT_EQ(length.SurfaceState.Depth + 1u, scratchState->getDepth());
EXPECT_EQ(length.SurfaceState.Width + 1u, scratchState->getWidth());
EXPECT_EQ(length.SurfaceState.Height + 1u, scratchState->getHeight());