Merge from 'sycl' to 'sycl-web'

Author: iclsrc

.github/workflows/sycl_nightly.yml

@@ -19,7 +19,7 @@ jobs:
       lts_config: "ocl_gen9;ocl_x64;hip_amdgpu"
 
   windows_default:
-    name: Windows (experimental)
+    name: Windows
     if: github.repository == 'intel/llvm'
     uses: ./.github/workflows/sycl_windows_build_and_test.yml
 

.github/workflows/sycl_post_commit.yml

@@ -98,4 +98,5 @@ jobs:
 
   windows_default:
     name: Windows
+    if: github.repository == 'intel/llvm'
     uses: ./.github/workflows/sycl_windows_build_and_test.yml

.github/workflows/sycl_windows_build_and_test.yml

@@ -2,54 +2,80 @@ name: SYCL Windows Test
 
 on:
   workflow_call:
+    inputs:
+      build_cache_suffix:
+        type: string
+        required: false
+        default: "default"
 
 jobs:
   build:
     name: Build
-    runs-on: windows-2022
+    runs-on: [Windows, build]
+    # TODO use cached checkout
     steps:
-    - uses: actions/checkout@v2
-      with:
-        path: src
-        fetch-depth: 1
-    - name: Install dependencies
-      shell: cmd
-      run: |
-        choco install -y ninja
-        choco install -y sccache --version 0.2.15
-        refreshenv
     - uses: ilammy/msvc-dev-cmd@9f8ae839b01883414208f29e3e24524387f48e1f
       with:
         arch: amd64
-    - name: Setup Cache
-      uses: actions/cache@v2
-      if: ${{ github.event_name != 'pull_request' }}
-      id: cache
+    - name: Set env
+      run: |
+        git config --system core.longpaths true
+        git config --global core.autocrlf false
+        echo "C:\Program Files\Git\usr\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+        echo "SCCACHE_DIR=D:\github\_work\cache\${{ inputs.build_cache_suffix }}" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+    - uses: actions/checkout@v2
       with:
-        path: cache
-        key: sycl-win-build-${{ github.sha }}
-        restore-keys: |
-          sycl-win-build-
-    - name: Build
+        path: src
+        fetch-depth: 1
+    - name: Register cleanup after job is finished
+      uses: ./src/devops/actions/cleanup
+    - name: Configure
       shell: cmd
       # TODO switch to clang-cl and lld when this is fixed https://github.com/oneapi-src/level-zero/issues/83
-      # TODO enable sccache, when problems with PDB are resolved
       run: |
         mkdir build
         mkdir install
-        IF NOT EXIST cache MKDIR cache
-        set SCCACHE_DIR=%GITHUB_WORKSPACE%\cache
-        set PATH=C:\ProgramData\chocolatey\lib\sccache\tools\sccache-v0.2.15-x86_64-pc-windows-msvc;%PATH%
+        IF NOT EXIST D:\github\_work\cache MKDIR D:\github\_work\cache
+        IF NOT EXIST D:\github\_work\cache\sycl_${{inputs.build_cache_suffix}} MKDIR D:\github\_work\cache\${{inputs.build_cache_suffix}}
         python.exe src/buildbot/configure.py -o build ^
+          --ci-default ^
           --cmake-opt="-DCMAKE_C_COMPILER=cl" ^
           --cmake-opt="-DCMAKE_CXX_COMPILER=cl" ^
           --cmake-opt="-DCMAKE_INSTALL_PREFIX=%GITHUB_WORKSPACE%\install" ^
           --cmake-opt="-DCMAKE_CXX_COMPILER_LAUNCHER=sccache" ^
           --cmake-opt="-DCMAKE_C_COMPILER_LAUNCHER=sccache"
+    - name: Build
+      id: build
+      run: |
         cmake --build build --target sycl-toolchain
         sccache --show-stats
