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

@@ -80,18 +80,13 @@ void ScratchSpaceControllerXeHPAndLater::programSurfaceState() {
}
void ScratchSpaceControllerXeHPAndLater::programSurfaceStateAtPtr(void *surfaceStateForScratchAllocation) {
const auto hwInfo = executionEnvironment.rootDeviceEnvironments[rootDeviceIndex]->getHardwareInfo();
auto &hwHelper = HwHelper::get(hwInfo->platform.eRenderCoreFamily);
auto &hwHelper = HwHelper::get(executionEnvironment.rootDeviceEnvironments[rootDeviceIndex]->getHardwareInfo()->platform.eRenderCoreFamily);
uint64_t scratchAllocationAddress = 0u;
if (scratchAllocation) {
scratchAllocationAddress = scratchAllocation->getGpuAddress();
}
auto maxSubSlice = HwInfoConfig::get(hwInfo->platform.eProductFamily)->computeMaxNeededSubSliceSpace(*hwInfo);
auto maxHwThreadCount = maxSubSlice * hwInfo->gtSystemInfo.MaxEuPerSubSlice * (hwInfo->gtSystemInfo.ThreadCount / hwInfo->gtSystemInfo.EUCount);
hwHelper.setRenderSurfaceStateForBuffer(*executionEnvironment.rootDeviceEnvironments[rootDeviceIndex],
surfaceStateForScratchAllocation, maxHwThreadCount, scratchAllocationAddress, 0,
surfaceStateForScratchAllocation, computeUnitsUsedForScratch, scratchAllocationAddress, 0,
perThreadScratchSize, nullptr, false, scratchType, false, true);
if (privateScratchSpaceSupported) {
@@ -102,7 +97,7 @@ void ScratchSpaceControllerXeHPAndLater::programSurfaceStateAtPtr(void *surfaceS
privateScratchAllocationAddress = privateScratchAllocation->getGpuAddress();
}
hwHelper.setRenderSurfaceStateForBuffer(*executionEnvironment.rootDeviceEnvironments[rootDeviceIndex],
surfaceStateForPrivateScratchAllocation, maxHwThreadCount,
surfaceStateForPrivateScratchAllocation, computeUnitsUsedForScratch,
privateScratchAllocationAddress, 0, perThreadPrivateScratchSize, nullptr, false,
scratchType, false, true);
}