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

Author: kbenzie

.github/workflows/sycl-post-commit.yml

@@ -103,7 +103,11 @@ jobs:
       && success()
       && github.repository == 'intel/llvm'
     uses: ./.github/workflows/sycl-windows-build.yml
-
+    with:
+      compiler: icx
+      build_configure_extra_args: --cmake-opt=-DCMAKE_C_FLAGS="/clang:-Wno-nonportable-include-path /clang:-Wno-cast-function-type-mismatch" --cmake-opt=-DCMAKE_CXX_FLAGS="/clang:-Wno-nonportable-include-path /clang:-Wno-cast-function-type-mismatch" --cmake-opt="-DCMAKE_EXE_LINKER_FLAGS=/manifest:no" --cmake-opt="-DCMAKE_MODULE_LINKER_FLAGS=/manifest:no" --cmake-opt="-DCMAKE_SHARED_LINKER_FLAGS=/manifest:no" 
+      build_cache_suffix: icx
+      
   e2e-win:
     needs: build-win
     # Continue if build was successful.
@@ -117,6 +121,7 @@ jobs:
       runner: '["Windows","gen12"]'
       sycl_toolchain_archive: ${{ needs.build-win.outputs.artifact_archive_name }}
       extra_lit_opts: --param gpu-intel-gen12=True
+      compiler: icx
 
   macos_default:
     name: macOS

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

@@ -10,6 +10,9 @@ on:
       build_ref:
         type: string
         required: false
+      build_configure_extra_args:
+        type: string
+        required: false
       changes:
         type: string
         description: 'Filter matches for the changed files in the PR'
@@ -22,6 +25,10 @@ on:
         description: 'Artifacts retention period'
         type: string
         default: 3
+      compiler:
+        type: string
+        required: false
+        default: "cl"
 
     outputs:
       build_conclusion:
@@ -41,6 +48,9 @@ on:
         type: choice
         options:
           - "default"
+      build_configure_extra_args:
+        type: string
+        required: false
       artifact_archive_name:
         type: choice
         options:
@@ -50,6 +60,12 @@ on:
         type: choice
         options:
           - 3
+      compiler:
+        type: choice
+        options:
+          - cl
+          - icx
+          
 permissions: read-all
 
 jobs:
@@ -61,37 +77,43 @@ jobs:
     outputs:
       build_conclusion: ${{ steps.build.conclusion }}
     steps:
+    - uses: actions/checkout@v4
+      with:
+        path: src
+        ref: ${{ inputs.build_ref || github.sha }}
+        fetch-depth: 1
     - uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756
       with:
         arch: amd64
+    - name: Setup oneAPI env
+      uses: ./src/devops/actions/setup_windows_oneapi_env
+      if: ${{ always() && !cancelled() && inputs.compiler == 'icx' }}
     - 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@v4
-      with:
-        path: src
-        ref: ${{ inputs.build_ref || github.sha }}
-        fetch-depth: 1
+        echo "CCACHE_DIR=D:\github\_work\cache\${{ inputs.build_cache_suffix }}" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+        echo "CCACHE_MAXSIZE=10G" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
     - name: Register cleanup after job is finished
       uses: ./src/devops/actions/cleanup
     - name: Configure
       shell: cmd
+      env:
+         ARGS: ${{ inputs.build_configure_extra_args }}
       # TODO switch to clang-cl and lld when this is fixed https://github.com/oneapi-src/level-zero/issues/83
       run: |
         mkdir build
         mkdir install
         IF NOT EXIST D:\github\_work\cache MKDIR D:\github\_work\cache
         IF NOT EXIST D:\github\_work\cache\${{inputs.build_cache_suffix}} MKDIR D:\github\_work\cache\${{inputs.build_cache_suffix}}
         python.exe src/buildbot/configure.py -o build ^
-          --ci-defaults ^
-          --cmake-opt="-DCMAKE_C_COMPILER=cl" ^
-          --cmake-opt="-DCMAKE_CXX_COMPILER=cl" ^
+          --ci-defaults %ARGS% ^
+          --cmake-opt="-DCMAKE_C_COMPILER=${{inputs.compiler}}" ^
+          --cmake-opt="-DCMAKE_CXX_COMPILER=${{inputs.compiler}}" ^
           --cmake-opt="-DCMAKE_INSTALL_PREFIX=%GITHUB_WORKSPACE%\install" ^
