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

Author: bso-intel

.github/CODEOWNERS

@@ -1,19 +1,19 @@
-clang/ @erichkeane, @Fznamznon
+* @bader
 
-clang/**/Driver @mdtoguchi @AGindinson
+clang/ @erichkeane @Fznamznon
 
-llvm-spirv/ @AlexeySotkin, @AlexeySachkov
+clang/**/Driver @mdtoguchi @AGindinson
 
-opencl-aot/ @dm-vodopyanov, @AlexeySachkov, @romanovvlad
+llvm-spirv/ @AlexeySotkin @AlexeySachkov
 
-libdevice/ @asavonic, @vzakhari
+opencl-aot/ @dm-vodopyanov @AlexeySachkov @romanovvlad
 
-sycl/doc/extensions/ @mkinsner, @jbrodman
+libdevice/ @asavonic @vzakhari
 
-sycl/doc/ @pvchupin, @kbobrovs
+sycl/ @romanovvlad @bader
 
-sycl/ @romanovvlad, @bader
+sycl/doc/ @pvchupin @kbobrovs
 
-xpti/ @tovinkere, @andykaylor
+sycl/doc/extensions/ @mkinsner @jbrodman
 
-* @bader
+xpti/ @tovinkere @andykaylor

.github/workflows/linux_post_commit.yml

@@ -10,7 +10,7 @@ jobs:
      strategy:
        fail-fast: false
        matrix:
-         config: ["Default", "SharedLibs", "Assertions"]
+         config: ["Default", "SharedLibs", "NoAssertions"]
 
      steps:
      - uses: actions/checkout@v2
@@ -28,14 +28,14 @@ jobs:
              SharedLibs)
                  export ARGS="--shared-libs"
                  ;;
-             Assertiosn)
-                 export ARGS="--assertions"
+             NoAssertions)
+                 export ARGS="--no-assertions"
                  ;;
          esac
          mkdir -p $GITHUB_WORKSPACE/build
          cd $GITHUB_WORKSPACE/build
          python3 $GITHUB_WORKSPACE/src/buildbot/configure.py -w $GITHUB_WORKSPACE \
-         -s $GITHUB_WORKSPACE/src -o $GITHUB_WORKSPACE/build -t Release --no-ocl $ARGS
+         -s $GITHUB_WORKSPACE/src -o $GITHUB_WORKSPACE/build -t Release $ARGS
      - name: Compile
        run: |
          python3 $GITHUB_WORKSPACE/src/buildbot/compile.py -w  $GITHUB_WORKSPACE \

.gitignore

@@ -23,6 +23,7 @@
 
 # Nested build directory
 /build*
+!buildbot
 
 #==============================================================================#
 # Explicit files to ignore (only matches one).

CONTRIBUTING.md

@@ -69,23 +69,41 @@ commit automatically with `git commit -s`.
 
 ### Development
 
