Formatting changes/follow patterns.

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

Author: jbrodman

sycl/test/usm/clext.cpp

@@ -9,42 +9,14 @@
 //===----------------------------------------------------------------------===//
 
 #include <CL/sycl/detail/clusm.hpp>
+
+#include "findplatforms.hpp"
+
 #include <cstring>
 #include <iostream>
 
 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;
@@ -72,7 +44,7 @@ int main(int argc, char** argv) {
   cl_platform_id platform;
   cl_device_id device;
 
-  if (!findPlatformAndDevice(deviceType, platform, device)) {
+  if (!findPlatformAndDevice(deviceType, platform, device, errorCode)) {
     return 2;
   }
 

sycl/test/usm/clusm.cpp

@@ -9,42 +9,14 @@
 //===----------------------------------------------------------------------===//
 
 #include <CL/sycl/detail/clusm.hpp>
+
+#include "findplatforms.hpp"
+
 #include <cstring>
 #include <iostream>
 
 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;
@@ -71,11 +43,10 @@ int main(int argc, char** argv) {
     : CL_DEVICE_TYPE_GPU;
 
   cl_int errorCode;
-  
   cl_platform_id platform;
   cl_device_id device;
 
-  if (!findPlatformAndDevice(deviceType, platform, device)) {
+  if (!findPlatformAndDevice(deviceType, platform, device, errorCode)) {
     return 2;
   }
 

sycl/test/usm/findplatforms.hpp

@@ -0,0 +1,35 @@
+//==------------------- findplatforms.hpp ----------------------------------==//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+bool findPlatformAndDevice(cl_device_type deviceType,
+                           cl_platform_id &platformOut, cl_device_id &deviceOut,
+                           cl_int &errorCode) {
+  cl_uint numPlatforms;
+  bool foundDevice = false;
+
+  errorCode = clGetPlatformIDs(0, nullptr, &numPlatforms);
+  std::vector<cl_platform_id> platforms(numPlatforms);
+  errorCode = clGetPlatformIDs(numPlatforms, platforms.data(), nullptr);
+
+  for (auto platform : platforms) {
+    if (!foundDevice) {
+      cl_uint numDevices = 0;
+      errorCode =
+          clGetDeviceIDs(platform, deviceType, 0, nullptr, &numDevices);
+      std::vector<cl_device_id> devices(numDevices);
+      errorCode = clGetDeviceIDs(platform, deviceType, numDevices,
+                                 devices.data(), nullptr);
+      if (numDevices) {
+        platformOut = platform;
+        deviceOut = devices[0];
+        foundDevice = true;
+      }
+    }
+  }
+
+  return foundDevice;
+}