Merge branch 'sycl' into simd_view_ctor

Author: kbobrovs

.github/CODEOWNERS

@@ -1,7 +1,7 @@
 * @bader
 
 # Front-end compiler
-clang/ @premanandrao @elizabethandrews @AaronBallman
+clang/ @premanandrao @elizabethandrews @smanna12
 
 # Driver
 clang/**/Driver @mdtoguchi @AGindinson @hchilama
@@ -22,9 +22,10 @@ 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
+sycl/doc/SPIRV @AlexeySotkin @bashbaug @mbelicki
 
 # Sub-groups
 sycl/include/CL/sycl/detail/spirv.hpp @Pennycook @AlexeySachkov
@@ -33,15 +34,15 @@ sycl/include/sycl/ext/intel/sub_group.hpp @Pennycook @AlexeySachkov
 sycl/include/sycl/ext/intel/sub_group_host.hpp @Pennycook @AlexeySachkov
 
 # PI API
-sycl/include/CL/sycl/detail/pi.def @smaslov-intel
-sycl/include/CL/sycl/detail/pi.h   @smaslov-intel
-sycl/include/CL/sycl/detail/pi.hpp @smaslov-intel
-sycl/include/CL/sycl/detail/pi* @smaslov-intel
-sycl/plugins/ @smaslov-intel
-sycl/source/detail/pi.cpp @smaslov-intel
-sycl/source/detail/plugin.hpp @smaslov-intel
-sycl/source/detail/posix_pi.cpp @smaslov-intel
-sycl/source/detail/windows_pi.cpp @smaslov-intel
+sycl/include/CL/sycl/detail/pi.def @smaslov-intel @againull
+sycl/include/CL/sycl/detail/pi.h   @smaslov-intel @againull
+sycl/include/CL/sycl/detail/pi.hpp @smaslov-intel @againull
+sycl/include/CL/sycl/detail/pi* @smaslov-intel @againull
+sycl/plugins/ @smaslov-intel @againull
+sycl/source/detail/pi.cpp @smaslov-intel @againull
+sycl/source/detail/plugin.hpp @smaslov-intel @againull
+sycl/source/detail/posix_pi.cpp @smaslov-intel @againull
+sycl/source/detail/windows_pi.cpp @smaslov-intel @againull
 
 # ESIMD CPU emulator plug-in
 sycl/plugins/esimd_cpu/ @kbobrovs @smaslov-intel
@@ -73,10 +74,6 @@ 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 @alexbatashev
 xptifw/ @tovinkere @andykaylor @alexbatashev
@@ -102,10 +99,10 @@ clang/tools/clang-offload-deps/ @sndmitriev @mlychkov @AlexeySachkov
 clang/tools/clang-offload-extract/ @sndmitriev @mlychkov @AlexeySachkov
 
 # Explicit SIMD
-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
+SYCLLowerIR/ @kbobrovs @sndmitriev @kychendev @v-klochkov 
+esimd/ @kbobrovs @v-klochkov @kychendev
+sycl/include/sycl/ext/intel/experimental/esimd.hpp @kbobrovs @v-klochkov @kychendev
+sycl/doc/extensions/ExplicitSIMD/ @kbobrovs @v-klochkov @kychendev
 
 # ITT annotations
 llvm/lib/Transforms/Instrumentation/SPIRITTAnnotations.cpp @MrSidims @vzakhari

.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 \
@@ -67,11 +78,15 @@ jobs:
        run: |
          python3 $GITHUB_WORKSPACE/src/buildbot/check.py -w  $GITHUB_WORKSPACE \
          -s  $GITHUB_WORKSPACE/src -o $GITHUB_WORKSPACE/build -t check-llvm-spirv
+     - name: check-xptifw
+       if: always()
+       run: |
+         python3 $GITHUB_WORKSPACE/src/buildbot/check.py -w  $GITHUB_WORKSPACE \
+         -s  $GITHUB_WORKSPACE/src -o $GITHUB_WORKSPACE/build -t check-xptifw
      - name: Pack
        run: tar -czvf llvm_sycl.tar.gz -C $GITHUB_WORKSPACE/build/install .
      - name: Upload artifacts
        uses: actions/upload-artifact@v1
        with:
          name: sycl_linux_${{ matrix.config }}
          path: llvm_sycl.tar.gz
