Skip to content

Commit 20980b9

Browse files
wenju-hewenju-he
committed
Merge branch 'main' into fix-bindless-L0-copy
2 parents 13f69b5 + 7371150 commit 20980b9

File tree

169 files changed

+6745
-2771
lines changed

Some content is hidden

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

169 files changed

+6745
-2771
lines changed

‎.github/CODEOWNERS

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,10 @@ source/adapters/opencl @oneapi-src/unified-runtime-opencl-write
1414
source/adapters/native_cpu @oneapi-src/unified-runtime-native-cpu-write
1515

1616
# Command-buffer experimental feature
17-
source/adapters/**/command_buffer.* @oneapi-src/unified-runtime-command-buffer-write
18-
scripts/core/EXP-COMMAND-BUFFER.rst @oneapi-src/unified-runtime-command-buffer-write
19-
scripts/core/exp-command-buffer.yml @oneapi-src/unified-runtime-command-buffer-write
17+
source/adapters/**/command_buffer.* @oneapi-src/unified-runtime-command-buffer-write
18+
scripts/core/EXP-COMMAND-BUFFER.rst @oneapi-src/unified-runtime-command-buffer-write
19+
scripts/core/exp-command-buffer.yml @oneapi-src/unified-runtime-command-buffer-write
20+
test/conformance/exp_command_buffer** @oneapi-src/unified-runtime-command-buffer-write
2021

2122
# Bindless Images experimental feature
2223
scripts/core/EXP-BINDLESS-IMAGES.rst @oneapi-src/unified-runtime-bindless-images-write