+**NB**: For any changes not related to DPC++, but rather to LLVM in general, it
+is strongly encouraged that you submit the patch to https://llvm.org/ directly.
+See [LLVM contribution guidelines](https://llvm.org/docs/Contributing.html)
+for more information.
+
 - Create a personal fork of the project on GitHub
   - For the DPC++ Compiler project, use **sycl** branch as baseline for your
     changes. See [Get Started Guide](sycl/doc/GetStartedGuide.md).
 - Prepare your patch (follow
-  [LLVM coding standards](https://llvm.org/docs/CodingStandards.html))
-- Build the project and run all tests
+  [LLVM coding standards](https://llvm.org/docs/CodingStandards.html)).
+  [clang-format](https://clang.llvm.org/docs/ClangFormat.html) and [clang-tidy](
+  https://clang.llvm.org/extra/clang-tidy/) tools can be integrated into your
+  workflow to ensure formatting and stylistic compliance of your changes.
+- Build the project and run all tests.
+
+### Commit message
+
+- When writing your commit message, please make sure to follow
+  [LLVM developer policies](
+  https://llvm.org/docs/DeveloperPolicy.html#commit-messages) on the subject.
+- For any DPC++-related commit, the `[SYCL]` tag should be present in the
+  commit message title. To a reasonable extent, additional tags can be used
+  to signify the component changed, e.g.: `[PI]`, `[CUDA]`, `[Doc]`.
 
 ### Review and acceptance testing
 
 - Create a pull request for your changes following [Creating a pull request
-instructions](https://help.github.com/articles/creating-a-pull-request/)
-- CI will run signed-off check as soon as PR is created, see **check_pr** CI
-check for results
-- CI will run build and functional testing check as soon as PR is approved by
-Intel representative
-  - New approval is needed if PR was updated (e.g. during code review)
-- Once PR is approved and all checks pass, the pull request is ready for merge
+instructions](https://help.github.com/articles/creating-a-pull-request/).
+- CI will run a signed-off check as soon as your PR is created - see the
+**check_pr** CI action results.
+- CI will run several build and functional testing checks as soon as the PR is
+approved by an Intel representative.
+  - A new approval is needed if the PR was updated (e.g. during code review).
+- Once the PR is approved and all checks have passed, the pull request is
+ready for merge.
 
 ### Merge
 
@@ -98,4 +116,3 @@ commits pulled from the LLVM community repository
 
 
 *Other names and brands may be claimed as the property of others.
-

buildbot/compile.py

@@ -1,14 +1,15 @@
 import argparse
-import os
+import multiprocessing
 import subprocess
 import sys
 
 DEFAULT_CPU_COUNT = 4
 
 
 def do_compile(args):
-    cpu_count = os.cpu_count()
-    if cpu_count is None:
+    try:
+        cpu_count = multiprocessing.cpu_count()
+    except NotImplementedError:
         cpu_count = DEFAULT_CPU_COUNT
 
     make_cmd = ["ninja", "-j", str(cpu_count), "deploy-sycl-toolchain", "deploy-opencl-aot"]

buildbot/configure.py

@@ -4,20 +4,29 @@
 import sys
 import platform
 
+# TODO:
+# 1. Make all required options optional
+# 2. Create obj_dir from the script if it doesn't exist
+
 def do_configure(args):
     ret = False
 
-    llvm_dir = os.path.join(args.src_dir, "llvm")
-    sycl_dir = os.path.join(args.src_dir, "sycl")
-    spirv_dir = os.path.join(args.src_dir, "llvm-spirv")
-    xpti_dir = os.path.join(args.src_dir, "xpti")
-    libdevice_dir = os.path.join(args.src_dir, "libdevice")
-    ocl_header_dir = os.path.join(args.obj_dir, "OpenCL-Headers")
-    icd_loader_lib = os.path.join(args.obj_dir, "OpenCL-ICD-Loader", "build")
+    # Get absolute paths
+    abs_src_dir = os.path.abspath(args.src_dir)
+    abs_obj_dir = os.path.abspath(args.obj_dir)
+
+    llvm_dir = os.path.join(abs_src_dir, "llvm")
+    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")
+    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'
     libclc_targets_to_build = ''
     sycl_build_pi_cuda = 'OFF'
+    sycl_werror = 'ON'
     llvm_enable_assertions = 'ON'
     llvm_enable_doxygen = 'OFF'
     llvm_enable_sphinx = 'OFF'
@@ -34,8 +43,11 @@ def do_configure(args):
         libclc_targets_to_build = 'nvptx64--;nvptx64--nvidiacl'
         sycl_build_pi_cuda = 'ON'
 
-    if args.assertions:
-        llvm_enable_assertions = 'ON'
+    if args.no_werror:
+        sycl_werror = 'OFF'
+
+    if args.no_assertions:
+        llvm_enable_assertions = 'OFF'
 
     if args.docs:
         llvm_enable_doxygen = 'ON'
@@ -44,7 +56,7 @@ def do_configure(args):
     if args.shared_libs:
         llvm_build_shared_libs = 'ON'
 
-    install_dir = os.path.join(args.obj_dir, "install")
+    install_dir = os.path.join(abs_obj_dir, "install")
 
     cmake_cmd = [
         "cmake",
@@ -61,37 +73,43 @@ def do_configure(args):
         "-DLIBCLC_TARGETS_TO_BUILD={}".format(libclc_targets_to_build),
         "-DSYCL_BUILD_PI_CUDA={}".format(sycl_build_pi_cuda),
         "-DLLVM_BUILD_TOOLS=ON",
-        "-DSYCL_ENABLE_WERROR=ON",
+        "-DSYCL_ENABLE_WERROR={}".format(sycl_werror),
         "-DCMAKE_INSTALL_PREFIX={}".format(install_dir),
         "-DSYCL_INCLUDE_TESTS=ON", # Explicitly include all kinds of SYCL tests.
         "-DLLVM_ENABLE_DOXYGEN={}".format(llvm_enable_doxygen),
         "-DLLVM_ENABLE_SPHINX={}".format(llvm_enable_sphinx),
         "-DBUILD_SHARED_LIBS={}".format(llvm_build_shared_libs),
-        "-DSYCL_ENABLE_XPTI_TRACING=ON", # Explicitly turn on XPTI tracing
-        llvm_dir
+        "-DSYCL_ENABLE_XPTI_TRACING=ON" # Explicitly turn on XPTI tracing
     ]
 
-    if not args.no_ocl:
+    if args.system_ocl:
       cmake_cmd.extend([
             "-DOpenCL_INCLUDE_DIR={}".format(ocl_header_dir),
             "-DOpenCL_LIBRARY={}".format(icd_loader_lib)])
 
+    # Add additional CMake options if provided
+    if args.cmake_opt:
+      cmake_cmd += args.cmake_opt
+
+    # Add path to root CMakeLists.txt
+    cmake_cmd.append(llvm_dir)
+
     print(cmake_cmd)
 
     try:
-        subprocess.check_call(cmake_cmd, cwd=args.obj_dir)
+        subprocess.check_call(cmake_cmd, cwd=abs_obj_dir)
     except subprocess.CalledProcessError:
-        cmake_cache = os.path.join(args.obj_dir, "CMakeCache.txt")
+        cmake_cache = os.path.join(abs_obj_dir, "CMakeCache.txt")
         if os.path.isfile(cmake_cache):
             os.remove(cmake_cache)
-        subprocess.check_call(cmake_cmd, cwd=args.obj_dir)
+        subprocess.check_call(cmake_cmd, cwd=abs_obj_dir)
 
     ret = True
     return ret
 
 def main():
     parser = argparse.ArgumentParser(prog="configure.py",
-                                     description="script to do configure",
+                                     description="Generate build files from CMake configuration files",
                                      formatter_class=argparse.RawTextHelpFormatter)
     parser.add_argument("-n", "--build-number", metavar="BUILD_NUM", help="build number")
     parser.add_argument("-b", "--branch", metavar="BRANCH", help="pull request branch")
@@ -104,10 +122,12 @@ def main():
     parser.add_argument("-t", "--build-type",
                         metavar="BUILD_TYPE", required=True, help="build type, debug or release")
     parser.add_argument("--cuda", action='store_true', help="switch from OpenCL to CUDA")
-    parser.add_argument("--assertions", action='store_true', help="build with assertions")
+    parser.add_argument("--no-assertions", action='store_true', help="build without assertions")
     parser.add_argument("--docs", action='store_true', help="build Doxygen documentation")
-    parser.add_argument("--no-ocl", action='store_true', help="download OpenCL deps via CMake")
+    parser.add_argument("--system-ocl", action='store_true', help="use OpenCL deps from system (no download)")
+    parser.add_argument("--no-werror", action='store_true', help="Don't treat warnings as errors")
     parser.add_argument("--shared-libs", action='store_true', help="Build shared libraries")
+    parser.add_argument("--cmake-opt", action='append', help="Additional CMake option not configured via script parameters")
 
     args = parser.parse_args()
 

clang-tools-extra/clang-apply-replacements/lib/Tooling/ApplyReplacements.cpp

@@ -143,18 +143,26 @@ groupReplacements(const TUReplacements &TUs, const TUDiagnostics &TUDs,
   llvm::DenseMap<const FileEntry *, std::vector<tooling::Replacement>>
       GroupedReplacements;
 
-  // Deduplicate identical replacements in diagnostics.
+  // Deduplicate identical replacements in diagnostics unless they are from the
+  // same TU.
   // FIXME: Find an efficient way to deduplicate on diagnostics level.
-  llvm::DenseMap<const FileEntry *, std::set<tooling::Replacement>>
+  llvm::DenseMap<const FileEntry *,
+                 std::map<tooling::Replacement,
+                          const tooling::TranslationUnitDiagnostics *>>
       DiagReplacements;
 
-  auto AddToGroup = [&](const tooling::Replacement &R, bool FromDiag) {
+  auto AddToGroup = [&](const tooling::Replacement &R,
+                        const tooling::TranslationUnitDiagnostics *SourceTU) {
     // Use the file manager to deduplicate paths. FileEntries are
     // automatically canonicalized.
     if (auto Entry = SM.getFileManager().getFile(R.getFilePath())) {
-      if (FromDiag) {
+      if (SourceTU) {
         auto &Replaces = DiagReplacements[*Entry];
-        if (!Replaces.insert(R).second)
+        auto It = Replaces.find(R);
+        if (It == Replaces.end())
+          Replaces.emplace(R, SourceTU);
+        else if (It->second != SourceTU)
+          // This replacement is a duplicate of one suggested by another TU.
           return;
       }
       GroupedReplacements[*Entry].push_back(R);
@@ -166,14 +174,14 @@ groupReplacements(const TUReplacements &TUs, const TUDiagnostics &TUDs,
 
   for (const auto &TU : TUs)
     for (const tooling::Replacement &R : TU.Replacements)
-      AddToGroup(R, false);
+      AddToGroup(R, nullptr);
 
   for (const auto &TU : TUDs)
     for (const auto &D : TU.Diagnostics)
       if (const auto *ChoosenFix = tooling::selectFirstFix(D)) {
         for (const auto &Fix : *ChoosenFix)
           for (const tooling::Replacement &R : Fix.second)
-            AddToGroup(R, true);
+            AddToGroup(R, &TU);
       }
 
   // Sort replacements per file to keep consistent behavior when