-          --cmake-opt="-DCMAKE_CXX_COMPILER_LAUNCHER=sccache" ^
-          --cmake-opt="-DCMAKE_C_COMPILER_LAUNCHER=sccache" ^
+          --cmake-opt="-DCMAKE_CXX_COMPILER_LAUNCHER=ccache" ^
+          --cmake-opt="-DCMAKE_C_COMPILER_LAUNCHER=ccache" ^
           --cmake-opt="-DLLVM_INSTALL_UTILS=ON" ^
           --cmake-opt="-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=SPIRV"
     - name: Build
@@ -101,16 +123,24 @@ jobs:
         cmake --build build --target sycl-toolchain
     - name: check-llvm
       if: always() && !cancelled() && contains(inputs.changes, 'llvm')
+      shell: bash
       run: |
+        if [[ ${{inputs.compiler}} == 'icx' ]]; then
+          export LIT_FILTER="SYCL"
+        fi
         cmake --build build --target check-llvm
     - name: check-clang
       if: always() && !cancelled() && contains(inputs.changes, 'clang')
       run: |
         cmake --build build --target check-clang
     - name: check-sycl
       if: always() && !cancelled() && contains(inputs.changes, 'sycl')
+      shell: bash
       run: |
-        cmake --build build --target check-sycl
+         if [[ ${{inputs.compiler}} == 'icx' ]]; then
+           export LIT_FILTER_OUT="host_tanpi_double_accuracy"
+         fi
+         cmake --build build --target check-sycl
     - name: check-sycl-unittests
       if: always() && !cancelled() && contains(inputs.changes, 'sycl')
       run: |

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

@@ -33,6 +33,11 @@ on:
         default: '{}'
         required: False
 
+      compiler:
+        type: string
+        required: false
+        default: "cl"
+
 permissions: read-all
 
 jobs:
@@ -42,20 +47,23 @@ jobs:
     environment: WindowsCILock
     env: ${{ fromJSON(inputs.env) }}
     steps:
+    # TODO: use cached_checkout
+    - uses: actions/checkout@v4
+      with:
+        persist-credentials: false
+        ref: ${{ inputs.ref || github.sha }}
+        path: llvm
     - uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756
       with:
         arch: amd64
+    - name: Setup oneAPI env
+      uses: ./llvm/devops/actions/setup_windows_oneapi_env
+      if: ${{ always() && !cancelled() && inputs.compiler == 'icx' }}
     - 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
-    # TODO: use cached_checkout
-    - uses: actions/checkout@v4
-      with:
-        persist-credentials: false
-        ref: ${{ inputs.ref || github.sha }}
-        path: llvm
     - name: Register cleanup after job is finished
       uses: ./llvm/devops/actions/cleanup
     - name: Download compiler toolchain
@@ -84,6 +92,9 @@ jobs:
       shell: bash
       run: |
         # Run E2E tests.
+        if [[ ${{inputs.compiler}} == 'icx' ]]; then
+           export LIT_FILTER_OUT="compile_on_win_with_mdd"
+        fi
         export LIT_OPTS="-v --no-progress-bar --show-unsupported --show-pass --show-xfail --max-time 3600 --time-tests ${{ inputs.extra_lit_opts }}"
         cmake --build build-e2e --target check-sycl-e2e
     - name: Detect hung tests

devops/actions/setup_windows_oneapi_env/action.yml

