From 96acb578ad6a8500ba7a667dd0b7b89ba4453e27 Mon Sep 17 00:00:00 2001 From: foreman Date: Tue, 21 Aug 2018 18:24:17 -0400 Subject: [PATCH] P4 to Git Change 1596631 by skudchad@skudchad-lnx on 2018/08/21 18:05:06 SWDEV-145570 - [HIP] Fixes incorrect condition. Its not needed Affected files ... ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/paldevice.cpp#106 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocdevice.cpp#99 edit --- rocclr/runtime/device/pal/paldevice.cpp | 4 ---- rocclr/runtime/device/rocm/rocdevice.cpp | 2 -- 2 files changed, 6 deletions(-) diff --git a/rocclr/runtime/device/pal/paldevice.cpp b/rocclr/runtime/device/pal/paldevice.cpp index a60e1fabd5..5d0a0bcd03 100644 --- a/rocclr/runtime/device/pal/paldevice.cpp +++ b/rocclr/runtime/device/pal/paldevice.cpp @@ -1206,10 +1206,6 @@ bool Device::init() { bool result = (nullptr != d) && d->create(deviceList[ordinal]); if (useDeviceList) { result &= (requestedDevices.find(ordinal) != requestedDevices.end()); - if (!result) { - delete d; - break; - } } if (result && ((nullptr == selectDeviceByName) || ('\0' == selectDeviceByName[0]) || (strstr(selectDeviceByName, d->info().name_) != nullptr))) { diff --git a/rocclr/runtime/device/rocm/rocdevice.cpp b/rocclr/runtime/device/rocm/rocdevice.cpp index a874a36372..4cd6ab352b 100644 --- a/rocclr/runtime/device/rocm/rocdevice.cpp +++ b/rocclr/runtime/device/rocm/rocdevice.cpp @@ -555,8 +555,6 @@ bool Device::init() { roc_device.release()->registerDevice(); } else if (useDeviceList && selectedDevices[ordinal++]) { roc_device.release()->registerDevice(); - } else { - break; } }