AI/rocm-systems
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SWDEV-423835 - Fixing kernel launch issues on Virtual Memory Management path.

Browse Source 
Change-Id: I9f5e8a3d83af3809b2c50b21a10697e26113dd23
This commit is contained in:
kjayapra-amd
2024-02-05 16:50:51 -05:00
committed by Karthik Jayaprakash
parent dd43dc930d
commit f5ca620baa
10 changed files with 87 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rocclr/device/pal/palvirtual.cpp
+11 -9
View File
@@ -2192,18 +2192,18 @@ void VirtualGPU::submitVirtualMap(amd::VirtualMapCommand& vcmd) {
amd::ScopedLock lock(execution());
profilingBegin(vcmd);
amd::Memory* va = amd::MemObjMap::FindVirtualMemObj(vcmd.ptr());
if (va == nullptr || !(va->getMemFlags() & CL_MEM_VA_RANGE_AMD)) {
amd::Memory* vaddr_mem_obj = amd::MemObjMap::FindVirtualMemObj(vcmd.ptr());
if (vaddr_mem_obj == nullptr || !(vaddr_mem_obj->getMemFlags() & CL_MEM_VA_RANGE_AMD)) {
profilingEnd(vcmd);
return;
}
pal::Memory* vaRange = dev().getGpuMemory(va);
Pal::IGpuMemory* memory = (vcmd.memory() == nullptr) ?
pal::Memory* vaddr_pal_mem = dev().getGpuMemory(vaddr_mem_obj);
Pal::IGpuMemory* phymem_igpu_mem = (vcmd.memory() == nullptr) ?
nullptr : dev().getGpuMemory(vcmd.memory())->iMem();
Pal::VirtualMemoryRemapRange range{
vaRange->iMem(),
vaddr_pal_mem->iMem(),
0,
memory,
phymem_igpu_mem,
0,
vcmd.size(),
Pal::VirtualGpuMemAccessMode::NoAccess
@@ -2224,13 +2224,15 @@ void VirtualGPU::submitVirtualMap(amd::VirtualMapCommand& vcmd) {
setGpuEvent(event);
if (result == Pal::Result::Success) {
if (vcmd.memory() != nullptr) {
// assert the va wasn't mapped already
// assert the vaddr_mem_obj wasn't mapped already
assert(amd::MemObjMap::FindMemObj(vcmd.ptr()) == nullptr);
amd::MemObjMap::AddMemObj(vcmd.ptr(), vcmd.memory());
amd::MemObjMap::AddMemObj(vcmd.ptr(), vaddr_mem_obj);
vaddr_mem_obj->getUserData().phys_mem_obj = vcmd.memory();
} else {
// assert the va is mapped and needs to be removed
// assert the vaddr_mem_obj is mapped and needs to be removed
assert(amd::MemObjMap::FindMemObj(vcmd.ptr()) != nullptr);
amd::MemObjMap::RemoveMemObj(vcmd.ptr());
vaddr_mem_obj->getUserData().phys_mem_obj = nullptr;
}
}
profilingEnd(vcmd);