Add options to test on L0v2

Author: luszczewskakasia1

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

@@ -69,39 +69,39 @@ jobs:
 
   # Build and run native cpu e2e tests separately as cannot currently
   # build all the e2e tests
-  build_run_native_cpu_e2e_tests:
-    if: ${{ !cancelled() && needs.build.outputs.build_conclusion == 'success' }}
-    runs-on: [Linux, build]
-    needs: [build]
-    container:
-      image: ghcr.io/intel/llvm/sycl_ubuntu2404_nightly:latest
-      options: -u 1001:1001
-    steps:
-      - uses: actions/checkout@v5
-        with:
-          sparse-checkout: |
-            devops/
+  # build_run_native_cpu_e2e_tests:
+  #   if: ${{ !cancelled() && needs.build.outputs.build_conclusion == 'success' }}
+  #   runs-on: [Linux, build]
+  #   needs: [build]
+    # container:
+    #   image: ghcr.io/intel/llvm/sycl_ubuntu2404_nightly:latest
+    #   options: -u 1001:1001
+    # steps:
+    #   - uses: actions/checkout@v5
+    #     with:
+    #       sparse-checkout: |
+    #         devops/
 
-      # download build artefact
-      - name: Download toolchain
-        uses: actions/download-artifact@v6
-        with:
-          name: sycl_linux_default
-      - name: Extract SYCL toolchain
-        shell: bash
-        run: |
-          mkdir toolchain
-          tar -xf llvm_sycl.tar.zst -C toolchain
-          rm llvm_sycl.tar.zst
-      - name: Build and run E2E tests
-        uses: ./devops/actions/run-tests/e2e
-        with:
-          ref: ${{ inputs.ref || github.sha }}
-          testing_mode: full
-          target_devices: native_cpu:cpu
-          sycl_compiler: $GITHUB_WORKSPACE/toolchain/bin/clang++
-          extra_lit_opts: --param sycl_build_targets="native_cpu"
-          extra_cmake_args: -DSYCL_TEST_E2E_TARGETS="native_cpu:cpu" -DSYCL_TEST_E2E_STANDALONE=ON
+    #   # download build artefact
+    #   - name: Download toolchain
+    #     uses: actions/download-artifact@v6
+    #     with:
+    #       name: sycl_linux_default
+    #   - name: Extract SYCL toolchain
+    #     shell: bash
+    #     run: |
+    #       mkdir toolchain
+    #       tar -xf llvm_sycl.tar.zst -C toolchain
+    #       rm llvm_sycl.tar.zst
+    #   - name: Build and run E2E tests
+    #     uses: ./devops/actions/run-tests/e2e
+    #     with:
+    #       ref: ${{ inputs.ref || github.sha }}
+    #       testing_mode: full
+    #       target_devices: native_cpu:cpu
+    #       sycl_compiler: $GITHUB_WORKSPACE/toolchain/bin/clang++
+    #       extra_lit_opts: --param sycl_build_targets="native_cpu"
+    #       extra_cmake_args: -DSYCL_TEST_E2E_TARGETS="native_cpu:cpu" -DSYCL_TEST_E2E_STANDALONE=ON
 
   # If a PR changes CUDA adapter, run the build on Ubuntu 22.04 as well.
   # Ubuntu 22.04 container has CUDA 12.1 installed while Ubuntu 24.0 image
@@ -190,9 +190,10 @@ jobs:
           #   extra_lit_opts: --param test-preview-mode=True
           #   binaries_artifact: e2e_bin_preview
           - name: L0 v2
-            runner: '["Linux", "bmg"]'
+            runner: '["TEST_PERF"]'
             # runner: '["Linux", "L0v2"]'
             target_devices: level_zero_v2:arch-intel_gpu_mtl_u
+            extra_lit_opts: -j 12 
 
           # We're in an ABI-breaking window, so these don't make sense for now.
           - name: ABI compatibility / sycl-rel-6_2

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

@@ -245,6 +245,14 @@ jobs:
         sparse-checkout: |
           devops
           sycl/cts_exclude_filter
+    - name: Show checkout information
+      shell: bash
+      run: |
+        echo "Current branch: $(git branch --show-current)"
+        echo "Current commit: $(git rev-parse HEAD)"
+        echo "Current commit (short): $(git rev-parse --short HEAD)"
+        echo "Commit message: $(git log -1 --pretty=%B)"
+        git log -1 --oneline
     - name: Register cleanup after job is finished
       uses: ./devops/actions/cleanup
     - name: Reset Intel GPU

devops/actions/run-tests/e2e/action.yml

@@ -62,6 +62,12 @@ runs:
       if [ -n "$CMAKE_EXTRA_ARGS" ]; then
         echo "opts=$CMAKE_EXTRA_ARGS" >> $GITHUB_OUTPUT
       fi
