Merge remote-tracking branch 'origin/sycl' into llvmspirv_pulldown

Closes: #18403

Author: sarnex

devops/scripts/benchmarks/benches/compute.py

@@ -49,7 +49,7 @@ def git_url(self) -> str:
         return "https://github.com/intel/compute-benchmarks.git"
 
     def git_hash(self) -> str:
-        return "015019f815f73e308171145a48b63d57c1263e45"
+        return "49a8c6314875c57fee9b59aea16e721572e3021d"
 
     def setup(self):
         if options.sycl is None:

libclc/utils/prepare-builtins.cpp

@@ -143,9 +143,11 @@ int main(int argc, char **argv) {
   //
   // NativeCPU uses the same builtins for multiple host targets and should
   // likewise not have features that limit the builtins to any particular
-  // target.
+  // target. It does not record any target triple so as to not confuse opt.
+  // TODO If this gets upstreamed into LLVM, it should be recognized in
+  // llvm::Triple.
   if (M->getTargetTriple().str().find("amdgcn") != std::string::npos ||
-      M->getTargetTriple().str() != "native_cpu") {
+      M->getTargetTriple().str() == "") {
     AttributeMask AM;
     AM.addAttribute("target-features");
     AM.addAttribute("target-cpu");

libdevice/cmake/modules/SYCLLibdevice.cmake

@@ -55,7 +55,7 @@ set(compile_opts
 set(SYCL_LIBDEVICE_GCC_TOOLCHAIN "" CACHE PATH "Path to GCC installation")
 
 if (NOT SYCL_LIBDEVICE_GCC_TOOLCHAIN STREQUAL "")
-  list(APPEND compile_opts "--gcc-toolchain=${SYCL_LIBDEVICE_GCC_TOOLCHAIN}")
+  list(APPEND compile_opts "--gcc-install-dir=${SYCL_LIBDEVICE_GCC_TOOLCHAIN}")
 endif()
 
 if (WIN32)
@@ -66,6 +66,7 @@ endif()
 add_custom_target(libsycldevice)
 
 set(filetypes obj obj-new-offload spv bc)
+set(filetypes_no_spv obj obj-new-offload bc)
 
 foreach(filetype IN LISTS filetypes)
   add_custom_target(libsycldevice-${filetype})
@@ -193,10 +194,14 @@ function(add_devicelibs filename)
   cmake_parse_arguments(ARG
     ""
     ""
-    "SRC;EXTRA_OPTS;DEPENDENCIES;SKIP_ARCHS"
+    "SRC;EXTRA_OPTS;DEPENDENCIES;SKIP_ARCHS;FILETYPES"
     ${ARGN})
-
-  foreach(filetype IN LISTS filetypes)
+  if(ARG_FILETYPES)
+    set(devicelib_filetypes "${ARG_FILETYPES}")
+  else()
+    set(devicelib_filetypes "${filetypes}")
+  endif()
+  foreach(filetype IN LISTS devicelib_filetypes)
     compile_lib(${filename}
       FILETYPE ${filetype}
       SRC ${ARG_SRC}
@@ -387,15 +392,15 @@ else()
       DEPENDENCIES ${asan_obj_deps}
       SKIP_ARCHS nvptx64-nvidia-cuda
                  amdgcn-amd-amdhsa
+      FILETYPES "${filetypes_no_spv}"
       EXTRA_OPTS -fno-sycl-instrument-device-code
                  -I${UR_SANITIZER_INCLUDE_DIR}
                  -I${CMAKE_CURRENT_SOURCE_DIR})
 
     # asan aot
-    set(sanitizer_filetypes obj obj-new-offload bc)
     set(asan_devicetypes pvc cpu dg2)
 
-    foreach(asan_ft IN LISTS sanitizer_filetypes)
+    foreach(asan_ft IN LISTS filetypes_no_spv)
       foreach(asan_device IN LISTS asan_devicetypes)
         compile_lib_ext(libsycl-asan-${asan_device}
                         SRC sanitizer/asan_rtl.cpp
@@ -409,14 +414,17 @@ else()
     add_devicelibs(libsycl-msan
       SRC sanitizer/msan_rtl.cpp
       DEPENDENCIES ${msan_obj_deps}
+      SKIP_ARCHS nvptx64-nvidia-cuda
+                 amdgcn-amd-amdhsa
+      FILETYPES "${filetypes_no_spv}"
       EXTRA_OPTS -fno-sycl-instrument-device-code
                  -I${UR_SANITIZER_INCLUDE_DIR}
                  -I${CMAKE_CURRENT_SOURCE_DIR})
 
     # msan aot
     set(msan_devicetypes pvc cpu)
 
-    foreach(msan_ft IN LISTS sanitizer_filetypes)
+    foreach(msan_ft IN LISTS filetypes_no_spv)
       foreach(msan_device IN LISTS msan_devicetypes)
         compile_lib_ext(libsycl-msan-${msan_device}
                         SRC sanitizer/msan_rtl.cpp
@@ -430,13 +438,16 @@ else()
     add_devicelibs(libsycl-tsan
       SRC sanitizer/tsan_rtl.cpp
       DEPENDENCIES ${tsan_obj_deps}
+      SKIP_ARCHS nvptx64-nvidia-cuda
+                 amdgcn-amd-amdhsa
+      FILETYPES "${filetypes_no_spv}"
       EXTRA_OPTS -fno-sycl-instrument-device-code
                  -I${UR_SANITIZER_INCLUDE_DIR}
                  -I${CMAKE_CURRENT_SOURCE_DIR})
 
     set(tsan_devicetypes pvc cpu)
 
-    foreach(tsan_ft IN LISTS sanitizer_filetypes)
+    foreach(tsan_ft IN LISTS filetypes_no_spv)
       foreach(tsan_device IN LISTS tsan_devicetypes)
         compile_lib_ext(libsycl-tsan-${tsan_device}
                         SRC sanitizer/tsan_rtl.cpp
@@ -470,9 +481,11 @@ add_devicelibs(libsycl-fallback-cmath-fp64
   DEPENDENCIES ${cmath_obj_deps})
 add_devicelibs(libsycl-fallback-bfloat16
   SRC fallback-bfloat16.cpp
+  FILETYPES "${filetypes_no_spv}"
   DEPENDENCIES ${bfloat16_obj_deps})
 add_devicelibs(libsycl-native-bfloat16
   SRC bfloat16_wrapper.cpp
+  FILETYPES "${filetypes_no_spv}"
   DEPENDENCIES ${bfloat16_obj_deps})
 
 # Create dependency and source lists for Intel math function libraries.
@@ -504,6 +517,10 @@ set(imf_host_cxx_flags -c
   -D__LIBDEVICE_HOST_IMPL__
 )
 
+if (NOT SYCL_LIBDEVICE_GCC_TOOLCHAIN STREQUAL "")
+  list(APPEND imf_host_cxx_flags "--gcc-install-dir=${SYCL_LIBDEVICE_GCC_TOOLCHAIN}")
+endif()
+
 macro(mangle_name str output)
   string(STRIP "${str}" strippedStr)
   string(REGEX REPLACE "^/" "" strippedStr "${strippedStr}")