From ca22d0ae0d8a35ec37b0880264df724df0804404 Mon Sep 17 00:00:00 2001 From: Artur Gainullin Date: Mon, 30 Sep 2024 17:46:48 -0700 Subject: [PATCH] [CI] additional docker volume mapping for E2E on Intel GPUs NEO runtime has env variables to emulate multiple root devices: NEOReadDebugKeys=1 CreateMultipleRootDevices=[num_devices] which seems to be useful to write E2E tests for multi-device scenario. It turns out those env variables don't work under docker container in our CI bacuse of missing system directory. Add additional volume mapping to fix this. --- .github/workflows/sycl-linux-precommit.yml | 6 +++--- .github/workflows/sycl-nightly.yml | 4 ++-- .github/workflows/sycl-post-commit.yml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/sycl-linux-precommit.yml b/.github/workflows/sycl-linux-precommit.yml index ab3c1fe1c5671..9fa114075ca00 100644 --- a/.github/workflows/sycl-linux-precommit.yml +++ b/.github/workflows/sycl-linux-precommit.yml @@ -83,14 +83,14 @@ jobs: - name: Intel runner: '["Linux", "gen12"]' image: ghcr.io/intel/llvm/ubuntu2204_intel_drivers:latest - image_options: -u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN + image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN target_devices: level_zero:gpu;opencl:gpu;opencl:cpu reset_intel_gpu: true extra_lit_opts: --param gpu-intel-gen12=True - name: E2E tests on Intel Arc A-Series Graphics runner: '["Linux", "arc"]' image: ghcr.io/intel/llvm/ubuntu2204_intel_drivers:latest - image_options: -u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN + image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN target_devices: level_zero:gpu;opencl:gpu reset_intel_gpu: true extra_lit_opts: --param matrix-xmx8=True --param gpu-intel-dg2=True @@ -98,7 +98,7 @@ jobs: - name: E2E tests with dev igc on Intel Arc A-Series Graphics runner: '["Linux", "arc"]' image: ghcr.io/intel/llvm/ubuntu2204_intel_drivers:devigc - image_options: -u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN + image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN target_devices: level_zero:gpu;opencl:gpu reset_intel_gpu: true extra_lit_opts: --param matrix-xmx8=True --param gpu-intel-dg2=True diff --git a/.github/workflows/sycl-nightly.yml b/.github/workflows/sycl-nightly.yml index 9b5953da8eccc..397bf84f40122 100644 --- a/.github/workflows/sycl-nightly.yml +++ b/.github/workflows/sycl-nightly.yml @@ -53,7 +53,7 @@ jobs: - name: Intel L0 GPU runner: '["Linux", "gen12"]' image: ghcr.io/intel/llvm/ubuntu2204_intel_drivers:latest - image_options: -u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN + image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN target_devices: level_zero:gpu reset_intel_gpu: true tests_selector: e2e @@ -62,7 +62,7 @@ jobs: - name: Intel OCL GPU runner: '["Linux", "gen12"]' image: ghcr.io/intel/llvm/ubuntu2204_intel_drivers:latest - image_options: -u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN + image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN target_devices: opencl:gpu reset_intel_gpu: true tests_selector: e2e diff --git a/.github/workflows/sycl-post-commit.yml b/.github/workflows/sycl-post-commit.yml index d67edc83a050c..1abd497a9c97c 100644 --- a/.github/workflows/sycl-post-commit.yml +++ b/.github/workflows/sycl-post-commit.yml @@ -87,7 +87,7 @@ jobs: name: ${{ matrix.name }} runner: ${{ matrix. runner }} image: ${{ matrix.image || 'ghcr.io/intel/llvm/ubuntu2204_intel_drivers:latest' }} - image_options: ${{ matrix.image_options || '-u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN' }} + image_options: ${{ matrix.image_options || '-u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN' }} target_devices: ${{ matrix.target_devices || 'level_zero:gpu' }} reset_intel_gpu: ${{ matrix.reset_intel_gpu }}