+  - name: Check cpu
+    shell: bash
+    run: | 
+      lscpu
+      lscpu | grep "Model name"
+
   - name: Configure E2E tests
     if: inputs.testing_mode != 'run-only'
     shell: bash
@@ -73,7 +79,9 @@ runs:
     shell: bash
     env:
       LIT_OPTS: -v --no-progress-bar --show-unsupported --show-pass --show-xfail --max-time 3600 --time-tests --param print_features=True --param test-mode=${{ inputs.testing_mode }} --param sycl_devices=${{ inputs.target_devices }} ${{ inputs.extra_lit_opts }}
+      # LIT_OPTS: -j 12 -v --param "sycl_devices=level_zero_v2:arch-intel_gpu_mtl_u" sycl/test-e2e/ 
     run: |
+      echo "LIT_OPTS: $LIT_OPTS"
       ninja -C build-e2e check-sycl-e2e > e2e.log 2>&1
   # Two steps below are duplicated between Lin/Win actions, updates must change both
   - name: E2E logs

sycl/test-e2e/AddressSanitizer/lit.local.cfg

@@ -31,4 +31,5 @@ unsupported_san_flags = [
 if any(flag in config.cxx_flags for flag in unsupported_san_flags):
     config.unsupported=True
 
-config.environment["ZE_AFFINITY_MASK"] = "0"
+if config.ze_affinity_mask is not None:
+    config.environment["ZE_AFFINITY_MASK"] = config.ze_affinity_mask

sycl/test-e2e/MemorySanitizer/lit.local.cfg

@@ -39,4 +39,5 @@ unsupported_san_flags = [
 if any(flag in config.cxx_flags for flag in unsupported_san_flags):
     config.unsupported=True
 
-config.environment["ZE_AFFINITY_MASK"] = "0"
+if config.ze_affinity_mask is not None:
+    config.environment["ZE_AFFINITY_MASK"] = config.ze_affinity_mask

sycl/test-e2e/ThreadSanitizer/lit.local.cfg

@@ -34,4 +34,5 @@ unsupported_san_flags = [
 if any(flag in config.cxx_flags for flag in unsupported_san_flags):
     config.unsupported=True
 
-config.environment["ZE_AFFINITY_MASK"] = "0"
+if config.ze_affinity_mask is not None:
+    config.environment["ZE_AFFINITY_MASK"] = config.ze_affinity_mask

sycl/test-e2e/lit.cfg.py

@@ -96,6 +96,7 @@
     "LIBCLANG_NOTHREADS",
     "LIBCLANG_RESOURCE_USAGE",
     "LIBCLANG_CODE_COMPLETION_LOGGING",
+    "ZE_AFFINITY_MASK",
 ]
 
 # Names of the Release and Debug versions of the XPTIFW library
@@ -917,12 +918,14 @@ def get_sycl_ls_verbose(sycl_device, env):
 
     env = copy.copy(llvm_config.config.environment)
 
+    backend_for_selector = backend.replace("_v2", "").replace("_v1", "")
+
     # Find all available devices under the backend
-    env["ONEAPI_DEVICE_SELECTOR"] = backend + ":*"
+    env["ONEAPI_DEVICE_SELECTOR"] = backend_for_selector + ":*"
 
     detected_architectures = []
 
-    platform_devices = remove_level_zero_suffix(backend + ":*")
+    platform_devices = backend_for_selector + ":*"
 
     for line in get_sycl_ls_verbose(platform_devices, env).stdout.splitlines():
         if re.match(r" *Architecture:", line):
@@ -948,6 +951,15 @@ def get_sycl_ls_verbose(sycl_device, env):
 
 config.sycl_devices = filtered_sycl_devices
 
+# Determine ZE_AFFINITY_MASK for Level Zero devices.
+# Sanitizer tests need to set ZE_AFFINITY_MASK to a single device index
+config.ze_affinity_mask = None
+for sycl_device in remove_level_zero_suffix(config.sycl_devices):
+    be, dev = sycl_device.split(":")
+    if be == "level_zero" and dev.isdigit():
+        config.ze_affinity_mask = dev
+        break
+
 for sycl_device in remove_level_zero_suffix(config.sycl_devices):
     be, dev = sycl_device.split(":")
     config.available_features.add("any-device-is-" + dev)
@@ -1114,6 +1126,13 @@ def get_sycl_ls_verbose(sycl_device, env):
     features.update(device_family)
 
     be, dev = sycl_device.split(":")
+    if dev.isdigit():
+        backend_devices = available_devices.get(be, "gpu")
+        if isinstance(backend_devices, tuple):
+            # arch-selection is typically used to select gpu device
+            dev = "gpu"
+        else:
+            dev = backend_devices
     features.add(dev.replace("fpga", "accelerator"))
     if "level_zero_v2" in full_name:
         features.add("level_zero_v2_adapter")