Merge from 'sycl' to 'sycl-web' (26 commits)

Author: iclsrc

.github/workflows/linux_single_e2e.yml

@@ -15,7 +15,7 @@ on:
         required: True
       image_options:
         type: string
-        required: False
+        required: True
 
       target_devices:
         type: string
@@ -59,6 +59,43 @@ on:
         default: '{}'
         required: False
 
+  workflow_dispatch:
+    inputs:
+      runner:
+        type: choice
+        options:
+          - '["Linux", "gen12"]'
+          - '["amdgpu"]'
+      image:
+        description: |
+          Use option ending with ":build" for AMDGPU, ":latest" for the rest.
+        type: choice
+        options:
+          - 'ghcr.io/intel/llvm/sycl_ubuntu2204_nightly:latest'
+          - 'ghcr.io/intel/llvm/sycl_ubuntu2204_nightly:build'
+      image_options:
+        description: |
+          Use option with "--device=/dev/kfd" for AMDGPU, without it for the rest.
+        type: choice
+        options:
+          - '-u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN'
+          - '-u 1001 --device=/dev/dri --device=/dev/kfd --privileged --cap-add SYS_ADMIN'
+      target_devices:
+        type: choice
+        options:
+          - 'opencl:cpu'
+          - 'opencl:gpu'
+          - 'opencl:acc'
+          - 'ext_oneapi_level_zero:gpu'
+          - 'ext_oneapi_hip:gpu'
+          - 'ext_intel_esimd_emulator:gpu'
+
+      env:
+        description: |
+          Suggested variables: LIT_FILTER, LIT_FILTER_OUT. LIT_OPTS won't work
+          as we redefine it as part of this workflow.
+        default: '{"LIT_FILTER":""}'
+
 jobs:
   lin_e2e_only:
     name: ${{ inputs.name }}
@@ -83,7 +120,7 @@ jobs:
     - uses: ./devops/actions/cached_checkout
       with:
         path: llvm
-        ref: ${{ inputs.ref }}
+        ref: ${{ inputs.ref || github.sha }}
         merge_ref: ${{ inputs.merge_ref }}
         cache_path: "/__w/repo_cache/"
     - name: Install drivers

.github/workflows/sycl_cleanup.yml

@@ -49,16 +49,9 @@ jobs:
               - 'sycl/!(test-e2e|doc)/**'
             ci:
               - .github/workflows/**
-              - devops/*/**
               # devops/* contains config files, including drivers versions.
               # Allow them to be tested in pre-commit.
-            drivers_and_configs: &drivers_and_configs
-              - devops/*
-            test_build:
-              - *sycl
-              - *drivers_and_configs
-              # Temporary, until plugins are enabled in nightly image.
-              - sycl/**
+              - devops/*/**
 
       - name: Set output
         id: result
@@ -71,6 +64,6 @@ jobs:
               return '${{ steps.changes.outputs.changes }}';
             }
             // Treat everything as changed for huge PRs.
-            return ["llvm", "llvm_spirv", "clang", "sycl_fusion", "xptifw", "libclc", "sycl", "ci", "drivers_and_configs", "test_build"];
+            return ["llvm", "llvm_spirv", "clang", "sycl_fusion", "xptifw", "libclc", "sycl", "ci"];
 
       - run: echo '${{ steps.result.outputs.result }}'

.github/workflows/sycl_detect_changes.yml

@@ -73,7 +73,7 @@ on:
         type: string
         required: false
         default: 'SYCL-2020'
-      check_filters:
+      changes:
         type: string
         description: 'Filter matches for the changed files in the PR'
         default: '[llvm, clang, sycl, llvm_spirv, xptifw, libclc, libdevice]'
@@ -136,35 +136,35 @@ jobs:
       id: build
       run: cmake --build $GITHUB_WORKSPACE/build
     - name: check-llvm
-      if: always() && !cancelled() && contains(inputs.check_filters, 'llvm')
+      if: always() && !cancelled() && contains(inputs.changes, 'llvm')
       run: |
         cmake --build $GITHUB_WORKSPACE/build --target check-llvm
     - name: check-clang