-

.github/workflows/sycl_containers.yaml

@@ -0,0 +1,32 @@
+name: CI Containers
+on:
+  workflow_dispatch:
+  schedule:
+    # Every 1st and 15th day of month
+    - cron: '0 0 1,15 * *'
+
+jobs:
+  base_image_ubuntu2004:
+    if: github.repository == 'intel/llvm'
+    name: Base Ubuntu 20.04 Docker image
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 1
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v1
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      - name: Build and Push Container
+        uses: docker/build-push-action@v2
+        with:
+          push: true
+          tags: |
+            ghcr.io/${{ github.repository }}/ubuntu2004_base:${{ github.sha }}
+            ghcr.io/${{ github.repository }}/ubuntu2004_base:latest
+          context: ${{ github.workspace }}/devops
+          file: ${{ github.workspace }}/devops/containers/ubuntu2004_base.Dockerfile

.mailmap

@@ -25,6 +25,7 @@
 <[email protected]> <[email protected]>
 <[email protected]> <[email protected]>
 <[email protected]> <[email protected]>
+<[email protected]> <[email protected]>
 <[email protected]> <[email protected]>
 <[email protected]> <[email protected]>
 <[email protected]> <[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

buildbot/configure.py

@@ -29,9 +29,10 @@ def do_configure(args):
     libclc_targets_to_build = ''
     libclc_gen_remangled_variants = 'OFF'
     sycl_build_pi_cuda = 'OFF'
-    sycl_build_pi_esimd_cpu = 'OFF'
-    sycl_build_pi_rocm = 'OFF'
-    sycl_build_pi_rocm_platform = 'AMD'
+    sycl_build_pi_esimd_emulator = 'OFF'
+    sycl_build_pi_hip = 'OFF'
+    sycl_build_pi_hip_platform = 'AMD'
+    sycl_clang_extra_flags = ''
     sycl_werror = 'ON'
     llvm_enable_assertions = 'ON'
     llvm_enable_doxygen = 'OFF'
@@ -40,15 +41,21 @@ def do_configure(args):
     llvm_enable_lld = 'OFF'
 
     sycl_enable_xpti_tracing = 'ON'
+    xpti_enable_werror = '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.enable_esimd_cpu_emulation:
-        sycl_build_pi_esimd_cpu = 'ON'
+        sycl_build_pi_esimd_emulator = 'ON'
 
-    if args.cuda or args.rocm:
+    if args.cuda or args.hip:
         llvm_enable_projects += ';libclc'
 
     if args.cuda:
@@ -57,23 +64,26 @@ def do_configure(args):
         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'
+            if args.hip_amd_arch:
+                sycl_clang_extra_flags += "-Xsycl-target-backend=amdgcn-amd-amdhsa --offload-arch="+args.hip_amd_arch
 
-            # The ROCm plugin for AMD uses lld for linking
+            # The HIP plugin for AMD uses lld for linking
             llvm_enable_projects += ';lld'
-        elif args.rocm_platform == 'NVIDIA' and not args.cuda:
+        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'
+        xpti_enable_werror = 'OFF'
 
     if args.no_assertions:
         llvm_enable_assertions = 'OFF'
@@ -107,8 +117,8 @@ def do_configure(args):
         "-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),
@@ -118,7 +128,9 @@ def do_configure(args):
         "-DBUILD_SHARED_LIBS={}".format(llvm_build_shared_libs),
         "-DSYCL_ENABLE_XPTI_TRACING={}".format(sycl_enable_xpti_tracing),
         "-DLLVM_ENABLE_LLD={}".format(llvm_enable_lld),
-        "-DSYCL_BUILD_PI_ESIMD_CPU={}".format(sycl_build_pi_esimd_cpu)
+        "-DSYCL_BUILD_PI_ESIMD_EMULATOR={}".format(sycl_build_pi_esimd_emulator),
+        "-DXPTI_ENABLE_WERROR={}".format(xpti_enable_werror),
+        "-DSYCL_CLANG_EXTRA_FLAGS={}".format(sycl_clang_extra_flags)
     ]
 
     if args.l0_headers and args.l0_loader:
@@ -178,8 +190,9 @@ 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("--hip-amd-arch", type=str, help="Sets AMD gpu architecture for llvm lit tests, this is only needed for the HIP backend and AMD platform")
     parser.add_argument("--arm", action='store_true', help="build ARM support rather than x86")
     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")
@@ -193,6 +206,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

@@ -1,39 +1,39 @@
 [VERSIONS]
-# https://github.com/intel/llvm/releases/download/2021-WW26/oclcpuexp-2021.12.6.0.19_rel.tar.gz
-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
+# https://github.com/intel/llvm/releases/download/2021-WW40/oclcpuexp-2021.12.9.0.24_rel.tar.gz
+ocl_cpu_rt_ver=2021.12.9.0.24
+# https://github.com/intel/llvm/releases/download/2021-WW40/win-oclcpuexp-2021.12.9.0.24_rel.zip
+ocl_cpu_rt_ver_win=2021.12.9.0.24
 # Same GPU driver supports Level Zero and OpenCL
-# https://github.com/intel/compute-runtime/releases/tag/21.33.20678
-ocl_gpu_rt_ver=21.33.20678
+# 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/646152/igfx_win_100.9805.zip
-ocl_gpu_rt_ver_win=30.0.100.9805
+# 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
 # https://github.com/oneapi-src/oneTBB/blob/master/cmake/README.md
 # or downloaded using links below:
-# https://github.com/oneapi-src/oneTBB/releases/download/v2021.2.0/oneapi-tbb-2021.2.0-lin.tgz
-tbb_ver=2021.3.0.418
-# https://github.com/oneapi-src/oneTBB/releases/download/v2021.2.0/oneapi-tbb-2021.2.0-win.zip
-tbb_ver_win=2021.3.0.418
+# https://github.com/oneapi-src/oneTBB/releases/download/v2021.3.0/oneapi-tbb-2021.3.0-lin.tgz
+tbb_ver=2021.4.0.569
+# https://github.com/oneapi-src/oneTBB/releases/download/v2021.3.0/oneapi-tbb-2021.3.0-win.zip
+tbb_ver_win=2021.4.0.561
 
-# https://github.com/intel/llvm/releases/download/2021-WW26/fpgaemu-2021.12.6.0.19_rel.tar.gz
-ocl_fpga_emu_ver=2021.12.6.0.19
-# https://github.com/intel/llvm/releases/download/2021-WW26/win-fpgaemu-2021.12.6.0.19_rel.zip
-ocl_fpga_emu_ver_win=2021.12.6.0.19
-fpga_ver=20210519_000004
-fpga_ver_win=20210509_000006
+# https://github.com/intel/llvm/releases/download/2021-WW40/fpgaemu-2021.12.9.0.24_rel.tar.gz
+ocl_fpga_emu_ver=2021.12.9.0.24
+# https://github.com/intel/llvm/releases/download/2021-WW40/win-fpgaemu-2021.12.9.0.24_rel.zip
+ocl_fpga_emu_ver_win=2021.12.9.0.24
+fpga_ver=20210805_000004
+fpga_ver_win=20210805_000004
 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.33.20678
-gpu_driver_win=30.0.100.9805
-fpga_driver_lin=2021.12.6.0.19
-fpga_driver_win=2021.12.6.0.19
+cpu_driver_lin=2021.12.9.0.24
+cpu_driver_win=2021.12.9.0.24
+gpu_driver_lin=21.37.20939
+gpu_driver_win=30.0.100.9864
+fpga_driver_lin=2021.12.9.0.24
+fpga_driver_win=2021.12.9.0.24
 # NVidia CUDA driver
 # TODO provide URL for CUDA driver
 nvidia_gpu_driver_lin=435.21