P4 to Git Change 1776019 by gandryey@gera-w8 on 2019/04/29 14:13:29

SWDEV-79445 - OCL generic changes and code clean-up
	- Remove GPU_DEVICE_NAME support

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpudevice.cpp#605 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/paldevice.cpp#131 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocdevice.cpp#125 edit
... //depot/stg/opencl/drivers/opencl/runtime/utils/flags.hpp#305 edit


[ROCm/clr commit: 5f99d6ed66]

projects/clr/rocclr/runtime/device/gpu/gpudevice.cpp

@@ -1216,25 +1216,21 @@ bool Device::init() {
   // Count up all the devices in the system.
   numDevices = gsAdaptor::enumerateAdaptors();
 
-  CALuint ordinal = 0;
   const char* selectDeviceByName = NULL;
   if (!flagIsDefault(GPU_DEVICE_ORDINAL)) {
     useDeviceList = true;
     parseRequestedDeviceList(requestedDevices);
-  } else if (!flagIsDefault(GPU_DEVICE_NAME)) {
-    selectDeviceByName = GPU_DEVICE_NAME;
   }
 
   // Loop through all active devices and initialize the device info structure
-  for (; ordinal < numDevices; ++ordinal) {
+  for (CALuint ordinal = 0; ordinal < numDevices; ++ordinal) {
     // Create the GPU device object
     Device* d = new Device();
     bool result = (NULL != d) && d->create(ordinal, numDevices);
     if (useDeviceList) {
       result &= (requestedDevices.find(ordinal) != requestedDevices.end());
     }
-    if (result && ((NULL == selectDeviceByName) || ('\0' == selectDeviceByName[0]) ||
-                   (strstr(selectDeviceByName, d->info().name_) != NULL))) {
+    if (result) {
       d->registerDevice();
     } else {
       delete d;