-      if: always() && !cancelled() && contains(inputs.check_filters, 'clang')
+      if: always() && !cancelled() && contains(inputs.changes, 'clang')
       run: |
         # Can we move this to Dockerfile? Hopefully, noop on Windows.
         export XDG_CACHE_HOME=$GITHUB_WORKSPACE/os_cache
         cmake --build $GITHUB_WORKSPACE/build --target check-clang
     - name: check-sycl
-      if: always() && !cancelled() && contains(inputs.check_filters, 'sycl')
+      if: always() && !cancelled() && contains(inputs.changes, 'sycl')
       run: |
         # TODO consider moving this to Dockerfile.
         export LD_LIBRARY_PATH=/usr/local/cuda/compat/:/usr/local/cuda/lib64:$LD_LIBRARY_PATH
         cmake --build $GITHUB_WORKSPACE/build --target check-sycl
     - name: check-llvm-spirv
-      if: always() && !cancelled() && contains(inputs.check_filters, 'llvm_spirv')
+      if: always() && !cancelled() && contains(inputs.changes, 'llvm_spirv')
       run: |
         cmake --build $GITHUB_WORKSPACE/build --target check-llvm-spirv
     - name: check-xptifw
-      if: always() && !cancelled() && contains(inputs.check_filters, 'xptifw')
+      if: always() && !cancelled() && contains(inputs.changes, 'xptifw')
       run: |
         cmake --build $GITHUB_WORKSPACE/build --target check-xptifw
     - name: check-libclc
-      if: always() && !cancelled() && contains(inputs.check_filters, 'libclc')
+      if: always() && !cancelled() && contains(inputs.changes, 'libclc')
       run: |
         cmake --build $GITHUB_WORKSPACE/build --target check-libclc
     - name: check-libdevice
-      if: always() && !cancelled() && contains(inputs.check_filters, 'libdevice')
+      if: always() && !cancelled() && contains(inputs.changes, 'libdevice')
       run: |
         cmake --build $GITHUB_WORKSPACE/build --target check-libdevice
     - name: Install

.github/workflows/sycl_linux_build_and_test.yml

@@ -11,9 +11,7 @@ jobs:
     name: Generate Test Matrix
     uses: ./.github/workflows/sycl_gen_test_matrix.yml
     with:
-      # Restore once plugins are enabled in the build.
-      # lts_config: "hip_amdgpu;ocl_gen12;ocl_x64;l0_gen12;esimd_emu;cuda_aws;win_l0_gen12"
-      lts_config: "ocl_gen12;ocl_x64;l0_gen12;win_l0_gen12"
+      lts_config: "hip_amdgpu;ocl_gen12;ocl_x64;l0_gen12;esimd_emu;cuda_aws;win_l0_gen12"
 
   ubuntu2204_build_test:
     if: github.repository == 'intel/llvm'
@@ -23,11 +21,11 @@ jobs:
     with:
       build_cache_root: "/__w/"
       build_artifact_suffix: default-2204
+      build_configure_extra_args: '--hip --cuda --enable-esimd-emulator'
       merge_ref: ''
       retention-days: 90
       lts_matrix: ${{ needs.test_matrix.outputs.lts_lx_matrix }}
       lts_aws_matrix: ${{ needs.test_matrix.outputs.lts_aws_matrix }}
-      build_configure_extra_args: ''
 
   ubuntu2204_opaque_pointers_build_test:
     if: github.repository == 'intel/llvm'
@@ -63,7 +61,7 @@ jobs:
     - name: Build and Push Container (with drivers)
       uses: ./devops/actions/build_container
       with:
-        push: ${{ github.event_name != 'pull_request' }}
+        push: ${{ github.ref_name == 'sycl' }}
         file: ubuntu2204_preinstalled
         username: ${{ github.repository_owner }}
         password: ${{ secrets.GITHUB_TOKEN }}
