Skip to content

Commit 35f8a51

Browse files
ianaylianayl
committed
Merge branch 'unify-benchmark-ci' of https://github.com/intel/llvm into ianayl/split-benchmark-ci
2 parents f49e3b1 + a884df8 commit 35f8a51

File tree

445 files changed

+7737
-3802
lines changed

Some content is hidden

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

445 files changed

+7737
-3802
lines changed

‎.github/workflows/coverity.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,11 @@ jobs:
4646
python3 $GITHUB_WORKSPACE/src/buildbot/configure.py -w $GITHUB_WORKSPACE \
4747
-s $GITHUB_WORKSPACE/src -o $GITHUB_WORKSPACE/build -t Release \
4848
--ci-defaults --hip --cuda \
49-
--cmake-opt="-DNATIVECPU_USE_OCK=Off" \
50-
--cmake-opt="-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=SPIRV"
49+
-DNATIVECPU_USE_OCK=Off \
50+
-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=SPIRV
5151
5252
- name: Build with coverity
53-
run: $GITHUB_WORKSPACE/cov-analysis-linux64-*/bin/cov-build --dir cov-int cmake --build $GITHUB_WORKSPACE/build
53+
run: $GITHUB_WORKSPACE/cov-analysis-linux64-*/bin/cov-build --dir cov-int cmake --build $GITHUB_WORKSPACE/build --target sycl-toolchain
5454

5555
- name: Compress results
5656
run: tar -I pigz -cf intel_llvm.tgz cov-int

‎.github/workflows/email-check.yaml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@ name: "Check for private emails used in PRs"
22

33
on:
44
pull_request:
5-
types:
6-
- opened
5+
branches:
6+
- sycl
7+
- sycl-rel-**
78

89
permissions:
910
contents: read

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -163,14 +163,15 @@ jobs:
163163
python3 $GITHUB_WORKSPACE/src/buildbot/configure.py -w $GITHUB_WORKSPACE \
164164
-s $GITHUB_WORKSPACE/src -o $GITHUB_WORKSPACE/build -t Release \
165165
--ci-defaults ${{ inputs.build_configure_extra_args }} \
166-
--cmake-opt=-DCMAKE_C_COMPILER_LAUNCHER=ccache \
167-
--cmake-opt=-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
168-
--cmake-opt="-DLLVM_INSTALL_UTILS=ON" \
169-
--cmake-opt="-DNATIVECPU_USE_OCK=Off" \
170-
--cmake-opt="-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=SPIRV"
166+
-DCMAKE_C_COMPILER_LAUNCHER=ccache \
167+
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
168+
-DLLVM_INSTALL_UTILS=ON \
169+
-DNATIVECPU_USE_OCK=Off \
170+
-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=SPIRV \
171+
--level_zero_v1_and_v2
171172
- name: Compile
172173
id: build
173-
run: cmake --build $GITHUB_WORKSPACE/build
174+
run: cmake --build $GITHUB_WORKSPACE/build --target sycl-toolchain
174175
- name: check-llvm
175176
if: always() && !cancelled() && contains(inputs.changes, 'llvm')
176177
run: |

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ jobs:
7171
target_devices: cuda:gpu
7272
# No idea why but that seems to work and be in sync with the main
7373
# pre-commit workflow.
74-
ref: ${{ github.event.workflow_run.referenced_workflows[0].sha }}
74+
repo_ref: ${{ github.event.workflow_run.referenced_workflows[0].sha }}
7575

7676
sycl_toolchain_artifact: sycl_linux_default
7777
sycl_toolchain_archive: llvm_sycl.tar.zst

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

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,12 +73,19 @@ jobs:
7373
image_options: -u 1001 --device=/dev/dri --device=/dev/kfd
7474
target_devices: hip:gpu
7575
reset_intel_gpu: false
76+
extra_lit_opts: -j 1
7677
- name: Intel Arc A-Series Graphics
7778
runner: '["Linux", "arc"]'
7879
image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
7980
target_devices: level_zero:gpu;opencl:gpu
8081
reset_intel_gpu: true
8182
extra_lit_opts: --param matrix-xmx8=True
83+
- name: Intel Arc A-Series Graphics for L0 V2 adapter
84+
runner: '["Linux", "arc"]'
85+
image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
86+
target_devices: level_zero_v2:gpu
87+
reset_intel_gpu: true
88+
extra_lit_opts: --param matrix-xmx8=True
8289
- name: E2E tests with dev igc on Intel Arc A-Series Graphics
8390
runner: '["Linux", "arc"]'
8491
image: ghcr.io/intel/llvm/ubuntu2404_intel_drivers:devigc
@@ -123,7 +130,7 @@ jobs:
123130
target_devices: ${{ matrix.target_devices }}
124131
extra_lit_opts: ${{ matrix.extra_lit_opts }}
125132
reset_intel_gpu: ${{ matrix.reset_intel_gpu }}
126-
ref: ${{ github.sha }}
133+
repo_ref: ${{ github.sha }}
127134
sycl_toolchain_artifact: sycl_linux_default
128135
sycl_toolchain_archive: ${{ needs.build.outputs.artifact_archive_name }}
129136
sycl_toolchain_decompress_command: ${{ needs.build.outputs.artifact_decompress_command }}
@@ -180,7 +187,7 @@ jobs:
180187
env: '{"LIT_FILTER":"PerformanceTests/"}'
181188
extra_lit_opts: -a -j 1 --param enable-perf-tests=True
182189

