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

Correct device handle for device/shared alloc

Browse Source 
Signed-off-by: John Falkowski <john.falkowski@intel.com>
This commit is contained in:
John Falkowski
2021-09-13 20:51:08 +00:00
committed by Compute-Runtime-Automation
parent 9f5828b615
commit 92c2c07bff
2 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
level_zero/core/source/context/context_imp.cpp
View File

@@ -136,8 +136,6 @@ ze_result_t ContextImp::allocDeviceMem(ze_device_handle_t hDevice,
return ZE_RESULT_SUCCESS;
}
neoDevice = this->driverHandle->devices[0]->getNEODevice();
if (lookupTable.relaxedSizeAllowed == false &&
(size > neoDevice->getDeviceInfo().maxMemAllocSize)) {
*ptr = nullptr;
@@ -155,8 +153,6 @@ ze_result_t ContextImp::allocDeviceMem(ze_device_handle_t hDevice,
return ZE_RESULT_ERROR_UNSUPPORTED_SIZE;
}
neoDevice = Device::fromHandle(hDevice)->getNEODevice();
deviceBitfields[rootDeviceIndex] = neoDevice->getDeviceBitfield();
NEO::SVMAllocsManager::UnifiedMemoryProperties unifiedMemoryProperties(InternalMemoryType::DEVICE_UNIFIED_MEMORY, this->driverHandle->rootDeviceIndices, deviceBitfields);
@@ -183,6 +179,12 @@ ze_result_t ContextImp::allocSharedMem(ze_device_handle_t hDevice,
size_t size,
size_t alignment,
void **ptr) {
auto neoDevice = this->devices.begin()->second->getNEODevice();
if (hDevice != nullptr) {
neoDevice = Device::fromHandle(hDevice)->getNEODevice();
}
bool relaxedSizeAllowed = NEO::DebugManager.flags.AllowUnrestrictedSize.get();
if (deviceDesc->pNext) {
const ze_base_desc_t *extendedDesc = reinterpret_cast<const ze_base_desc_t *>(deviceDesc->pNext);
@@ -196,14 +198,12 @@ ze_result_t ContextImp::allocSharedMem(ze_device_handle_t hDevice,
}
}
auto neoDevice = this->devices.begin()->second->getNEODevice();
if (relaxedSizeAllowed == false &&
(size > neoDevice->getDeviceInfo().maxMemAllocSize)) {
*ptr = nullptr;
return ZE_RESULT_ERROR_UNSUPPORTED_SIZE;
}
neoDevice = this->driverHandle->devices[0]->getNEODevice();
uint64_t globalMemSize = neoDevice->getDeviceInfo().globalMemSize;
uint32_t numSubDevices = neoDevice->getNumGenericSubDevices();
@@ -216,7 +216,6 @@ ze_result_t ContextImp::allocSharedMem(ze_device_handle_t hDevice,
return ZE_RESULT_ERROR_UNSUPPORTED_SIZE;
}
neoDevice = this->devices.begin()->second->getNEODevice();
auto deviceBitfields = this->deviceBitfields;
NEO::Device *unifiedMemoryPropertiesDevice = nullptr;
if (hDevice) {