Merge remote-tracking branch 'intel/sycl' into private/MrSidims/MemChannel

Author: MrSidims

.arcconfig

@@ -2,5 +2,6 @@
   "phabricator.uri" : "https://reviews.llvm.org/",
   "repository.callsign" : "G",
   "conduit_uri" : "https://reviews.llvm.org/",
-  "base": "git:HEAD^"
+  "base": "git:HEAD^",
+  "arc.land.onto.default": "main"
 }

.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,16 +90,23 @@ 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
+clang/tools/clang-offload-deps/ @sndmitriev
+
+# 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

@@ -3,7 +3,7 @@ name: main branch sync
 on:
   push:
     branches:
-      - 'master'
+      - 'main'
 
 jobs:
   branch_sync:
@@ -22,4 +22,4 @@ jobs:
         env:
           LLVMBOT_TOKEN: ${{ secrets.LLVMBOT_MAIN_SYNC }}
         run: |
-          git push https://[email protected]/${{ github.repository }} HEAD:main
+          git push https://[email protected]/${{ github.repository }} HEAD:master

.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/dependency.conf

@@ -4,8 +4,8 @@ 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.46.18421
-ocl_gpu_rt_ver=20.46.18421
+# https://github.com/intel/compute-runtime/releases/tag/20.50.18716
+ocl_gpu_rt_ver=20.50.18716
 # 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
@@ -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.46.18421
+gpu_driver_lin=20.50.18716
 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-query/Query.h

@@ -120,7 +120,7 @@ template <> struct SetQueryKind<OutputKind> {
   static const QueryKind value = QK_SetOutputKind;
 };
 
