Skip to content

Commit 065b441

Browse files
sarnexsarnex
committed
Merge remote-tracking branch 'upstream/sycl' into oneapilin
Signed-off-by: Sarnie, Nick <[email protected]>
2 parents 55819e8 + 68840f1 commit 065b441

File tree

61 files changed

+2264
-1423
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+2264
-1423
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
imagefile: ubuntu2404_intel_drivers
3434
tag: devigc
3535
build_args: |
36-
"use_latest=false"
36+
"use_unstable_driver=false"
3737
"use_igc_dev=true"
3838
steps:
3939
- name: Checkout

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

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,33 +43,44 @@ jobs:
4343
file: ubuntu2404_base
4444
tag: latest
4545
build_args: ""
46-
- name: Build Ubuntu Docker image
46+
- name: Build Ubuntu 22.04 Docker image
4747
file: ubuntu2204_build
4848
tag: latest
4949
build_args: ""
50+
- name: Build Ubuntu 24.04 Docker image
51+
file: ubuntu2404_build
52+
tag: latest
53+
build_args: ""
5054
- name: Build Ubuntu 24.04 oneAPI Docker image
5155
file: ubuntu2404_build_oneapi
5256
tag: latest
5357
build_args: ""
5458
- name: Intel Drivers Ubuntu 22.04 Docker image
5559
file: ubuntu2204_intel_drivers
5660
tag: latest
57-
build_args: "use_latest=false"
61+
build_args: "use_unstable_driver=false"
5862
- name: Intel Drivers Ubuntu 24.04 Docker image
5963
file: ubuntu2404_intel_drivers
6064
tag: latest
61-
build_args: "use_latest=false"
65+
build_args: "use_unstable_driver=false"
6266
- name: Intel Drivers (unstable) Ubuntu 24.04 Docker image
6367
file: ubuntu2404_intel_drivers
6468
tag: unstable
65-
build_args: "use_latest=true"
69+
build_args: "use_unstable_driver=true"
6670
- name: Build + Intel Drivers Ubuntu 22.04 Docker image
6771
file: ubuntu2204_intel_drivers
6872
tag: alldeps
6973
build_args: |
7074
base_image=ghcr.io/intel/llvm/ubuntu2204_build
7175
base_tag=latest
72-
use_latest=false
76+
use_unstable_driver=false
77+
- name: Build + Intel Drivers Ubuntu 24.04 Docker image
78+
file: ubuntu2404_intel_drivers
79+
tag: alldeps
80+
build_args: |
81+
base_image=ghcr.io/intel/llvm/ubuntu2404_build
82+
base_tag=latest
83+
use_unstable_driver=false
7384
steps:
7485
- name: Checkout
7586
uses: actions/checkout@v4

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ on:
1414
build_image:
1515
type: string
1616
required: false
17-
default: "ghcr.io/intel/llvm/ubuntu2204_build:latest"
17+
default: "ghcr.io/intel/llvm/ubuntu2404_build:latest"
1818
build_ref:
1919
type: string
2020
required: false

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -128,12 +128,12 @@ jobs:
128128
include:
129129
- name: NVIDIA/CUDA
130130
runner: '["Linux", "cuda"]'
131-
image: ghcr.io/intel/llvm/ubuntu2204_build:latest
131+
image: ghcr.io/intel/llvm/ubuntu2404_build:latest
132132
image_options: -u 1001 --gpus all --cap-add SYS_ADMIN
133133
target_devices: ext_oneapi_cuda:gpu
134134
- name: AMD/HIP
135135
runner: '["Linux", "amdgpu"]'
136-
image: ghcr.io/intel/llvm/ubuntu2204_build:latest
136+
image: ghcr.io/intel/llvm/ubuntu2404_build:latest
137137
image_options: -u 1001 --device=/dev/dri --device=/dev/kfd
138138
target_devices: ext_oneapi_hip:gpu
139139
reset_intel_gpu: false
@@ -211,11 +211,11 @@ jobs:
211211
reset_intel_gpu: true
212212
- name: AMD system
213213
runner: '["Linux", "amdgpu"]'
214-
image: ghcr.io/intel/llvm/ubuntu2204_build:latest
214+
image: ghcr.io/intel/llvm/ubuntu2404_build:latest
215215
image_extra_opts: --device=/dev/dri --device=/dev/kfd
216216
- name: CUDA system
217217
runner: '["Linux", "cuda"]'
218-
image: ghcr.io/intel/llvm/ubuntu2204_build:latest
218+
image: ghcr.io/intel/llvm/ubuntu2404_build:latest
219219
image_extra_opts: --gpus all
220220
uses: ./.github/workflows/sycl-linux-run-tests.yml
221221
with:

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@ on:
113113
- '["Linux", "gen12"]'
114114
- '["amdgpu"]'
115115
- '["Linux", "arc"]'
116+
- '["Linux", "pvc"]'
116117
- '["cts-cpu"]'
117118
- '["Linux", "build"]'
118119
image:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
include:
4646
- name: AMD/HIP
4747
runner: '["Linux", "amdgpu"]'
48-
image: ghcr.io/intel/llvm/ubuntu2204_build:latest
48+
image: ghcr.io/intel/llvm/ubuntu2404_build:latest
4949
image_options: -u 1001 --device=/dev/dri --device=/dev/kfd
5050
target_devices: ext_oneapi_hip:gpu
5151
tests_selector: e2e
@@ -156,7 +156,7 @@ jobs:
156156
with:
157157
name: CUDA E2E
158158
runner: '["aws_cuda-${{ github.run_id }}-${{ github.run_attempt }}"]'
159-
image: ghcr.io/intel/llvm/ubuntu2204_build:latest-0300ac924620a51f76c4929794637b82790f12ab
159+
image: ghcr.io/intel/llvm/ubuntu2404_build:latest
160160
image_options: -u 1001 --gpus all --cap-add SYS_ADMIN --env NVIDIA_DISABLE_REQUIRE=1
161161
target_devices: ext_oneapi_cuda:gpu
162162
ref: ${{ github.sha }}

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

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
build_cache_root: "/__w/llvm"
3737
build_cache_suffix: icx
3838
build_artifact_suffix: default
39-
build_configure_extra_args: --no-assertions --hip --cuda --native_cpu --cmake-opt=-DSYCL_ENABLE_STACK_PRINTING=ON --cmake-opt=-DSYCL_LIB_WITH_DEBUG_SYMBOL=ON --cmake-opt=-DCOMPILER_RT_BUILD_SANITIZERS=Off --cmake-opt=-DCOMPILER_RT_BUILD_MEMPROF=Off
39+
build_configure_extra_args: --no-assertions --hip --cuda --native_cpu --cmake-opt="-DSYCL_ENABLE_STACK_PRINTING=ON" --cmake-opt="-DSYCL_LIB_WITH_DEBUG_SYMBOL=ON" --cmake-opt="-DCOMPILER_RT_BUILD_SANITIZERS=Off" --cmake-opt="-DCOMPILER_RT_BUILD_MEMPROF=Off"
4040
merge_ref: ''
4141
cc: icx
4242
cxx: icpx
@@ -59,10 +59,25 @@ jobs:
5959
reset_intel_gpu: true
6060
- name: AMD/HIP
6161
runner: '["Linux", "amdgpu"]'
62-
image: ghcr.io/intel/llvm/ubuntu2204_build:latest
62+
image: ghcr.io/intel/llvm/ubuntu2404_build:latest
6363
image_options: -u 1001 --device=/dev/dri --device=/dev/kfd
6464
target_devices: ext_oneapi_hip:gpu
6565
reset_intel_gpu: false
66+
- name: E2E tests on Intel Ponte Vecchio GPU
67+
runner: '["Linux", "pvc"]'
68+
env: '{"LIT_FILTER_OUT":"ESIMD/unified_memory_api/"}'
69+
image: ghcr.io/intel/llvm/ubuntu2404_intel_drivers:latest
70+
image_options: -u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN
71+
target_devices: ext_oneapi_level_zero:gpu;opencl:gpu
72+
extra_lit_opts: -j 50
73+
- name: E2E tests with dev igc on Intel Ponte Vecchio GPU
74+
runner: '["Linux", "pvc"]'
75+
env: '{"LIT_FILTER_OUT":"ESIMD/unified_memory_api/"}'
76+
image: ghcr.io/intel/llvm/ubuntu2404_intel_drivers:devigc
77+
image_options: -u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN
78+
target_devices: ext_oneapi_level_zero:gpu;opencl:gpu
79+
use_igc_dev: true
80+
extra_lit_opts: -j 50
6681
# Performance tests below. Specifics:
6782
# - only run performance tests (use LIT_FILTER env)
6883
# - ask llvm-lit to show all the output, even for PASS (-a)

