Merge branch 'sycl' into private/mkinsner/device_global_extension

Author: bader

.github/CODEOWNERS

@@ -4,7 +4,7 @@
 clang/ @premanandrao @elizabethandrews @AaronBallman
 
 # Driver
-clang/**/Driver @mdtoguchi @AGindinson
+clang/**/Driver @mdtoguchi @AGindinson @hchilama
 
 # LLVM-SPIRV translator
 llvm-spirv/ @AlexeySotkin @AlexeySachkov
@@ -22,7 +22,7 @@ libdevice/ @vzakhari @jinge90
 sycl/ @intel/llvm-reviewers-runtime
 
 # Documentation
-sycl/ReleaseNotes.md @pvchupin
+sycl/ReleaseNotes.md @pvchupin @tfzhu
 sycl/doc/ @pvchupin @bader
 sycl/doc/extensions/ @intel/dpcpp-specification-reviewers
 
@@ -43,6 +43,9 @@ sycl/source/detail/plugin.hpp @smaslov-intel
 sycl/source/detail/posix_pi.cpp @smaslov-intel
 sycl/source/detail/windows_pi.cpp @smaslov-intel
 
+# ESIMD CPU emulator plug-in
+sycl/plugins/esimd_cpu/ @kbobrovs @smaslov-intel
+
 # CUDA plugin
 sycl/plugins/cuda/ @intel/llvm-reviewers-cuda
 
@@ -70,13 +73,9 @@ sycl/source/function_pointer.cpp @AlexeySachkov
 sycl/include/CL/sycl/half_type.hpp @AlexeySachkov
 sycl/source/half_type.cpp @AlexeySachkov
 
-# vec and swizzles
-sycl/include/CL/sycl/swizzles.def @turinevgeny
-sycl/include/CL/sycl/types.hpp @turinevgeny
-
 # XPTI instrumentation utilities
-xpti/ @tovinkere @andykaylor
-xptifw/ @tovinkere  @andykaylor
+xpti/ @tovinkere @andykaylor @alexbatashev
+xptifw/ @tovinkere @andykaylor @alexbatashev
 
 # DPC++ tools
 llvm/**/append-file/ @mdtoguchi @AGindinson
@@ -99,10 +98,10 @@ clang/tools/clang-offload-deps/ @sndmitriev @mlychkov @AlexeySachkov
 clang/tools/clang-offload-extract/ @sndmitriev @mlychkov @AlexeySachkov
 
 # Explicit SIMD
-SYCLLowerIR/ @kbobrovs @DenisBakhvalov
-esimd/ @kbobrovs @DenisBakhvalov
-sycl/include/sycl/ext/intel/experimental/esimd.hpp @kbobrovs @DenisBakhvalov
-sycl/doc/extensions/ExplicitSIMD/ @kbobrovs
+SYCLLowerIR/ @kbobrovs @DenisBakhvalov @kychendev
+esimd/ @kbobrovs @DenisBakhvalov @kychendev
+sycl/include/sycl/ext/intel/experimental/esimd.hpp @kbobrovs @DenisBakhvalov @kychendev
+sycl/doc/extensions/ExplicitSIMD/ @kbobrovs @DenisBakhvalov @kychendev
 
 # ITT annotations
 llvm/lib/Transforms/Instrumentation/SPIRITTAnnotations.cpp @MrSidims @vzakhari

.github/workflows/gh_pages.yml

@@ -16,7 +16,7 @@ jobs:
     - name: Install deps
       run: |
         sudo apt-get install -y doxygen graphviz ssh ninja-build
-        sudo pip3 install 'sphinx==3.0.0' 'recommonmark==0.6.0' 'sphinx_markdown_tables==0.0.12'
+        sudo pip3 install 'sphinx==4.1.2' 'myst-parser==0.15.1'
     - name: Build Docs
       run: |
         mkdir -p $GITHUB_WORKSPACE/build

.github/workflows/linux_post_commit.yml

@@ -6,7 +6,7 @@ on:
       - sycl
 jobs:
    check:
-     runs-on: ubuntu-18.04
+     runs-on: ubuntu-20.04
      if: github.repository == 'intel/llvm'
      strategy:
        fail-fast: false
@@ -18,7 +18,15 @@ jobs:
        with:
          path: src
      - name: Install Ubuntu deps
