Merge remote-tracking branch 'origin/sycl' into llvmspirv_pulldown

 Conflicts:
	libclc/CMakeLists.txt
	libclc/clc/include/clc/clcfunc.h
	libclc/generic/include/clc/clc.h
	libclc/libspirv/include/libspirv/spirv.h

Author: jsji

.github/CODEOWNERS

@@ -177,6 +177,7 @@ sycl/doc/syclgraph/ @intel/sycl-graphs-reviewers
 sycl/**/syclcompat/ @intel/syclcompat-lib-reviewers
 sycl/cmake/modules/AddSYCLLibraryUnitTest.cmake @intel/syclcompat-lib-reviewers
 sycl/include/syclcompat.hpp @intel/syclcompat-lib-reviewers
+sycl/test-e2e/syclcompat/ @intel/syclcompat-lib-reviewers
 
 # bindless images
 sycl/doc/extensions/experimental/sycl_ext_oneapi_bindless_images.asciidoc @intel/bindless-images-reviewers

.github/workflows/sycl-containers-igc-dev.yaml

@@ -7,12 +7,14 @@ on:
     paths:
       - 'devops/actions/build_container/**'
       - 'devops/scripts/**'
+      - '!devops/scripts/benchmarks/**'
       - 'devops/dependencies-igc-dev.json'
       - '.github/workflows/sycl-containers-igc-dev.yaml'
   pull_request:
     paths:
       - 'devops/actions/build_container/**'
       - 'devops/scripts/**'
+      - '!devops/scripts/benchmarks/**'
       - 'devops/dependencies-igc-dev.json'
       - '.github/workflows/sycl-containers-igc-dev.yaml'
 

.github/workflows/sycl-linux-build.yml

@@ -32,6 +32,10 @@ on:
       build_artifact_suffix:
         type: string
         required: true
+      build_target:
+        type: string
+        required: false
+        default: sycl-toolchain
       artifact_archive_name:
         type: string
         default: llvm_sycl.tar.zst
@@ -177,7 +181,8 @@ jobs:
           -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=SPIRV
     - name: Compile
       id: build
-      run: cmake --build $GITHUB_WORKSPACE/build --target sycl-toolchain
+      # Emulate default value for manual dispatch as we've run out of available arguments.
+      run: cmake --build $GITHUB_WORKSPACE/build --target ${{ inputs.build_target || 'sycl-toolchain' }}
     - name: check-llvm
       if: always() && !cancelled() && contains(inputs.changes, 'llvm')
       run: |

.github/workflows/sycl-linux-run-tests.yml

@@ -321,6 +321,9 @@ jobs:
     - name: Run SYCL CTS Tests
       if: inputs.tests_selector == 'cts'
       uses: ./devops/actions/run-tests/cts
+      # Normally this job takes less than 10m. But sometimes it hangs up and
+      # reaches the 360m limit. Set a lower limit to free up the runner earlier.
+      timeout-minutes: 35
       with:
         ref: ${{ inputs.tests_ref || 'main' }}
         cts_exclude_ref: ${{ inputs.repo_ref }}

.github/workflows/sycl-nightly.yml

@@ -33,6 +33,7 @@ jobs:
       build_cache_suffix: sprod_shared
       build_artifact_suffix: sprod_shared
       build_configure_extra_args: '--shared-libs --hip --cuda --native_cpu --no-assertions'
+      build_target: all
 
       artifact_archive_name: sycl_linux_shared.tar.zst
 
@@ -151,6 +152,7 @@ jobs:
       artifact_archive_name: sycl_windows.tar.gz
       # Disable the spirv-dis requirement as to not require SPIR-V Tools.
       build_configure_extra_args: -DLLVM_SPIRV_ENABLE_LIBSPIRV_DIS=off
+      build_target: all
 
   e2e-win:
     needs: build-win
@@ -217,9 +219,6 @@ jobs:
   run-sycl-cts-linux:
     needs: [ubuntu2204_build, build-sycl-cts-linux]
     if: ${{ always() && !cancelled() && needs.ubuntu2204_build.outputs.build_conclusion == 'success' }}
-    # Normally these jobs take less than 10m. But sometimes the job hangs up and
-    # reaches the 360m limit. Set a lower limit to free up the runner earlier.
-    timeout-minutes: 35
     strategy:
       fail-fast: false
       matrix:

.github/workflows/sycl-windows-build.yml

@@ -10,6 +10,10 @@ on:
       build_configure_extra_args:
         type: string
         required: false
+      build_target:
+        type: string
+        required: false
+        default: sycl-toolchain
       changes:
         type: string
         description: 'Filter matches for the changed files in the PR'
@@ -58,6 +62,11 @@ on:
       build_configure_extra_args:
         type: string
         required: false
+      build_target:
+        type: choice
+        options:
+          - "sycl-toolchain"
+          - "all"
       artifact_archive_name:
         type: choice
         options:
@@ -143,7 +152,7 @@ jobs:
       id: build
       shell: bash
       run: |
