Merge remote-tracking branch 'upstream/sycl' into jakub/debug_output

Author: jchlanda

.github/CODEOWNERS

@@ -129,6 +129,7 @@ clang/test/Driver/sycl-native-cpu*.cpp @intel/dpcpp-nativecpu-pi-reviewers
 sycl/**/native_cpu/ @intel/dpcpp-nativecpu-pi-reviewers
 sycl/doc/design/SYCLNativeCPU.md @intel/dpcpp-nativecpu-pi-reviewers
 sycl/include/sycl/detail/native_cpu.hpp @intel/dpcpp-nativecpu-pi-reviewers
+libdevice/nativecpu* @intel/dpcpp-nativecpu-pi-reviewers
 
 # SYCL-Graphs extensions
 sycl/include/sycl/ext/oneapi/experimental/graph.hpp @intel/sycl-graphs-reviewers

.github/workflows/sycl-nightly.yml

@@ -23,6 +23,19 @@ jobs:
       # prefer widespread gzip compression.
       artifact_archive_name: sycl_linux.tar.gz
 
+  ubuntu2204_shared_build:
+    if: github.repository == 'intel/llvm'
+    uses: ./.github/workflows/sycl-linux-build.yml
+    secrets: inherit
+    with:
+      build_cache_root: "/__w/"
+      build_cache_suffix: sprod_shared
+      build_artifact_suffix: sprod_shared
+      build_configure_extra_args: '--shared-libs --hip --cuda --native_cpu'
+      merge_ref: ''
+
+      artifact_archive_name: sycl_linux_shared.tar.zst
+
   ubuntu2204_test:
     needs: [ubuntu2204_build]
     if: ${{ always() && !cancelled() && needs.ubuntu2204_build.outputs.build_conclusion == 'success' }}
@@ -120,7 +133,7 @@ jobs:
     if: |
       always()
       && !cancelled()
-      && needs.build.outputs.build_conclusion == 'success'
+      && needs.build-win.outputs.build_conclusion == 'success'
     uses: ./.github/workflows/sycl-windows-run-tests.yml
     with:
       name: Intel GEN12 Graphics with Level Zero

.github/workflows/sycl-post-commit.yml

@@ -28,28 +28,13 @@ permissions: read-all
 
 jobs:
   build-lin:
-    name: Linux (Self build + shared libraries + no-assertions)
+    name: Linux (Self build + no-assertions)
     if: github.repository == 'intel/llvm'
     uses: ./.github/workflows/sycl-linux-build.yml
     with:
       build_cache_root: "/__w/llvm"
-      build_cache_suffix: sprod_shared
-      build_artifact_suffix: sprod_shared
-      build_configure_extra_args: --shared-libs --no-assertions --hip --cuda --native_cpu --cmake-opt="-DSYCL_ENABLE_STACK_PRINTING=ON" --cmake-opt="-DSYCL_LIB_WITH_DEBUG_SYMBOL=ON"
-      # Docker image has last nightly pre-installed and added to the PATH
-      build_image: "ghcr.io/intel/llvm/sycl_ubuntu2204_nightly:build"
-      cc: clang
-      cxx: clang++
-      merge_ref: ''
-
-  build-lin-static:
-    name: Linux (Self build + static libraries + no-assertions)
-    if: github.repository == 'intel/llvm'
-    uses: ./.github/workflows/sycl-linux-build.yml
-    with:
-      build_cache_root: "/__w/llvm"
-      build_cache_suffix: sprod_static
-      build_artifact_suffix: sprod_static
+      build_cache_suffix: default
+      build_artifact_suffix: default
       build_configure_extra_args: --no-assertions --hip --cuda --native_cpu --cmake-opt="-DSYCL_ENABLE_STACK_PRINTING=ON" --cmake-opt="-DSYCL_LIB_WITH_DEBUG_SYMBOL=ON"
       # Docker image has last nightly pre-installed and added to the PATH
       build_image: "ghcr.io/intel/llvm/sycl_ubuntu2204_nightly:build"
@@ -58,7 +43,7 @@ jobs:
       merge_ref: ''
 
   e2e-lin:
-    needs: [build-lin, build-lin-static]
+    needs: [build-lin]
     if: ${{ always() && !cancelled() && needs.build-lin.outputs.build_conclusion == 'success' }}
     strategy:
       fail-fast: false
@@ -79,10 +64,6 @@ jobs:
             image_options: -u 1001 --device=/dev/dri --device=/dev/kfd
             target_devices: ext_oneapi_hip:gpu
             reset_intel_gpu: false
-            # Use static build because of shared lld packaging issue
-            sycl_toolchain_artifact: sycl_linux_sprod_static
-            sycl_toolchain_archive: ${{ needs.build-lin-static.outputs.artifact_archive_name }}
-            sycl_toolchain_decompress_command: ${{ needs.build-lin-static.outputs.artifact_decompress_command }}
           # Performance tests below. Specifics:
           #  - only run performance tests (use LIT_FILTER env)
           #  - ask llvm-lit to show all the output, even for PASS (-a)
