Fix tests to deal with multiple CLs being installed

Signed-off-by: James Brodman <james.brodman@intel.com>

Author: jbrodman

sycl/test/usm/clext.cpp

@@ -14,6 +14,37 @@
 
 using namespace cl::sycl::detail::usm;
 
+static int SIZE = 6;
+
+bool findPlatformAndDevice(cl_device_type deviceType,
+			   cl_platform_id& platformOut,
+			   cl_device_id& deviceOut) {
+  cl_platform_id platforms[SIZE];
+  cl_uint numPlatforms;
+  cl_device_id device;
+  cl_int errorCode;
+  bool foundDevice = false;
+
+  errorCode = clGetPlatformIDs(SIZE, platforms, &numPlatforms);
+
+  for (int i = 0; (!foundDevice) && (i < numPlatforms); i++) {
+    cl_uint numDevices;
+    errorCode = clGetDeviceIDs(platforms[i],
+			       deviceType,
+			       1,
+			       &device,
+			       &numDevices);
+
+    if (numDevices) {
+      platformOut = platforms[i];
+      deviceOut = device;
+      foundDevice = true;
+    }
+  }
+
+  return foundDevice;
+}
+
 int main(int argc, char** argv) {
   if (argc != 2) {
     std::cerr << "Please specify -cpu or -gpu!" << std::endl;
@@ -38,22 +69,14 @@ int main(int argc, char** argv) {
     : CL_DEVICE_TYPE_GPU;
 
   cl_int errorCode;
-  
   cl_platform_id platform;
-  errorCode = clGetPlatformIDs(1, &platform, nullptr);
-
-  GetCLUSM()->initExtensions(platform);
-  
-  if (errorCode != CL_SUCCESS) return 2;
-
   cl_device_id device;
-  errorCode = clGetDeviceIDs(platform,
-                             deviceType,
-                             1,
-                             &device,
-                             nullptr);
 
-  if (errorCode != CL_SUCCESS) return 3;
+  if (!findPlatformAndDevice(deviceType, platform, device)) {
+    return 2;
+  }
+
+  GetCLUSM()->initExtensions(platform);
 
   cl_context_properties ctxtProps[] =
   {

sycl/test/usm/clusm.cpp

@@ -14,6 +14,37 @@
 
 using namespace cl::sycl::detail::usm;
 
+static int SIZE = 6;
+
+bool findPlatformAndDevice(cl_device_type deviceType,
+			   cl_platform_id& platformOut,
+			   cl_device_id& deviceOut) {
+  cl_platform_id platforms[SIZE];
+  cl_uint numPlatforms;
+  cl_device_id device;
+  cl_int errorCode;
+  bool foundDevice = false;
+
+  errorCode = clGetPlatformIDs(SIZE, platforms, &numPlatforms);
+
+  for (int i = 0; (!foundDevice) && (i < numPlatforms); i++) {
+    cl_uint numDevices;
+    errorCode = clGetDeviceIDs(platforms[i],
+			       deviceType,
+			       1,
+			       &device,
+			       &numDevices);
+
+    if (numDevices) {
+      platformOut = platforms[i];
+      deviceOut = device;
+      foundDevice = true;
+    }
+  }
+
+  return foundDevice;
+}
+
 int main(int argc, char** argv) {
   if (argc != 2) {
     std::cerr << "Please specify -cpu or -gpu!" << std::endl;
@@ -42,18 +73,11 @@ int main(int argc, char** argv) {
   cl_int errorCode;
 
   cl_platform_id platform;
-  errorCode = clGetPlatformIDs(1, &platform, nullptr);
-
-  if (errorCode != CL_SUCCESS) return 2;
-
   cl_device_id device;
-  errorCode = clGetDeviceIDs(platform,
-                             deviceType,
-                             1,
-                             &device,
-                             nullptr);
 
-  if (errorCode != CL_SUCCESS) return 3;
+  if (!findPlatformAndDevice(deviceType, platform, device)) {
+    return 2;
+  }
 
   cl_context_properties ctxtProps[] =
   {