+    - name: check-llvm
+      shell: bash
+      if: ${{ always() && !cancelled() && steps.build.outcome == 'success' }}
+      run: |
+        cmake --build build --target check-llvm
+    - name: check-clang
+      if: ${{ always() && !cancelled() && steps.build.outcome == 'success' }}
+      shell: bash
+      run: |
+        cmake --build build --target check-clang
+    - name: check-sycl
+      if: ${{ always() && !cancelled() && steps.build.outcome == 'success' }}
+      shell: bash
+      run: |
+        cmake --build build --target check-sycl
+    - name: check-llvm-spirv
+      if: ${{ always() && !cancelled() && steps.build.outcome == 'success' }}
+      shell: bash
+      run: |
+        cmake --build build --target check-llvm-spirv
+    - name: check-xptifw
+      if: ${{ always() && !cancelled() && steps.build.outcome == 'success' }}
+      shell: bash
+      run: |
+        cmake --build build --target check-xptifw
     - name: Install
-      shell: cmd
+      shell: bash
       run: cmake --build build --target deploy-sycl-toolchain
     - name: Upload toolchain
       uses: actions/upload-artifact@v2

buildbot/configure.py

@@ -31,27 +31,25 @@ def do_configure(args):
     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_emulator = 'OFF'
-    sycl_build_pi_hip = 'OFF'
     sycl_build_pi_hip_platform = 'AMD'
     sycl_clang_extra_flags = ''
-    sycl_werror = 'ON'
+    sycl_werror = 'OFF'
     llvm_enable_assertions = 'ON'
     llvm_enable_doxygen = 'OFF'
     llvm_enable_sphinx = 'OFF'
     llvm_build_shared_libs = 'OFF'
     llvm_enable_lld = 'OFF'
+    sycl_enabled_plugins = ["opencl", "level_zero"]
 
     sycl_enable_xpti_tracing = 'ON'
-    xpti_enable_werror = 'ON'
+    xpti_enable_werror = 'OFF'
 
     # replace not append, so ARM ^ X86
     if args.arm:
         llvm_targets_to_build = 'ARM;AArch64'
 
     if args.enable_esimd_emulator:
-        sycl_build_pi_esimd_emulator = 'ON'
+        sycl_enabled_plugins.append("esimd_emulator")
 
     if args.cuda or args.hip:
         llvm_enable_projects += ';libclc'
@@ -60,7 +58,7 @@ def do_configure(args):
         llvm_targets_to_build += ';NVPTX'
         libclc_targets_to_build = libclc_nvidia_target_names
         libclc_gen_remangled_variants = 'ON'
-        sycl_build_pi_cuda = 'ON'
+        sycl_enabled_plugins.append("cuda")
 
     if args.hip:
         if args.hip_platform == 'AMD':
@@ -75,11 +73,11 @@ def do_configure(args):
         libclc_gen_remangled_variants = 'ON'
 
         sycl_build_pi_hip_platform = args.hip_platform
-        sycl_build_pi_hip = 'ON'
+        sycl_enabled_plugins.append("hip")
 
-    if args.no_werror:
-        sycl_werror = 'OFF'
-        xpti_enable_werror = 'OFF'
+    if args.werror or args.ci_defaults:
+        sycl_werror = 'ON'
+        xpti_enable_werror = 'ON'
 
     if args.no_assertions:
         llvm_enable_assertions = 'OFF'
@@ -115,6 +113,9 @@ def do_configure(args):
         if libclc_nvidia_target_names not in libclc_targets_to_build:
             libclc_targets_to_build += libclc_nvidia_target_names
 
+    if args.enable_plugin:
+        sycl_enabled_plugins += args.enable_plugin
+
     install_dir = os.path.join(abs_obj_dir, "install")
 
     cmake_cmd = [
@@ -133,8 +134,6 @@ def do_configure(args):
         "-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_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),
@@ -145,9 +144,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_EMULATOR={}".format(sycl_build_pi_esimd_emulator),
         "-DXPTI_ENABLE_WERROR={}".format(xpti_enable_werror),
-        "-DSYCL_CLANG_EXTRA_FLAGS={}".format(sycl_clang_extra_flags)
+        "-DSYCL_CLANG_EXTRA_FLAGS={}".format(sycl_clang_extra_flags),
+        "-DSYCL_ENABLE_PLUGINS={}".format(';'.join(set(sycl_enabled_plugins)))
     ]
 
     if args.l0_headers and args.l0_loader:
@@ -213,7 +212,7 @@ def main():
     parser.add_argument("--enable-esimd-emulator", action='store_true', help="build with ESIMD 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")