@@ -76,7 +74,7 @@ jobs:
     - name: Build and Push Container (no drivers)
       uses: ./devops/actions/build_container
       with:
-        push: ${{ github.event_name != 'pull_request' }}
+        push: ${{ github.ref_name == 'sycl' }}
         file: ubuntu2204_preinstalled
         username: ${{ github.repository_owner }}
         password: ${{ secrets.GITHUB_TOKEN }}
@@ -89,7 +87,7 @@ jobs:
     - name: Build and Push Container (Build image)
       uses: ./devops/actions/build_container
       with:
-        push: ${{ github.event_name != 'pull_request' }}
+        push: ${{ github.ref_name == 'sycl' }}
         file: ubuntu2204_preinstalled
         username: ${{ github.repository_owner }}
         password: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/sycl_linux_gen12_exp.yml

@@ -92,4 +92,4 @@ jobs:
       build_cache_suffix: "default"
       lts_matrix: ${{ needs.test_matrix.outputs.lts_lx_matrix }}
       lts_aws_matrix: ${{ needs.test_matrix.outputs.lts_aws_matrix }}
-      check_filters: ${{ needs.detect_changes.outputs.filters }}
+      changes: ${{ needs.detect_changes.outputs.filters }}

.github/workflows/sycl_nightly.yml

@@ -84,4 +84,4 @@ jobs:
     with:
       lts_matrix: ${{ needs.test_matrix.outputs.lts_wn_matrix }}
       build_ref: ${{ github.event.pull_request.head.sha }}
-      check_filters: ${{ needs.detect_changes.outputs.filters }}
+      changes: ${{ needs.detect_changes.outputs.filters }}

.github/workflows/sycl_precommit_linux.yml

@@ -18,7 +18,7 @@ on:
         type: string
         required: false
         default: ""
-      check_filters:
+      changes:
         type: string
         description: 'Filter matches for the changed files in the PR'
         default: '[llvm, clang, sycl, llvm_spirv, xptifw, libclc, libdevice]'
@@ -77,27 +77,27 @@ jobs:
       run: |
         cmake --build build --target sycl-toolchain
     - name: check-llvm
-      if: always() && !cancelled() && contains(inputs.check_filters, 'llvm')
+      if: always() && !cancelled() && contains(inputs.changes, 'llvm')
       run: |
         cmake --build build --target check-llvm
     - name: check-clang
-      if: always() && !cancelled() && contains(inputs.check_filters, 'clang')
+      if: always() && !cancelled() && contains(inputs.changes, 'clang')
       run: |
         cmake --build build --target check-clang
     - name: check-sycl
-      if: always() && !cancelled() && contains(inputs.check_filters, 'sycl')
+      if: always() && !cancelled() && contains(inputs.changes, 'sycl')
       run: |
         cmake --build build --target check-sycl
     - name: check-llvm-spirv
-      if: always() && !cancelled() && contains(inputs.check_filters, 'llvm_spirv')
+      if: always() && !cancelled() && contains(inputs.changes, 'llvm_spirv')
       run: |
         cmake --build build --target check-llvm-spirv
     - name: check-xptifw
-      if: always() && !cancelled() && contains(inputs.check_filters, 'xptifw')
+      if: always() && !cancelled() && contains(inputs.changes, 'xptifw')
       run: |
         cmake --build build --target check-xptifw
     - name: check-libdevice
-      if: always() && !cancelled() && contains(inputs.check_filters, 'libdevice')
+      if: always() && !cancelled() && contains(inputs.changes, 'libdevice')
       run: |
         cmake --build build --target check-libdevice
     - name: Install

.github/workflows/sycl_precommit_windows.yml

@@ -112,6 +112,8 @@ the following values for the :ref:`offload kind<table-offload_kind>` and the
     +------------+-------+---------------------------------------+
     | OFK_HIP    | 0x03  | The producer was HIP                  |
     +------------+-------+---------------------------------------+
+    | OFK_SYCL   | 0x04  | The producer was SYCL                 |
+    +------------+-------+---------------------------------------+
 
 The flags are used to signify certain conditions, such as the presence of
 debugging information or whether or not LTO was used. The string entry table is

