Merge remote-tracking branch 'upstream/sycl' into sub_group_info_rework

* upstream/sycl: (616 commits)
  [SYCL][L0] Implement robust error handling in level_zero plugin (intel#2870)
  [SYCL][NFC] Code clean up (phase 5) revealed by self build. (intel#2907)
  [Driver][NFC] Remove unused variable (intel#2908)
  [Github Action] Enable automatic sync for main branch from llvm-project to llvm (intel#2904)
  [ESIMD][NFC] Remove unnecessary macro checks (intel#2900)
  [SYCL] Fix handling of multiple usages of composite spec constants (intel#2894)
  [SYCL] Adjust parallel-for range global size to improve group size selection (intel#2703)
  [SYCL] Add template parameter support for no_global_work_offset attribute (intel#2839)
  [SYCL] Support LLVM FP intrinsic in llvm-spirv and FE (intel#2880)
  [SYCL]Link Libm FP64 SYCL device library by default (intel#2892)
  [SYCL][NFC] Code clean up (phase 4) revealed by self build. (intel#2878)
  [SYCL][NFC] Code clean up (phase 3) revealed by self build. (intel#2865)
  [SYCL] Fix backend selection for SYCL_DEVICE_TYPE=* (intel#2890)
  [SYCL] Fix spec constants support in integration header (intel#2896)
  [Driver] Update unbundling of offload libraries to use archive type (intel#2883)
  [SYCL][NFC] Clang format SYCL.cpp (intel#2891)
  [CODEOWNERS] Add code owners for DPC++ tools (intel#2884)
  [XPTIFW] Enable in-tree builds (intel#2849)
  [SYCL] Don't dump IR and dot files by default in the LowerWGScope pass (intel#2887)
  [SYCL] Use llvm-link's only-needed option to link device libs (intel#2783)
  ...

Author: Alexander Batashev

.github/CODEOWNERS

@@ -1,18 +1,27 @@
 * @bader
 
+# Front-end compiler
 clang/ @Fznamznon @premanandrao @elizabethandrews
 
+# Driver
 clang/**/Driver @mdtoguchi @AGindinson
 
+# LLVM-SPIRV translator
 llvm-spirv/ @AlexeySotkin @AlexeySachkov
 
+# OpenCL "offline" compiler
 opencl-aot/ @dm-vodopyanov @AlexeySachkov @romanovvlad
 
+# Device library
 libdevice/ @vzakhari
 
-sycl/ @intel/llvm-reviewers-runtime
-
+# Documentation
 sycl/ReleaseNotes.md @pvchupin
+sycl/doc/ @pvchupin @kbobrovs
+sycl/doc/extensions/ @intel/dpcpp-specification-reviewers
+
+# DPC++ runtime library
+sycl/ @intel/llvm-reviewers-runtime
 
 # USM
 sycl/include/CL/sycl/detail/clusm.hpp @jbrodman
@@ -41,6 +50,9 @@ sycl/source/detail/plugin.hpp @smaslov-intel
 sycl/source/detail/posix_pi.cpp @smaslov-intel
 sycl/source/detail/windows_pi.cpp @smaslov-intel
 
+# CUDA plugin
+sycl/plugins/cuda/ @intel/llvm-reviewers-cuda
+
 # Stream
 sycl/include/CL/sycl/detail/stream_impl.hpp @againull
 sycl/include/CL/sycl/stream.hpp @againull
@@ -78,11 +90,22 @@ sycl/source/half_type.cpp @AlexeySachkov
 sycl/include/CL/sycl/swizzles.def @turinevgeny
 sycl/include/CL/sycl/types.hpp @turinevgeny
 
-sycl/plugins/cuda/ @intel/llvm-reviewers-cuda
-
-sycl/doc/ @pvchupin @kbobrovs
-
-sycl/doc/extensions/ @intel/dpcpp-specification-reviewers
-
+# XPTI instrumentation utilities
 xpti/ @tovinkere @andykaylor
 xptifw/ @tovinkere  @andykaylor
+
+# DPC++ tools
+llvm/tools/file-table-tform/ @kbobrovs @AlexeySachkov
+llvm/tools/llvm-foreach/ @AlexeySachkov  @Fznamznon
+llvm/tools/llvm-no-spir-kernel/ @AGindinson @AlexeySachkov
+llvm/tools/sycl-post-link/ @kbobrovs @AlexeySachkov
+
+# Clang offload tools
+clang/tools/clang-offload-bundler/ @kbobrovs @sndmitriev
+clang/tools/clang-offload-wrapper/ @sndmitriev @kbobrovs
+
+# Explicit SIMD
+SYCLLowerIR/ @kbobrovs
+esimd/ @kbobrovs
+sycl/include/CL/sycl/INTEL/esimd.hpp @kbobrovs
+sycl/doc/extensions/ExplicitSIMD/ @kbobrovs

.github/workflows/main-branch-sync.yml

@@ -12,10 +12,14 @@ jobs:
       - name: Checkout Code
         uses: actions/checkout@v2
         with:
+          # persist-credentials: false allows us to use our own credentials for
+          # pushing to the repository.  Otherwise, the default github actions token
+          # is used.
+          persist-credentials: false
           fetch-depth: 0
 
       - name: Update branch
         env:
           LLVMBOT_TOKEN: ${{ secrets.LLVMBOT_MAIN_SYNC }}
         run: |
-          git push https://[email protected]/${{ github.repository }} HEAD:temp-test-main
+          git push https://[email protected]/${{ github.repository }} HEAD:main

.github/workflows/sync-main.yml

@@ -0,0 +1,48 @@
+name: automatic sync main branch from llvm-project to llvm
+
+on:
+  schedule:
+  - cron: '/10 * * * *'
+jobs:
+  sync:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          # persist-credentials: false allows us to use our own credentials for
+          # pushing to the repository.  Otherwise, the default github actions token
+          # is used.
+          persist-credentials: false
+          fetch-depth: 0
+          path: src
+      - name: Sync
+        env:
+          BRANCH: main
+          SYNC_REPO: https://github.com/llvm/llvm-project
+          LLVMBOT_TOKEN: ${{ secrets.LLVM_MAIN_SYNC_BBSYCL_TOKEN }}
+        run: |
+          cd $GITHUB_WORKSPACE/src
+          branch_exist=`git ls-remote --heads origin $BRANCH | wc -l`
+          if [ $branch_exist -ne 0 ]; then
+              git checkout $BRANCH
+              git pull --ff --ff-only $SYNC_REPO $BRANCH
+              if [ $? -ne 0 ]; then
+                  echo "failed to pull from $SYNC_REPO $BRANCH, abort"
+                  exit 1
+              fi
+              git_status=`git rev-list --count --left-right origin/$BRANCH...$BRANCH`
+              if [ "0	0" == "$git_status" ] ; then
+                  echo "no change, skip"
+              elif [[ "$git_status" =  0* ]] ; then
+                  git push https://[email protected]/${{ github.repository }} ${BRANCH}
+              else
+                  echo "$BRANCH branch invalid state"
+                  exit 1
+              fi
+          else
+              git remote add upstream $SYNC_REPO
+              git fetch upstream
+              git checkout -B $BRANCH upstream/$BRANCH
+              git push https://[email protected]/${{ github.repository }} ${BRANCH}
+          fi
+          echo "sync finished"

buildbot/configure.py

@@ -17,11 +17,12 @@ def do_configure(args):
     sycl_dir = os.path.join(abs_src_dir, "sycl")
     spirv_dir = os.path.join(abs_src_dir, "llvm-spirv")
     xpti_dir = os.path.join(abs_src_dir, "xpti")
+    xptifw_dir = os.path.join(abs_src_dir, "xptifw")
     libdevice_dir = os.path.join(abs_src_dir, "libdevice")
     ocl_header_dir = os.path.join(abs_obj_dir, "OpenCL-Headers")
     icd_loader_lib = os.path.join(abs_obj_dir, "OpenCL-ICD-Loader", "build")
     llvm_targets_to_build = 'X86'
-    llvm_enable_projects = 'clang;llvm-spirv;sycl;opencl-aot;xpti;libdevice'
+    llvm_enable_projects = 'clang;llvm-spirv;sycl;opencl-aot;xpti;xptifw;libdevice'
     libclc_targets_to_build = ''
     sycl_build_pi_cuda = 'OFF'
     sycl_werror = 'ON'
@@ -63,10 +64,12 @@ def do_configure(args):
         "-DCMAKE_BUILD_TYPE={}".format(args.build_type),
         "-DLLVM_ENABLE_ASSERTIONS={}".format(llvm_enable_assertions),
         "-DLLVM_TARGETS_TO_BUILD={}".format(llvm_targets_to_build),
-        "-DLLVM_EXTERNAL_PROJECTS=sycl;llvm-spirv;opencl-aot;xpti;libdevice",
+        "-DLLVM_EXTERNAL_PROJECTS=sycl;llvm-spirv;opencl-aot;xpti;xptifw;libdevice",
         "-DLLVM_EXTERNAL_SYCL_SOURCE_DIR={}".format(sycl_dir),
         "-DLLVM_EXTERNAL_LLVM_SPIRV_SOURCE_DIR={}".format(spirv_dir),
         "-DLLVM_EXTERNAL_XPTI_SOURCE_DIR={}".format(xpti_dir),
+        "-DXPTI_SOURCE_DIR={}".format(xpti_dir),
+        "-DLLVM_EXTERNAL_XPTIFW_SOURCE_DIR={}".format(xptifw_dir),
         "-DLLVM_EXTERNAL_LIBDEVICE_SOURCE_DIR={}".format(libdevice_dir),
         "-DLLVM_ENABLE_PROJECTS={}".format(llvm_enable_projects),
         "-DLIBCLC_TARGETS_TO_BUILD={}".format(libclc_targets_to_build),

buildbot/dependency.conf

@@ -3,10 +3,10 @@
 ocl_cpu_rt_ver=2020.11.11.0.04
 # https://github.com/intel/llvm/releases/download/2020-WW45/win-oclcpuexp-2020.11.11.0.04_rel.zip
 ocl_cpu_rt_ver_win=2020.11.11.0.04
-# Same GPU driver supports Level Zero and OpenCL:
-# https://github.com/intel/compute-runtime/releases/tag/20.45.18403
-ocl_gpu_rt_ver=20.45.18403
-# Same GPU driver supports Level Zero and OpenCL:
+# Same GPU driver supports Level Zero and OpenCL
+# https://github.com/intel/compute-runtime/releases/tag/20.46.18421
+ocl_gpu_rt_ver=20.46.18421
+# Same GPU driver supports Level Zero and OpenCL
 # https://downloadmirror.intel.com/29988/a08/igfx_win10_100.8935.zip
 ocl_gpu_rt_ver_win=27.20.100.8935
 intel_sycl_ver=build
@@ -25,7 +25,7 @@ fpga_ver_win=20201022_000005
 [DRIVER VERSIONS]
 cpu_driver_lin=2020.11.11.0.04
 cpu_driver_win=2020.11.11.0.04
-gpu_driver_lin=20.45.18403
+gpu_driver_lin=20.46.18421
 gpu_driver_win=27.20.100.8935
 fpga_driver_lin=2020.11.11.0.04
 fpga_driver_win=2020.11.11.0.04

clang-tools-extra/clang-move/Move.cpp

@@ -691,11 +691,10 @@ void ClangMoveTool::addIncludes(llvm::StringRef IncludeHeader, bool IsAngled,
                                 llvm::StringRef FileName,
                                 CharSourceRange IncludeFilenameRange,
                                 const SourceManager &SM) {
-  SmallVector<char, 128> HeaderWithSearchPath;
+  SmallString<128> HeaderWithSearchPath;
   llvm::sys::path::append(HeaderWithSearchPath, SearchPath, IncludeHeader);
   std::string AbsoluteIncludeHeader =
-      MakeAbsolutePath(SM, llvm::StringRef(HeaderWithSearchPath.data(),
-                                           HeaderWithSearchPath.size()));
+      MakeAbsolutePath(SM, HeaderWithSearchPath);
   std::string IncludeLine =
       IsAngled ? ("#include <" + IncludeHeader + ">\n").str()
                : ("#include \"" + IncludeHeader + "\"\n").str();

clang-tools-extra/clang-tidy/CMakeLists.txt

@@ -55,6 +55,7 @@ add_subdirectory(altera)
 add_subdirectory(boost)
 add_subdirectory(bugprone)
 add_subdirectory(cert)
+add_subdirectory(concurrency)
 add_subdirectory(cppcoreguidelines)
 add_subdirectory(darwin)
 add_subdirectory(fuchsia)
@@ -81,6 +82,7 @@ set(ALL_CLANG_TIDY_CHECKS
   clangTidyBoostModule
   clangTidyBugproneModule
   clangTidyCERTModule
+  clangTidyConcurrencyModule
   clangTidyCppCoreGuidelinesModule
   clangTidyDarwinModule
   clangTidyFuchsiaModule

clang-tools-extra/clang-tidy/ClangTidyForceLinker.h

@@ -45,6 +45,11 @@ extern volatile int CERTModuleAnchorSource;
 static int LLVM_ATTRIBUTE_UNUSED CERTModuleAnchorDestination =
     CERTModuleAnchorSource;
 
+// This anchor is used to force the linker to link the ConcurrencyModule.
+extern volatile int ConcurrencyModuleAnchorSource;
+static int LLVM_ATTRIBUTE_UNUSED ConcurrencyModuleAnchorDestination =
+    ConcurrencyModuleAnchorSource;
+
 // This anchor is used to force the linker to link the CppCoreGuidelinesModule.
 extern volatile int CppCoreGuidelinesModuleAnchorSource;
 static int LLVM_ATTRIBUTE_UNUSED CppCoreGuidelinesModuleAnchorDestination =

clang-tools-extra/clang-tidy/abseil/StringFindStrContainsCheck.cpp

@@ -29,6 +29,7 @@ using ::clang::transformer::cat;
 using ::clang::transformer::change;
 using ::clang::transformer::makeRule;
 using ::clang::transformer::node;
+using ::clang::transformer::RewriteRule;
 
 static const char DefaultStringLikeClasses[] = "::std::basic_string;"
                                                "::std::basic_string_view;"
@@ -69,7 +70,7 @@ MakeRule(const LangOptions &LangOpts,
             hasArgument(1, cxxDefaultArgExpr())),
       onImplicitObjectArgument(expr().bind("string_being_searched")));
 
-  tooling::RewriteRule rule = applyFirst(
+  RewriteRule rule = applyFirst(
       {makeRule(binaryOperator(hasOperatorName("=="),
                                hasOperands(ignoringParenImpCasts(StringNpos),
                                            ignoringParenImpCasts(StringFind))),

clang-tools-extra/clang-tidy/concurrency/CMakeLists.txt

@@ -0,0 +1,24 @@
+set(LLVM_LINK_COMPONENTS
+  FrontendOpenMP
+  Support
+  )
+
+add_clang_library(clangTidyConcurrencyModule
+  ConcurrencyTidyModule.cpp
+  MtUnsafeCheck.cpp
+
+  LINK_LIBS
+  clangTidy
+  clangTidyUtils
+  )
+
+clang_target_link_libraries(clangTidyConcurrencyModule
+  PRIVATE
+  clangAnalysis
+  clangAST
+  clangASTMatchers
+  clangBasic
+  clangLex
+  clangSerialization
+  clangTooling
+  )

clang-tools-extra/clang-tidy/concurrency/ConcurrencyTidyModule.cpp

@@ -0,0 +1,37 @@
+//===--- ConcurrencyTidyModule.cpp - clang-tidy ---------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#include "../ClangTidy.h"
+#include "../ClangTidyModule.h"
+#include "../ClangTidyModuleRegistry.h"
+#include "MtUnsafeCheck.h"
+
+namespace clang {
+namespace tidy {
+namespace concurrency {
+
+class ConcurrencyModule : public ClangTidyModule {
+public:
+  void addCheckFactories(ClangTidyCheckFactories &CheckFactories) override {
+    CheckFactories.registerCheck<concurrency::MtUnsafeCheck>(
+        "concurrency-mt-unsafe");
+  }
+};
+
+} // namespace concurrency
+
+// Register the ConcurrencyTidyModule using this statically initialized variable.
+static ClangTidyModuleRegistry::Add<concurrency::ConcurrencyModule>
+    X("concurrency-module", "Adds concurrency checks.");
+
+// This anchor is used to force the linker to link in the generated object file
+// and thus register the ConcurrencyModule.
+volatile int ConcurrencyModuleAnchorSource = 0;
+
+} // namespace tidy
+} // namespace clang