+    parser.add_argument("--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")
     parser.add_argument("--cmake-gen", default="Ninja", help="CMake generator")
@@ -223,6 +222,7 @@ def main():
     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")
+    parser.add_argument("--enable-plugin", action='append', help="Enable SYCL plugin")
     args = parser.parse_args()
 
     print("args:{}".format(args))

buildbot/dependency.conf

@@ -1,8 +1,8 @@
 [VERSIONS]
-# https://github.com/intel/llvm/releases/download/2021-WW50/oclcpuexp-2021.13.11.0.23_rel.tar.gz
-ocl_cpu_rt_ver=2021.13.11.0.23
-# https://github.com/intel/llvm/releases/download/2021-WW50/win-oclcpuexp-2021.13.11.0.23_rel.zip
-ocl_cpu_rt_ver_win=2021.13.11.0.23
+# https://github.com/intel/llvm/releases/download/2022-WW13/oclcpuexp-2022.13.3.0.16_rel.tar.gz
+ocl_cpu_rt_ver=2022.13.3.0.16
+# https://github.com/intel/llvm/releases/download/2022-WW13/win-oclcpuexp-2022.13.3.0.16_rel.zip
+ocl_cpu_rt_ver_win=2022.13.3.0.16
 # Same GPU driver supports Level Zero and OpenCL
 # https://github.com/intel/compute-runtime/releases/tag/22.10.22597
 ocl_gpu_rt_ver=22.10.22597
@@ -15,26 +15,26 @@ intel_sycl_ver=build
 # 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.5.0/oneapi-tbb-2021.5.0-lin.tgz
-tbb_ver=2021.5.0
+tbb_ver=2021.6.0.755
 # https://github.com/oneapi-src/oneTBB/releases/download/v2021.5.0/oneapi-tbb-2021.5.0-win.zip
-tbb_ver_win=2021.5.0
+tbb_ver_win=2021.6.0.755
 
-# https://github.com/intel/llvm/releases/download/2021-WW50/fpgaemu-2021.13.11.0.23_rel.tar.gz
-ocl_fpga_emu_ver=2021.13.11.0.23
-# https://github.com/intel/llvm/releases/download/2021-WW50/win-fpgaemu-2021.13.11.0.23_rel.zip
-ocl_fpga_emu_ver_win=2021.13.11.0.23
-fpga_ver=20211014_000004
-fpga_ver_win=20211014_000004
+# https://github.com/intel/llvm/releases/download/2022-WW13/fpgaemu-2022.13.3.0.16_rel.tar.gz
+ocl_fpga_emu_ver=2022.13.3.0.16
+# https://github.com/intel/llvm/releases/download/2022-WW13/win-fpgaemu-2022.13.3.0.16_rel.zip
+ocl_fpga_emu_ver_win=2022.13.3.0.16
+fpga_ver=20220120_000001
+fpga_ver_win=20220120_000001
 # https://downloadmirror.intel.com/723911/igfx_win_101.1404.zip
 ocloc_ver_win=101.1404
 
 [DRIVER VERSIONS]
-cpu_driver_lin=2021.13.11.0.23
-cpu_driver_win=2021.13.11.0.23
+cpu_driver_lin=2022.13.3.0.16
+cpu_driver_win=2022.13.3.0.16
 gpu_driver_lin=22.10.22597
 gpu_driver_win=101.1404
-fpga_driver_lin=2021.13.11.0.23
-fpga_driver_win=2021.13.11.0.23
+fpga_driver_lin=2022.13.3.0.16
+fpga_driver_win=2022.13.3.0.16
 # NVidia CUDA driver
 # TODO provide URL for CUDA driver
 nvidia_gpu_driver_lin=435.21

clang/include/clang/Basic/Attr.td

@@ -1696,6 +1696,16 @@ def SYCLAddIRAttributesGlobalVariable : InheritableAttr {
   let Documentation = [SYCLAddIRAttributesGlobalVariableDocs];
 }
 