-        cmake --build build --target sycl-toolchain
+        cmake --build build --target ${{ inputs.build_target }}
     - name: check-llvm
       if: always() && !cancelled() && contains(inputs.changes, 'llvm')
       shell: bash

.github/workflows/ur-build-hw.yml

@@ -144,7 +144,6 @@ jobs:
         -DUR_DEVELOPER_MODE=ON
         -DUR_BUILD_TESTS=ON
         -DUR_BUILD_ADAPTER_${{matrix.adapter.name}}=ON
-        -DUR_CONFORMANCE_TEST_LOADER=${{ matrix.adapter.other_name != '' && 'ON' || 'OFF' }}
         ${{ matrix.adapter.other_name != '' && format('-DUR_BUILD_ADAPTER_{0}=ON', matrix.adapter.other_name) || '' }}
         -DUR_STATIC_LOADER=${{matrix.adapter.static_Loader}}
         -DUR_STATIC_ADAPTER_${{matrix.adapter.name}}=${{matrix.adapter.static_adapter}}
@@ -165,14 +164,16 @@ jobs:
     - name: Test adapter specific
       env:
         ZE_ENABLE_LOADER_DEBUG_TRACE: 1
-      run: ctest -C ${{matrix.build_type}} --test-dir build --output-on-failure -L "adapter-specific" -E "memcheck" --timeout 600 -VV
+        LIT_OPTS: "--timeout 120 --filter-out 'adapters/level_zero/memcheck.test'"
+      run: cmake --build build -j $(nproc) -- check-unified-runtime-adapter
       # Don't run adapter specific tests when building multiple adapters
       if: ${{ matrix.adapter.other_name == '' }}
 
     - name: Test adapters
       env:
         ZE_ENABLE_LOADER_DEBUG_TRACE: 1
-      run: ctest -C ${{matrix.build_type}} --test-dir build --output-on-failure -L "conformance" --timeout 600 -VV
+        LIT_OPTS: "--timeout 120"
+      run: cmake --build build -j $(nproc) -- check-unified-runtime-conformance
 
     - name: Get information about platform
       if: ${{ always() }}

clang/include/clang/Basic/Attr.td

@@ -1637,12 +1637,14 @@ def SYCLType: InheritableAttr {
   let Subjects = SubjectList<[CXXRecord, Enum], ErrorDiag>;
   let LangOpts = [SYCLIsDevice, SilentlyIgnoreSYCLIsHost];
   let Args = [EnumArgument<"Type", "SYCLType", /*is_string=*/true,
-                           ["accessor", "local_accessor", "work_group_memory", "dynamic_work_group_memory",
+                           ["accessor", "local_accessor", "dynamic_local_accessor",
+                           "work_group_memory", "dynamic_work_group_memory",
                             "specialization_id", "kernel_handler", "buffer_location",
                             "no_alias", "accessor_property_list", "group",
                             "private_memory", "aspect", "annotated_ptr", "annotated_arg",
                             "stream", "sampler", "host_pipe", "multi_ptr"],
-                           ["accessor", "local_accessor", "work_group_memory", "dynamic_work_group_memory",
+                           ["accessor", "local_accessor", "dynamic_local_accessor",
+                           "work_group_memory", "dynamic_work_group_memory",
                             "specialization_id", "kernel_handler", "buffer_location",
                             "no_alias", "accessor_property_list", "group",
                             "private_memory", "aspect", "annotated_ptr", "annotated_arg",

clang/include/clang/Basic/DiagnosticDriverKinds.td

@@ -142,9 +142,10 @@ def warn_drv_unsupported_option_for_offload_arch_req_feature : Warning<
   "ignoring '%0' option for offload arch '%1' as it is not currently supported "
   "there. Use it with an offload arch containing '%2' instead">,
   InGroup<OptionIgnored>;
-def warn_drv_unsupported_option_for_target : Warning<
-  "ignoring '%0' option as it is not currently supported for target '%1'">,
-  InGroup<OptionIgnored>;
+def warn_drv_unsupported_option_for_target
+    : Warning<"ignoring '%0' option as it is not currently supported for "
+              "target '%1'%select{|; only supported for host compilation}2">,
+      InGroup<OptionIgnored>;
 def warn_drv_unsupported_option_for_flang : Warning<
   "the argument '%0' is not supported for option '%1'. Mapping to '%1%2'">,
   InGroup<OptionIgnored>;

clang/include/clang/Basic/DiagnosticSemaKinds.td

@@ -12928,7 +12928,8 @@ def err_free_function_variadic_args : Error<
   "free function kernel cannot be a variadic function">;
 def err_free_function_return_type : Error<
   "SYCL free function kernel should have return type 'void'">;
-
+def err_free_function_first_occurrence_missing_attr: Error<
+  "the first occurrence of SYCL kernel free function should be declared with 'sycl-nd-range-kernel' or 'sycl-single-task-kernel' compile time properties">;
 
 // SYCL kernel entry point diagnostics
 def err_sycl_entry_point_invalid : Error<