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

* upstream/sycl: (36 commits)
  [SYCL] Add SYCL2020 target::device enumeration value (intel#4587)
  [SYCL][Doc] Update ITT instrumentation docs (intel#4503)
  [SYCL][L0] Make all L0 events have device-visibility (intel#4534)
  [SYCL] Updated Level-Zero backend spec according to SYCL 2020 standard (intel#4560)
  [SYCL] Add error_code support for SYCL 1.2.1 exception classes (intel#4574)
  [SYCL][CI] Provide --ci-defaults option for config script (intel#4583)
  [CI] Switch GitHub Actions to Ubuntu 20.04 (intel#4582)
  [SYCL][CUDA] Fix context clearing in PiCuda tests (intel#4483)
  [SYCL] Hide SYCL service kernels (intel#4519)
  [SYCL][L0] Fix mismatched ZE call count (intel#4559)
  [SYCL] Remove function pointers extension (intel#4459)
  [GitHub Actions] Uplift clang version in post-commit validation (intel#4581)
  [SYCL] Ignore usm prefetch dummy flag (intel#4568)
  [SYCL][Group algorithms] Add group sorting algorithms implementation (intel#4439)
  [SYCL] Resolve name clash with a user defined symbol (intel#4570)
  [clang-offload-wrapper] Do not create .tgtimg section with -emit-reg-funcs=0 (intel#4577)
  [SYCL][FPGA] Remove deprecated attribute functionality (intel#4532)
  [SYCL] Remove _class aliases (intel#4465)
  [SYCL][CUDA][HIP] Report every device in its own platform (intel#4571)
  [SYCL][L0] make_device shouldn't need platform as an input (intel#4561)
  ...

Author: alexbatashev

.github/CODEOWNERS

@@ -73,10 +73,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

.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
@@ -28,12 +28,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 +42,7 @@ 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
      - name: Compile
        run: |
          python3 $GITHUB_WORKSPACE/src/buildbot/compile.py -w  $GITHUB_WORKSPACE \
@@ -79,4 +79,3 @@ jobs:
        with:
          name: sycl_linux_${{ matrix.config }}
          path: llvm_sycl.tar.gz
-

buildbot/configure.py

@@ -30,8 +30,8 @@ def do_configure(args):
     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_hip = 'OFF'
+    sycl_build_pi_hip_platform = 'AMD'
     sycl_werror = 'ON'
     llvm_enable_assertions = 'ON'
     llvm_enable_doxygen = 'OFF'
@@ -40,17 +40,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'
 
-    if args.cuda or args.rocm:
+    if args.cuda or args.hip:
         llvm_enable_projects += ';libclc'
 
     if args.cuda:
@@ -59,20 +63,20 @@ 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'
 
-            # 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'
@@ -110,8 +114,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),
@@ -182,8 +186,8 @@ 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("--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")
@@ -197,6 +201,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

@@ -7,8 +7,8 @@ ocl_cpu_rt_ver_win=2021.12.6.0.19
 # https://github.com/intel/compute-runtime/releases/tag/21.34.20767
 ocl_gpu_rt_ver=21.34.20767
 # 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
@@ -31,7 +31,7 @@ ocloc_ver_win=27.20.100.9168
 cpu_driver_lin=2021.12.6.0.19
 cpu_driver_win=2021.12.6.0.19
 gpu_driver_lin=21.34.20767
-gpu_driver_win=30.0.100.9805
+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