Media
/
compute-runtime
mirror of https://github.com/intel/compute-runtime.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Allocate Sip kernel in front window" 

This reverts commit 4924a2e741.

Signed-off-by: Compute-Runtime-Validation <compute-runtime-validation@intel.com>
This commit is contained in:
Compute-Runtime-Validation 2021-03-26 11:18:36 +01:00 committed by Compute-Runtime-Automation
parent 86a234ead6
commit d97c3a7478
2 changed files with 1 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
opencl/test/unit_test/built_ins/built_in_tests.cpp
View File

@ -2119,28 +2119,6 @@ TEST_F(BuiltInTests, WhenGettingSipKernelThenReturnProgramCreatedFromIsaAcquired
mockCompilerInterface->releaseDummyGenBinary(); mockCompilerInterface->releaseDummyGenBinary();
} }
TEST_F(BuiltInTests, WhenGettingSipKernelThenItIsAllocatedInFrontWindow) {
auto mockCompilerInterface = new MockCompilerInterface();
pDevice->getExecutionEnvironment()->rootDeviceEnvironments[rootDeviceIndex]->compilerInterface.reset(mockCompilerInterface);
auto builtins = new BuiltIns;
pDevice->getExecutionEnvironment()->rootDeviceEnvironments[rootDeviceIndex]->builtins.reset(builtins);
mockCompilerInterface->sipKernelBinaryOverride = mockCompilerInterface->getDummyGenBinary();
const SipKernel &sipKernel = builtins->getSipKernel(SipKernelType::Csr, *pDevice);
HeapAssigner heapAssigner;
bool useLocalMem = heapAssigner.useExternal32BitHeap(sipKernel.getSipAllocation()->getAllocationType()) ? HwHelper::get(defaultHwInfo->platform.eRenderCoreFamily).heapInLocalMem(*defaultHwInfo) : false;
auto heap = heapAssigner.get32BitHeapIndex(sipKernel.getSipAllocation()->getAllocationType(), useLocalMem, *defaultHwInfo, true);
auto base = pDevice->getMemoryManager()->getGfxPartition(rootDeviceIndex)->getHeapBase(heap);
auto limit = pDevice->getMemoryManager()->getGfxPartition(rootDeviceIndex)->getHeapLimit(heap);
EXPECT_LE(base, GmmHelper::decanonize(sipKernel.getSipAllocation()->getGpuAddress()));
EXPECT_GT(limit, GmmHelper::decanonize(sipKernel.getSipAllocation()->getGpuAddress()));
mockCompilerInterface->releaseDummyGenBinary();
}
TEST_F(BuiltInTests, givenSipKernelWhenItIsCreatedThenItHasGraphicsAllocationForKernel) { TEST_F(BuiltInTests, givenSipKernelWhenItIsCreatedThenItHasGraphicsAllocationForKernel) {
const SipKernel &sipKern = pDevice->getBuiltIns()->getSipKernel(SipKernelType::Csr, pContext->getDevice(0)->getDevice()); const SipKernel &sipKern = pDevice->getBuiltIns()->getSipKernel(SipKernelType::Csr, pContext->getDevice(0)->getDevice());
auto sipAllocation = sipKern.getSipAllocation(); auto sipAllocation = sipKern.getSipAllocation();

2
shared/source/built_ins/built_ins.cpp
View File

@ -49,7 +49,7 @@ const SipKernel &BuiltIns::getSipKernel(SipKernelType type, Device &device) {
const auto allocType = GraphicsAllocation::AllocationType::KERNEL_ISA_INTERNAL; const auto allocType = GraphicsAllocation::AllocationType::KERNEL_ISA_INTERNAL;
AllocationProperties properties = {device.getRootDeviceIndex(), sipBinary.size(), allocType, device.getDeviceBitfield()}; AllocationProperties properties = {device.getRootDeviceIndex(), sipBinary.size(), allocType, device.getDeviceBitfield()};
properties.flags.use32BitFrontWindow = true; properties.flags.use32BitFrontWindow = false;
auto sipAllocation = device.getMemoryManager()->allocateGraphicsMemoryWithProperties(properties); auto sipAllocation = device.getMemoryManager()->allocateGraphicsMemoryWithProperties(properties);