[SYCL] address review comments #2

Signed-off-by: Sergey V Maslov <[email protected]>

Author: smaslov-intel

sycl/CMakeLists.txt

@@ -282,6 +282,7 @@ set( SYCL_TOOLCHAIN_DEPLOY_COMPONENTS
      llvm-link
      llvm-objcopy
      sycl-post-link
+     sycl-ls
      clang-resource-headers
      opencl-headers
      sycl-headers

sycl/test/plugins/sycl-ls-gpu-cuda.cpp

@@ -0,0 +1,15 @@
+// REQUIRES: gpu, cuda
+
+// RUN: env SYCL_BE=PI_CUDA sycl-ls --verbose >%t.cuda.out
+// RUN: FileCheck %s --check-prefixes=CHECK-BUILTIN-GPU-CUDA,CHECK-CUSTOM-GPU-CUDA --input-file %t.cuda.out
+
+// CHECK-BUILTIN-GPU-CUDA: gpu_selector(){{.*}}GPU :{{.*}}CUDA
+// CHECK-CUSTOM-GPU-CUDA: custom_selector(gpu){{.*}}GPU :{{.*}}CUDA
+
+//==---- sycl-ls-gpu-cuda.cpp - SYCL test for discovered/selected devices --==//
+//
+// 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
+//
+//===----------------------------------------------------------------------===//

sycl/test/plugins/lspi_gpu_opencl.cpp renamed to sycl/test/plugins/sycl-ls-gpu-opencl.cpp

@@ -1,15 +1,15 @@
-// REQUIRES: gpu
+// REQUIRES: gpu, opencl
 
-// RUN: lspi --verbose >%t.default.out
+// RUN: sycl-ls --verbose >%t.default.out
 // RUN: FileCheck %s --check-prefixes=CHECK-GPU-BUILTIN,CHECK-GPU-CUSTOM --input-file %t.default.out
 
-// RUN: env SYCL_BE=PI_OPENCL lspi --verbose >%t.opencl.out
+// RUN: env SYCL_BE=PI_OPENCL sycl-ls --verbose >%t.opencl.out
 // RUN: FileCheck %s --check-prefixes=CHECK-GPU-BUILTIN,CHECK-GPU-CUSTOM --input-file %t.opencl.out
 
 // CHECK-GPU-BUILTIN: gpu_selector(){{.*}}GPU : OpenCL
 // CHECK-GPU-CUSTOM: custom_selector(gpu){{.*}}GPU : OpenCL
 
-//==------- lspi_gpu_opencl.cpp - SYCL test for discovered/selected devices===//
+//==-- sycl-ls-gpu-opencl.cpp - SYCL test for discovered/selected devices -===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.

sycl/test/plugins/lspi_gpu_cuda.cpp renamed to sycl/test/plugins/sycl-ls-gpu-sycl-be.cpp

@@ -1,21 +1,21 @@
-// REQUIRES: gpu, cuda
+// REQUIRES: gpu, cuda, opencl
 
-// RUN: lspi --verbose >%t.default.out
+// RUN: sycl-ls --verbose >%t.default.out
 // RUN: FileCheck %s --check-prefixes=CHECK-BUILTIN-GPU-OPENCL,CHECK-CUSTOM-GPU-OPENCL --input-file %t.default.out
 
-// RUN: env SYCL_BE=PI_OPENCL lspi --verbose >%t.opencl.out
+// RUN: env SYCL_BE=PI_OPENCL sycl-ls --verbose >%t.opencl.out
 // RUN: FileCheck %s --check-prefixes=CHECK-BUILTIN-GPU-OPENCL,CHECK-CUSTOM-GPU-OPENCL --input-file %t.opencl.out
 
 // CHECK-BUILTIN-GPU-OPENCL: gpu_selector(){{.*}}GPU : OpenCL
 // CHECK-CUSTOM-GPU-OPENCL: custom_selector(gpu){{.*}}GPU : OpenCL
 
-// RUN: env SYCL_BE=PI_CUDA lspi --verbose >%t.cuda.out
+// RUN: env SYCL_BE=PI_CUDA sycl-ls --verbose >%t.cuda.out
 // RUN: FileCheck %s --check-prefixes=CHECK-BUILTIN-GPU-CUDA,CHECK-CUSTOM-GPU-CUDA --input-file %t.cuda.out
 
 // CHECK-BUILTIN-GPU-CUDA: gpu_selector(){{.*}}GPU : CUDA
 // CHECK-CUSTOM-GPU-CUDA: custom_selector(gpu){{.*}}GPU : CUDA
 
-//==------- lspi_gpu_cuda.cpp - SYCL test for discovered/selected devices --==//
+//==---- sycl-ls-gpu-sycl-be.cpp - SYCL test for discovered/selected devices --==//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.

sycl/test/plugins/sycl-ls.cpp

@@ -0,0 +1,11 @@
+// RUN: sycl-ls --verbose | grep "Device \[" | wc -l >%t.verbose.out
+// RUN: sycl-ls | wc -l >%t.concise.out
+// RUN: diff %t.verbose.out %t.concise.out
+
+//==---- sycl-ls.cpp - SYCL test for consistency of sycl-ls output ---------==//
+//
+// 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
+//
+//===----------------------------------------------------------------------===//

sycl/tools/sycl-ls/CMakeLists.txt

@@ -1,13 +1,8 @@
-set(CMAKE_CXX_STANDARD 11)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-set(CMAKE_CXX_EXTENSIONS OFF)
-
 add_executable(sycl-ls sycl-ls.cpp)
 add_dependencies(sycl-ls sycl)
 target_include_directories(sycl-ls PRIVATE "${sycl_inc_dir}")
 target_link_libraries(sycl-ls
   PRIVATE
     sycl
     OpenCL::Headers
-    ${OpenCL_LIBRARIES}
 )

sycl/tools/sycl-ls/sycl-ls.cpp

@@ -7,7 +7,7 @@
 //===----------------------------------------------------------------------===//
 //
 // The "sycl-ls" utility lists all platforms/devices discovered by PI similar to
-// how lscl prints this for OpenCL devices.
+// how clinfo prints this for OpenCL devices.
 //
 // There are two types of output:
 //   concise (default) and