+def SYCLAddIRAnnotationsMember : InheritableAttr {
+  let Spellings = [CXX11<"__sycl_detail__", "add_ir_annotations_member">];
+  let Args = [VariadicExprArgument<"Args">];
+  let LangOpts = [SYCLIsDevice, SilentlyIgnoreSYCLIsHost];
+  let Subjects = SubjectList<[Field], ErrorDiag>;
+  let AcceptsExprPack = 1;
+  let AdditionalMembers = SYCLAddIRAttrCommonMembers.MemberCode;
+  let Documentation = [SYCLAddIRAnnotationsMemberDocs];
+}
+
 def C11NoReturn : InheritableAttr {
   let Spellings = [Keyword<"_Noreturn">];
   let Subjects = SubjectList<[Function], ErrorDiag>;

clang/include/clang/Basic/AttrDocs.td

@@ -3611,6 +3611,83 @@ where the last N*2 are as described above.
   }];
 }
 
+def SYCLAddIRAnnotationsMemberDocs : Documentation {
+  let Category = DocCatVariable;
+  let Heading = "add_ir_annotations_member";
+  let Content = [{
+This attribute can be applied to a non-static field. Access to a field with this
+attribute will generate a call to ``llvm.ptr.annotation`` with the arguments
+paired.
+The attribute must contain N*2 arguments. Each of the first N of these arguments
+must be either string literals or ``constexpr const char *``. The following N
+must be integer, floating point, character, boolean, ``const char *``, or an
+enumeration as either a literal or ``constexpr`` value. The first N arguments
+and the second N arguments are zipped into pairs when creating the call to
+``llvm.ptr.annotation``, i.e. in the constant global variable pointed to by the
+generated annotation intrinsic call, the N+1'th argument of the attribute will
+occur after the first argument of the attribute, the N+2'th argument of the
+attribute will occur after the second argument of the attribute, etc.
+The generated call to ``llvm.ptr.annotation`` will have the following arguments
+in this order:
+  * First argument is a pointer to the field.
+  * A pointer to a string literal in a constant global variable. This will
+    always be "sycl-properties".
+  * A pointer to a string literal in a constant global variable with the name of
+    the source file.
+  * The line number of the field declaration in the source file.
+  * A pointer to a constant global variable containing pointers to string
+    literals in constant global variables. These pointers to string literals
+    occur in pairs. If the second value of a pair was a ``nullptr`` or an empty
+    string then the pointer will be a null-pointer.
+A pair will not be in the call to ``llvm.ptr.annotation`` if the first value of
+the pair is an empty string.
+
+.. code-block:: c++
+
+  struct Foo {
+    int *ptr
+  #ifdef __SYCL_DEVICE_ONLY__
+        [[__sycl_detail__::add_ir_annotations_member(
+            "Attr1", "Attr2", "Attribute value", 3.14)]]
+  #endif
+        ;
+  };
+  // Accessing the 'ptr' field of 'Foo' will result in a call to
+  // 'llvm.ptr.annotation' with the second argument pointing to a constant
+  // global variable containing "sycl-properties" and the fifth argument
+  // pointing to a constant global variable with pointers to string literals
+  // "Attr1", "Attribute value", "Attr2", "3.14" in that order.
+
+Optionally, the first argument of the attribute can be an initializer list
+containing only string literals. This initializer list acts as a filter,
+allowing only pairs with the first value in the initializer list to be
+generated. If this intializer list is present, the attribute must have N*2+1
+arguments, where the last N*2 are as described above.
+
+.. code-block:: c++
+
+  struct Foo {
+    int *ptr
+  #ifdef __SYCL_DEVICE_ONLY__
+        [[__sycl_detail__::add_ir_annotations_member(
+            {"Attr2"}, "Attr1", "Attr2", "Attribute value", 3.14)]]
+  #endif
+        ;
+  };
+  // Accessing the 'ptr' field of 'Foo' will result in a call to
+  // 'llvm.ptr.annotation' with the second argument pointing to a constant
+  // global variable containing "sycl-properties" and the fifth argument
+  // pointing to a constant global variable with pointers to string literals
+  // "Attr2", "3.14" in that order.
+
+.. Note:: This attribute will only generate a call to ``llvm.ptr.annotation`` in
+  SYCL device code.
+
+.. Note:: This attribute is intended as an internal implementation detail and is
+  not intended to be used by external users.
+  }];
+}
+
 def SYCLDeviceIndirectlyCallableDocs : Documentation {
   let Category = DocCatFunction;
   let Heading = "intel::device_indirectly_callable";