.github/workflows/sycl_windows_build_and_test.yml

@@ -1757,6 +1757,9 @@ BUILTIN(__builtin_ms_va_copy, "vc*&c*&", "n")
 // Arithmetic Fence: to prevent FP reordering and reassociation optimizations
 LANGBUILTIN(__arithmetic_fence, "v.", "tE", ALL_LANGUAGES)
 
+// Builtins for Intel SYCL
+BUILTIN(__builtin_intel_sycl_ptr_annotation, "v.", "nt")
+
 // Builtins for Intel FPGA
 BUILTIN(__builtin_intel_fpga_reg, "v.", "nt")
 BUILTIN(__builtin_intel_fpga_mem, "v.", "nt")

clang/docs/ClangOffloadPackager.rst

@@ -167,6 +167,13 @@ def err_intel_fpga_mem_arg_mismatch
             "a pointer"
             "|a non-negative integer constant}0">;
 
+def err_intel_sycl_ptr_annotation_arg_number_mismatch
+    :Error<"number of parameters must be odd number">;
+def err_intel_sycl_ptr_annotation_mismatch
+    : Error<"builtin parameter must be %select{"
+            "a pointer"
+            "|a string literal or constexpr const char*}0">;
+
 // C99 variable-length arrays
 def ext_vla : Extension<"variable length arrays are a C99 feature">,
   InGroup<VLAExtension>;

clang/include/clang/Basic/Builtins.def

@@ -3167,11 +3167,13 @@ def fsycl_device_obj_EQ : Joined<["-"], "fsycl-device-obj=">,
   "device code stored in the resulting object. Valid values are: spirv, llvmir "
   "(default)">;
 def fsycl_use_bitcode : Flag<["-"], "fsycl-use-bitcode">,
-  Alias<fsycl_device_obj_EQ>, AliasArgs<["llvmir"]>, Flags<[CoreOption]>,
-  HelpText<"Use LLVM bitcode instead of SPIR-V in fat objects">;
+  Alias<fsycl_device_obj_EQ>, AliasArgs<["llvmir"]>,
+  Flags<[CoreOption, Deprecated]>,
+  HelpText<"Use LLVM bitcode instead of SPIR-V in fat objects (deprecated)">;
 def fno_sycl_use_bitcode : Flag<["-"], "fno-sycl-use-bitcode">,
-  Alias<fsycl_device_obj_EQ>, AliasArgs<["spirv"]>, Flags<[CoreOption]>,
-  HelpText<"Use SPIR-V instead of LLVM bitcode in fat objects">;
+  Alias<fsycl_device_obj_EQ>, AliasArgs<["spirv"]>,
+  Flags<[CoreOption, Deprecated]>,
+  HelpText<"Use SPIR-V instead of LLVM bitcode in fat objects (deprecated)">;
 def fsycl_link_EQ : Joined<["-"], "fsycl-link=">,
   Flags<[CC1Option, CoreOption]>, HelpText<"Generate partially linked device and host object to be used at various stages of compilation">, Values<"image,early">;
 def fsycl_link : Flag<["-"], "fsycl-link">, Alias<fsycl_link_EQ>,

clang/include/clang/Basic/DiagnosticSemaKinds.td

@@ -14052,6 +14052,9 @@ class Sema final {
   bool CheckIntelFPGARegBuiltinFunctionCall(unsigned BuiltinID, CallExpr *Call);
   bool CheckIntelFPGAMemBuiltinFunctionCall(CallExpr *Call);
 
+  bool CheckIntelSYCLPtrAnnotationBuiltinFunctionCall(unsigned BuiltinID,
+                                                      CallExpr *Call);
+
   bool SemaBuiltinVAStart(unsigned BuiltinID, CallExpr *TheCall);
   bool SemaBuiltinVAStartARMMicrosoft(CallExpr *Call);
   bool SemaBuiltinUnorderedCompare(CallExpr *TheCall);