Skip to content

Commit b0c7344

Browse files
sarnexsarnex
committed
Merge remote-tracking branch 'upstream/sycl' into sycl
2 parents 6260b8f + 4fd899a commit b0c7344

35 files changed

+169
-134
lines changed

‎.github/workflows/sycl-containers.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@ jobs:
8282
file: ${{ matrix.file }}
8383
username: ${{ github.repository_owner }}
8484
password: ${{ secrets.GITHUB_TOKEN }}
85-
sycl_ci_passwd: ${{ secrets.DOCKER_SUDO_PASSWORD }}
8685
tags: |
8786
ghcr.io/${{ github.repository }}/${{ matrix.file }}:${{ matrix.tag }}-${{ github.sha }}
8887
ghcr.io/${{ github.repository }}/${{ matrix.file }}:${{ matrix.tag }}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,14 +92,14 @@ jobs:
9292
reset_intel_gpu: false
9393
- name: Intel
9494
runner: '["Linux", "gen12"]'
95-
image: ghcr.io/intel/llvm/ubuntu2204_intel_drivers:latest
95+
image: ghcr.io/intel/llvm/ubuntu2404_intel_drivers:latest
9696
image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
9797
target_devices: level_zero:gpu;opencl:gpu;opencl:cpu
9898
reset_intel_gpu: true
9999
extra_lit_opts: --param gpu-intel-gen12=True
100100
- name: E2E tests on Intel Arc A-Series Graphics
101101
runner: '["Linux", "arc"]'
102-
image: ghcr.io/intel/llvm/ubuntu2204_intel_drivers:latest
102+
image: ghcr.io/intel/llvm/ubuntu2404_intel_drivers:latest
103103
image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
104104
target_devices: level_zero:gpu;opencl:gpu
105105
reset_intel_gpu: true
@@ -161,12 +161,12 @@ jobs:
161161
include:
162162
- name: Intel GEN12 Graphics system
163163
runner: '["Linux", "gen12"]'
164-
image: ghcr.io/intel/llvm/ubuntu2204_intel_drivers:latest
164+
image: ghcr.io/intel/llvm/ubuntu2404_intel_drivers:latest
165165
image_extra_opts: --device=/dev/dri
166166
reset_intel_gpu: true
167167
- name: Intel Arc A-Series Graphics system
168168
runner: '["Linux", "arc"]'
169-
image: ghcr.io/intel/llvm/ubuntu2204_intel_drivers:latest
169+
image: ghcr.io/intel/llvm/ubuntu2404_intel_drivers:latest
170170
image_extra_opts: --device=/dev/dri
171171
reset_intel_gpu: true
172172
- name: AMD system

‎.github/workflows/sycl-nightly.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252

5353
- name: Intel L0 GPU
5454
runner: '["Linux", "gen12"]'
55-
image: ghcr.io/intel/llvm/ubuntu2204_intel_drivers:latest
55+
image: ghcr.io/intel/llvm/ubuntu2404_intel_drivers:latest
5656
image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
5757
target_devices: level_zero:gpu
5858
reset_intel_gpu: true
@@ -61,7 +61,7 @@ jobs:
6161

6262
- name: Intel OCL GPU
6363
runner: '["Linux", "gen12"]'
64-
image: ghcr.io/intel/llvm/ubuntu2204_intel_drivers:latest
64+
image: ghcr.io/intel/llvm/ubuntu2404_intel_drivers:latest
6565
image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
6666
target_devices: opencl:gpu
6767
reset_intel_gpu: true
@@ -70,35 +70,35 @@ jobs:
7070

7171
- name: OCL CPU (AMD)
7272
runner: '["Linux", "amdgpu"]'
73-
image: ghcr.io/intel/llvm/ubuntu2204_intel_drivers:latest
73+
image: ghcr.io/intel/llvm/ubuntu2404_intel_drivers:latest
7474
image_options: -u 1001
7575
target_devices: opencl:cpu
7676
tests_selector: e2e
7777

7878
- name: OCL CPU (Intel/GEN12)
7979
runner: '["Linux", "gen12"]'
80-
image: ghcr.io/intel/llvm/ubuntu2204_intel_drivers:latest
80+
image: ghcr.io/intel/llvm/ubuntu2404_intel_drivers:latest
8181
image_options: -u 1001 --privileged --cap-add SYS_ADMIN
8282
target_devices: opencl:cpu
8383
tests_selector: e2e
8484

8585
- name: OCL CPU (Intel/Arc)
8686
runner: '["Linux", "arc"]'
87-
image: ghcr.io/intel/llvm/ubuntu2204_intel_drivers:latest
87+
image: ghcr.io/intel/llvm/ubuntu2404_intel_drivers:latest
8888
image_options: -u 1001
8989
target_devices: opencl:cpu
9090
tests_selector: e2e
9191

