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

P4 to Git Change 1553193 by gandryey@gera-lnx-rcf-lc on 2018/05/10 13:55:21

Browse Source 
SWDEV-79445 - OCL generic changes and code clean-up
	- Following CL#1552596. Add a flag to skip memory allocation. ROCr backend requires access to the parent object in the blit manager, but it's not fully initialized and a view creation is required. However a view creation with not fully initialized object can cause a dead lock if device memory is allocated during the object create.

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocmemory.cpp#35 edit
... //depot/stg/opencl/drivers/opencl/runtime/platform/memory.cpp#132 edit
... //depot/stg/opencl/drivers/opencl/runtime/platform/memory.hpp#104 edit
This commit is contained in:
foreman
2018-05-10 14:03:44 -04:00
parent 522de89190
commit e56e3ce677
3 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rocclr/runtime/platform/memory.cpp
+4 -4
View File
@@ -205,7 +205,7 @@ bool Memory::allocHostMemory(void* initFrom, bool allocHostMem, bool forceCopy)
return true;
}
bool Memory::create(void* initFrom, bool sysMemAlloc) {
bool Memory::create(void* initFrom, bool sysMemAlloc, bool skipAlloc) {
static const bool forceAllocHostMem = false;
initDeviceMemory();
@@ -238,7 +238,7 @@ bool Memory::create(void* initFrom, bool sysMemAlloc) {
deviceMemories_[i].ref_ = devices[i];
deviceMemories_[i].value_ = NULL;
if ((devices.size() == 1) || DISABLE_DEFERRED_ALLOC) {
if (!skipAlloc && ((devices.size() == 1) || DISABLE_DEFERRED_ALLOC)) {
device::Memory* mem = getDeviceMemory(*devices[i]);
if (NULL == mem) {
LogPrintfError("Can't allocate memory size - 0x%08X bytes!", getSize());
@@ -436,7 +436,7 @@ void Buffer::initDeviceMemory() {
memset(deviceMemories_, 0, context_().devices().size() * sizeof(DeviceMemory));
}
bool Buffer::create(void* initFrom, bool sysMemAlloc) {
bool Buffer::create(void* initFrom, bool sysMemAlloc, bool skipAlloc) {
if ((getMemFlags() & CL_MEM_EXTERNAL_PHYSICAL_AMD) && (initFrom != NULL)) {
busAddress_ = *(reinterpret_cast<cl_bus_address_amd*>(initFrom));
initFrom = NULL;
@@ -444,7 +444,7 @@ bool Buffer::create(void* initFrom, bool sysMemAlloc) {
busAddress_.surface_bus_address = 0;
busAddress_.marker_bus_address = 0;
}
return Memory::create(initFrom, sysMemAlloc);
return Memory::create(initFrom, sysMemAlloc, skipAlloc);
}
bool Buffer::isEntirelyCovered(const Coord3D& origin, const Coord3D& region) const {