-       run: sudo apt install -y ninja-build
+       run: sudo apt install -y ninja-build ccache
+     - name: Setup Cache
+       uses: actions/cache@v2
+       id: cache
+       with:
+         path: ${{ github.workspace }}/cache
+         key: build-${{ runner.os }}-${{ matrix.config }}-${{ github.sha }}
+         restore-keys: |
+           build-${{ runner.os }}-${{ matrix.config }}-
      - name: Configure
        run: |
          CONFIG=${{ matrix.config }}
@@ -28,12 +36,12 @@ jobs:
                  ;;
              SharedLibs)
                  wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
-                 sudo add-apt-repository "deb http://apt.llvm.org/bionic/   llvm-toolchain-bionic-12 main"
+                 sudo add-apt-repository "deb http://apt.llvm.org/focal/   llvm-toolchain-focal-13 main"
                  sudo apt-get update
-                 sudo apt-get install -y clang-12
+                 sudo apt-get install -y clang-13
                  export ARGS="--shared-libs"
-                 export CC="clang-12"
-                 export CXX="clang++-12"
+                 export CC="clang-13"
+                 export CXX="clang++-13"
                  ;;
              NoAssertions)
                  export ARGS="--no-assertions"
@@ -42,7 +50,10 @@ jobs:
          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 $ARGS
+         -s $GITHUB_WORKSPACE/src -o $GITHUB_WORKSPACE/build -t Release \
+         --ci-defaults $ARGS --cmake-opt="-DLLVM_CCACHE_BUILD=ON" \
+         --cmake-opt="-DLLVM_CCACHE_DIR=$GITHUB_WORKSPACE/cache" \
+         --cmake-opt="-DLLVM_CCACHE_MAXSIZE=2G"
      - name: Compile
        run: |
          python3 $GITHUB_WORKSPACE/src/buildbot/compile.py -w  $GITHUB_WORKSPACE \
@@ -74,4 +85,3 @@ jobs:
        with:
          name: sycl_linux_${{ matrix.config }}
          path: llvm_sycl.tar.gz
-

.mailmap

@@ -28,8 +28,8 @@
 <[email protected]> <[email protected]>
 <[email protected]> <[email protected]>
 <[email protected]> <[email protected]>
-Jon Roelofs <[email protected]> Jon Roelofs <jroelofs@jroelofs.com>
-Jon Roelofs <[email protected]> Jonathan Roelofs <jonathan@codesourcery.com>
-Jon Roelofs <[email protected]> Jonathan Roelofs <jroelofs@jroelofs.com>
+Jon Roelofs <[email protected]> <jonathan@codesourcery.com>
+Jon Roelofs <[email protected]> <jroelofs@jroelofs.com>
+LLVM GN Syncbot <llvmgnsyncbot@gmail.com>
 Martin Storsjö <[email protected]>
-Saleem Abdulrasool <[email protected]> <[email protected]>
+Saleem Abdulrasool <[email protected]>

CONTRIBUTING.md