9292
- name: SYCL-CTS on OCL CPU
9393
runner: '["Linux", "gen12"]'
94-
image: ghcr.io/intel/llvm/ubuntu2204_intel_drivers:latest
94+
image: ghcr.io/intel/llvm/ubuntu2404_intel_drivers:latest
9595
image_options: -u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN
9696
target_devices: opencl:cpu
9797
tests_selector: cts
9898

9999
- name: SYCL-CTS on L0 gen12
100100
runner: '["Linux", "gen12"]'
101-
image: ghcr.io/intel/llvm/ubuntu2204_intel_drivers:latest
101+
image: ghcr.io/intel/llvm/ubuntu2404_intel_drivers:latest
102102
image_options: -u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN
103103
target_devices: level_zero:gpu
104104
tests_selector: cts
@@ -229,7 +229,7 @@ jobs:
229229
username: ${{ github.repository_owner }}
230230
password: ${{ secrets.GITHUB_TOKEN }}
231231
build-args: |
232-
base_image=ghcr.io/intel/llvm/ubuntu2204_intel_drivers
232+
base_image=ghcr.io/intel/llvm/ubuntu2404_intel_drivers
233233
base_tag=latest
234234
tags: |
235235
ghcr.io/${{ github.repository }}/sycl_ubuntu2204_nightly:${{ github.sha }}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ jobs:
8585
with:
8686
name: ${{ matrix.name }}
8787
runner: ${{ matrix. runner }}
88-
image: ${{ matrix.image || 'ghcr.io/intel/llvm/ubuntu2204_intel_drivers:latest' }}
88+
image: ${{ matrix.image || 'ghcr.io/intel/llvm/ubuntu2404_intel_drivers:latest' }}
8989
image_options: ${{ matrix.image_options || '-u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN' }}
9090
target_devices: ${{ matrix.target_devices || 'level_zero:gpu' }}
9191
reset_intel_gpu: ${{ matrix.reset_intel_gpu }}

‎.github/workflows/sycl-rel-nightly.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,14 @@ jobs:
5454
include:
5555
- name: AMD/HIP
5656
runner: '["Linux", "amdgpu"]'
57-
image: ghcr.io/intel/llvm/ubuntu2204_build:latest
57+
image: ghcr.io/intel/llvm/ubuntu2404_build:latest
5858
image_options: -u 1001 --device=/dev/dri --device=/dev/kfd
5959
target_devices: ext_oneapi_hip:gpu
6060
tests_selector: e2e
6161

6262
- name: Intel L0 GPU
6363
runner: '["Linux", "gen12"]'
64-
image: ghcr.io/intel/llvm/ubuntu2204_intel_drivers:latest
64+
image: ghcr.io/intel/llvm/ubuntu2404_intel_drivers:latest
6565
image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
6666
target_devices: level_zero:gpu
6767
reset_intel_gpu: true
@@ -70,7 +70,7 @@ jobs:
7070

7171
- name: Intel OCL GPU
7272
runner: '["Linux", "gen12"]'
73-
image: ghcr.io/intel/llvm/ubuntu2204_intel_drivers:latest
73+
image: ghcr.io/intel/llvm/ubuntu2404_intel_drivers:latest
7474
image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
7575
target_devices: opencl:gpu
7676
reset_intel_gpu: true
@@ -79,21 +79,21 @@ jobs:
7979

8080
- name: Intel OCL CPU
8181
runner: '["Linux", "gen12"]'
82-
image: ghcr.io/intel/llvm/ubuntu2204_intel_drivers:latest
82+
image: ghcr.io/intel/llvm/ubuntu2404_intel_drivers:latest
8383
image_options: -u 1001 --privileged --cap-add SYS_ADMIN
8484
target_devices: opencl:cpu
8585
tests_selector: e2e
8686

8787
- name: SYCL-CTS on OCL CPU
8888
runner: '["Linux", "gen12"]'
89-
image: ghcr.io/intel/llvm/ubuntu2204_intel_drivers:latest
89+
image: ghcr.io/intel/llvm/ubuntu2404_intel_drivers:latest
9090
image_options: -u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN
9191
target_devices: opencl:cpu
9292
tests_selector: cts
9393

9494
- name: SYCL-CTS on L0 gen12
9595
runner: '["Linux", "gen12"]'
96-
image: ghcr.io/intel/llvm/ubuntu2204_intel_drivers:latest
96+
image: ghcr.io/intel/llvm/ubuntu2404_intel_drivers:latest
9797
image_options: -u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN
9898
target_devices: level_zero:gpu
9999
tests_selector: cts

‎devops/actions/build_container/action.yml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,6 @@ inputs:
2121
file:
2222
description: "Dockerfile"
2323
required: true
24-
sycl_ci_passwd:
25-
description: "Password to assign to sycl_ci user within a container"
26-
required: true
2724

2825
runs:
2926
using: "composite"
@@ -44,4 +41,3 @@ runs:
4441
file: ${{ github.workspace }}/devops/containers/${{ inputs.file }}.Dockerfile
4542
secrets: |
4643
github_token=${{ github.token }}
47-
sycl_ci_passwd=${{ inputs.sycl_ci_passwd }}