‎compiler-rt/lib/builtins/CMakeLists.txt‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -850,9 +850,12 @@ else ()
850850
if (CAN_TARGET_${arch})
851851
cmake_push_check_state()
852852
# TODO: we should probably make most of the checks in builtin-config depend on the target flags.
853-
message(STATUS "Performing additional configure checks with target flags: ${TARGET_${arch}_CFLAGS}")
854853
set(BUILTIN_CFLAGS_${arch} ${BUILTIN_CFLAGS})
855-
list(APPEND CMAKE_REQUIRED_FLAGS ${TARGET_${arch}_CFLAGS} ${BUILTIN_CFLAGS_${arch}})
854+
# CMAKE_REQUIRED_FLAGS must be a space separated string but unlike TARGET_${arch}_CFLAGS,
855+
# BUILTIN_CFLAGS_${arch} is a CMake list, so we have to join it to create a valid command line.
856+
list(JOIN BUILTIN_CFLAGS " " CMAKE_REQUIRED_FLAGS)
857+
set(CMAKE_REQUIRED_FLAGS "${TARGET_${arch}_CFLAGS} ${BUILTIN_CFLAGS_${arch}}")
858+
message(STATUS "Performing additional configure checks with target flags: ${CMAKE_REQUIRED_FLAGS}")
856859
# For ARM archs, exclude any VFP builtins if VFP is not supported
857860
if (${arch} MATCHES "^(arm|armhf|armv7|armv7s|armv7k|armv7m|armv7em|armv8m.main|armv8.1m.main)$")
858861
string(REPLACE ";" " " _TARGET_${arch}_CFLAGS "${TARGET_${arch}_CFLAGS}")