183-
ref: ${{ github.sha }}
190+
repo_ref: ${{ github.sha }}
184191

185192
sycl_toolchain_artifact: sycl_linux_default
186193
sycl_toolchain_archive: ${{ needs.build.outputs.artifact_archive_name }}

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

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ on:
3535
type: string
3636
default: ''
3737

38-
ref:
38+
repo_ref:
3939
type: string
4040
required: True
4141
description: |
@@ -173,17 +173,14 @@ on:
173173
Extra options to be added to LIT_OPTS.
174174
default: ''
175175

176-
install_igc_driver:
176+
reset_intel_gpu:
177+
description: |
178+
Reset Intel GPUs
177179
type: choice
178180
options:
179181
- false
180182
- true
181183

182-
install_dev_igc_driver:
183-
type: choice
184-
options:
185-
- false
186-
- true
187184
e2e_testing_mode:
188185
type: choice
189186
options:
@@ -217,7 +214,7 @@ jobs:
217214
done
218215
- uses: actions/checkout@v4
219216
with:
220-
ref: ${{ inputs.devops_ref || inputs.ref }}
217+
ref: ${{ inputs.devops_ref || inputs.repo_ref }}
221218
sparse-checkout: |
222219
devops
223220
- name: Register cleanup after job is finished
@@ -307,7 +304,7 @@ jobs:
307304
if: inputs.tests_selector == 'e2e'
308305
uses: ./devops/actions/run-tests/e2e
309306
with:
310-
ref: ${{ inputs.tests_ref || inputs.ref || github.sha }}
307+
ref: ${{ inputs.tests_ref || inputs.repo_ref || github.sha }}
311308
binaries_artifact: ${{ inputs.e2e_binaries_artifact }}
312309
testing_mode: ${{ inputs.e2e_testing_mode }}
313310
extra_cmake_args: ${{ inputs.extra_cmake_args }}

‎.github/workflows/sycl-macos-build-and-test.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ jobs:
5050
python3 $GITHUB_WORKSPACE/src/buildbot/configure.py -w $GITHUB_WORKSPACE \
5151
-s $GITHUB_WORKSPACE/src -o $GITHUB_WORKSPACE/build -t Release \
5252
--ci-defaults $ARGS \
53-
--cmake-opt=-DCMAKE_C_COMPILER_LAUNCHER=ccache \
54-
--cmake-opt=-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
55-
--cmake-opt="-DLLVM_INSTALL_UTILS=ON"
53+
-DCMAKE_C_COMPILER_LAUNCHER=ccache \
54+
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
55+
-DLLVM_INSTALL_UTILS=ON
5656
- name: Compile
5757
run: cmake --build $GITHUB_WORKSPACE/build --target deploy-sycl-toolchain

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

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
build_cache_root: "/__w/"
4444
build_cache_suffix: oneapi
4545
build_artifact_suffix: oneapi
46-
build_configure_extra_args: --cmake-opt=-DCMAKE_C_FLAGS="-no-intel-lib -ffp-model=precise" --cmake-opt=-DCMAKE_CXX_FLAGS="-no-intel-lib -ffp-model=precise"
46+
build_configure_extra_args: -DCMAKE_C_FLAGS="-no-intel-lib -ffp-model=precise" -DCMAKE_CXX_FLAGS="-no-intel-lib -ffp-model=precise"
4747
cc: icx
4848
cxx: icpx
4949

