Add options to test on L0v2

Author: luszczewskakasia1

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

@@ -151,44 +151,48 @@ jobs:
  fail-fast: false
  matrix:
  include:
- - name: Intel / GEN 12 Integrated
- runner: '["Linux", "gen12"]'
- target_devices: level_zero:gpu;opencl:gpu;opencl:cpu
- - name: NVIDIA/CUDA
- runner: '["Linux", "cuda"]'
- image_options: -u 1001 --gpus all --cap-add SYS_ADMIN
- target_devices: cuda:gpu
- - name: AMD/HIP
- runner: '["Linux", "amdgpu"]'
- image_options: -u 1001 --device=/dev/dri --device=/dev/kfd
- target_devices: hip:gpu
- extra_lit_opts: -j 1
- - name: Intel / Arc A-Series Graphics
- runner: '["Linux", "arc"]'
- target_devices: level_zero:gpu;opencl:gpu;level_zero_v2:gpu
- - name: Intel Dev IGC / Arc A-Series Graphics
- runner: '["Linux", "arc"]'
- image: ghcr.io/intel/llvm/ubuntu2404_intel_drivers:devigc
- target_devices: level_zero:gpu
- use_igc_dev: true
- env: '{"LIT_FILTER":"Matrix/"}'
- - name: Intel / Ponte Vecchio GPU
- runner: '["Linux", "pvc"]'
- target_devices: level_zero:gpu;opencl:gpu;level_zero_v2:gpu
- - name: Intel Dev IGC / Ponte Vecchio GPU
- runner: '["Linux", "pvc"]'
- image: ghcr.io/intel/llvm/ubuntu2404_intel_drivers:devigc
- target_devices: level_zero:gpu
- use_igc_dev: true
- env: '{"LIT_FILTER":"Matrix/"}'
- - name: Intel / Battlemage Graphics
+ # - name: Intel / GEN 12 Integrated
+ # runner: '["Linux", "gen12"]'
+ # target_devices: level_zero:gpu;opencl:gpu;opencl:cpu
+ # - name: NVIDIA/CUDA
+ # runner: '["Linux", "cuda"]'
+ # image_options: -u 1001 --gpus all --cap-add SYS_ADMIN
+ # target_devices: cuda:gpu
+ # - name: AMD/HIP
+ # runner: '["Linux", "amdgpu"]'
+ # image_options: -u 1001 --device=/dev/dri --device=/dev/kfd
+ # target_devices: hip:gpu
+ # extra_lit_opts: -j 1
+ # - name: Intel / Arc A-Series Graphics
+ # runner: '["Linux", "arc"]'
+ # target_devices: level_zero:gpu;opencl:gpu;level_zero_v2:gpu
+ # - name: Intel Dev IGC / Arc A-Series Graphics
+ # runner: '["Linux", "arc"]'
+ # image: ghcr.io/intel/llvm/ubuntu2404_intel_drivers:devigc
+ # target_devices: level_zero:gpu
+ # use_igc_dev: true
+ # env: '{"LIT_FILTER":"Matrix/"}'
+ # - name: Intel / Ponte Vecchio GPU
+ # runner: '["Linux", "pvc"]'
+ # target_devices: level_zero:gpu;opencl:gpu;level_zero_v2:gpu
+ # - name: Intel Dev IGC / Ponte Vecchio GPU
+ # runner: '["Linux", "pvc"]'
+ # image: ghcr.io/intel/llvm/ubuntu2404_intel_drivers:devigc
+ # target_devices: level_zero:gpu
+ # use_igc_dev: true
+ # env: '{"LIT_FILTER":"Matrix/"}'
+ # - name: Intel / Battlemage Graphics
+ # runner: '["Linux", "bmg"]'
+ # target_devices: level_zero_v1:gpu;level_zero_v2:gpu
+ # - name: Preview Mode
+ # runner: '["Linux", "gen12"]'
+ # target_devices: level_zero:gpu;opencl:gpu;opencl:cpu
+ # extra_lit_opts: --param test-preview-mode=True
+ # binaries_artifact: e2e_bin_preview
+ - name: L0 v2
  runner: '["Linux", "bmg"]'
- target_devices: level_zero_v1:gpu;level_zero_v2:gpu
- - name: Preview Mode
- runner: '["Linux", "gen12"]'
- target_devices: level_zero:gpu;opencl:gpu;opencl:cpu
- extra_lit_opts: --param test-preview-mode=True
- binaries_artifact: e2e_bin_preview
+ # runner: '["Linux", "L0v2"]'
+ target_devices: level_zero_v2:arch-intel_gpu_mtl_u
 
  # We're in an ABI-breaking window, so these don't make sense for now.
  - name: ABI compatibility / sycl-rel-6_2
@@ -236,44 +240,44 @@ jobs:
  skip_run: ${{matrix.use_igc_dev && contains(github.event.pull_request.labels.*.name, 'ci-no-devigc') || matrix.skip_run || 'false'}}
  env: ${{ matrix.env || (contains(needs.detect_changes.outputs.filters, 'esimd') && '{}' || '{"LIT_FILTER_OUT":"ESIMD/"}') }}
 
