Fix findplatforms issue due to CL weirdness for return types. Add multictxt tests.

Signed-off-by: James Brodman <[email protected]>

Author: jbrodman

sycl/test/lit.cfg

@@ -94,6 +94,7 @@ if getDeviceCount("cpu"):
     print("Found available CPU device")
     cpu_run_substitute = "env SYCL_DEVICE_TYPE=CPU "
     cpu_check_substitute = "| FileCheck %s"
+    config.available_features.add('cpu')
 config.substitutions.append( ('%CPU_RUN_PLACEHOLDER',  cpu_run_substitute) )
 config.substitutions.append( ('%CPU_CHECK_PLACEHOLDER',  cpu_check_substitute) )
 

sycl/test/usm/findplatforms.hpp

@@ -5,30 +5,31 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
+#include <iostream>
+
 bool findPlatformAndDevice(cl_device_type deviceType,
                            cl_platform_id &platformOut, cl_device_id &deviceOut) {
   cl_uint numPlatforms;
   cl_int errorCode;
 
   errorCode = clGetPlatformIDs(0, nullptr, &numPlatforms);
-  if (errorCode != CL_SUCCESS) return false;
 
   std::vector<cl_platform_id> platforms(numPlatforms);
   errorCode = clGetPlatformIDs(numPlatforms, platforms.data(), nullptr);
-  if (errorCode != CL_SUCCESS) return false;
 
   for (auto platform : platforms) {
     cl_uint numDevices = 0;
     errorCode =
       clGetDeviceIDs(platform, deviceType, 0, nullptr, &numDevices);
-    if (errorCode != CL_SUCCESS) return false;
-
-    std::vector<cl_device_id> devices(numDevices);
-    errorCode = clGetDeviceIDs(platform, deviceType, numDevices,
-                               devices.data(), nullptr);
-    if (errorCode != CL_SUCCESS) return false;
+    if (!(errorCode == CL_SUCCESS || errorCode == CL_DEVICE_NOT_FOUND))
+      return false;
 
     if (numDevices) {
+      std::vector<cl_device_id> devices(numDevices);
+      errorCode = clGetDeviceIDs(platform, deviceType, numDevices,
+				 devices.data(), nullptr);
+      if (errorCode != CL_SUCCESS) return false;
+
       platformOut = platform;
       deviceOut = devices[0];
       return true;

sycl/test/usm/multictxtcpu.cpp

@@ -0,0 +1,28 @@
+// REQUIRES: cpu,gpu
+// RUN: %clangxx -fsycl %s -o %t1.out -lOpenCL
+// RUN: %t1.out
+
+//==----------------- multictxtcpu.cpp - Multi Context USM CPU test --------==//
+//
+// 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
+//
+//===----------------------------------------------------------------------===//
+
+#include <CL/sycl.hpp>
+
+using namespace cl::sycl;
+
+int main() {
+  queue gpu_q(gpu_selector{});
+  queue cpu_q(cpu_selector{});
+  device dev = cpu_q.get_device();
+  context ctx = cpu_q.get_context();
+  
+  void *ptr = malloc_shared(128, dev, ctx);
+  
+  free(ptr, ctx);
+  
+  return 0;
+}

sycl/test/usm/multictxtgpu.cpp

@@ -0,0 +1,28 @@
+// REQUIRES: cpu, gpu
+// RUN: %clangxx -fsycl %s -o %t1.out -lOpenCL
+// RUN: %t1.out
+
+//==----------------- multictxtgpu.cpp - Multi Context USM GPU test --------==//
+//
+// 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
+//
+//===----------------------------------------------------------------------===//
+
+#include <CL/sycl.hpp>
+
+using namespace cl::sycl;
+
+int main() {
+  queue cpu_q(cpu_selector{});
+  queue gpu_q(gpu_selector{});
+  device dev = gpu_q.get_device();
+  context ctx = gpu_q.get_context();
+  
+  void *ptr = malloc_shared(128, dev, ctx);
+  
+  free(ptr, ctx);
+  
+  return 0;
+}

sycl/test/usm/multictxtgpu2.cpp

@@ -0,0 +1,28 @@
+// REQUIRES: cpu, gpu
+// RUN: %clangxx -fsycl %s -o %t1.out -lOpenCL
+// RUN: %t1.out
+
+//==----------------- multictxtgpu2.cpp - Multi Context USM GPU test -------==//
+//
+// 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
+//
+//===----------------------------------------------------------------------===//
+
+#include <CL/sycl.hpp>
+
+using namespace cl::sycl;
+
+int main() {
+  queue gpu_q(gpu_selector{});
+  queue cpu_q(cpu_selector{});
+  device dev = gpu_q.get_device();
+  context ctx = gpu_q.get_context();
+  
+  void *ptr = malloc_shared(128, dev, ctx);
+  
+  free(ptr, ctx);
+  
+  return 0;
+}