Skip to content

Commit 161767b

Browse files
tovinkeretovinkere
committed
Merge remote-tracking branch 'origin' into xpti_overheads
2 parents 00bbf8e + dde5462 commit 161767b

File tree

385 files changed

+2718
-2122
lines changed

Some content is hidden

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

385 files changed

+2718
-2122
lines changed

‎.github/workflows/sycl-detect-changes.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ jobs:
5454
- *libclc
5555
- 'sycl/*'
5656
- 'sycl/!(test-e2e|doc)/**'
57+
- 'libdevice/**'
5758
ci:
5859
- .github/workflows/**
5960
# devops/* contains config files, including drivers versions.

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ on:
4242
changes:
4343
type: string
4444
description: 'Filter matches for the changed files in the PR'
45-
default: '[llvm, clang, sycl, llvm_spirv, xptifw, libclc, libdevice]'
45+
default: '[llvm, clang, sycl, llvm_spirv, xptifw, libclc]'
4646
required: false
4747
retention-days:
4848
description: 'Artifacts retention period'
@@ -70,7 +70,7 @@ on:
7070
type: choice
7171
options:
7272
- "[]"
73-
- '[llvm, clang, sycl, llvm_spirv, xptifw, libclc, libdevice]'
73+
- '[llvm, clang, sycl, llvm_spirv, xptifw, libclc]'
7474
build_image:
7575
type: choice
7676
options:
@@ -218,7 +218,7 @@ jobs:
218218
run: |
219219
cmake --build $GITHUB_WORKSPACE/build --target check-libclc
220220
- name: check-libdevice
221-
if: always() && !cancelled() && contains(inputs.changes, 'libdevice')
221+
if: always() && !cancelled() && contains(inputs.changes, 'sycl')
222222
run: |
223223
cmake --build $GITHUB_WORKSPACE/build --target check-libdevice
224224
- name: Check E2E test requirements

‎.github/workflows/sycl-rel-container.yaml‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
name: CI sycl-rel container
2+
3+
on:
4+
workflow_dispatch:
5+
pull_request:
6+
paths:
7+
- 'devops/actions/build_container/**'
8+
- 'devops/containers/release_build.DockerFile'
9+
- 'devops/scripts/create-sycl-user.sh'
10+
- '.github/workflows/sycl-rel-container.yaml'
11+
12+
permissions: read-all
13+
14+
jobs:
15+
build_and_push_images:
16+
if: github.repository == 'intel/llvm'
17+
name: Build and Push Docker Images
18+
runs-on: [Linux, build]
19+
permissions:
20+
packages: write
21+
steps:
22+
- name: Checkout
23+
uses: actions/checkout@v4
24+
with:
25+
sparse-checkout: devops
26+
27+
- name: Build and Push Container
28+
uses: ./devops/actions/build_container
29+
with:
30+
push: ${{ github.event_name != 'pull_request' }}
31+
file: release_build
32+
username: ${{ github.repository_owner }}
33+
password: ${{ secrets.GITHUB_TOKEN }}
34+
tags: |
35+
ghcr.io/${{ github.repository }}/release_build:latest-${{ github.sha }}
36+
ghcr.io/${{ github.repository }}/release_build:latest

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
# older >24h. That means the previous run already tested this commit.
2727
run: |
2828
if [ "$GITHUB_EVENT_NAME" = "schedule" ]; then
29-
latest_commit_time=$(curl -s https://api.github.com/repos/intel/llvm/commits/sycl-rel-6_2 | jq -r '.commit.committer.date')
29+
latest_commit_time=$(curl -s -H "Authorization: token $GH_TOKEN" https://api.github.com/repos/intel/llvm/commits/sycl-rel-6_2 | jq -r '.commit.committer.date')
3030
echo $latest_commit_time
3131
latest_commit_epoch=$(date -d "$latest_commit_time" +%s)
3232
now_epoch=$(date +%s)

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ on:
1717
changes:
1818
type: string
1919
description: 'Filter matches for the changed files in the PR'
20-
default: '[llvm, clang, sycl, llvm_spirv, xptifw, libclc, libdevice]'
20+
default: '[llvm, clang, sycl, llvm_spirv, xptifw, libclc]'
2121
required: false
2222
ref:
2323
type: string
@@ -54,7 +54,7 @@ on:
5454
options:
5555
- "[]"
5656
- '[sycl]'
57-
- '[llvm, clang, sycl, llvm_spirv, xptifw, libclc, libdevice]'
57+
- '[llvm, clang, sycl, llvm_spirv, xptifw, libclc]'
5858
build_cache_suffix:
5959
type: choice
6060
options:
@@ -180,7 +180,7 @@ jobs:
180180
run: |
181181
cmake --build build --target check-xptifw
182182
- name: check-libdevice
183-
if: always() && !cancelled() && contains(inputs.changes, 'libdevice')
183+
if: always() && !cancelled() && contains(inputs.changes, 'sycl')
184184
run: |
185185
cmake --build build --target check-libdevice
186186
- name: Generate/diff new ABI symbols

‎buildbot/configure.py‎

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -248,16 +248,9 @@ def do_configure(args, passthrough_args):
248248
cmake_cmd.append(llvm_dir)
249249

250250
if args.use_libcxx:
251-
if not (args.libcxx_include and args.libcxx_library):
252-
sys.exit(
253-
"Please specify include and library path of libc++ when building sycl "
254-
"runtime with it"
255-
)
256251
cmake_cmd.extend(
257252
[
258-
"-DSYCL_USE_LIBCXX=ON",
259-
"-DSYCL_LIBCXX_INCLUDE_PATH={}".format(args.libcxx_include),
260-
"-DSYCL_LIBCXX_LIBRARY_PATH={}".format(args.libcxx_library),
253+
"-DLLVM_ENABLE_LIBCXX=ON",
261254
]
262255
)
263256

@@ -380,15 +373,7 @@ def main():
380373
help="Additional CMake option not configured via script parameters",
381374
)
382375
parser.add_argument("--cmake-gen", default="Ninja", help="CMake generator")
383-
parser.add_argument(
384-
"--use-libcxx", action="store_true", help="build sycl runtime with libcxx"
385-
)
386-
parser.add_argument(
387-
"--libcxx-include", metavar="LIBCXX_INCLUDE_PATH", help="libcxx include path"
388-
)
389-
parser.add_argument(
390-
"--libcxx-library", metavar="LIBCXX_LIBRARY_PATH", help="libcxx library path"
391-
)
376+
parser.add_argument("--use-libcxx", action="store_true", help="build with libcxx")
392377
parser.add_argument(
393378
"--use-lld", action="store_true", help="Use LLD linker for build"
394379
)

‎devops/containers/release_build.Dockerfile‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
FROM docker.io/aswf/ci-base:2025.1
2+
3+
ENV DEBIAN_FRONTEND=noninteractive
4+
5+
USER root
6+
7+
COPY scripts/create-sycl-user.sh /user-setup.sh
8+
RUN /user-setup.sh
9+
10+
# Install ROCm (for RHEL 8.10), see:
11+
# https://rocm.docs.amd.com/projects/install-on-linux/en/latest/install/quick-start.html
12+
RUN dnf -y install https://repo.radeon.com/amdgpu-install/6.4.1/rhel/8.10/amdgpu-install-6.4.60401-1.el8.noarch.rpm && \
13+
wget https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm && \
14+
rpm -e epel-release && \
15+
rpm -ivh epel-release-latest-8.noarch.rpm && \
16+
dnf install dnf-plugin-config-manager && \
17+
crb enable && \
18+
dnf -y install python3-setuptools python3-wheel && \
19+
usermod -a -G render,video sycl && \
20+
dnf -y install rocm && \
21+
dnf clean all && rm -rf /var/cache/dnf
22+
23+
COPY scripts/docker_entrypoint.sh /docker_entrypoint.sh
24+
25+
USER sycl
26+
27+
ENTRYPOINT ["/docker_entrypoint.sh"]

‎devops/dependencies-igc-dev.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"linux": {
33
"igc_dev": {
4-
"github_tag": "igc-dev-420b632",
5-
"version": "420b632",
6-
"updated_at": "2025-07-20T08:48:29Z",
7-
"url": "https://api.github.com/repos/intel/intel-graphics-compiler/actions/artifacts/3571853551/zip",
4+
"github_tag": "igc-dev-342c4fb",
5+
"version": "342c4fb",
6+
"updated_at": "2025-07-23T15:43:39Z",
7+
"url": "https://api.github.com/repos/intel/intel-graphics-compiler/actions/artifacts/3598417593/zip",
88
"root": "{DEPS_ROOT}/opencl/runtime/linux/oclgpu"
99
}
1010
}

‎devops/dependencies.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
{
22
"linux": {
33
"compute_runtime": {
4-
"github_tag": "25.18.33578.6",
5-
"version": "25.18.33578.6",
6-
"url": "https://github.com/intel/compute-runtime/releases/tag/25.18.33578.6",
4+
"github_tag": "25.27.34303.5",
5+
"version": "25.27.34303.5",
6+
"url": "https://github.com/intel/compute-runtime/releases/tag/25.27.34303.5",
77
"root": "{DEPS_ROOT}/opencl/runtime/linux/oclgpu"
88
},
99
"igc": {
10-
"github_tag": "v2.11.7",
11-
"version": "v2.11.7",
12-
"url": "https://github.com/intel/intel-graphics-compiler/releases/tag/v2.11.7",
10+
"github_tag": "v2.14.1",
11+
"version": "v2.14.1",
12+
"url": "https://github.com/intel/intel-graphics-compiler/releases/tag/v2.14.1",
1313
"root": "{DEPS_ROOT}/opencl/runtime/linux/oclgpu"
1414
},
1515
"cm": {
@@ -42,7 +42,7 @@
4242
"version": "101.6881",
4343
"url": "https://downloadmirror.intel.com/857041/gfx_win_101.6881.exe",
4444
"root": ""
45-
},
45+
},
4646
"tbb": {
4747
"github_tag": "v2022.2.0",
4848
"version": "2022.2.0",

‎devops/scripts/create-sycl-user.sh‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,10 @@ USER_ID=1001
1313
groupadd -g $USER_ID $USER_NAME && useradd $USER_NAME -u $USER_ID -g $USER_ID -m -s /bin/bash
1414
# Add user to video/irc groups so that it can access GPU
1515
usermod -aG video $USER_NAME
16-
usermod -aG irc $USER_NAME
16+
# check if the irc group exists
17+
if grep -q '^irc:' /etc/group; then
18+
usermod -aG irc $USER_NAME
19+
fi
1720

1821
# group 109 is required for user to access PVC card.
1922
groupadd -f -g 109 render

0 commit comments

Comments
 (0)