[SYCL] Replace CUDA & HIP features.hpp headers with macros (#14667)

Split out from #14145 this patch
replaces the generated `features.hpp` header for the CUDA and HIP
plugins, which only defined single feature test macro, with
`#cmakedefine01` definitions controlled by the build system.

Author: kbenzie

sycl/CMakeLists.txt

@@ -157,19 +157,21 @@ option(SYCL_ENABLE_MAJOR_RELEASE_PREVIEW_LIB "Enable build of the SYCL major rel
 
 # Needed for feature_test.hpp
 if ("cuda" IN_LIST SYCL_ENABLE_PLUGINS)
-  set(SYCL_BUILD_PI_CUDA ON)
+  set(SYCL_BUILD_BACKEND_CUDA ON)
+  set(SYCL_EXT_ONEAPI_BACKEND_CUDA ON)
 endif()
 if ("hip" IN_LIST SYCL_ENABLE_PLUGINS)
-  set(SYCL_BUILD_PI_HIP ON)
+  set(SYCL_BUILD_BACKEND_HIP ON)
+  set(SYCL_EXT_ONEAPI_BACKEND_HIP ON)
 endif()
 if ("opencl" IN_LIST SYCL_ENABLE_PLUGINS)
-  set(SYCL_BUILD_PI_OPENCL ON)
+  set(SYCL_BUILD_BACKEND_OPENCL ON)
 endif()
 if ("level_zero" IN_LIST SYCL_ENABLE_PLUGINS)
-  set(SYCL_BUILD_PI_LEVEL_ZERO ON)
+  set(SYCL_BUILD_BACKENDLEVEL_ZERO ON)
 endif()
 if ("native_cpu" IN_LIST SYCL_ENABLE_PLUGINS)
-  set(SYCL_BUILD_NATIVE_CPU ON)
+  set(SYCL_BUILD_BACKEND_NATIVE_CPU ON)
 endif()
 
 # Configure SYCL version macro

sycl/source/feature_test.hpp.in

@@ -116,13 +116,8 @@ inline namespace _V1 {
 #define __has_include(x) 0
 #endif
 
-#if __has_include("detail/plugins/cuda/features.hpp")
-#include "detail/plugins/cuda/features.hpp"
-#endif
-
-#if __has_include("detail/plugins/hip/features.hpp")
-#include "detail/plugins/hip/features.hpp"
-#endif
+#cmakedefine01 SYCL_EXT_ONEAPI_BACKEND_CUDA
+#cmakedefine01 SYCL_EXT_ONEAPI_BACKEND_HIP
 
 } // namespace _V1
 } // namespace sycl

sycl/test/CMakeLists.txt

@@ -58,10 +58,10 @@ add_lit_testsuite(check-sycl-deploy "Running the SYCL regression tests"
 set_target_properties(check-sycl-deploy PROPERTIES FOLDER "SYCL tests")
 
 set(TRIPLES "spir64-unknown-unknown")
-if (SYCL_BUILD_PI_CUDA OR (SYCL_BUILD_PI_HIP AND "${SYCL_BUILD_PI_HIP_PLATFORM}" STREQUAL "NVIDIA"))
+if (SYCL_BUILD_BACKEND_CUDA OR (SYCL_BUILD_BACKEND_HIP AND "${SYCL_BUILD_PI_HIP_PLATFORM}" STREQUAL "NVIDIA"))
   set(TRIPLES "${TRIPLES},nvptx64-nvidia-cuda")
 endif()
-if ((SYCL_BUILD_PI_HIP AND "${SYCL_BUILD_PI_HIP_PLATFORM}" STREQUAL "AMD"))
+if ((SYCL_BUILD_BACKEND_HIP AND "${SYCL_BUILD_PI_HIP_PLATFORM}" STREQUAL "AMD"))
   set(TRIPLES "${TRIPLES},amdgcn-amd-amdhsa")
 endif()
 
@@ -94,7 +94,7 @@ add_lit_testsuite(check-sycl-dumps "Running ABI dump tests only"
   EXCLUDE_FROM_CHECK_ALL
   )
 
-if(SYCL_BUILD_PI_CUDA)
+if(SYCL_BUILD_BACKEND_CUDA)
   add_lit_testsuite(check-sycl-ptx "Running device-agnostic SYCL regression tests for NVidia PTX"
     ${CMAKE_CURRENT_BINARY_DIR}
     ARGS ${RT_TEST_ARGS}
@@ -108,7 +108,7 @@ if(SYCL_BUILD_PI_CUDA)
   add_dependencies(check-sycl-cuda check-sycl-ptx)
 endif()
 
-if(SYCL_BUILD_PI_HIP)
+if(SYCL_BUILD_BACKEND_HIP)
   add_custom_target(check-sycl-hip)
   if("${SYCL_BUILD_PI_HIP_PLATFORM}" STREQUAL "NVIDIA")
     add_lit_testsuite(check-sycl-hip-ptx "Running device-agnostic SYCL regression tests for HIP NVidia PTX"

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

@@ -26,11 +26,11 @@ config.llvm_enable_projects = "@LLVM_ENABLE_PROJECTS@"
 config.sycl_threads_lib = '@SYCL_THREADS_LIB@'
 config.sycl_use_libcxx = '@SYCL_USE_LIBCXX@'
 config.extra_environment = lit_config.params.get("extra_environment", "@LIT_EXTRA_ENVIRONMENT@")
-config.cuda = '@SYCL_BUILD_PI_CUDA@'
-config.hip = '@SYCL_BUILD_PI_HIP@'
-config.opencl = '@SYCL_BUILD_PI_OPENCL@'
-config.level_zero = '@SYCL_BUILD_PI_LEVEL_ZERO@'
-config.native_cpu = '@SYCL_BUILD_NATIVE_CPU@'
+config.cuda = '@SYCL_BUILD_BACKEND_CUDA@'
+config.hip = '@SYCL_BUILD_BACKEND_HIP@'
+config.opencl = '@SYCL_BUILD_BACKEND_OPENCL@'
+config.level_zero = '@SYCL_BUILD_BACKEND_LEVEL_ZERO@'
+config.native_cpu = '@SYCL_BUILD_BACKEND_NATIVE_CPU@'
 config.native_cpu_ock = '@NATIVECPU_USE_OCK@'
 config.sycl_preview_lib_enabled = '@SYCL_ENABLE_MAJOR_RELEASE_PREVIEW_LIB@'
 

sycl/tools/sycl-trace/CMakeLists.txt

@@ -97,13 +97,13 @@ target_include_directories(sycl_pi_trace_collector PRIVATE
 
 add_dependencies(sycl_pi_trace_collector pi-pretty-printers)
 
-if(SYCL_BUILD_PI_CUDA)
+if(SYCL_BUILD_BACKEND_CUDA)
 
   find_package(CUDA 10.1 REQUIRED)
 
   target_compile_definitions(cuda_trace_collector
     PRIVATE
-      $<$<BOOL:${SYCL_BUILD_PI_CUDA}>:USE_PI_CUDA>
+      $<$<BOOL:${SYCL_BUILD_BACKEND_CUDA}>:USE_PI_CUDA>
   )
 
   # The following two if's can be removed when FindCUDA -> FindCUDAToolkit.
@@ -157,7 +157,7 @@ if(SYCL_BUILD_PI_CUDA)
   target_link_libraries(cuda_trace_collector PRIVATE xptifw)
   target_compile_definitions(sycl_pi_trace_collector
     PRIVATE
-      $<$<BOOL:${SYCL_BUILD_PI_CUDA}>:USE_PI_CUDA>
+      $<$<BOOL:${SYCL_BUILD_BACKEND_CUDA}>:USE_PI_CUDA>
   )
 endif()