@@ -116,9 +97,9 @@ jobs:
       ref: ${{ github.sha }}
       merge_ref: ''
 
-      sycl_toolchain_artifact: ${{ matrix.sycl_toolchain_artifact || 'sycl_linux_sprod_shared' }}
-      sycl_toolchain_archive: ${{ matrix.sycl_toolchain_archive || needs.build-lin.outputs.artifact_archive_name }}
-      sycl_toolchain_decompress_command: ${{ matrix.sycl_toolchain_decompress_command || needs.build-lin.outputs.artifact_decompress_command }}
+      sycl_toolchain_artifact: sycl_linux_default
+      sycl_toolchain_archive: ${{ needs.build-lin.outputs.artifact_archive_name }}
+      sycl_toolchain_decompress_command: ${{ needs.build-lin.outputs.artifact_decompress_command }}
 
   build-win:
     if: |

buildbot/configure.py

@@ -59,14 +59,14 @@ def do_configure(args):
     llvm_enable_sphinx = "OFF"
     llvm_build_shared_libs = "OFF"
     llvm_enable_lld = "OFF"
-    sycl_enabled_plugins = ["opencl"]
+    sycl_enabled_backends = ["opencl"]
     sycl_preview_lib = "ON"
 
     sycl_enable_xpti_tracing = "ON"
     xpti_enable_werror = "OFF"
 
     if sys.platform != "darwin":
-        sycl_enabled_plugins.append("level_zero")
+        sycl_enabled_backends.append("level_zero")
 
     # lld is needed on Windows or for the HIP plugin on AMD
     if platform.system() == "Windows" or (args.hip and args.hip_platform == "AMD"):
@@ -80,7 +80,7 @@ def do_configure(args):
         llvm_targets_to_build += ";NVPTX"
         libclc_targets_to_build = libclc_nvidia_target_names
         libclc_gen_remangled_variants = "ON"
-        sycl_enabled_plugins.append("cuda")
+        sycl_enabled_backends.append("cuda")
 
     if args.hip:
         if args.hip_platform == "AMD":
@@ -93,15 +93,15 @@ def do_configure(args):
         libclc_gen_remangled_variants = "ON"
 
         sycl_build_pi_hip_platform = args.hip_platform
-        sycl_enabled_plugins.append("hip")
+        sycl_enabled_backends.append("hip")
 
     if args.native_cpu:
         if args.native_cpu_libclc_targets:
             libclc_targets_to_build += ";" + args.native_cpu_libclc_targets
         else:
             libclc_build_native = "ON"
         libclc_gen_remangled_variants = "ON"
-        sycl_enabled_plugins.append("native_cpu")
+        sycl_enabled_backends.append("native_cpu")
 
     # all llvm compiler targets don't require 3rd party dependencies, so can be
     # built/tested even if specific runtimes are not available
@@ -153,7 +153,7 @@ def do_configure(args):
             libclc_gen_remangled_variants = "ON"
 
     if args.enable_plugin:
-        sycl_enabled_plugins += args.enable_plugin
+        sycl_enabled_backends += args.enable_plugin
 
     if args.disable_preview_lib:
         sycl_preview_lib = "OFF"
@@ -188,7 +188,7 @@ def do_configure(args):
         "-DLLVM_ENABLE_LLD={}".format(llvm_enable_lld),
         "-DXPTI_ENABLE_WERROR={}".format(xpti_enable_werror),
         "-DSYCL_CLANG_EXTRA_FLAGS={}".format(sycl_clang_extra_flags),
-        "-DSYCL_ENABLE_PLUGINS={}".format(";".join(set(sycl_enabled_plugins))),
+        "-DSYCL_ENABLE_BACKENDS={}".format(";".join(set(sycl_enabled_backends))),
         "-DSYCL_ENABLE_EXTENSION_JIT={}".format(sycl_enable_jit),
         "-DSYCL_ENABLE_MAJOR_RELEASE_PREVIEW_LIB={}".format(sycl_preview_lib),
         "-DBUG_REPORT_URL=https://github.com/intel/llvm/issues",

clang/include/clang/Basic/DiagnosticDriverKinds.td

@@ -217,7 +217,8 @@ def warn_drv_mismatch_fpga_archive : Warning<
 def warn_drv_sycl_native_cpu_and_targets: Warning<
   "-fsycl-targets=native_cpu overrides SYCL targets option">,
   InGroup<SyclNativeCPUTargets>;
-def err_drv_unsupported_opt_dpcpp : Error<"option '%0' unsupported with DPC++">;
+def err_drv_unsupported_opt_sycl : Error<
+  "option '%0' not supported with SYCL compilation">;
 def err_drv_argument_only_allowed_with : Error<
   "invalid argument '%0' only allowed with '%1'">;
 def err_drv_opt_unsupported_input_type : Error<
