[CI] Use oneAPI for Windows postcommit builds

Signed-off-by: Sarnie, Nick <[email protected]>

Author: sarnex

.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"
+      build_cache_suffix: icx
+      
   e2e-win:
     needs: build-win
     # Continue if build was successful.

.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:
@@ -50,12 +57,18 @@ on:
         type: choice
         options:
           - 3
+      compiler:
+        type: choice
+        options:
+          - cl
+          - icx
+          
 permissions: read-all
 
 jobs:
   build:
     name: Build + LIT
-    runs-on: [Windows, build]
+    runs-on: [Windows, build-test]
     environment: WindowsCILock
     # TODO use cached checkout
     outputs:
@@ -64,12 +77,36 @@ jobs:
     - uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756
       with:
         arch: amd64
+    - name: oneAPI setup
+      if: ${{ always() && !cancelled() && inputs.compiler == 'icx' }}
+      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"
+                }
+            }
+        }
     - 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
+        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
     - uses: actions/checkout@v4
       with:
         path: src
@@ -78,25 +115,27 @@ jobs:
     - name: Register cleanup after job is finished
       uses: ./src/devops/actions/cleanup
     - name: Configure
+      env:
+         ARGS: ${{ inputs.build_configure_extra_args }}
       shell: cmd
       # TODO switch to clang-cl and lld when this is fixed https://github.com/oneapi-src/level-zero/issues/83
       run: |
         mkdir build
+        fsutil.exe file setCaseSensitiveInfo build enable
         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
       id: build
-      shell: bash
       run: |
         cmake --build build --target sycl-toolchain
     - name: check-llvm

sycl/source/detail/windows_ur.cpp

@@ -56,24 +56,6 @@ void *getOsLibraryFuncAddress(void *Library, const std::string &FunctionName) {
       GetProcAddress((HMODULE)Library, FunctionName.c_str()));
 }
 
-static std::filesystem::path getCurrentDSODirPath() {
-  wchar_t Path[MAX_PATH];
-  auto Handle =
-      getOSModuleHandle(reinterpret_cast<void *>(&getCurrentDSODirPath));
-  DWORD Ret = GetModuleFileName(
-      reinterpret_cast<HMODULE>(ExeModuleHandle == Handle ? 0 : Handle), Path,
-      MAX_PATH);
-  assert(Ret < MAX_PATH && "Path is longer than MAX_PATH?");
-  assert(Ret > 0 && "GetModuleFileName failed");
-  (void)Ret;
-
-  BOOL RetCode = PathRemoveFileSpec(Path);
-  assert(RetCode && "PathRemoveFileSpec failed");
-  (void)RetCode;
-
-  return std::filesystem::path(Path);
-}
-
 void *getURLoaderLibrary() { return getPreloadedURLib(); }
 
 } // namespace ur

sycl/unittests/assert/assert.cpp

@@ -145,10 +145,8 @@ static AssertHappened ExpectedToOutput = {
 };
 
 static constexpr int KernelLaunchCounterBase = 0;
-static int KernelLaunchCounter = KernelLaunchCounterBase;
 static constexpr int MemoryMapCounterBase = 1000;
 static int MemoryMapCounter = MemoryMapCounterBase;
-static constexpr int PauseWaitOnIdx = KernelLaunchCounterBase + 1;
 
 // Mock redifinitions
 static ur_result_t redefinedKernelGetGroupInfoAfter(void *pParams) {
@@ -167,37 +165,6 @@ static ur_result_t redefinedKernelGetGroupInfoAfter(void *pParams) {
   return UR_RESULT_SUCCESS;
 }
 
-static ur_result_t redefinedEnqueueKernelLaunchAfter(void *pParams) {
-  auto params = *static_cast<ur_enqueue_kernel_launch_params_t *>(pParams);
-  static ur_event_handle_t UserKernelEvent = **params.pphEvent;
-  int Val = KernelLaunchCounter++;
-  // This output here is to reduce amount of time requried to debug/reproduce a
-  // failing test upon feature break
-  printf("Enqueued %i\n", Val);
-
-  if (PauseWaitOnIdx == Val) {
-    // It should be copier kernel. Check if it depends on user's one.
-    EXPECT_EQ(*params.pnumEventsInWaitList, 1U);
-    EXPECT_EQ(*params.pphEventWaitList[0], UserKernelEvent);
-  }
-
-  return UR_RESULT_SUCCESS;
-}
-
-static ur_result_t redefinedEventWaitPositive(void *pParams) {
-  auto params = *static_cast<ur_event_wait_params_t *>(pParams);
-  // there should be two events: one is for memory map and the other is for
-  // copier kernel
-  assert(*params.pnumEvents == 2);
-
-  int EventIdx1 = reinterpret_cast<int *>((*params.pphEventWaitList)[0])[0];
-  int EventIdx2 = reinterpret_cast<int *>((*params.pphEventWaitList)[1])[0];
-  // This output here is to reduce amount of time requried to debug/reproduce
-  // a failing test upon feature break
-  printf("Waiting for events %i, %i\n", EventIdx1, EventIdx2);
-  return UR_RESULT_SUCCESS;
-}
-
 static ur_result_t redefinedEventWaitNegative(void *pParams) {
   auto params = *static_cast<ur_enqueue_events_wait_params_t *>(pParams);
   // For negative tests we do not expect the copier kernel to be used, so
@@ -223,18 +190,6 @@ static ur_result_t redefinedEnqueueMemBufferMapAfter(void *pParams) {
   return UR_RESULT_SUCCESS;
 }
 
-static void setupMock(sycl::unittest::UrMock<> &Mock) {
-  using namespace sycl::detail;
-  mock::getCallbacks().set_after_callback("urKernelGetGroupInfo",
-                                          &redefinedKernelGetGroupInfoAfter);
-  mock::getCallbacks().set_after_callback("urEnqueueKernelLaunch",
-                                          &redefinedEnqueueKernelLaunchAfter);
-  mock::getCallbacks().set_after_callback("urEnqueueMemBufferMap",
-                                          &redefinedEnqueueMemBufferMapAfter);
-  mock::getCallbacks().set_before_callback("urEventWait",
-                                           &redefinedEventWaitPositive);
-}
-
 namespace TestInteropKernel {
 const sycl::context *Context = nullptr;
 const sycl::device *Device = nullptr;