@@ -0,0 +1,28 @@
+name: Windows setup oneAPI env
+
+runs:
+  using: "composite"
+  steps:
+    - name: Setup oneAPI env
+      shell: powershell
+      run: |
+        $batchFilePath = "C:\Program Files (x86)\Intel\oneAPI\setvars.bat"
+
+        $githubEnvFilePath = $env:GITHUB_ENV
+
+        $envBefore = Get-ChildItem Env: | ForEach-Object { "$($_.Name)=$($_.Value)" }
+
+        $envVars = & cmd.exe /c "call `"$batchFilePath`" && set" | Out-String
+
+        $envAfter = $envVars -split "`r`n" | Where-Object { $_ -match "^(.*?)=(.*)$" }
+
+        foreach ($envVar in $envAfter) {
+            if ($envVar -match "^(.*?)=(.*)$") {
+                $name = $matches[1]
+                $value = $matches[2]
+                $envBeforeVar = $envBefore | Where-Object { $_ -like "$name=*" }
+                if (-not $envBeforeVar -or $envBeforeVar -ne "$name=$value") {
+                    Add-Content -Path $githubEnvFilePath -Value "$name=$value"
+                }
+            }
+         }

sycl/include/sycl/ext/oneapi/experimental/enqueue_functions.hpp

@@ -89,20 +89,27 @@ template <typename LCRangeT, typename LCPropertiesT> struct LaunchConfigAccess {
   }
 };
 
-template <typename CommandGroupFunc>
-void submit_impl(queue &Q, CommandGroupFunc &&CGF,
+template <typename CommandGroupFunc, typename PropertiesT>
+void submit_impl(queue &Q, PropertiesT Props, CommandGroupFunc &&CGF,
                  const sycl::detail::code_location &CodeLoc) {
-  Q.submit_without_event(std::forward<CommandGroupFunc>(CGF), CodeLoc);
+  Q.submit_without_event(Props, std::forward<CommandGroupFunc>(CGF), CodeLoc);
+}
+
+template <typename CommandGroupFunc, typename PropertiesT>
+event submit_with_event_impl(queue &Q, PropertiesT Props,
+                             CommandGroupFunc &&CGF,
+                             const sycl::detail::code_location &CodeLoc) {
+  return Q.submit_with_event(Props, std::forward<CommandGroupFunc>(CGF),
+                             nullptr, CodeLoc);
 }
 } // namespace detail
 
 template <typename CommandGroupFunc, typename PropertiesT>
 void submit(queue Q, PropertiesT Props, CommandGroupFunc &&CGF,
             const sycl::detail::code_location &CodeLoc =
                 sycl::detail::code_location::current()) {
-  std::ignore = Props;
   sycl::ext::oneapi::experimental::detail::submit_impl(
-      Q, std::forward<CommandGroupFunc>(CGF), CodeLoc);
+      Q, Props, std::forward<CommandGroupFunc>(CGF), CodeLoc);
 }
 
 template <typename CommandGroupFunc>
@@ -116,8 +123,8 @@ template <typename CommandGroupFunc, typename PropertiesT>
 event submit_with_event(queue Q, PropertiesT Props, CommandGroupFunc &&CGF,
                         const sycl::detail::code_location &CodeLoc =
                             sycl::detail::code_location::current()) {
-  std::ignore = Props;
-  return Q.submit(std::forward<CommandGroupFunc>(CGF), CodeLoc);
+  return sycl::ext::oneapi::experimental::detail::submit_with_event_impl(
+      Q, Props, std::forward<CommandGroupFunc>(CGF), CodeLoc);
 }
 
 template <typename CommandGroupFunc>

sycl/include/sycl/ext/oneapi/experimental/event_mode_property.hpp

@@ -0,0 +1,37 @@
+//==-- cluster_group_prop.hpp --- SYCL extension for event mode property ---==//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#pragma once
+
+#include <sycl/ext/oneapi/properties/property.hpp>
+
+namespace sycl {
+inline namespace _V1 {
+namespace ext::oneapi::experimental {
+
+enum class event_mode_enum { none, low_power };
+
+struct event_mode
+    : detail::run_time_property_key<event_mode, detail::PropKind::EventMode> {
+  event_mode(event_mode_enum mode) : value(mode) {}
+
+  event_mode_enum value;
+};
+
+using event_mode_key = event_mode;
+
+inline bool operator==(const event_mode &lhs, const event_mode &rhs) {
+  return lhs.value == rhs.value;
+}
+inline bool operator!=(const event_mode &lhs, const event_mode &rhs) {
+  return !(lhs == rhs);
+}
+
+} // namespace ext::oneapi::experimental
+} // namespace _V1
+} // namespace sycl

sycl/include/sycl/ext/oneapi/properties/property.hpp

@@ -223,8 +223,9 @@ enum PropKind : uint32_t {
   InitializeToIdentity = 78,
   WorkGroupScratchSize = 79,
   Restrict = 80,
+  EventMode = 81,
   // PropKindSize must always be the last value.
-  PropKindSize = 81,
+  PropKindSize = 82,
 };
 
 template <typename PropertyT> struct PropertyToKind {