- test-perf:
- needs: [build, detect_changes]
- permissions:
- contents: write
- packages: read
- if: |
- !cancelled()
- && needs.build.outputs.build_conclusion == 'success'
- && (contains(github.event.pull_request.labels.*.name, 'run-perf-tests')
- || contains(needs.detect_changes.outputs.filters, 'perf-tests'))
- strategy:
- fail-fast: false
- matrix:
- include:
- - name: Intel GEN12 Graphics system
- runner: '["Linux", "gen12"]'
- image_extra_opts: --device=/dev/dri
- - name: Intel Arc A-Series Graphics system
- runner: '["Linux", "arc"]'
- image_extra_opts: --device=/dev/dri
- - name: AMD system
- runner: '["Linux", "amdgpu"]'
- image_extra_opts: --device=/dev/dri --device=/dev/kfd
- - name: CUDA system
- runner: '["Linux", "cuda"]'
- image_extra_opts: --gpus all
- uses: ./.github/workflows/sycl-linux-run-tests.yml
- with:
- name: Perf tests on ${{ matrix.name }}
- runner: ${{ matrix. runner }}
- image_options: -u 1001 --privileged --cap-add SYS_ADMIN ${{ matrix.image_extra_opts }}
- target_devices: all
+ # test-perf:
+ #  needs: [build, detect_changes]
+ #  permissions:
+ #  contents: write
+ #  packages: read
+ #  if: |
+ #  !cancelled()
+ #  && needs.build.outputs.build_conclusion == 'success'
+ #  && (contains(github.event.pull_request.labels.*.name, 'run-perf-tests')
+ #  || contains(needs.detect_changes.outputs.filters, 'perf-tests'))
+ #  strategy:
+ #  fail-fast: false
+ #  matrix:
+ #  include:
+ #  - name: Intel GEN12 Graphics system
+ #  runner: '["Linux", "gen12"]'
+ #  image_extra_opts: --device=/dev/dri
+ #  - name: Intel Arc A-Series Graphics system
+ #  runner: '["Linux", "arc"]'
+ #  image_extra_opts: --device=/dev/dri
+ #  - name: AMD system
+ #  runner: '["Linux", "amdgpu"]'
+ #  image_extra_opts: --device=/dev/dri --device=/dev/kfd
+ #  - name: CUDA system
+ #  runner: '["Linux", "cuda"]'
+ #  image_extra_opts: --gpus all
+ #  uses: ./.github/workflows/sycl-linux-run-tests.yml
+ #  with:
+ #  name: Perf tests on ${{ matrix.name }}
+ #  runner: ${{ matrix. runner }}
+ #  image_options: -u 1001 --privileged --cap-add SYS_ADMIN ${{ matrix.image_extra_opts }}
+ #  target_devices: all
 
- env: '{"LIT_FILTER":"PerformanceTests/"}'
- extra_lit_opts: -a -j 1 --param enable-perf-tests=True
+ #  env: '{"LIT_FILTER":"PerformanceTests/"}'
+ #  extra_lit_opts: -a -j 1 --param enable-perf-tests=True
 
- repo_ref: ${{ github.sha }}
+ #  repo_ref: ${{ github.sha }}
 
- toolchain_artifact: ${{ needs.build.outputs.toolchain_artifact }}
- toolchain_artifact_filename: ${{ needs.build.outputs.toolchain_artifact_filename }}
- toolchain_decompress_command: ${{ needs.build.outputs.toolchain_decompress_command }}
+ #  toolchain_artifact: ${{ needs.build.outputs.toolchain_artifact }}
+ #  toolchain_artifact_filename: ${{ needs.build.outputs.toolchain_artifact_filename }}
+ #  toolchain_decompress_command: ${{ needs.build.outputs.toolchain_decompress_command }}

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

@@ -158,6 +158,7 @@ on:
  - '["Linux", "build"]'
  - '["cuda"]'
  - '["PVC_PERF"]'
+ - '["Linux", "L0v2"]'
  image:
  type: choice
  options:
@@ -181,6 +182,7 @@ on:
  - 'opencl:gpu'
  - 'hip:gpu'
  - 'cuda:gpu'
+ - 'level_zero_v2:arch-intel_gpu_mtl_u'
  tests_selector:
  type: choice
  options:

sycl/test-e2e/format.py

@@ -334,6 +334,12 @@ def get_extra_env(sycl_devices):
  expanded = "env"
 
  extra_env = get_extra_env([parsed_dev_name])
+ backend, device = parsed_dev_name.split(":", 1)
+ device_selector = parsed_dev_name
+ if backend == "level_zero" and device.isdigit():
+ extra_env.append(f"ZE_AFFINITY_MASK={device}")
+ device_selector = f"{backend}:0"
+
  if extra_env:
  expanded += " {}".format(" ".join(extra_env))
 
@@ -343,7 +349,7 @@ def get_extra_env(sycl_devices):
  expanded += " env UR_LOADER_USE_LEVEL_ZERO_V2=0"
 
  expanded += " ONEAPI_DEVICE_SELECTOR={} {}".format(
- parsed_dev_name, test.config.run_launcher
+ device_selector, test.config.run_launcher
  )
  cmd = directive.command.replace("%{run}", expanded)
  # Expand device-specific condtions (%if ... %{ ... %}).

sycl/test-e2e/lit.cfg.py

@@ -706,7 +706,7 @@ def remove_level_zero_suffix(devices):
 available_devices = {
  "opencl": ("cpu", "gpu", "fpga"),
  "cuda": "gpu",
- "level_zero": "gpu",
+ "level_zero": ("gpu", "0", "1"),
  "hip": "gpu",
  "native_cpu": "cpu",
  "offload": "gpu",
@@ -917,12 +917,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):
@@ -1112,6 +1114,7 @@ def get_sycl_ls_verbose(sycl_device, env):
  features.update(sg_size_features)
  features.update(architecture_feature)
  features.update(device_family)
+ features.update(aspects)
 
  be, dev = sycl_device.split(":")
  features.add(dev.replace("fpga", "accelerator"))