@@ -126,7 +126,7 @@ jobs:
126126
tests_selector: e2e
127127
extra_lit_opts: "--param 'cxx_flags=-D_GLIBCXX_USE_CXX11_ABI=0' ${{ matrix.extra_lit_opts }}"
128128
reset_intel_gpu: ${{ matrix.reset_intel_gpu }}
129-
ref: ${{ github.sha }}
129+
repo_ref: ${{ github.sha }}
130130
sycl_toolchain_artifact: sycl_linux_default
131131
sycl_toolchain_archive: ${{ needs.ubuntu2204_build.outputs.artifact_archive_name }}
132132
sycl_toolchain_decompress_command: ${{ needs.ubuntu2204_build.outputs.artifact_decompress_command }}
@@ -142,7 +142,7 @@ jobs:
142142
reset_intel_gpu: true
143143
extra_lit_opts: -j 50
144144
image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
145-
ref: ${{ github.sha }}
145+
repo_ref: ${{ github.sha }}
146146
sycl_toolchain_artifact: sycl_linux_oneapi
147147
sycl_toolchain_archive: ${{ needs.ubuntu2404_oneapi_build.outputs.artifact_archive_name }}
148148
sycl_toolchain_decompress_command: ${{ needs.ubuntu2404_oneapi_build.outputs.artifact_decompress_command }}
@@ -187,7 +187,7 @@ jobs:
187187
image: ghcr.io/intel/llvm/ubuntu2204_build:latest
188188
image_options: -u 1001 --gpus all --cap-add SYS_ADMIN --env NVIDIA_DISABLE_REQUIRE=1
189189
target_devices: cuda:gpu
190-
ref: ${{ github.sha }}
190+
repo_ref: ${{ github.sha }}
191191

192192
sycl_toolchain_artifact: sycl_linux_default
193193
sycl_toolchain_archive: ${{ needs.ubuntu2204_build.outputs.artifact_archive_name }}
@@ -211,7 +211,7 @@ jobs:
211211
cts_testing_mode: 'build-only'
212212
image_options: -u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN
213213
tests_selector: cts
214-
ref: ${{ github.sha }}
214+
repo_ref: ${{ github.sha }}
215215
sycl_toolchain_artifact: sycl_linux_default
216216
sycl_toolchain_archive: ${{ needs.ubuntu2204_build.outputs.artifact_archive_name }}
217217
sycl_toolchain_decompress_command: ${{ needs.ubuntu2204_build.outputs.artifact_decompress_command }}
@@ -240,14 +240,14 @@ jobs:
240240
image_options: ${{ matrix.image_options }}
241241
target_devices: ${{ matrix.target_devices }}
242242
tests_selector: cts
243-
ref: ${{ github.sha }}
243+
repo_ref: ${{ github.sha }}
244244
sycl_toolchain_artifact: sycl_linux_default
245245
sycl_toolchain_archive: ${{ needs.ubuntu2204_build.outputs.artifact_archive_name }}
246246
sycl_toolchain_decompress_command: ${{ needs.ubuntu2204_build.outputs.artifact_decompress_command }}
247247
sycl_cts_artifact: sycl_cts_bin
248248

249249
aggregate_benchmark_results:
250-
if: always() && !cancelled()
250+
if: github.repository == 'intel/llvm' && !cancelled()
251251
name: Aggregate benchmark results and produce historical averages
252252
uses: ./.github/workflows/sycl-benchmark-aggregate.yml
253253
secrets:
@@ -262,13 +262,8 @@ jobs:
262262
fail-fast: false
263263
matrix:
264264
include:
265-
- name: Run compute-benchmarks on L0 Gen12
266-
runner: '["Linux", "gen12"]'
267-
image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
268-
target_devices: level_zero:gpu
269-
reset_intel_gpu: true
270265
- name: Run compute-benchmarks on L0 PVC
271-
runner: '["Linux", "pvc"]'
266+
runner: '["PVC_PERF"]'
272267
image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
273268
target_devices: level_zero:gpu
274269
reset_intel_gpu: true
@@ -281,7 +276,7 @@ jobs:
281276
target_devices: ${{ matrix.target_devices }}
282277
tests_selector: compute-benchmarks
283278
reset_intel_gpu: ${{ matrix.reset_intel_gpu }}
284-
ref: ${{ github.sha }}
279+
repo_ref: ${{ github.sha }}
285280
sycl_toolchain_artifact: sycl_linux_default
286281
sycl_toolchain_archive: ${{ needs.ubuntu2204_build.outputs.artifact_archive_name }}
287282
sycl_toolchain_decompress_command: ${{ needs.ubuntu2204_build.outputs.artifact_decompress_command }}

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ on:
1818
- .github/workflows/sycl-macos-build-and-test.yml
1919
- ./devops/actions/cleanup
2020
- ./devops/actions/cached_checkout
21+
- ./devops/dependencies.json
22+
- ./devops/dependencies-igc-dev.json
2123

