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

Don't call updateFreeMemory() if the allocation failed

Browse Source 
Change-Id: I978cb2e463914f6a48b3d4a9057c0f67e7bdb646


[ROCm/clr commit: c781f4d419]
This commit is contained in:
Vladislav Sytchenko
2020-04-08 14:10:10 -04:00
committed by Vladislav Sytchenko
parent 5503b370fa
commit 668d49db62
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/clr/rocclr/device/rocm/rocmemory.cpp
+6 -4
View File
@@ -650,7 +650,8 @@ void Buffer::destroy() {
dev().memFree(deviceMemory_, size());
}
if (dev().settings().apuSystem_ || !isFineGrain) {
if ((deviceMemory_ != nullptr) &&
(dev().settings().apuSystem_ || !isFineGrain)) {
const_cast<Device&>(dev()).updateFreeMemory(size(), true);
}
@@ -739,7 +740,8 @@ bool Buffer::create() {
owner()->parent()->commitSvmMemory();
}
if (dev().settings().apuSystem_ || !isFineGrain) {
if ((deviceMemory_ != nullptr) &&
(dev().settings().apuSystem_ || !isFineGrain)) {
const_cast<Device&>(dev()).updateFreeMemory(size(), false);
}
@@ -805,7 +807,7 @@ bool Buffer::create() {
deviceMemory_ = dev().hostAlloc(size(), 1, false);
owner()->setHostMem(deviceMemory_);
if (dev().settings().apuSystem_) {
if ((deviceMemory_ != nullptr) && dev().settings().apuSystem_) {
const_cast<Device&>(dev()).updateFreeMemory(size(), false);
}
}
@@ -1091,7 +1093,7 @@ bool Image::create() {
if (originalDeviceMemory_ == nullptr) {
originalDeviceMemory_ = dev().hostAlloc(alloc_size, 1, false);
if (dev().settings().apuSystem_) {
if ((originalDeviceMemory_ != nullptr) && dev().settings().apuSystem_) {
const_cast<Device&>(dev()).updateFreeMemory(alloc_size, false);
}
}