intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2026-01-05 09:09:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Check indirect access from igc"

Browse Source 
This reverts commit e5d63cd303.

Signed-off-by: Compute-Runtime-Validation <compute-runtime-validation@intel.com>
This commit is contained in:
Compute-Runtime-Validation
2022-07-22 03:04:43 +02:00
committed by Compute-Runtime-Automation
parent 2d8176fdbd
commit 0eb2001d8f
9 changed files with 14 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -258,8 +258,7 @@ cl_int Kernel::initialize() {
this->kernelHasIndirectAccess |= kernelInfo.kernelDescriptor.kernelAttributes.hasNonKernelArgLoad ||
kernelInfo.kernelDescriptor.kernelAttributes.hasNonKernelArgStore ||
kernelInfo.kernelDescriptor.kernelAttributes.hasNonKernelArgAtomic ||
kernelInfo.hasIndirectStatelessAccess;
kernelInfo.kernelDescriptor.kernelAttributes.hasNonKernelArgAtomic;
provideInitializationHints();
// resolve the new kernel info to account for kernel handlers
@@ -1120,14 +1119,6 @@ inline void Kernel::makeArgsResident(CommandStreamReceiver &commandStreamReceive
commandStreamReceiver.makeResident(*memObj->getMcsAllocation());
}
}
} else if (kernelArguments[argIndex].svmAllocation) {
auto svmAlloc = kernelArguments[argIndex].svmAllocation;
auto pageFaultManager = executionEnvironment.memoryManager->getPageFaultManager();
if (pageFaultManager &&
this->isUnifiedMemorySyncRequired) {
pageFaultManager->moveAllocationToGpuDomain(reinterpret_cast<void *>(svmAlloc->getGpuAddress()));
}
commandStreamReceiver.makeResident(*svmAlloc);
}
}
}
@@ -1260,9 +1251,9 @@ void Kernel::makeResident(CommandStreamReceiver &commandStreamReceiver) {
gtpinNotifyMakeResident(this, &commandStreamReceiver);
if (this->kernelHasIndirectAccess && (unifiedMemoryControls.indirectDeviceAllocationsAllowed ||
unifiedMemoryControls.indirectHostAllocationsAllowed ||
unifiedMemoryControls.indirectSharedAllocationsAllowed)) {
if (unifiedMemoryControls.indirectDeviceAllocationsAllowed ||
unifiedMemoryControls.indirectHostAllocationsAllowed ||
unifiedMemoryControls.indirectSharedAllocationsAllowed) {
this->getContext().getSVMAllocsManager()->makeInternalAllocationsResident(commandStreamReceiver, unifiedMemoryControls.generateMask());
}
}
@@ -1644,24 +1635,6 @@ cl_int Kernel::setArgImmediate(uint32_t argIndex,
}
}
if (KernelArgMetadata::AddressSpaceQualifier::AddrPrivate == kernelInfo.getArgDescriptorAt(argIndex).getTraits().getAddressQualifier() &&
sizeof(void *) == argSize &&
isAligned<sizeof(void *)>(argVal)) {
const auto possibleSvmPointer = *static_cast<void *const *>(argVal);
if (possibleSvmPointer && isAligned<sizeof(void *)>(possibleSvmPointer)) {
const auto context = this->program->getContextPtr();
if (context) {
const auto svmManager = context->getSVMAllocsManager();
if (svmManager) {
auto possibleSvmAlloc = svmManager->getSVMAlloc(possibleSvmPointer);
if (possibleSvmAlloc) {
this->kernelArguments[argIndex].svmAllocation = possibleSvmAlloc->gpuAllocations.getGraphicsAllocation(this->getDevice().getRootDeviceIndex());
}
}
}
}
}
retVal = CL_SUCCESS;
}