2224
concurrency:
2325
# Cancel a currently running workflow from the same PR or commit hash.
@@ -35,7 +37,7 @@ jobs:
3537
build_cache_root: "/__w/llvm"
3638
build_cache_suffix: default
3739
build_artifact_suffix: default
38-
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"
40+
build_configure_extra_args: --no-assertions --hip --cuda --native_cpu -DSYCL_ENABLE_STACK_PRINTING=ON -DSYCL_LIB_WITH_DEBUG_SYMBOL=ON
3941

4042
e2e-lin:
4143
needs: [build-lin]
@@ -86,7 +88,7 @@ jobs:
8688
extra_lit_opts: ${{ matrix.extra_lit_opts }}
8789
env: ${{ matrix.env || '{}' }}
8890

89-
ref: ${{ github.sha }}
91+
repo_ref: ${{ github.sha }}
9092

9193
sycl_toolchain_artifact: sycl_linux_default
9294
sycl_toolchain_archive: ${{ needs.build-lin.outputs.artifact_archive_name }}
@@ -100,7 +102,7 @@ jobs:
100102
uses: ./.github/workflows/sycl-windows-build.yml
101103
with:
102104
compiler: icx
103-
build_configure_extra_args: --cmake-opt=-DCMAKE_C_FLAGS="/fp:precise /clang:-Wno-nonportable-include-path /clang:-Wno-cast-function-type-mismatch" --cmake-opt=-DCMAKE_CXX_FLAGS="/fp:precise /clang:-Wno-nonportable-include-path /clang:-Wno-cast-function-type-mismatch" --cmake-opt="-DCMAKE_EXE_LINKER_FLAGS=/manifest:no" --cmake-opt="-DCMAKE_MODULE_LINKER_FLAGS=/manifest:no" --cmake-opt="-DCMAKE_SHARED_LINKER_FLAGS=/manifest:no"
105+
build_configure_extra_args: -DCMAKE_C_FLAGS="/fp:precise /clang:-Wno-nonportable-include-path /clang:-Wno-cast-function-type-mismatch" -DCMAKE_CXX_FLAGS="/fp:precise /clang:-Wno-nonportable-include-path /clang:-Wno-cast-function-type-mismatch" -DCMAKE_EXE_LINKER_FLAGS=/manifest:no -DCMAKE_MODULE_LINKER_FLAGS=/manifest:no -DCMAKE_SHARED_LINKER_FLAGS=/manifest:no
104106
build_cache_suffix: icx
105107

106108
e2e-win:

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ jobs:
8989
tests_selector: ${{ matrix.tests_selector }}
9090
extra_lit_opts: ${{ matrix.extra_lit_opts }}
9191
reset_intel_gpu: ${{ matrix.reset_intel_gpu }}
92-
ref: sycl-rel-6_0_0
92+
repo_ref: sycl-rel-6_0_0
9393
devops_ref: sycl
9494
sycl_toolchain_artifact: sycl_linux_default
9595
sycl_toolchain_archive: ${{ needs.ubuntu2204_build.outputs.artifact_archive_name }}
@@ -141,7 +141,7 @@ jobs:
141141
image: ghcr.io/intel/llvm/ubuntu2204_build:latest
142142
image_options: -u 1001 --gpus all --cap-add SYS_ADMIN --env NVIDIA_DISABLE_REQUIRE=1
143143
target_devices: cuda:gpu
144-
ref: sycl-rel-6_0_0
144+
repo_ref: sycl-rel-6_0_0
145145
devops_ref: sycl
146146

147147
sycl_toolchain_artifact: sycl_linux_default
@@ -167,7 +167,7 @@ jobs:
167167
cts_testing_mode: 'build-only'
168168
image_options: -u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN
169169
tests_selector: cts
170-
ref: sycl-rel-6_0_0
170+
repo_ref: sycl-rel-6_0_0
171171
devops_ref: sycl
172172
sycl_toolchain_artifact: sycl_linux_default
173173
sycl_toolchain_archive: ${{ needs.ubuntu2204_build.outputs.artifact_archive_name }}
@@ -197,7 +197,7 @@ jobs:
197197
image_options: ${{ matrix.image_options }}
198198
target_devices: ${{ matrix.target_devices }}
199199
tests_selector: cts
200-
ref: ${{ github.sha }}
200+
repo_ref: ${{ github.sha }}
201201
devops_ref: sycl
202202
sycl_toolchain_artifact: sycl_linux_default
203203
sycl_toolchain_archive: ${{ needs.ubuntu2204_build.outputs.artifact_archive_name }}

0 commit comments

Comments
 (0)