Merge branch 'sycl' into dbakhval-esimd-inlining

Author: DenisBakhvalov

.github/workflows/README.md

@@ -0,0 +1 @@
+Github action workflows should be stored in this directrory.

.github/workflows/linux_post_commit.yml

@@ -6,7 +6,7 @@ on:
       - sycl
 jobs:
    check:
-     runs-on: ubuntu-latest
+     runs-on: ubuntu-18.04
      strategy:
        fail-fast: false
        matrix:

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

@@ -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/21.07.19042
-ocl_gpu_rt_ver=21.07.19042
+# https://github.com/intel/compute-runtime/releases/tag/21.08.19096
+ocl_gpu_rt_ver=21.08.19096
 # Same GPU driver supports Level Zero and OpenCL
 # https://downloadmirror.intel.com/30148/a08/igfx_win10_100.9168.zip
 ocl_gpu_rt_ver_win=27.20.100.9168
@@ -30,7 +30,7 @@ ocloc_ver_win=27.20.100.9168
 [DRIVER VERSIONS]
 cpu_driver_lin=2020.11.11.0.04
 cpu_driver_win=2020.11.11.0.04
-gpu_driver_lin=21.07.19042
+gpu_driver_lin=21.08.19096
 gpu_driver_win=27.20.100.9168
 fpga_driver_lin=2020.11.11.0.04
 fpga_driver_win=2020.11.11.0.04

buildbot/dependency.conf

@@ -50,29 +50,34 @@ def do_dependency(args):
     ocl_header_dir = os.path.join(args.obj_dir, "OpenCL-Headers")
     if not os.path.isdir(ocl_header_dir):
         clone_cmd = ["git", "clone", "https://github.com/KhronosGroup/OpenCL-Headers",
-                     "OpenCL-Headers", "-b", "v2020.06.16"]
+                     "OpenCL-Headers", "-b", "master"]
         subprocess.check_call(clone_cmd, cwd=args.obj_dir)
     else:
         fetch_cmd = ["git", "pull", "--ff", "--ff-only", "origin"]
         subprocess.check_call(fetch_cmd, cwd=ocl_header_dir)
 
-    # Workaround to unblock CI until KhronosGroup/OpenCL-ICD-Loader/pull/124
-    # is submitted
-    checkout_cmd = ["git", "checkout", "d1b936b72b9610626ecab8a991cec18348fba047"]
+    # Checkout fixed version to avoid unexpected issues coming from upstream
+    # Specific version can be uplifted as soon as such need arise
+    checkout_cmd = ["git", "checkout", "23710f1b99186065c1768fc3098ba681adc0f253"]
     subprocess.check_call(checkout_cmd, cwd=ocl_header_dir)
 
     # fetch and build OpenCL ICD loader
     icd_loader_dir = os.path.join(args.obj_dir, "OpenCL-ICD-Loader")
     if not os.path.isdir(icd_loader_dir):
         clone_cmd = ["git", "clone",
                      "https://github.com/KhronosGroup/OpenCL-ICD-Loader",
-                     "OpenCL-ICD-Loader", "-b", "v2020.06.16"]
+                     "OpenCL-ICD-Loader", "-b", "master"]
 
         subprocess.check_call(clone_cmd, cwd=args.obj_dir)
     else:
         fetch_cmd = ["git", "pull", "--ff", "--ff-only", "origin"]
         subprocess.check_call(fetch_cmd, cwd=icd_loader_dir)
 
+    # Checkout fixed version to avoid unexpected issues coming from upstream
+    # Specific version can be uplifted as soon as such need arise
+    checkout_cmd = ["git", "checkout", "5f8249691ec8c25775789498951f8e9eb62c201d"]
+    subprocess.check_call(checkout_cmd, cwd=icd_loader_dir)
+
     icd_build_dir = os.path.join(icd_loader_dir, "build")
     if os.path.isdir(icd_build_dir):
         shutil.rmtree(icd_build_dir)
@@ -119,4 +124,3 @@ def main():
     ret = main()
     exit_code = 0 if ret else 1
     sys.exit(exit_code)
