[SYCL][CUDA] Remove PI_CUDA specific details from clang

Removes PI_CUDA specific code paths and tests from clang, opting to
always enable them.

Signed-off-by: Alexander Johnston <[email protected]>

Author: Alexander Johnston

clang/CMakeLists.txt

@@ -219,10 +219,6 @@ endif()
 include(CheckIncludeFile)
 check_include_file(sys/resource.h CLANG_HAVE_RLIMITS)
 
-if(SYCL_BUILD_PI_CUDA)
-  set(SYCL_HAVE_PI_CUDA 1)
-endif()
-
 set(CLANG_RESOURCE_DIR "" CACHE STRING
   "Relative directory from the Clang binary to its resource files.")
 

clang/include/clang/Config/config.h.cmake

@@ -80,9 +80,6 @@
 #cmakedefine01 CLANG_ENABLE_OBJC_REWRITER
 #cmakedefine01 CLANG_ENABLE_STATIC_ANALYZER
 
-/* Define if we have SYCL PI CUDA support */
-#cmakedefine01 SYCL_HAVE_PI_CUDA
-
 /* Spawn a new process clang.exe for the CC1 tool invocation, when necessary */
 #cmakedefine01 CLANG_SPAWN_CC1
 

clang/lib/Driver/Driver.cpp

@@ -615,11 +615,9 @@ Driver::OpenMPRuntimeKind Driver::getOpenMPRuntime(const ArgList &Args) const {
 }
 
 static bool isValidSYCLTriple(llvm::Triple T) {
-#ifdef SYCL_HAVE_PI_CUDA
   // NVPTX is valid for SYCL.
   if (T.isNVPTX())
     return true;
-#endif
   // Check for invalid SYCL device triple values.
   // Non-SPIR arch.
   if (!T.isSPIR())

clang/test/Driver/sycl-libspirv-invalid.cpp

@@ -1,5 +1,5 @@
 /// Test that `-fsycl-libspirv-path=` produces a diagnostic when the library is not found.
-// REQUIRES: clang-driver, sycl-pi-cuda
+// REQUIRES: clang-driver
 // UNSUPPORTED: system-windows
 
 // RUN: %clangxx -### -std=c++11 -target x86_64-unknown-linux-gnu -fsycl \

clang/test/Driver/sycl-libspirv.cpp

@@ -1,5 +1,5 @@
 /// Test that `-fsycl-libspirv-path=` adds `-mlink-builtin-bitcode` when the library is found.
-// REQUIRES: clang-driver, sycl-pi-cuda
+// REQUIRES: clang-driver
 // UNSUPPORTED: system-windows
 
 // RUN: %clangxx -### -std=c++11 -target x86_64-unknown-linux-gnu -fsycl \

clang/test/Driver/sycl-offload-nvptx.cpp

@@ -1,5 +1,5 @@
 /// Tests specific to `-fsycl-targets=nvptx64-nvidia-nvcl-sycldevice`
-// REQUIRES: clang-driver, sycl-pi-cuda
+// REQUIRES: clang-driver
 
 // UNSUPPORTED: system-windows
 

clang/test/lit.cfg.py

@@ -77,9 +77,6 @@
     if config.clang_staticanalyzer_z3 == '1':
         config.available_features.add('z3')
 
-if config.sycl_pi_cuda == '1':
-    config.available_features.add('sycl-pi-cuda')
-
 llvm_config.add_tool_substitutions(tools, tool_dirs)
 
 config.substitutions.append(

clang/test/lit.site.cfg.py.in

@@ -30,7 +30,6 @@ config.host_arch = "@HOST_ARCH@"
 config.python_executable = "@PYTHON_EXECUTABLE@"
 config.use_z3_solver = lit_config.params.get('USE_Z3_SOLVER', "@USE_Z3_SOLVER@")
 config.has_plugins = @LLVM_ENABLE_PLUGINS@
-config.sycl_pi_cuda = "@SYCL_HAVE_PI_CUDA@"
 
 # Support substitution of the tools and libs dirs with user parameters. This is
 # used when we can't determine the tool dir at configuration time.

llvm/CMakeLists.txt

@@ -462,10 +462,6 @@ if( LLVM_USE_PERF )
   endif( NOT CMAKE_SYSTEM_NAME MATCHES "Linux" )
 endif( LLVM_USE_PERF )
 
-option(SYCL_BUILD_PI_CUDA
-  "Selects the PI API backend. When set to ON, the CUDA backend is selected. \
-   When set to OFF, the OpenCL backend is selected." OFF)
-
 set(LLVM_USE_SANITIZER "" CACHE STRING
   "Define the sanitizer used to build binaries and tests.")
 option(LLVM_OPTIMIZE_SANITIZED_BUILDS "Pass -O1 on debug sanitizer builds" ON)

sycl/CMakeLists.txt

@@ -137,6 +137,10 @@ install(DIRECTORY ${OPENCL_INCLUDE}/CL
   COMPONENT opencl-headers
 )
 
+option(SYCL_BUILD_PI_CUDA
+  "Selects the PI API backend. When set to ON, the CUDA backend is selected. \
+   When set to OFF, the OpenCL backend is selected." OFF)
+
 # Configure SYCL version macro
 set(sycl_inc_dir ${CMAKE_CURRENT_SOURCE_DIR}/include)
 set(sycl_src_dir ${CMAKE_CURRENT_SOURCE_DIR}/source)