@@ -38,7 +38,9 @@ see [ABI Policy Guide](sycl/doc/ABIPolicyGuide.md) for more information.
   - [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.
+    compliance of your changes. To avoid code formatting misalignment with
+    GitHub Actions check we recommend using 10 version of clang-format tool
+    (default version on Ubuntu 20.04).
   - use
 
     ```bash
@@ -66,11 +68,6 @@ There are 3 types of tests which are used for DPC++ toolchain validation:
 should not have hardware (e.g. GPU, FPGA, etc.) or external software
 dependencies (e.g. OpenCL, Level Zero, CUDA runtimes). All tests not following
 this approach should be moved to DPC++ end-to-end or SYCL-CTS tests.
-However, the tests for a feature under active development requiring atomic
-change for tests and product can be put to
-[sycl/test/on-device](../../sycl/test/on-device) temporarily. It is developer
-responsibility to move the tests to DPC++ E2E test suite or SYCL-CTS once
-the feature is stabilized.
 
     **Guidelines for adding DPC++ in-tree LIT tests (DPC++ Clang FE tests)**:
     - Use `sycl::` namespace instead of `cl::sycl::`

README.md

@@ -1,37 +1,30 @@
 # Intel Project for LLVM\* technology
 
-## Introduction
+Intel staging area for llvm.org contribution. Home for Intel LLVM-based projects:
 
-Intel staging area for llvm.org contribution.
-Home for Intel LLVM-based projects:
+## oneAPI Data Parallel C++ compiler
 
-* oneAPI Data Parallel C++ compiler - see
-  [sycl](https://github.com/intel/llvm/tree/sycl) branch. More information on
-  oneAPI and DPC++ is available at
-  [https://www.oneapi.com/](https://www.oneapi.com/)
-  * [![Linux Post Commit Checks](https://github.com/intel/llvm/workflows/Linux%20Post%20Commit%20Checks/badge.svg)](https://github.com/intel/llvm/actions?query=workflow%3A%22Linux+Post+Commit+Checks%22)
-    [![Generate Doxygen documentation](https://github.com/intel/llvm/workflows/Generate%20Doxygen%20documentation/badge.svg)](https://github.com/intel/llvm/actions?query=workflow%3A%22Generate+Doxygen+documentation%22)
-* Late-outline OpenMP\* and OpenMP\* Offload - see
-  [openmp](https://github.com/intel/llvm/tree/openmp) branch.
+[![](https://spec.oneapi.io/oneapi-logo-white-scaled.jpg)](https://www.oneapi.io/)
 
-## License
+See [sycl](https://github.com/intel/llvm/tree/sycl) branch and
+[DPC++ Documentation](https://intel.github.io/llvm-docs/).
 
-See [LICENSE.txt](sycl/LICENSE.TXT) for details.
+[![Linux Post Commit Checks](https://github.com/intel/llvm/workflows/Linux%20Post%20Commit%20Checks/badge.svg)](https://github.com/intel/llvm/actions?query=workflow%3A%22Linux+Post+Commit+Checks%22)
+[![Generate Doxygen documentation](https://github.com/intel/llvm/workflows/Generate%20Doxygen%20documentation/badge.svg)](https://github.com/intel/llvm/actions?query=workflow%3A%22Generate+Doxygen+documentation%22)
 
-## Contributing
+DPC++ is an open, cross-architecture language built upon the ISO C++ and Khronos
+SYCL\* standards. DPC++ extends these standards with a number of extensions,
+which can be found in [sycl/doc/extensions](sycl/doc/extensions) directory.
 
-See [CONTRIBUTING.md](CONTRIBUTING.md) for details.
+## Late-outline OpenMP\* and OpenMP\* Offload
+See [openmp](https://github.com/intel/llvm/tree/openmp) branch.
 
-## Sub-projects Documentation
+# License
 
-* oneAPI Data Parallel C++ compiler - See
-  [DPC++ Documentation](https://intel.github.io/llvm-docs/)
-* Late-outline OpenMP\* and OpenMP\* Offload - TBD
+See [LICENSE.txt](sycl/LICENSE.TXT) for details.
 
-## DPC++ extensions
+# Contributing
 
-DPC++ is an open, cross-architecture language built upon the ISO C++ and Khronos
-SYCL\* standards. DPC++ extends these standards with a number of extensions,
-which can be found in [sycl/doc/extensions](sycl/doc/extensions) directory.
+See [CONTRIBUTING.md](CONTRIBUTING.md) for details.
 
 *\*Other names and brands may be claimed as the property of others.*

buildbot/configure.py

@@ -27,10 +27,11 @@ def do_configure(args):
     llvm_targets_to_build = 'X86'
     llvm_enable_projects = 'clang;' + llvm_external_projects
     libclc_targets_to_build = ''
+    libclc_gen_remangled_variants = 'OFF'
     sycl_build_pi_cuda = 'OFF'
-    sycl_build_pi_esimd_cpu = 'ON'
-    sycl_build_pi_rocm = 'OFF'
-    sycl_build_pi_rocm_platform = 'AMD'
+    sycl_build_pi_esimd_cpu = 'OFF'
+    sycl_build_pi_hip = 'OFF'
+    sycl_build_pi_hip_platform = 'AMD'
     sycl_werror = 'ON'
     llvm_enable_assertions = 'ON'
     llvm_enable_doxygen = 'OFF'
@@ -40,31 +41,41 @@ def do_configure(args):
 
     sycl_enable_xpti_tracing = 'ON'
 
+    if args.ci_defaults:
+        print("#############################################")
+        print("# Default CI configuration will be applied. #")
+        print("#############################################")
+
     # replace not append, so ARM ^ X86
     if args.arm:
         llvm_targets_to_build = 'ARM;AArch64'
 
-    if args.disable_esimd_cpu:
-        sycl_build_pi_esimd_cpu = 'OFF'
+    if args.enable_esimd_cpu_emulation:
+        sycl_build_pi_esimd_cpu = 'ON'
 
-    if args.cuda or args.rocm:
+    if args.cuda or args.hip:
         llvm_enable_projects += ';libclc'
 
     if args.cuda:
         llvm_targets_to_build += ';NVPTX'
         libclc_targets_to_build = 'nvptx64--;nvptx64--nvidiacl'
+        libclc_gen_remangled_variants = 'ON'
         sycl_build_pi_cuda = 'ON'
 
-    if args.rocm:
-        if args.rocm_platform == 'AMD':
+    if args.hip:
+        if args.hip_platform == 'AMD':
             llvm_targets_to_build += ';AMDGPU'
             libclc_targets_to_build += ';amdgcn--;amdgcn--amdhsa'
-        elif args.rocm_platform == 'NVIDIA' and not args.cuda:
+
+            # The HIP plugin for AMD uses lld for linking
+            llvm_enable_projects += ';lld'
+        elif args.hip_platform == 'NVIDIA' and not args.cuda:
             llvm_targets_to_build += ';NVPTX'
             libclc_targets_to_build += ';nvptx64--;nvptx64--nvidiacl'
+        libclc_gen_remangled_variants = 'ON'
 
-        sycl_build_pi_rocm_platform = args.rocm_platform
-        sycl_build_pi_rocm = 'ON'
+        sycl_build_pi_hip_platform = args.hip_platform
+        sycl_build_pi_hip = 'ON'
 
     if args.no_werror:
         sycl_werror = 'OFF'
@@ -99,9 +110,10 @@ def do_configure(args):
         "-DLLVM_EXTERNAL_LIBDEVICE_SOURCE_DIR={}".format(libdevice_dir),
         "-DLLVM_ENABLE_PROJECTS={}".format(llvm_enable_projects),
         "-DLIBCLC_TARGETS_TO_BUILD={}".format(libclc_targets_to_build),
+        "-DLIBCLC_GENERATE_REMANGLED_VARIANTS={}".format(libclc_gen_remangled_variants),
         "-DSYCL_BUILD_PI_CUDA={}".format(sycl_build_pi_cuda),
-        "-DSYCL_BUILD_PI_ROCM={}".format(sycl_build_pi_rocm),
-        "-DSYCL_BUILD_PI_ROCM_PLATFORM={}".format(sycl_build_pi_rocm_platform),
+        "-DSYCL_BUILD_PI_HIP={}".format(sycl_build_pi_hip),
+        "-DSYCL_BUILD_PI_HIP_PLATFORM={}".format(sycl_build_pi_hip_platform),
         "-DLLVM_BUILD_TOOLS=ON",
         "-DSYCL_ENABLE_WERROR={}".format(sycl_werror),
         "-DCMAKE_INSTALL_PREFIX={}".format(install_dir),
@@ -171,10 +183,10 @@ def main():
     parser.add_argument("-t", "--build-type",
                         metavar="BUILD_TYPE", default="Release", help="build type: Debug, Release")
     parser.add_argument("--cuda", action='store_true', help="switch from OpenCL to CUDA")
-    parser.add_argument("--rocm", action='store_true', help="switch from OpenCL to ROCm")
-    parser.add_argument("--rocm-platform", type=str, choices=['AMD', 'NVIDIA'], default='AMD', help="choose ROCm backend")
+    parser.add_argument("--hip", action='store_true', help="switch from OpenCL to HIP")
+    parser.add_argument("--hip-platform", type=str, choices=['AMD', 'NVIDIA'], default='AMD', help="choose hardware platform for HIP backend")
     parser.add_argument("--arm", action='store_true', help="build ARM support rather than x86")
-    parser.add_argument("--disable-esimd-cpu", action='store_true', help="build without ESIMD_CPU support")
+    parser.add_argument("--enable-esimd-cpu-emulation", action='store_true', help="build with ESIMD_CPU emulation support")
     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-werror", action='store_true', help="Don't treat warnings as errors")
@@ -186,6 +198,7 @@ def main():
     parser.add_argument("--libcxx-library", metavar="LIBCXX_LIBRARY_PATH", help="libcxx library path")
     parser.add_argument("--use-lld", action="store_true", help="Use LLD linker for build")
     parser.add_argument("--llvm-external-projects", help="Add external projects to build. Add as comma seperated list.")
+    parser.add_argument("--ci-defaults", action="store_true", help="Enable default CI parameters")
     args = parser.parse_args()
 
     print("args:{}".format(args))

buildbot/dependency.conf

@@ -4,11 +4,11 @@ ocl_cpu_rt_ver=2021.12.6.0.19
 # https://github.com/intel/llvm/releases/download/2021-WW26/win-oclcpuexp-2021.12.6.0.19_rel.zip
 ocl_cpu_rt_ver_win=2021.12.6.0.19
 # Same GPU driver supports Level Zero and OpenCL
-# https://github.com/intel/compute-runtime/releases/tag/21.26.20194
-ocl_gpu_rt_ver=21.26.20194
+# https://github.com/intel/compute-runtime/releases/tag/21.37.20939
+ocl_gpu_rt_ver=21.37.20939
 # Same GPU driver supports Level Zero and OpenCL
-# https://downloadmirror.intel.com/30381/a08/igfx_win10_100.9466.zip
-ocl_gpu_rt_ver_win=27.20.100.9466
+# https://downloadmirror.intel.com/648245/igfx_win_100.9864.zip
+ocl_gpu_rt_ver_win=30.0.100.9864
 intel_sycl_ver=build
 
 # TBB binaries can be built from sources following instructions under
@@ -30,8 +30,8 @@ ocloc_ver_win=27.20.100.9168
 [DRIVER VERSIONS]
 cpu_driver_lin=2021.12.6.0.19
 cpu_driver_win=2021.12.6.0.19
-gpu_driver_lin=21.26.20194
-gpu_driver_win=27.20.100.9466
+gpu_driver_lin=21.37.20939
+gpu_driver_win=30.0.100.9864
 fpga_driver_lin=2021.12.6.0.19
 fpga_driver_win=2021.12.6.0.19
 # NVidia CUDA driver

clang-tools-extra/clang-change-namespace/ChangeNamespace.cpp

@@ -442,7 +442,7 @@ void ChangeNamespaceTool::registerMatchers(ast_matchers::MatchFinder *Finder) {
                                hasDeclaration(DeclMatcher),
                                unless(templateSpecializationType()))))),
                            hasParent(nestedNameSpecifierLoc()),
-                           hasAncestor(isImplicit()),
+                           hasAncestor(decl(isImplicit())),
                            hasAncestor(UsingShadowDeclInClass),
                            hasAncestor(functionDecl(isDefaulted())))),
               hasAncestor(decl().bind("dc")))
@@ -466,7 +466,7 @@ void ChangeNamespaceTool::registerMatchers(ast_matchers::MatchFinder *Finder) {
           hasAncestor(decl(IsInMovedNs).bind("dc")),
           loc(nestedNameSpecifier(
               specifiesType(hasDeclaration(DeclMatcher.bind("from_decl"))))),
-          unless(anyOf(hasAncestor(isImplicit()),
+          unless(anyOf(hasAncestor(decl(isImplicit())),
                        hasAncestor(UsingShadowDeclInClass),
                        hasAncestor(functionDecl(isDefaulted())),
                        hasAncestor(typeLoc(loc(qualType(hasDeclaration(
@@ -495,7 +495,7 @@ void ChangeNamespaceTool::registerMatchers(ast_matchers::MatchFinder *Finder) {
                                 hasAncestor(cxxRecordDecl()))),
                    hasParent(namespaceDecl()));
   Finder->addMatcher(expr(hasAncestor(decl().bind("dc")), IsInMovedNs,
-                          unless(hasAncestor(isImplicit())),
+                          unless(hasAncestor(decl(isImplicit()))),
                           anyOf(callExpr(callee(FuncMatcher)).bind("call"),
                                 declRefExpr(to(FuncMatcher.bind("func_decl")))
                                     .bind("func_ref"))),

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

@@ -245,7 +245,7 @@ clang::TypoCorrection IncludeFixerSemaSource::CorrectTypo(
     // parent_path.
     // FIXME: Don't rely on source text.
     const char *End = Source.end();
-    while (isIdentifierBody(*End) || *End == ':')
+    while (isAsciiIdentifierContinue(*End) || *End == ':')
       ++End;
 
     return std::string(Source.begin(), End);

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

@@ -34,7 +34,7 @@ DiagnosticBuilder ClangTidyCheck::diag(StringRef Message,
 
 DiagnosticBuilder
 ClangTidyCheck::configurationDiag(StringRef Description,
-                                  DiagnosticIDs::Level Level) {
+                                  DiagnosticIDs::Level Level) const {
   return Context->configurationDiag(Description, Level);
 }
 

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

@@ -123,7 +123,7 @@ class ClangTidyCheck : public ast_matchers::MatchFinder::MatchCallback {
   /// Adds a diagnostic to report errors in the check's configuration.
   DiagnosticBuilder
   configurationDiag(StringRef Description,
-                    DiagnosticIDs::Level Level = DiagnosticIDs::Warning);
+                    DiagnosticIDs::Level Level = DiagnosticIDs::Warning) const;
 
   /// Should store all options supported by this check with their
   /// current values or default values for options that haven't been overridden.