@@ -389,8 +390,6 @@ def err_drv_fsycl_with_c_type : Error<
   "'%0' must not be used in conjunction with '-fsycl', which expects C++ source">;
 def err_drv_fsycl_with_pch : Error<
   "precompiled header generation is not supported with '-fsycl'">;
-def err_drv_fsycl_unsupported_with_opt
-  : Error<"'%0' is not supported with '-fsycl'">;
 def warn_drv_opt_requires_opt
   : Warning<"'%0' should be used only in conjunction with '%1'">, InGroup<UnusedCommandLineArgument>;
 def err_drv_sycl_missing_amdgpu_arch : Error<

clang/include/clang/Basic/DiagnosticGroups.td

@@ -1375,9 +1375,8 @@ def OpenMP : DiagGroup<"openmp", [
   ]>;
 
 // SYCL warnings
-def Sycl2017Compat : DiagGroup<"sycl-2017-compat">;
 def Sycl2020Compat : DiagGroup<"sycl-2020-compat">;
-def SyclStrict : DiagGroup<"sycl-strict", [ Sycl2017Compat, Sycl2020Compat]>;
+def SyclStrict : DiagGroup<"sycl-strict", [ Sycl2020Compat]>;
 def SyclTarget : DiagGroup<"sycl-target">;
 def SyclFPGAMismatch : DiagGroup<"sycl-fpga-mismatch">;
 def SyclAspectMismatch : DiagGroup<"sycl-aspect-mismatch">;

clang/include/clang/Basic/DiagnosticSemaKinds.td

@@ -12485,14 +12485,6 @@ def err_sycl_invalid_aspect_argument : Error<
 def warn_sycl_pass_by_value_deprecated 
     : Warning<"passing kernel functions by value is deprecated in SYCL 2020">,
       InGroup<Sycl2020Compat>, ShowInSystemHeader;
-def warn_sycl_pass_by_reference_future 
-    : Warning<"passing of kernel functions by reference is a SYCL 2020 extension">,
-      InGroup<Sycl2017Compat>, ShowInSystemHeader;
-def warn_sycl_implicit_decl
-    : Warning<"SYCL 1.2.1 specification requires an explicit forward "
-              "declaration for a kernel type name; your program may not "
-              "be portable">,
-      InGroup<SyclStrict>, ShowInSystemHeader, DefaultIgnore;
 def warn_sycl_potentially_invalid_as_cast : Warning<
   "explicit cast from %0 to %1 potentially leads to an invalid address space"
   " cast in the resulting code">, InGroup<SyclStrict>,
@@ -12528,9 +12520,6 @@ def err_sycl_mismatch_group_size
 def note_sycl_kernel_declared_here : Note<"kernel declared here">;
 def err_sycl_expected_finalize_method : Error<
   "expected a 'finalize' method for the 'stream' class">;
-def ext_sycl_2020_attr_spelling : ExtWarn<
-  "use of attribute %0 is a SYCL 2020 extension">,
-  InGroup<Sycl2017Compat>;
 def err_sycl_esimd_not_supported_for_type : Error<
   "type %0 is not supported in ESIMD context">;
 def err_sycl_taking_address_of_wrong_function : Error<

clang/include/clang/Basic/LangOptions.h

@@ -146,15 +146,13 @@ class LangOptionsBase {
 
   enum SYCLMajorVersion {
     SYCL_None,
-    SYCL_2017,
     SYCL_2020,
     // The "default" SYCL version to be used when none is specified on the
     // frontend command line.
     SYCL_Default = SYCL_2020
   };
 
   enum class SYCLVersionList {
-    sycl_1_2_1,
     undefined
   };
 

clang/include/clang/Basic/SourceManager.h

@@ -906,6 +906,19 @@ class SourceManager : public RefCountedBase<SourceManager> {
   /// Get the file ID for the precompiled preamble if there is one.
   FileID getPreambleFileID() const { return PreambleFileID; }
 
+  ///  Get the file ID for the integration footer.
+  FileID ComputeValidFooterFileID(StringRef Footer) {
+    FileID FooterFileID;
+    llvm::Expected<FileEntryRef> ExpectedFileRef =
+        getFileManager().getFileRef(Footer);
+    if (ExpectedFileRef) {
+      FooterFileID = getOrCreateFileID(ExpectedFileRef.get(),
+                                       SrcMgr::CharacteristicKind::C_User);
+    }
+    assert(FooterFileID.isValid() && "expecting a valid footer FileID");
+    return FooterFileID;
+  }
+
   //===--------------------------------------------------------------------===//
   // Methods to create new FileID's and macro expansions.
   //===--------------------------------------------------------------------===//