‎devops/containers/ubuntu2204_intel_drivers.Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ FROM $base_image:$base_tag
55

66
ENV DEBIAN_FRONTEND=noninteractive
77

8-
ARG use_latest=true
8+
ARG use_unstable_driver=true
99

1010
USER root
1111

@@ -18,7 +18,7 @@ COPY dependencies.json /
1818
RUN mkdir /runtimes
1919
ENV INSTALL_LOCATION=/runtimes
2020
RUN --mount=type=secret,id=github_token \
21-
if [ "$use_latest" = "true" ]; then \
21+
if [ "$use_unstable_driver" = "true" ]; then \
2222
install_driver_opt=" --use-latest"; \
2323
else \
2424
install_driver_opt=" dependencies.json"; \

‎devops/containers/ubuntu2404_build.Dockerfile‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
FROM nvidia/cuda:12.6.3-devel-ubuntu24.04
2+
3+
ENV DEBIAN_FRONTEND=noninteractive
4+
5+
USER root
6+
7+
# Install SYCL prerequisites
8+
COPY scripts/install_build_tools.sh /install.sh
9+
RUN /install.sh
10+
11+
SHELL ["/bin/bash", "-ec"]
12+
13+
# Make the directory if it doesn't exist yet.
14+
# This location is recommended by the distribution maintainers.
15+
RUN mkdir --parents --mode=0755 /etc/apt/keyrings
16+
# Download the key, convert the signing-key to a full
17+
# keyring required by apt and store in the keyring directory
18+
RUN wget https://repo.radeon.com/rocm/rocm.gpg.key -O - | \
19+
gpg --dearmor | tee /etc/apt/keyrings/rocm.gpg > /dev/null && \
20+
# Add rocm repo
21+
echo "deb [arch=amd64 signed-by=/etc/apt/keyrings/rocm.gpg] https://repo.radeon.com/amdgpu/6.3/ubuntu noble main" \
22+
| tee /etc/apt/sources.list.d/amdgpu.list && \
23+
echo "deb [arch=amd64 signed-by=/etc/apt/keyrings/rocm.gpg] https://repo.radeon.com/rocm/apt/6.3 noble main" \
24+
| tee --append /etc/apt/sources.list.d/rocm.list && \
25+
echo -e 'Package: *\nPin: release o=repo.radeon.com\nPin-Priority: 600' \
26+
| tee /etc/apt/preferences.d/rocm-pin-600 && \
27+
echo -e 'Package: *\nPin: release o=repo.radeon.com\nPin-Priority: 600' \
28+
| tee /etc/apt/preferences.d/rocm-pin-600
29+
# Install the ROCM kernel driver
30+
RUN apt update && apt install -yqq rocm-dev && \
31+
apt-get clean && \
32+
rm -rf /var/lib/apt/lists/*
33+
34+
COPY scripts/create-sycl-user.sh /user-setup.sh
35+
RUN /user-setup.sh
36+
37+
COPY scripts/docker_entrypoint.sh /docker_entrypoint.sh
38+
39+
USER sycl
40+
41+
ENTRYPOINT ["/docker_entrypoint.sh"]
42+

0 commit comments

Comments
 (0)