Skip to content

Commit 38394bb

Browse files
committed
[CI] Use commit hash instead, fix issues with run
1 parent 5d3b0d9 commit 38394bb

File tree

1 file changed

+21
-18
lines changed

1 file changed

+21
-18
lines changed

.github/workflows/benchmark.yml

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ on:
55
- cron: '0 1 * * *' # 2 hrs earlier than sycl-nightly.yml
66
workflow_call:
77
inputs:
8-
pr_no:
9-
type: number
8+
commit_hash:
9+
type: string
1010
required: false
1111
upload_results:
12-
type: bool
12+
type: string # true/false: workflow_dispatch does not support booleans
1313
required: true
1414
runner:
1515
type: string
@@ -18,16 +18,17 @@ on:
1818
type: string
1919
required: true
2020
reset_intel_gpu:
21-
type: bool
21+
type: string # true/false: workflow_dispatch does not support booleans
2222
required: true
2323
default: true
2424

2525
workflow_dispatch:
2626
inputs:
27-
pr_no:
28-
description: Specific PR no. to build
29-
type: number
27+
commit_hash:
28+
description: Commit hash to build intel/llvm from
29+
type: string
3030
required: false
31+
default: ''
3132
upload_results:
3233
description: 'Save and upload results'
3334
type: choice
@@ -53,37 +54,36 @@ on:
5354
- true
5455
default: true
5556

56-
permissions:
57-
contents: read
58-
packages: read
57+
permissions: read-all
5958

6059
jobs:
6160
build_sycl:
6261
name: Build SYCL from PR
63-
if: inputs.pr_no != null
62+
if: inputs.commit_hash != ''
6463
uses: ./.github/workflows/sycl-linux-build.yml
6564
with:
66-
build_ref: "origin/pr/${{ inputs.pr_no }}/merge"
65+
build_ref: ${{ inputs.commit_hash }}
6766
build_cache_root: "/__w/"
6867
build_artifact_suffix: "default"
6968
build_cache_suffix: "default"
7069
# Docker image has last nightly pre-installed and added to the PATH
7170
build_image: "ghcr.io/intel/llvm/sycl_ubuntu2404_nightly:latest"
7271
cc: clang
7372
cxx: clang++
73+
changes: '[]'
7474

7575
run_benchmarks_build:
7676
name: Run Benchmarks (on PR Build)
7777
needs: [ build_sycl ]
78-
if: inputs.pr_no != null
78+
if: inputs.commit_hash != ''
7979
strategy:
8080
matrix:
8181
# Set default values if not specified:
8282
include:
8383
- runner: ${{ inputs.runner || '["PVC_PERF"]' }}
8484
backend: ${{ inputs.backend || 'level_zero:gpu' }}
85-
reset_intel_gpu: ${{ inputs.reset_intel_gpu || true }}
86-
ref: origin/pr/${{ inputs.pr_no }}/merge
85+
reset_intel_gpu: ${{ inputs.reset_intel_gpu || 'true' }}
86+
ref: ${{ inputs.commit_hash }}
8787
uses: ./.github/workflows/sycl-linux-run-tests.yml
8888
secrets: inherit
8989
with:
@@ -96,21 +96,23 @@ jobs:
9696
reset_intel_gpu: ${{ matrix.reset_intel_gpu }}
9797
tests_selector: benchmark_v2
9898
repo_ref: ${{ matrix.ref }}
99+
devops_ref: ${{ github.ref }}
99100
sycl_toolchain_artifact: sycl_linux_default
100101
sycl_toolchain_archive: ${{ needs.build_sycl.outputs.artifact_archive_name }}
101102
sycl_toolchain_decompress_command: ${{ needs.build_sycl.outputs.artifact_decompress_command }}
102103

103104
run_benchmarks_nightly:
104105
name: Run Benchmarks (on Nightly Build)
105-
if: inputs.pr_no == 0
106+
if: inputs.commit_hash == ''
106107
strategy:
107108
matrix:
108109
# Set default values if not specified:
109110
include:
110111
- runner: ${{ inputs.runner || '["PVC_PERF"]' }}
111112
backend: ${{ inputs.backend || 'level_zero:gpu' }}
112-
reset_intel_gpu: ${{ inputs.reset_intel_gpu || true }}
113+
reset_intel_gpu: ${{ inputs.reset_intel_gpu || 'true' }}
113114
uses: ./.github/workflows/sycl-linux-run-tests.yml
115+
secrets: inherit
114116
with:
115117
# TODO support other benchmarks
116118
name: Run compute-benchmarks (${{ matrix.runner }}, ${{ matrix.backend }})
@@ -119,4 +121,5 @@ jobs:
119121
image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
120122
target_devices: ${{ matrix.backend }}
121123
reset_intel_gpu: ${{ matrix.reset_intel_gpu }}
122-
tests_selector: benchmark_v2
124+
tests_selector: benchmark_v2
125+
repo_ref: ${{ github.ref }}

0 commit comments

Comments
 (0)