-template <> struct SetQueryKind<ast_type_traits::TraversalKind> {
+template <> struct SetQueryKind<TraversalKind> {
   static const QueryKind value = QK_SetTraversalKind;
 };
 

clang-tools-extra/clang-query/QueryParser.cpp

@@ -128,20 +128,17 @@ template <typename QueryType> QueryRef QueryParser::parseSetOutputKind() {
   llvm_unreachable("Invalid output kind");
 }
 
-QueryRef QueryParser::parseSetTraversalKind(
-    ast_type_traits::TraversalKind QuerySession::*Var) {
+QueryRef QueryParser::parseSetTraversalKind(TraversalKind QuerySession::*Var) {
   StringRef ValStr;
   unsigned Value =
       LexOrCompleteWord<unsigned>(this, ValStr)
-          .Case("AsIs", ast_type_traits::TK_AsIs)
-          .Case("IgnoreUnlessSpelledInSource",
-                ast_type_traits::TK_IgnoreUnlessSpelledInSource)
+          .Case("AsIs", TK_AsIs)
+          .Case("IgnoreUnlessSpelledInSource", TK_IgnoreUnlessSpelledInSource)
           .Default(~0u);
   if (Value == ~0u) {
     return new InvalidQuery("expected traversal kind, got '" + ValStr + "'");
   }
-  return new SetQuery<ast_type_traits::TraversalKind>(
-      Var, static_cast<ast_type_traits::TraversalKind>(Value));
+  return new SetQuery<TraversalKind>(Var, static_cast<TraversalKind>(Value));
 }
 
 QueryRef QueryParser::endQuery(QueryRef Q) {

clang-tools-extra/clang-query/QueryParser.h

@@ -43,8 +43,7 @@ class QueryParser {
   template <typename T> struct LexOrCompleteWord;
 
   QueryRef parseSetBool(bool QuerySession::*Var);
-  QueryRef
-  parseSetTraversalKind(ast_type_traits::TraversalKind QuerySession::*Var);
+  QueryRef parseSetTraversalKind(TraversalKind QuerySession::*Var);
   template <typename QueryType> QueryRef parseSetOutputKind();
   QueryRef completeMatcherExpression();
 

clang-tools-extra/clang-query/QuerySession.h

@@ -26,7 +26,7 @@ class QuerySession {
   QuerySession(llvm::ArrayRef<std::unique_ptr<ASTUnit>> ASTs)
       : ASTs(ASTs), PrintOutput(false), DiagOutput(true),
         DetailedASTOutput(false), BindRoot(true), PrintMatcher(false),
-        Terminate(false), TK(ast_type_traits::TK_AsIs) {}
+        Terminate(false), TK(TK_AsIs) {}
 
   llvm::ArrayRef<std::unique_ptr<ASTUnit>> ASTs;
 
@@ -38,7 +38,7 @@ class QuerySession {
   bool PrintMatcher;
   bool Terminate;
 
-  ast_type_traits::TraversalKind TK;
+  TraversalKind TK;
   llvm::StringMap<ast_matchers::dynamic::VariantValue> NamedValues;
 };
 

clang-tools-extra/clang-tidy/ClangTidyCheck.cpp

@@ -21,34 +21,28 @@ char UnparseableEnumOptionError::ID;
 char UnparseableIntegerOptionError::ID;
 
 std::string MissingOptionError::message() const {
-  llvm::SmallString<128> Buffer;
-  llvm::raw_svector_ostream Output(Buffer);
-  Output << "option not found '" << OptionName << '\'';
+  llvm::SmallString<128> Buffer({"option not found '", OptionName, "'"});
   return std::string(Buffer);
 }
 
 std::string UnparseableEnumOptionError::message() const {
-  llvm::SmallString<128> Buffer;
-  llvm::raw_svector_ostream Output(Buffer);
-  Output << "invalid configuration value '" << LookupValue << "' for option '"
-         << LookupName << '\'';
+  llvm::SmallString<256> Buffer({"invalid configuration value '", LookupValue,
+                                 "' for option '", LookupName, "'"});
   if (SuggestedValue)
-    Output << "; did you mean '" << *SuggestedValue << "'?";
+    Buffer.append({"; did you mean '", *SuggestedValue, "'?"});
   return std::string(Buffer);
 }
 
 std::string UnparseableIntegerOptionError::message() const {
-  llvm::SmallString<128> Buffer;
-  llvm::raw_svector_ostream Output(Buffer);
-  Output << "invalid configuration value '" << LookupValue << "' for option '"
-         << LookupName << "'; expected "
-         << (IsBoolean ? "a bool" : "an integer value");
+  llvm::SmallString<256> Buffer({"invalid configuration value '", LookupValue,
+                                 "' for option '", LookupName, "'; expected ",
+                                 (IsBoolean ? "a bool" : "an integer value")});
   return std::string(Buffer);
 }
 
 ClangTidyCheck::ClangTidyCheck(StringRef CheckName, ClangTidyContext *Context)
     : CheckName(CheckName), Context(Context),
-      Options(CheckName, Context->getOptions().CheckOptions) {
+      Options(CheckName, Context->getOptions().CheckOptions, Context) {
   assert(Context != nullptr);
   assert(!CheckName.empty());
 }
@@ -58,16 +52,29 @@ DiagnosticBuilder ClangTidyCheck::diag(SourceLocation Loc, StringRef Message,
   return Context->diag(CheckName, Loc, Message, Level);
 }
 
+DiagnosticBuilder ClangTidyCheck::diag(StringRef Message,
+                                       DiagnosticIDs::Level Level) {
+  return Context->diag(CheckName, Message, Level);
+}
+
+DiagnosticBuilder
+ClangTidyCheck::configurationDiag(StringRef Description,
+                                  DiagnosticIDs::Level Level) {
+  return Context->configurationDiag(Description, Level);
+}
+
 void ClangTidyCheck::run(const ast_matchers::MatchFinder::MatchResult &Result) {
   // For historical reasons, checks don't implement the MatchFinder run()
   // callback directly. We keep the run()/check() distinction to avoid interface
   // churn, and to allow us to add cross-cutting logic in the future.
   check(Result);
 }
 
-ClangTidyCheck::OptionsView::OptionsView(StringRef CheckName,
-                         const ClangTidyOptions::OptionMap &CheckOptions)
-    : NamePrefix(CheckName.str() + "."), CheckOptions(CheckOptions) {}
+ClangTidyCheck::OptionsView::OptionsView(
+    StringRef CheckName, const ClangTidyOptions::OptionMap &CheckOptions,
+    ClangTidyContext *Context)
+    : NamePrefix(CheckName.str() + "."), CheckOptions(CheckOptions),
+      Context(Context) {}
 
 llvm::Expected<std::string>
 ClangTidyCheck::OptionsView::get(StringRef LocalName) const {
@@ -127,7 +134,7 @@ bool ClangTidyCheck::OptionsView::get<bool>(StringRef LocalName,
   llvm::Expected<bool> ValueOr = get<bool>(LocalName);
   if (ValueOr)
     return *ValueOr;
-  logIfOptionParsingError(ValueOr.takeError());
+  reportOptionParsingError(ValueOr.takeError());
   return Default;
 }
 
@@ -146,7 +153,7 @@ bool ClangTidyCheck::OptionsView::getLocalOrGlobal<bool>(StringRef LocalName,
   llvm::Expected<bool> ValueOr = getLocalOrGlobal<bool>(LocalName);
   if (ValueOr)
     return *ValueOr;
-  logIfOptionParsingError(ValueOr.takeError());
+  reportOptionParsingError(ValueOr.takeError());
   return Default;
 }
 
@@ -205,11 +212,11 @@ llvm::Expected<int64_t> ClangTidyCheck::OptionsView::getEnumInt(
                                                       Iter->getValue().Value);
 }
 
-void ClangTidyCheck::OptionsView::logIfOptionParsingError(llvm::Error &&Err) {
+void ClangTidyCheck::OptionsView::reportOptionParsingError(
+    llvm::Error &&Err) const {
   if (auto RemainingErrors =
           llvm::handleErrors(std::move(Err), [](const MissingOptionError &) {}))
-    llvm::logAllUnhandledErrors(std::move(RemainingErrors),
-                                llvm::WithColor::warning());
+    Context->configurationDiag(llvm::toString(std::move(RemainingErrors)));
 }
 
 template <>