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


[ROCm/clr commit: 96acb578ad]

projects/clr/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))) {

projects/clr/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;
     }
   }