Media/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2025-09-15 13:01:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add resolves for USM allocations when aux translation is required

Browse Source 
Related-To: NEO-5107

Signed-off-by: Milczarek, Slawomir <slawomir.milczarek@intel.com>
This commit is contained in:
Milczarek, Slawomir
2021-07-27 13:09:02 +00:00
committed by Compute-Runtime-Automation
parent 214deac4dc
commit f9f5c96ffe
2 changed files with 52 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
opencl/source/kernel/kernel.cpp
View File

@ -2481,6 +2481,17 @@ void Kernel::fillWithKernelObjsForAuxTranslation(KernelObjsForAuxTranslation &ke
}
}
}
if (getContext().getSVMAllocsManager()) {
for (auto &allocation : getContext().getSVMAllocsManager()->getSVMAllocs()->allocations) {
auto gfxAllocation = allocation.second.gpuAllocations.getDefaultGraphicsAllocation();
if (gfxAllocation->getAllocationType() == GraphicsAllocation::AllocationType::BUFFER_COMPRESSED) {
kernelObjsForAuxTranslation.insert({KernelObjForAuxTranslation::Type::GFX_ALLOC, gfxAllocation});
}
if (gfxAllocation->getAllocationType() == GraphicsAllocation::AllocationType::SVM_GPU) {
kernelObjsForAuxTranslation.insert({KernelObjForAuxTranslation::Type::GFX_ALLOC, gfxAllocation});
}
}
}
}
}

41
opencl/test/unit_test/kernel/kernel_arg_buffer_tests.cpp
View File

@ -642,6 +642,47 @@ TEST_F(KernelArgBufferTest, givenSetUnifiedMemoryExecInfoOnKernelWithIndirectSta
}
}
TEST_F(KernelArgBufferTest, givenSVMAllocsManagerWithCompressedSVMAllocationsWhenFillWithKernelObjsForAuxTranslationIsCalledThenSetKernelObjectsForAuxTranslation) {
if (pContext->getSVMAllocsManager() == nullptr) {
return;
}
DebugManagerStateRestore debugRestorer;
DebugManager.flags.EnableStatelessCompression.set(1);
const auto allocationTypes = {GraphicsAllocation::AllocationType::BUFFER,
GraphicsAllocation::AllocationType::BUFFER_COMPRESSED,
GraphicsAllocation::AllocationType::BUFFER_HOST_MEMORY,
GraphicsAllocation::AllocationType::SVM_GPU};
MockGraphicsAllocation gfxAllocation;
SvmAllocationData allocData(0);
allocData.gpuAllocations.addAllocation(&gfxAllocation);
allocData.device = &pClDevice->getDevice();
for (const auto type : allocationTypes) {
gfxAllocation.setAllocationType(type);
pContext->getSVMAllocsManager()->insertSVMAlloc(allocData);
KernelObjsForAuxTranslation kernelObjsForAuxTranslation;
pKernel->fillWithKernelObjsForAuxTranslation(kernelObjsForAuxTranslation);
if ((gfxAllocation.getAllocationType() == GraphicsAllocation::AllocationType::BUFFER_COMPRESSED) ||
(gfxAllocation.getAllocationType() == GraphicsAllocation::AllocationType::SVM_GPU)) {
EXPECT_EQ(1u, kernelObjsForAuxTranslation.size());
auto kernelObj = *kernelObjsForAuxTranslation.find({KernelObjForAuxTranslation::Type::GFX_ALLOC, &gfxAllocation});
EXPECT_NE(nullptr, kernelObj.object);
EXPECT_EQ(KernelObjForAuxTranslation::Type::GFX_ALLOC, kernelObj.type);
kernelObjsForAuxTranslation.erase(kernelObj);
} else {
EXPECT_EQ(0u, kernelObjsForAuxTranslation.size());
}
pContext->getSVMAllocsManager()->removeSVMAlloc(allocData);
}
}
class KernelArgBufferFixtureBindless : public KernelArgBufferFixture {
public:
void SetUp() {