Merge branch 'sycl' into private/bb-sycl/Lin_GPU_RT_Uplift_21.13.19438

Author: yanfeng3721

.github/workflows/clang-format.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Get clang-format first
-      run: sudo apt-get install -yqq clang-format-9
+      run: sudo apt-get install -yqq clang-format
 
     - uses: actions/checkout@v2
       with:

.github/workflows/linux_post_commit.yml

@@ -7,6 +7,7 @@ on:
 jobs:
    check:
      runs-on: ubuntu-18.04
+     if: github.repository == 'intel/llvm'
      strategy:
        fail-fast: false
        matrix:

.github/workflows/sync-main.yml

@@ -2,10 +2,11 @@ name: automatic sync main branch from llvm-project to llvm
 
 on:
   schedule:
-  - cron: '*/10 * * * *'
+  - cron: '0 */1 * * *'
 jobs:
   sync:
     runs-on: ubuntu-latest
+    if: github.repository == 'intel/llvm'
     steps:
       - uses: actions/checkout@v2
         with:

buildbot/dependency.conf

@@ -4,7 +4,6 @@ ocl_cpu_rt_ver=2021.11.3.0.09
 # https://github.com/intel/llvm/releases/download/2021-WW11/win-oclcpuexp-2021.11.3.0.09_rel.zip
 ocl_cpu_rt_ver_win=2021.11.3.0.09
 # Same GPU driver supports Level Zero and OpenCL
-# https://github.com/intel/compute-runtime/releases/tag/21.13.19438
 ocl_gpu_rt_ver=21.13.19438
 # Same GPU driver supports Level Zero and OpenCL
 # https://downloadmirror.intel.com/30266/a08/igfx_win10_100.9316.zip

clang-tools-extra/clang-move/tool/ClangMove.cpp

@@ -30,7 +30,8 @@ namespace {
 std::error_code CreateNewFile(const llvm::Twine &path) {
   int fd = 0;
   if (std::error_code ec = llvm::sys::fs::openFileForWrite(
-          path, fd, llvm::sys::fs::CD_CreateAlways, llvm::sys::fs::OF_Text))
+          path, fd, llvm::sys::fs::CD_CreateAlways,
+          llvm::sys::fs::OF_TextWithCRLF))
     return ec;
 
   return llvm::sys::Process::SafelyCloseFileDescriptor(fd);

clang-tools-extra/clang-tidy/readability/BracesAroundStatementsCheck.cpp

@@ -105,10 +105,7 @@ void BracesAroundStatementsCheck::storeOptions(
 }
 
 void BracesAroundStatementsCheck::registerMatchers(MatchFinder *Finder) {
-  Finder->addMatcher(
-      ifStmt(unless(allOf(isConstexpr(), isInTemplateInstantiation())))
-          .bind("if"),
-      this);
+  Finder->addMatcher(ifStmt().bind("if"), this);
   Finder->addMatcher(whileStmt().bind("while"), this);
   Finder->addMatcher(doStmt().bind("do"), this);
   Finder->addMatcher(forStmt().bind("for"), this);

clang-tools-extra/clang-tidy/readability/BracesAroundStatementsCheck.h

@@ -55,6 +55,9 @@ class BracesAroundStatementsCheck : public ClangTidyCheck {
   template <typename IfOrWhileStmt>
   SourceLocation findRParenLoc(const IfOrWhileStmt *S, const SourceManager &SM,
                                const ASTContext *Context);
+  llvm::Optional<TraversalKind> getCheckTraversalKind() const override {
+    return TK_IgnoreUnlessSpelledInSource;
+  }
 
 private:
   std::set<const Stmt *> ForceBracesStmts;

clang-tools-extra/clang-tidy/readability/ElseAfterReturnCheck.cpp

@@ -171,8 +171,7 @@ void ElseAfterReturnCheck::registerPPCallbacks(const SourceManager &SM,
 void ElseAfterReturnCheck::registerMatchers(MatchFinder *Finder) {
   const auto InterruptsControlFlow = stmt(anyOf(
       returnStmt().bind(InterruptingStr), continueStmt().bind(InterruptingStr),
-      breakStmt().bind(InterruptingStr),
-      expr(ignoringImplicit(cxxThrowExpr().bind(InterruptingStr)))));
+      breakStmt().bind(InterruptingStr), cxxThrowExpr().bind(InterruptingStr)));
   Finder->addMatcher(
       compoundStmt(
           forEach(ifStmt(unless(isConstexpr()),

clang-tools-extra/clang-tidy/readability/ElseAfterReturnCheck.h

@@ -28,6 +28,9 @@ class ElseAfterReturnCheck : public ClangTidyCheck {
                            Preprocessor *ModuleExpanderPP) override;
   void registerMatchers(ast_matchers::MatchFinder *Finder) override;
   void check(const ast_matchers::MatchFinder::MatchResult &Result) override;
+  llvm::Optional<TraversalKind> getCheckTraversalKind() const override {
+    return TK_IgnoreUnlessSpelledInSource;
+  }
 
   using ConditionalBranchMap =
       llvm::DenseMap<FileID, SmallVector<SourceRange, 1>>;

clang-tools-extra/clang-tidy/readability/InconsistentDeclarationParameterNameCheck.cpp

@@ -294,8 +294,7 @@ void InconsistentDeclarationParameterNameCheck::storeOptions(
 
 void InconsistentDeclarationParameterNameCheck::registerMatchers(
     MatchFinder *Finder) {
-  Finder->addMatcher(functionDecl(unless(isImplicit()), hasOtherDeclarations())
-                         .bind("functionDecl"),
+  Finder->addMatcher(functionDecl(hasOtherDeclarations()).bind("functionDecl"),
                      this);
 }