‎.github/labeler.yml

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
# Config file for .github/workflows/labeler.yml to automatically add labels to
2+
# pull requests based on the globs below. For documentation see:
3+
# https://github.com/marketplace/actions/labeler
4+
---
5+
ci/cd:
6+
- changed-files:
7+
- any-glob-to-any-file:
8+
- .github/**
9+
10+
specification:
11+
- changed-files:
12+
- any-glob-to-any-file:
13+
- scripts/core/**
14+
15+
experimental:
16+
- changed-files:
17+
- any-glob-to-any-file:
18+
- scripts/core/EXP*.rst
19+
- scripts/core/exp*.yml
20+
21+
common:
22+
- changed-files:
23+
- any-glob-to-any-file:
24+
- source/common/**
25+
26+
loader:
27+
- changed-files:
28+
- any-glob-to-any-file:
29+
- source/loader/**
30+
31+
opencl:
32+
- changed-files:
33+
- any-glob-to-any-file:
34+
- source/adapter/opencl/**
35+
36+
level-zero:
37+
- changed-files:
38+
- any-glob-to-any-file:
39+
- source/adapters/level_zero/**
40+
41+
cuda:
42+
- changed-files:
43+
- any-glob-to-any-file:
44+
- source/adapters/cuda/**
45+
46+
hip:
47+
- changed-files:
48+
- any-glob-to-any-file:
49+
- source/adapters/hip/**
50+
51+
native-cpu:
52+
- changed-files:
53+
- any-glob-to-any-file:
54+
- source/adapters/native_cpu/**
55+
56+
conformance:
57+
- changed-files:
58+
- any-glob-to-any-file:
59+
- test/conformance/**
60+
61+
command-buffer:
62+
- changed-files:
63+
- any-glob-to-any-file:
64+
- scripts/core/EXP-COMMAND-BUFFER.rst
65+
- scripts/core/exp-command-buffer.yml
66+
- source/adapters/**/command_buffer.*
67+
- test/conformance/exp_command_buffer**
68+
images:
69+
- changed-files:
70+
- any-glob-to-any-file:
71+
- scripts/core/EXP-BINDLESS-IMAGES.rst
72+
- scripts/core/exp-bindless-images.yml
73+
- source/adapters/**/image.*
74+
75+
sanitizer:
76+
- changed-files:
77+
- any-glob-to-any-file:
78+
- source/loader/layers/sanitizer/*

‎.github/workflows/bandit.yml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,20 @@ permissions:
1111
contents: read
1212

1313
jobs:
14-
linux:
14+
bandit:
1515
name: Bandit
16-
runs-on: ubuntu-latest
17-
16+
strategy:
17+
matrix:
18+
os: [ubuntu-latest, windows-latest]
19+
runs-on: ${{matrix.os}}
20+
1821
steps:
1922
- name: Clone the git repo
2023
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
2124

2225
- name: Install pip packages
2326
run: pip install -r third_party/requirements.txt
2427

25-
# Scan is run only for the 'tools' folder.
28+
# Scan all files, except for dev. scripts
2629
- name: Run Bandit
27-
run: |
28-
bandit -r tools
30+
run: bandit -r . -x ./scripts/

‎.github/workflows/cmake.yml

Lines changed: 48 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -115,51 +115,50 @@ jobs:
115115
working-directory: ${{github.workspace}}/build
116116
run: ctest -C ${{matrix.build_type}} --output-on-failure -L "umf|loader|validation|tracing|unit|urtrace"
117117

118-
# Disable short fuzz tests until the ubuntu-22.04 runner is fixed
119-
# fuzztest-build:
120-
# name: Build and run quick fuzztest scenarios
121-
# strategy:
122-
# matrix:
123-
# build_type: [Debug, Release]
124-
# compiler: [{c: clang, cxx: clang++}]
125-
126-
# runs-on: 'ubuntu-22.04'
127-
128-
# steps:
129-
# - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
130-
131-
# - name: Install pip packages
132-
# run: pip install -r third_party/requirements.txt
133-
134-
# - name: Download DPC++
135-
# run: |
136-
# sudo apt install libncurses5
137-
# wget -O ${{github.workspace}}/dpcpp_compiler.tar.gz https://github.com/intel/llvm/releases/download/sycl-nightly%2F20230626/dpcpp-compiler.tar.gz
138-
# tar -xvf ${{github.workspace}}/dpcpp_compiler.tar.gz
139-
140-
# - name: Setup DPC++
141-
# run: |
142-
# source ${{github.workspace}}/dpcpp_compiler/startup.sh
143-
144-
# - name: Configure CMake
145-
# run: >
146-
# cmake
147-
# -B${{github.workspace}}/build
148-
# -DCMAKE_C_COMPILER=${{matrix.compiler.c}}
149-
# -DCMAKE_CXX_COMPILER=${{matrix.compiler.cxx}}
150-
# -DUR_ENABLE_TRACING=ON
151-
# -DCMAKE_BUILD_TYPE=${{matrix.build_type}}
152-
# -DUR_BUILD_TESTS=ON
153-
# -DUR_USE_ASAN=ON
154-
# -DUR_USE_UBSAN=ON
155-
# -DUR_DPCXX=${{github.workspace}}/dpcpp_compiler/bin/clang++
156-
157-
# - name: Build
158-
# run: cmake --build ${{github.workspace}}/build -j $(nproc)
159-
160-
# - name: Fuzz test
161-
# working-directory: ${{github.workspace}}/build
162-
# run: ctest -C ${{matrix.build_type}} --output-on-failure -L "fuzz-short"
118+
fuzztest-build:
119+
name: Build and run quick fuzztest scenarios
120+
strategy:
121+
matrix:
122+
build_type: [Debug, Release]
123+
compiler: [{c: clang, cxx: clang++}]
124+
125+
runs-on: 'ubuntu-22.04'
126+
127+
steps:
128+
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
129+
130+
- name: Install pip packages
131+
run: pip install -r third_party/requirements.txt
132+
133+
- name: Download DPC++
134+
run: |
135+
sudo apt install libncurses5
136+
wget -O ${{github.workspace}}/dpcpp_compiler.tar.gz https://github.com/intel/llvm/releases/download/sycl-nightly%2F20230626/dpcpp-compiler.tar.gz
137+
tar -xvf ${{github.workspace}}/dpcpp_compiler.tar.gz
138+
139+
- name: Setup DPC++
140+
run: |
141+
source ${{github.workspace}}/dpcpp_compiler/startup.sh
142+
143+
- name: Configure CMake
144+
run: >
145+
cmake
146+
-B${{github.workspace}}/build
147+
-DCMAKE_C_COMPILER=${{matrix.compiler.c}}
148+
-DCMAKE_CXX_COMPILER=${{matrix.compiler.cxx}}
149+
-DUR_ENABLE_TRACING=ON
150+
-DCMAKE_BUILD_TYPE=${{matrix.build_type}}
151+
-DUR_BUILD_TESTS=ON
152+
-DUR_USE_ASAN=ON
153+
-DUR_USE_UBSAN=ON
154+
-DUR_DPCXX=${{github.workspace}}/dpcpp_compiler/bin/clang++
155+
156+
- name: Build
157+
run: cmake --build ${{github.workspace}}/build -j $(nproc)
158+
159+
- name: Fuzz test
160+
working-directory: ${{github.workspace}}/build
161+
run: ctest -C ${{matrix.build_type}} --output-on-failure -L "fuzz-short" --verbose
163162

164163
adapter-build-hw:
165164
name: Build - Adapters on HW
@@ -175,6 +174,10 @@ jobs:
175174
]
176175
build_type: [Debug, Release]
177176
compiler: [{c: gcc, cxx: g++}, {c: clang, cxx: clang++}]
177+
# TODO: The latest L0 loader segfaults when built with clang.
178+
exclude:
179+
- adapter: {name: L0, platform: ""}
180+
compiler: {c: clang, cxx: clang++}
178181

179182
runs-on: ${{matrix.adapter.name}}
180183

‎.github/workflows/coverage.yml

Lines changed: 0 additions & 80 deletions
This file was deleted.

‎.github/workflows/e2e_core.yml

Lines changed: 5 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -106,29 +106,6 @@ jobs:
106106
ref: sycl
107107
path: sycl-repo
108108

109-
- name: Install pip packages
110-
working-directory: ${{github.workspace}}/ur-repo
111-
run: pip install -r third_party/requirements.txt
112-
113-
- name: Configure CMake UR
114-
working-directory: ${{github.workspace}}/ur-repo
115-
run: >
116-
cmake
117-
-B build
118-
-DCMAKE_C_COMPILER=${{matrix.compiler.c}}
119-
-DCMAKE_CXX_COMPILER=${{matrix.compiler.cxx}}
120-
-DCMAKE_BUILD_TYPE=${{matrix.build_type}}
121-
-DUR_ENABLE_TRACING=ON
122-
-DUR_DEVELOPER_MODE=ON
123-
-DUR_BUILD_ADAPTER_${{matrix.adapter.name}}=ON
124-
125-
- name: Build UR
126-
run: LD_LIBRARY_PATH=${{github.workspace}}/dpcpp_compiler/lib
127-
cmake --build ${{github.workspace}}/ur-repo/build -j $(nproc)
128-
129-
- name: Set prefer UR
130-
run: echo "SYCL_PREFER_UR=1" >> $GITHUB_ENV
131-
132109
- name: Set CUDA env vars
133110
if: matrix.adapter.name == 'CUDA'
134111
run: |
@@ -145,26 +122,23 @@ jobs:
145122
python3 sycl-repo/buildbot/configure.py
146123
-t ${{matrix.build_type}}
147124
-o ${{github.workspace}}/sycl_build
148-
--cmake-gen "Unix Makefiles"
125+
--cmake-gen "Ninja"
149126
--ci-defaults ${{matrix.adapter.config}}
150127
--cmake-opt="-DLLVM_INSTALL_UTILS=ON"
151128
--cmake-opt="-DSYCL_PI_TESTS=OFF"
129+
--cmake-opt="-DSYCL_PI_UR_USE_FETCH_CONTENT=OFF"
130+
--cmake-opt="-DSYCL_PI_UR_SOURCE_DIR=${{github.workspace}}/ur-repo/"
152131
--cmake-opt=-DCMAKE_C_COMPILER_LAUNCHER=ccache
153132
--cmake-opt=-DCMAKE_CXX_COMPILER_LAUNCHER=ccache
154133
155134
- name: Build SYCL
156-
run: cmake --build ${{github.workspace}}/sycl_build
135+
run: cmake --build ${{github.workspace}}/sycl_build -j
157136

158137
- name: Run check-sycl
159138
# Remove after fixing SYCL test :: abi/layout_handler.cpp
160139
# This issue does not affect further execution of e2e with UR.
161140
continue-on-error: true
162-
run: cmake --build ${{github.workspace}}/sycl_build --target check-sycl
163-
164-
- name: Swap UR loader and adapters
165-
run: |
166-
cp ${{github.workspace}}/ur-repo/build/lib/libur_loader.so* ${{github.workspace}}/sycl_build/lib/
167-
cp ${{github.workspace}}/ur-repo/build/lib/libur_adapter_${{matrix.adapter.str_name}}.so* ${{github.workspace}}/sycl_build/lib/
141+
run: cmake --build ${{github.workspace}}/sycl_build --target check-sycl -j6
168142

169143
- name: Set additional env. vars
170144
run: |

‎.github/workflows/labeler.yml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# Automatically add labels to pull requests based on globs in the
2+
# .github/labeler.yml config file. For documentation see:
3+
# https://github.com/marketplace/actions/labeler
4+
---
5+
name: Pull Request Labeler
6+
7+
on: [ pull_request_target ]
8+
9+
concurrency:
10+
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
11+
cancel-in-progress: true
12+
13+
jobs:
14+
labeler:
15+
permissions:
16+
contents: read
17+
pull-requests: write
18+
runs-on: ubuntu-latest
19+
steps:
20+
- uses: actions/labeler@v5

0 commit comments

Comments
 (0)