Merge branch 'sycl' into remove_outdated_templates

* sycl: (108 commits)
  [SYCL][XPTI] Revisit resource management strategy (intel#4494)
  [SYCL][ESIMD] Fix misprint: ESIMD_L1_FLUASH_RO_DATA -> ESIMD_L1_FLUSH_RO_DATA (intel#4681)
  [SYCL] Make kernel_bundle interop more conformant (intel#4672)
  [SYCL] Submission with kernel parameter ignores set kernel bundle (intel#4667)
  [SYCL] Add support for std::byte to vec class  (intel#4637)
  [BuildBot] Uplift CPU/FPGAEMU RT version for CI Process (intel#4671)
  [SYCL] Fix an error on host when big image is used on opencl:gpu (intel#4668)
  [SYCL] Exclude exported symbols from kernel bundles (intel#4660)
  Revert "[SYCL] Allow overriding plugin libraries (intel#4067)" (intel#4659)
  [SYCL] Handle exceptions on mutually exclusive handler operations (intel#4639)
  [sycl-post-link] Don't split module if function pointer has a user that's not CallInst (intel#4657)
  [SYCL][HIP] Fix MemBufferFill for nvidia platform (intel#4629)
  [SYCL][Doc] Describe DPC++ CUDA install w/ non-standard toolkit loc (intel#4663)
  [SYCL] Fix device code instrumentation (intel#4615)
  Remove myself as a code owner (intel#4653)
  [SYCL] Fix overwriting insert to sub_group_mask (intel#4656)
  [x86][Matrix] Replace packed_a with row_major in matrix testcases (intel#4641)
  [SYCL][Doc] Add device global extension spec (intel#4233)
  [sycl-post-link] Adds property listing exported functions (intel#4626)
  [Driver][SYCL] Do not consider non-archive files for FPGA binary checks (intel#4644)
  ...

Author: alexbatashev

.github/CODEOWNERS

@@ -1,7 +1,7 @@
 * @bader
 
 # Front-end compiler
-clang/ @premanandrao @elizabethandrews @AaronBallman
+clang/ @premanandrao @elizabethandrews
 
 # Driver
 clang/**/Driver @mdtoguchi @AGindinson @hchilama

.github/workflows/linux_post_commit.yml

@@ -78,6 +78,11 @@ jobs:
        run: |
          python3 $GITHUB_WORKSPACE/src/buildbot/check.py -w  $GITHUB_WORKSPACE \
          -s  $GITHUB_WORKSPACE/src -o $GITHUB_WORKSPACE/build -t check-llvm-spirv
+     - name: check-xptifw
+       if: always()
+       run: |
+         python3 $GITHUB_WORKSPACE/src/buildbot/check.py -w  $GITHUB_WORKSPACE \
+         -s  $GITHUB_WORKSPACE/src -o $GITHUB_WORKSPACE/build -t check-xptifw
      - name: Pack
        run: tar -czvf llvm_sycl.tar.gz -C $GITHUB_WORKSPACE/build/install .
      - name: Upload artifacts

buildbot/configure.py

@@ -40,6 +40,7 @@ def do_configure(args):
     llvm_enable_lld = 'OFF'
 
     sycl_enable_xpti_tracing = 'ON'
+    xpti_enable_werror = 'ON'
 
     if args.ci_defaults:
         print("#############################################")
@@ -79,6 +80,7 @@ def do_configure(args):
 
     if args.no_werror:
         sycl_werror = 'OFF'
+        xpti_enable_werror = 'OFF'
 
     if args.no_assertions:
         llvm_enable_assertions = 'OFF'
@@ -123,7 +125,8 @@ def do_configure(args):
         "-DBUILD_SHARED_LIBS={}".format(llvm_build_shared_libs),
         "-DSYCL_ENABLE_XPTI_TRACING={}".format(sycl_enable_xpti_tracing),
         "-DLLVM_ENABLE_LLD={}".format(llvm_enable_lld),
-        "-DSYCL_BUILD_PI_ESIMD_CPU={}".format(sycl_build_pi_esimd_cpu)
+        "-DSYCL_BUILD_PI_ESIMD_CPU={}".format(sycl_build_pi_esimd_cpu),
+        "-DXPTI_ENABLE_WERROR={}".format(xpti_enable_werror)
     ]
 
     if args.l0_headers and args.l0_loader:

buildbot/dependency.conf

@@ -1,8 +1,8 @@
 [VERSIONS]
-# https://github.com/intel/llvm/releases/download/2021-WW26/oclcpuexp-2021.12.6.0.19_rel.tar.gz
-ocl_cpu_rt_ver=2021.12.6.0.19
-# https://github.com/intel/llvm/releases/download/2021-WW26/win-oclcpuexp-2021.12.6.0.19_rel.zip
-ocl_cpu_rt_ver_win=2021.12.6.0.19
+# https://github.com/intel/llvm/releases/download/2021-WW40/oclcpuexp-2021.12.9.0.24_rel.tar.gz
+ocl_cpu_rt_ver=2021.12.9.0.24
+# https://github.com/intel/llvm/releases/download/2021-WW40/win-oclcpuexp-2021.12.9.0.24_rel.zip
+ocl_cpu_rt_ver_win=2021.12.9.0.24
 # Same GPU driver supports Level Zero and OpenCL
 # https://github.com/intel/compute-runtime/releases/tag/21.37.20939
 ocl_gpu_rt_ver=21.37.20939
@@ -14,26 +14,26 @@ intel_sycl_ver=build
 # TBB binaries can be built from sources following instructions under
 # https://github.com/oneapi-src/oneTBB/blob/master/cmake/README.md
 # or downloaded using links below:
-# https://github.com/oneapi-src/oneTBB/releases/download/v2021.2.0/oneapi-tbb-2021.2.0-lin.tgz
-tbb_ver=2021.3.0.418
-# https://github.com/oneapi-src/oneTBB/releases/download/v2021.2.0/oneapi-tbb-2021.2.0-win.zip
-tbb_ver_win=2021.3.0.418
+# https://github.com/oneapi-src/oneTBB/releases/download/v2021.3.0/oneapi-tbb-2021.3.0-lin.tgz
+tbb_ver=2021.4.0.569
+# https://github.com/oneapi-src/oneTBB/releases/download/v2021.3.0/oneapi-tbb-2021.3.0-win.zip
+tbb_ver_win=2021.4.0.561
 
-# https://github.com/intel/llvm/releases/download/2021-WW26/fpgaemu-2021.12.6.0.19_rel.tar.gz
-ocl_fpga_emu_ver=2021.12.6.0.19
-# https://github.com/intel/llvm/releases/download/2021-WW26/win-fpgaemu-2021.12.6.0.19_rel.zip
-ocl_fpga_emu_ver_win=2021.12.6.0.19
-fpga_ver=20210519_000004
-fpga_ver_win=20210509_000006
+# https://github.com/intel/llvm/releases/download/2021-WW40/fpgaemu-2021.12.9.0.24_rel.tar.gz
+ocl_fpga_emu_ver=2021.12.9.0.24
+# https://github.com/intel/llvm/releases/download/2021-WW40/win-fpgaemu-2021.12.9.0.24_rel.zip
+ocl_fpga_emu_ver_win=2021.12.9.0.24
+fpga_ver=20210805_000004
+fpga_ver_win=20210805_000004
 ocloc_ver_win=27.20.100.9168
 
 [DRIVER VERSIONS]
-cpu_driver_lin=2021.12.6.0.19
-cpu_driver_win=2021.12.6.0.19
+cpu_driver_lin=2021.12.9.0.24
+cpu_driver_win=2021.12.9.0.24
 gpu_driver_lin=21.37.20939
 gpu_driver_win=30.0.100.9864
-fpga_driver_lin=2021.12.6.0.19
-fpga_driver_win=2021.12.6.0.19
+fpga_driver_lin=2021.12.9.0.24
+fpga_driver_win=2021.12.9.0.24
 # NVidia CUDA driver
 # TODO provide URL for CUDA driver
 nvidia_gpu_driver_lin=435.21

clang-tools-extra/clangd/InlayHints.cpp

@@ -366,6 +366,12 @@ std::vector<InlayHint> inlayHints(ParsedAST &AST) {
   std::vector<InlayHint> Results;
   InlayHintVisitor Visitor(Results, AST);
   Visitor.TraverseAST(AST.getASTContext());
+
+  // De-duplicate hints. Duplicates can sometimes occur due to e.g. explicit
+  // template instantiations.
+  llvm::sort(Results);
+  Results.erase(std::unique(Results.begin(), Results.end()), Results.end());
+
   return Results;
 }
 

clang-tools-extra/clangd/Protocol.cpp

@@ -1326,6 +1326,14 @@ llvm::json::Value toJSON(const InlayHint &H) {
   return llvm::json::Object{
       {"range", H.range}, {"kind", H.kind}, {"label", H.label}};
 }
+bool operator==(const InlayHint &A, const InlayHint &B) {
+  return std::tie(A.kind, A.range, A.label) ==
+         std::tie(B.kind, B.range, B.label);
+}
+bool operator<(const InlayHint &A, const InlayHint &B) {
+  return std::tie(A.kind, A.range, A.label) <
+         std::tie(B.kind, B.range, B.label);
+}
 
 static const char *toString(OffsetEncoding OE) {
   switch (OE) {

clang-tools-extra/clangd/Protocol.h

@@ -1548,6 +1548,8 @@ struct InlayHint {
   std::string label;
 };
 llvm::json::Value toJSON(const InlayHint &);
+bool operator==(const InlayHint &, const InlayHint &);
+bool operator<(const InlayHint &, const InlayHint &);
 
 struct ReferenceContext {
   /// Include the declaration of the current symbol.

clang-tools-extra/clangd/unittests/InlayHintTests.cpp

@@ -612,6 +612,18 @@ TEST(TypeHints, DefaultTemplateArgs) {
                   ExpectedHint{": A<float>", "var"});
 }
 
+TEST(TypeHints, Deduplication) {
+  assertTypeHints(R"cpp(
+    template <typename T>
+    void foo() {
+      auto $var[[var]] = 42;
+    }
+    template void foo<int>();
+    template void foo<float>();
+  )cpp",
+                  ExpectedHint{": int", "var"});
+}
+
 // FIXME: Low-hanging fruit where we could omit a type hint:
 //  - auto x = TypeName(...);
 //  - auto x = (TypeName) (...);
@@ -625,4 +637,4 @@ TEST(TypeHints, DefaultTemplateArgs) {
 
 } // namespace
 } // namespace clangd
-} // namespace clang
+} // namespace clang

clang/CMakeLists.txt

@@ -709,6 +709,7 @@ if (CLANG_ENABLE_BOOTSTRAP)
     CMAKE_CXX_COMPILER_LAUNCHER
     CMAKE_MAKE_PROGRAM
     CMAKE_OSX_ARCHITECTURES
+    CMAKE_BUILD_TYPE
     LLVM_ENABLE_PROJECTS
     LLVM_ENABLE_RUNTIMES)
 

clang/cmake/modules/AddClang.cmake

@@ -100,12 +100,7 @@ macro(add_clang_library name)
       # The Xcode generator doesn't handle object libraries correctly.
       list(APPEND LIBTYPE OBJECT)
     endif()
-    if (NOT EXCLUDE_FROM_ALL)
-      # Only include libraries that don't have EXCLUDE_FROM_ALL set. This
-      # ensure that the clang static analyzer libraries are not compiled
-      # as part of clang-shlib if CLANG_ENABLE_STATIC_ANALYZER=OFF.
-      set_property(GLOBAL APPEND PROPERTY CLANG_STATIC_LIBS ${name})
-    endif()
+    set_property(GLOBAL APPEND PROPERTY CLANG_STATIC_LIBS ${name})
   endif()
   llvm_add_library(${name} ${LIBTYPE} ${ARG_UNPARSED_ARGUMENTS} ${srcs})
 
@@ -115,11 +110,8 @@ macro(add_clang_library name)
   endif()
 
   foreach(lib ${libs})
-   if(TARGET ${lib})
+    if(TARGET ${lib})
       target_link_libraries(${lib} INTERFACE ${LLVM_COMMON_LIBS})
-      if (EXCLUDE_FROM_ALL)
-        continue()
-      endif()
 
       if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY OR ARG_INSTALL_WITH_TOOLCHAIN)
         get_target_export_arg(${name} Clang export_to_clangtargets UMBRELLA clang-libraries)