Add InterProcess memory sharing support.

Support is disabled pending KFD / Thunk readiness.

Change-Id: I55def748e3d56cbfcfa6e24983a0ab78567aa81d
This commit is contained in:
Sean Keely
2016-11-10 02:51:19 -06:00
rodzic 9dd76dbeda
commit 8081758a55
9 zmienionych plików z 260 dodań i 5 usunięć
@@ -620,10 +620,11 @@ hsa_status_t Runtime::InteropMap(uint32_t num_agents, Agent** agents,
&altAddress, map_flags, num_agents,
nodes) != HSAKMT_STATUS_SUCCESS) {
map_flags.ui32.PageSize = HSA_PAGE_SIZE_4KB;
if (hsaKmtMapMemoryToGPUNodes(info.MemoryAddress, info.SizeInBytes,
&altAddress, map_flags, num_agents,
nodes) != HSAKMT_STATUS_SUCCESS)
if (hsaKmtMapMemoryToGPUNodes(info.MemoryAddress, info.SizeInBytes, &altAddress, map_flags,
num_agents, nodes) != HSAKMT_STATUS_SUCCESS) {
hsaKmtDeregisterMemory(info.MemoryAddress);
return HSA_STATUS_ERROR_OUT_OF_RESOURCES;
}
}
if (metadata_size != NULL) *metadata_size = info.MetadataSizeInBytes;
@@ -715,6 +716,80 @@ hsa_status_t Runtime::SetPtrInfoData(void* ptr, void* userptr) {
return HSA_STATUS_ERROR_INVALID_ARGUMENT;
}
hsa_status_t Runtime::IPCCreate(void* ptr, size_t len, hsa_amd_ipc_memory_t* handle) {
return HSA_STATUS_ERROR;
//static_assert(sizeof(hsa_amd_ipc_memory_t) == sizeof(HsaSharedMemoryHandle),
// "Thunk IPC mismatch.");
//if (hsaKmtShareMemory(ptr, len, (HsaSharedMemoryHandle*)handle) == HSAKMT_STATUS_SUCCESS)
// return HSA_STATUS_SUCCESS;
//else
// return HSA_STATUS_ERROR_INVALID_ARGUMENT;
}
hsa_status_t Runtime::IPCAttach(const hsa_amd_ipc_memory_t* handle, size_t len, uint32_t num_agents,
Agent** agents, void** mapped_ptr) {
return HSA_STATUS_ERROR;
//static const int tinyArraySize = 8;
//void* importAddress;
//HSAuint64 importSize;
//HSAuint64 altAddress;
//if (num_agents == 0) {
// if (hsaKmtRegisterSharedHandle(reinterpret_cast<const HsaSharedMemoryHandle*>(handle),
// &importAddress, &importSize) != HSAKMT_STATUS_SUCCESS)
// return HSA_STATUS_ERROR_INVALID_ARGUMENT;
// if (hsaKmtMapMemoryToGPU(importAddress, importSize, &altAddress) != HSAKMT_STATUS_SUCCESS) {
// hsaKmtDeregisterMemory(importAddress);
// return HSA_STATUS_ERROR_OUT_OF_RESOURCES;
// }
// *mapped_ptr = importAddress;
// return HSA_STATUS_SUCCESS;
//}
//HSAuint32* nodes = nullptr;
//if (num_agents > tinyArraySize)
// nodes = new HSAuint32[num_agents];
//else
// nodes = (HSAuint32*)alloca(sizeof(HSAuint32) * num_agents);
//if (nodes == NULL) return HSA_STATUS_ERROR_OUT_OF_RESOURCES;
//MAKE_SCOPE_GUARD([&]() {
// if (num_agents > tinyArraySize) delete[] nodes;
//});
//for (int i = 0; i < num_agents; i++)
// agents[i]->GetInfo((hsa_agent_info_t)HSA_AMD_AGENT_INFO_DRIVER_NODE_ID, &nodes[i]);
//if (hsaKmtRegisterSharedHandleToNodes(reinterpret_cast<const HsaSharedMemoryHandle*>(handle),
// &importAddress, &importSize, num_agents,
// nodes) != HSAKMT_STATUS_SUCCESS)
// return HSA_STATUS_ERROR_INVALID_ARGUMENT;
//HsaMemMapFlags map_flags;
//map_flags.Value = 0;
//map_flags.ui32.PageSize = HSA_PAGE_SIZE_64KB;
//if (hsaKmtMapMemoryToGPUNodes(importAddress, importSize, &altAddress, map_flags, num_agents,
// nodes) != HSAKMT_STATUS_SUCCESS) {
// map_flags.ui32.PageSize = HSA_PAGE_SIZE_4KB;
// if (hsaKmtMapMemoryToGPUNodes(importAddress, importSize, &altAddress, map_flags, num_agents,
// nodes) != HSAKMT_STATUS_SUCCESS) {
// hsaKmtDeregisterMemory(importAddress);
// return HSA_STATUS_ERROR_OUT_OF_RESOURCES;
// }
//}
//*mapped_ptr = importAddress;
//return HSA_STATUS_SUCCESS;
}
hsa_status_t Runtime::IPCDetach(void* ptr) {
return HSA_STATUS_ERROR;
//if (hsaKmtUnmapMemoryToGPU(ptr) != HSAKMT_STATUS_SUCCESS)
// return HSA_STATUS_ERROR_INVALID_ARGUMENT;
//if (hsaKmtDeregisterMemory(ptr) != HSAKMT_STATUS_SUCCESS)
// return HSA_STATUS_ERROR_INVALID_ARGUMENT;
//return HSA_STATUS_SUCCESS;
}
void Runtime::AsyncEventsLoop(void*) {
auto& async_events_control_ = runtime_singleton_->async_events_control_;
auto& async_events_ = runtime_singleton_->async_events_;