SWDEV-311270 - Clean-up IPC path in ROCclr

- Make IPC interfaces generic between devices and rely on the IPC buffer
for attach/detach logic

Change-Id: Id3c18d122030329b7ee532bbb6317de9dd6a0bbe


[ROCm/clr commit: 9aa6f25f1c]
这个提交包含在:
German
2023-06-16 18:38:34 -04:00
提交者 German Andryeyev
父节点 60b9dc4a45
当前提交 c8e65415ea
修改 13 个文件,包含 196 行新增299 行删除
+1 -111
查看文件
@@ -1,4 +1,4 @@
/* Copyright (c) 2008 - 2021 Advanced Micro Devices, Inc.
/* Copyright (c) 2008 - 2023 Advanced Micro Devices, Inc.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
@@ -2345,116 +2345,6 @@ void Device::virtualFree(void* addr) {
}
}
// ================================================================================================
bool Device::IpcCreate(void* dev_ptr, size_t* mem_size, void* handle, size_t* mem_offset) const {
hsa_status_t hsa_status = HSA_STATUS_SUCCESS;
amd::Memory* amd_mem_obj = amd::MemObjMap::FindMemObj(dev_ptr);
if (amd_mem_obj == nullptr) {
DevLogPrintfError("Cannot retrieve amd_mem_obj for dev_ptr: 0x%x", dev_ptr);
return false;
}
// Get the original pointer from the amd::Memory object
void* orig_dev_ptr = nullptr;
if (amd_mem_obj->getSvmPtr() != nullptr) {
orig_dev_ptr = amd_mem_obj->getSvmPtr();
} else if (amd_mem_obj->getHostMem() != nullptr) {
orig_dev_ptr = amd_mem_obj->getHostMem();
} else {
ShouldNotReachHere();
}
// Check if the dev_ptr is lesser than original dev_ptr
if (orig_dev_ptr > dev_ptr) {
// If this happens, then revisit FindMemObj logic
DevLogPrintfError("Original dev_ptr: 0x%x cannot be greater than dev_ptr: 0x%x", orig_dev_ptr,
dev_ptr);
return false;
}
// Calculate the memory offset from the original base ptr
*mem_offset = reinterpret_cast<address>(dev_ptr) - reinterpret_cast<address>(orig_dev_ptr);
*mem_size = amd_mem_obj->getSize();
// Check if the dev_ptr is greater than memory allocated
if (*mem_offset > *mem_size) {
DevLogPrintfError(
"Memory offset: %u cannot be greater than size of original memory allocated: %u", *mem_size,
*mem_offset);
return false;
}
auto dev_mem = getGpuMemory(amd_mem_obj);
*reinterpret_cast<void**>(handle) = dev_mem->ExportHandle();
return true;
}
// ================================================================================================
bool Device::IpcAttach(const void* handle, size_t mem_size, size_t mem_offset, unsigned int flags,
void** dev_ptr) const {
amd::Memory* amd_mem_obj = nullptr;
// Note: ROCr path has a validation for duplicated IPC memory, but PAL currently can't
// identify the duplicates
// Create an amd Memory object for the handle
amd_mem_obj = new (context()) amd::IpcBuffer(context(), flags, mem_offset, mem_size,
*reinterpret_cast<amd::Os::FileDesc*>(const_cast<void*>(handle)));
if (amd_mem_obj == nullptr) {
LogError("failed to create a mem object!");
return false;
}
if (!amd_mem_obj->create(nullptr)) {
LogError("failed to create a svm hidden buffer!");
amd_mem_obj->release();
return false;
}
// Add the original mem_ptr to the MemObjMap with newly created amd_mem_obj
amd::MemObjMap::AddMemObj(amd_mem_obj->getSvmPtr(), amd_mem_obj);
// Make sure the mem_offset doesnt overflow the allocated memory
guarantee((mem_offset < mem_size), "IPC mem offset greater than allocated size");
*dev_ptr = amd_mem_obj->getSvmPtr();
return true;
}
// ================================================================================================
bool Device::IpcDetach(void* dev_ptr) const {
hsa_status_t hsa_status = HSA_STATUS_SUCCESS;
amd::Memory* amd_mem_obj = amd::MemObjMap::FindMemObj(dev_ptr);
if (amd_mem_obj == nullptr) {
DevLogPrintfError("Memory object for the ptr: 0x%x cannot be null \n", dev_ptr);
return false;
}
if (!amd_mem_obj->ipcShared()) {
DevLogPrintfError("Memory object for the ptr: 0x%x is not ipcShared \n", dev_ptr);
return false;
}
// Get the original pointer from the amd::Memory object
void* orig_dev_ptr = nullptr;
if (amd_mem_obj->getSvmPtr() != nullptr) {
orig_dev_ptr = amd_mem_obj->getSvmPtr();
} else if (amd_mem_obj->getHostMem() != nullptr) {
orig_dev_ptr = amd_mem_obj->getHostMem();
} else {
ShouldNotReachHere();
}
if (amd_mem_obj->release() == 0) {
amd::MemObjMap::RemoveMemObj(orig_dev_ptr);
}
return true;
}
// ================================================================================================
bool Device::AcquireExclusiveGpuAccess() {
// Lock the virtual GPU list