‎devops/containers/ubuntu2204_base.Dockerfile‎

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,25 +8,14 @@ USER root
88
COPY scripts/install_build_tools.sh /install.sh
99
RUN /install.sh
1010

11-
# By default Ubuntu sets an arbitrary UID value, that is different from host
12-
# system. When CI passes default UID value of 1001, some of LLVM tools fail to
13-
# discover user home directory and fail a few LIT tests. Fixes UID and GID to
14-
# 1001, that is used as default by GitHub Actions.
15-
RUN groupadd -g 1001 sycl && useradd sycl -u 1001 -g 1001 -m -s /bin/bash
16-
# Add sycl user to video/irc groups so that it can access GPU
17-
RUN usermod -aG video sycl
18-
RUN usermod -aG irc sycl
19-
20-
# group 109 is required for sycl user to access PVC card.
21-
RUN groupadd -g 109 render
22-
RUN usermod -aG render sycl
23-
24-
# Allow sycl user to run as sudo
25-
RUN echo "sycl ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers
11+
COPY scripts/create-sycl-user.sh /user-setup.sh
12+
RUN /user-setup.sh
2613

2714
COPY actions/cached_checkout /actions/cached_checkout
2815
COPY actions/cleanup /actions/cleanup
2916
COPY scripts/docker_entrypoint.sh /docker_entrypoint.sh
3017
COPY scripts/install_drivers.sh /opt/install_drivers.sh
3118

19+
USER sycl
20+
3221
ENTRYPOINT ["/docker_entrypoint.sh"]

‎devops/containers/ubuntu2204_build.Dockerfile‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,23 +24,18 @@ gpg --dearmor | tee /etc/apt/keyrings/rocm.gpg > /dev/null && \
2424
# Add rocm repo
2525
echo "deb [arch=amd64 signed-by=/etc/apt/keyrings/rocm.gpg] https://repo.radeon.com/rocm/apt/6.1.1 jammy main" \
2626
| tee --append /etc/apt/sources.list.d/rocm.list && \
27-
printf 'Package: *\nPin: release o=repo.radeon.com\nPin-Priority: 600' | tee /etc/apt/preferences.d/rocm-pin-600 && \
28-
apt update
27+
printf 'Package: *\nPin: release o=repo.radeon.com\nPin-Priority: 600' | tee /etc/apt/preferences.d/rocm-pin-600
2928
# Install the kernel driver
30-
RUN apt install -yqq rocm-dev && \
29+
RUN apt update && apt install -yqq rocm-dev && \
3130
apt-get clean && \
3231
rm -rf /var/lib/apt/lists/*
3332

34-
# By default Ubuntu sets an arbitrary UID value, that is different from host
35-
# system. When CI passes default UID value of 1001, some of LLVM tools fail to
36-
# discover user home directory and fail a few LIT tests. Fixes UID and GID to
37-
# 1001, that is used as default by GitHub Actions.
38-
RUN groupadd -g 1001 sycl && useradd sycl -u 1001 -g 1001 -m -s /bin/bash
39-
# Add sycl user to video/irc groups so that it can access GPU
40-
RUN usermod -aG video sycl
41-
RUN usermod -aG irc sycl
33+
COPY scripts/create-sycl-user.sh /user-setup.sh
34+
RUN /user-setup.sh
4235

4336
COPY scripts/docker_entrypoint.sh /docker_entrypoint.sh
4437

38+
USER sycl
39+
4540
ENTRYPOINT ["/docker_entrypoint.sh"]
4641

‎devops/containers/ubuntu2204_intel_drivers.Dockerfile‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ ENV DEBIAN_FRONTEND=noninteractive
77

88
ARG use_latest=true
99

10+
USER root
11+
1012
RUN apt update && apt install -yqq wget
1113

1214
COPY scripts/get_release.py /
@@ -25,5 +27,7 @@ RUN --mount=type=secret,id=github_token \
2527

2628
COPY scripts/drivers_entrypoint.sh /drivers_entrypoint.sh
2729

30+
USER sycl_ci
31+
2832
ENTRYPOINT ["/bin/bash", "/drivers_entrypoint.sh"]
2933

‎devops/containers/ubuntu2204_preinstalled.Dockerfile‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,16 @@ ARG base_image=ghcr.io/intel/llvm/ubuntu2204_intel_drivers
33

44
FROM $base_image:$base_tag
55

6+
USER root
7+
68
COPY scripts/drivers_entrypoint.sh /drivers_entrypoint.sh
79
RUN mkdir -p /opt/sycl
810
ADD sycl_linux.tar.gz /opt/sycl/
911

1012
ENV PATH /opt/sycl/bin:$PATH
1113
ENV LD_LIBRARY_PATH /opt/sycl/lib:$LD_LIBRARY_PATH
1214

15+
USER sycl_ci
16+
1317
ENTRYPOINT ["/bin/bash", "/drivers_entrypoint.sh"]
1418

0 commit comments

Comments
 (0)