-

buildbot/dependency.py

@@ -99,8 +99,13 @@ llvm::ErrorOr<std::vector<std::string>> GetAllowedSymbolPatterns() {
 
 int main(int argc, const char **argv) {
   llvm::sys::PrintStackTraceOnErrorSignal(argv[0]);
-  tooling::CommonOptionsParser OptionsParser(argc, argv,
-                                             ChangeNamespaceCategory);
+  auto ExpectedParser =
+      tooling::CommonOptionsParser::create(argc, argv, ChangeNamespaceCategory);
+  if (!ExpectedParser) {
+    llvm::errs() << ExpectedParser.takeError();
+    return 1;
+  }
+  tooling::CommonOptionsParser &OptionsParser = ExpectedParser.get();
   const auto &Files = OptionsParser.getSourcePathList();
   tooling::RefactoringTool Tool(OptionsParser.getCompilations(), Files);
   llvm::ErrorOr<std::vector<std::string>> AllowedPatterns =

clang-tools-extra/clang-change-namespace/tool/ClangChangeNamespace.cpp

@@ -149,6 +149,7 @@ SymbolIndexManager::search(llvm::StringRef Identifier,
   rank(MatchedSymbols, FileName);
   // Strip signals, they are no longer needed.
   std::vector<SymbolInfo> Res;
+  Res.reserve(MatchedSymbols.size());
   for (auto &SymAndSig : MatchedSymbols)
     Res.push_back(std::move(SymAndSig.Symbol));
   return Res;

clang-tools-extra/clang-include-fixer/SymbolIndexManager.cpp

@@ -128,7 +128,14 @@ bool Merge(llvm::StringRef MergeDir, llvm::StringRef OutputFile) {
 } // namespace find_all_symbols
 
 int main(int argc, const char **argv) {
-  CommonOptionsParser OptionsParser(argc, argv, FindAllSymbolsCategory);
+  auto ExpectedParser =
+      CommonOptionsParser::create(argc, argv, FindAllSymbolsCategory);
+  if (!ExpectedParser) {
+    llvm::errs() << ExpectedParser.takeError();
+    return 1;
+  }
+
+  CommonOptionsParser &OptionsParser = ExpectedParser.get();
   ClangTool Tool(OptionsParser.getCompilations(),
                  OptionsParser.getSourcePathList());
 

clang-tools-extra/clang-include-fixer/find-all-symbols/tool/FindAllSymbolsMain.cpp

@@ -263,7 +263,13 @@ void writeToJson(llvm::raw_ostream &OS, const IncludeFixerContext& Context) {
 }
 
 int includeFixerMain(int argc, const char **argv) {
-  tooling::CommonOptionsParser options(argc, argv, IncludeFixerCategory);
+  auto ExpectedParser =
+      tooling::CommonOptionsParser::create(argc, argv, IncludeFixerCategory);
+  if (!ExpectedParser) {
+    llvm::errs() << ExpectedParser.takeError();
+    return 1;
+  }
+  tooling::CommonOptionsParser &options = ExpectedParser.get();
   tooling::ClangTool tool(options.getCompilations(),
                           options.getSourcePathList());
 

clang-tools-extra/clang-include-fixer/tool/ClangIncludeFixer.cpp

@@ -95,7 +95,13 @@ cl::opt<bool> DumpDecls(
 
 int main(int argc, const char **argv) {
   llvm::sys::PrintStackTraceOnErrorSignal(argv[0]);
-  tooling::CommonOptionsParser OptionsParser(argc, argv, ClangMoveCategory);
+  auto ExpectedParser =
+      tooling::CommonOptionsParser::create(argc, argv, ClangMoveCategory);
+  if (!ExpectedParser) {
+    llvm::errs() << ExpectedParser.takeError();
+    return 1;
+  }
+  tooling::CommonOptionsParser &OptionsParser = ExpectedParser.get();
 
   if (OldDependOnNew && NewDependOnOld) {
     llvm::errs() << "Provide either --old_depend_on_new or "