diff --git a/.github/workflows/sycl-docs.yml b/.github/workflows/sycl-docs.yml index c442fe37e42da..fa11280b817b9 100644 --- a/.github/workflows/sycl-docs.yml +++ b/.github/workflows/sycl-docs.yml @@ -64,7 +64,7 @@ jobs: touch .nojekyll # Update benchmarking dashboard configuration cat << EOF > benchmarks/config.js - remoteDataUrl = 'https://raw.githubusercontent.com/intel/llvm-ci-perf-results/refs/heads/unify-ci/'; + remoteDataUrl = 'https://raw.githubusercontent.com/intel/llvm/refs/heads/sycl-benchmark-ci-results/'; defaultCompareNames = ["Baseline_PVC_L0"]; EOF # Upload the generated docs as an artifact and deploy to GitHub Pages. diff --git a/.github/workflows/sycl-linux-precommit-aws.yml b/.github/workflows/sycl-linux-precommit-aws.yml index d11f2171bffaa..0dcca650acbf0 100644 --- a/.github/workflows/sycl-linux-precommit-aws.yml +++ b/.github/workflows/sycl-linux-precommit-aws.yml @@ -63,6 +63,9 @@ jobs: e2e-cuda: needs: [aws-start] uses: ./.github/workflows/sycl-linux-run-tests.yml + permissions: + contents: write + packages: read with: name: CUDA E2E runner: '["aws_cuda-${{ github.event.workflow_run.id }}-${{ github.event.workflow_run.run_attempt }}"]' diff --git a/.github/workflows/sycl-linux-precommit.yml b/.github/workflows/sycl-linux-precommit.yml index eae8323f95449..6d8c95c73e136 100644 --- a/.github/workflows/sycl-linux-precommit.yml +++ b/.github/workflows/sycl-linux-precommit.yml @@ -144,6 +144,9 @@ jobs: E2E: needs: [build, detect_changes, compat_read_exclude] if: ${{ always() && !cancelled() && needs.build.outputs.build_conclusion == 'success' }} + permissions: + contents: write + packages: read strategy: fail-fast: false matrix: @@ -231,6 +234,9 @@ jobs: test-perf: needs: [build, detect_changes] + permissions: + contents: write + packages: read if: | always() && !cancelled() && needs.build.outputs.build_conclusion == 'success' diff --git a/.github/workflows/sycl-linux-run-tests.yml b/.github/workflows/sycl-linux-run-tests.yml index 202ffd0488efa..9f8c83f2b050b 100644 --- a/.github/workflows/sycl-linux-run-tests.yml +++ b/.github/workflows/sycl-linux-run-tests.yml @@ -233,6 +233,9 @@ jobs: if: github.event_name == 'workflow_dispatch' || inputs.skip_run == 'false' name: ${{ inputs.name }} runs-on: ${{ fromJSON(inputs.runner) }} + permissions: + contents: write + packages: read container: image: ${{ inputs.image || 'ghcr.io/intel/llvm/ubuntu2404_intel_drivers:alldeps'}} options: ${{ inputs.image_options }} @@ -376,4 +379,3 @@ jobs: build_ref: ${{ inputs.repo_ref }} env: RUNNER_TAG: ${{ inputs.runner }} - GITHUB_TOKEN: ${{ secrets.LLVM_SYCL_BENCHMARK_TOKEN }} diff --git a/.github/workflows/sycl-nightly.yml b/.github/workflows/sycl-nightly.yml index 7647533a8c68c..e207fcd4a506e 100644 --- a/.github/workflows/sycl-nightly.yml +++ b/.github/workflows/sycl-nightly.yml @@ -82,6 +82,9 @@ jobs: ubuntu2204_test: needs: [ubuntu2204_build] + permissions: + contents: write + packages: read if: ${{ always() && !cancelled() && needs.ubuntu2204_build.outputs.build_conclusion == 'success' }} strategy: fail-fast: false @@ -169,6 +172,9 @@ jobs: ubuntu2404_oneapi_test: needs: [ubuntu2404_oneapi_build] + permissions: + contents: write + packages: read if: ${{ always() && !cancelled() && needs.ubuntu2404_oneapi_build.outputs.build_conclusion == 'success' }} uses: ./.github/workflows/sycl-linux-run-tests.yml with: @@ -230,6 +236,9 @@ jobs: cuda-run-tests: needs: [ubuntu2204_build, cuda-aws-start] + permissions: + contents: write + packages: read if: ${{ always() && !cancelled() && needs.ubuntu2204_build.outputs.build_conclusion == 'success' }} uses: ./.github/workflows/sycl-linux-run-tests.yml with: @@ -254,6 +263,9 @@ jobs: build-sycl-cts-linux: needs: ubuntu2204_build + permissions: + contents: write + packages: read if: ${{ always() && !cancelled() && needs.ubuntu2204_build.outputs.build_conclusion == 'success' }} uses: ./.github/workflows/sycl-linux-run-tests.yml with: @@ -270,6 +282,9 @@ jobs: run-sycl-cts-linux: needs: [ubuntu2204_build, build-sycl-cts-linux] + permissions: + contents: write + packages: read if: ${{ always() && !cancelled() && needs.ubuntu2204_build.outputs.build_conclusion == 'success' }} strategy: fail-fast: false diff --git a/.github/workflows/sycl-post-commit.yml b/.github/workflows/sycl-post-commit.yml index ce0afb273860f..438259efb1c86 100644 --- a/.github/workflows/sycl-post-commit.yml +++ b/.github/workflows/sycl-post-commit.yml @@ -48,6 +48,9 @@ jobs: e2e-lin: needs: [detect_changes, build-lin] if: ${{ always() && !cancelled() && needs.build-lin.outputs.build_conclusion == 'success' }} + permissions: + contents: write + packages: read strategy: fail-fast: false matrix: diff --git a/.github/workflows/sycl-ur-perf-benchmarking.yml b/.github/workflows/sycl-ur-perf-benchmarking.yml index 0cc4894bcb0f3..4890c1c26a7d1 100644 --- a/.github/workflows/sycl-ur-perf-benchmarking.yml +++ b/.github/workflows/sycl-ur-perf-benchmarking.yml @@ -150,6 +150,9 @@ jobs: benchmark_dispatch: name: '[Dispatch] Benchmarks' needs: [ build_sycl_dispatch, sanitize_inputs_dispatch ] + permissions: + contents: write + packages: read if: always() && !cancelled() && needs.build_sycl_dispatch.outputs.build_conclusion == 'success' strategy: matrix: @@ -193,6 +196,9 @@ jobs: benchmark_nightly: name: '[Nightly] Benchmarks' needs: [build_nightly] + permissions: + contents: write + packages: read if: always() && !cancelled() && needs.build_nightly.outputs.build_conclusion == 'success' strategy: fail-fast: false @@ -241,6 +247,9 @@ jobs: test_benchmark_framework: name: '[PR] Benchmark suite testing' needs: [build_pr] + permissions: + contents: write + packages: read if: always() && !cancelled() && needs.build_pr.outputs.build_conclusion == 'success' uses: ./.github/workflows/sycl-linux-run-tests.yml with: diff --git a/.github/workflows/sycl-weekly.yml b/.github/workflows/sycl-weekly.yml index d6f0af31dc62d..efd42991a8461 100644 --- a/.github/workflows/sycl-weekly.yml +++ b/.github/workflows/sycl-weekly.yml @@ -22,6 +22,9 @@ jobs: # This job builds SYCL-CTS with -fsycl-use-spirv-backend-for-spirv-gen. build-sycl-cts: needs: ubuntu2204_build + permissions: + contents: write + packages: read if: ${{ always() && !cancelled() && needs.ubuntu2204_build.outputs.build_conclusion == 'success' }} uses: ./.github/workflows/sycl-linux-run-tests.yml with: @@ -39,6 +42,9 @@ jobs: run-sycl-cts: needs: [ubuntu2204_build, build-sycl-cts] + permissions: + contents: write + packages: read if: ${{ always() && !cancelled() && needs.ubuntu2204_build.outputs.build_conclusion == 'success' }} strategy: fail-fast: false diff --git a/devops/actions/run-tests/benchmark/action.yml b/devops/actions/run-tests/benchmark/action.yml index 0a442f2c869da..f8054553b8617 100644 --- a/devops/actions/run-tests/benchmark/action.yml +++ b/devops/actions/run-tests/benchmark/action.yml @@ -37,6 +37,9 @@ inputs: type: string required: False +env: + BENCHMARK_RESULTS_BRANCH: "sycl-benchmark-ci-results" + runs: # composite actions don't make use of 'name', so copy-paste names as a comment in the first line of each step using: "composite" @@ -141,10 +144,10 @@ runs: cd - - name: Checkout results repo - shell: bash - run: | - # Checkout results repo - git clone -b unify-ci https://github.com/intel/llvm-ci-perf-results + uses: actions/checkout@v5 + with: + ref: ${{ env.BENCHMARK_RESULTS_BRANCH }} + path: llvm-ci-perf-results - name: Build and run benchmarks env: # Need to append "__" to save name in order to follow @@ -252,9 +255,8 @@ runs: run: | # Push benchmarks results cd "./llvm-ci-perf-results" - git config user.name "SYCL Benchmarking Bot" - git config user.email "sys_sycl_benchmarks@intel.com" - results_branch="unify-ci" + git config user.name "github-actions[bot]" + git config user.email "github-actions[bot]@users.noreply.github.com" if git diff --quiet && git diff --cached --quiet; then echo "No new results added, skipping push." @@ -267,7 +269,7 @@ runs: git commit -m "[GHA] Upload compute-benchmarks results from https://github.com/intel/llvm/actions/runs/${{ github.run_id }}" results_file="$(git diff HEAD~1 --name-only -- results/ | head -n 1)" - if git push "https://$GITHUB_TOKEN@github.com/intel/llvm-ci-perf-results.git" "$results_branch"; then + if git push; then echo "Push succeeded" break fi @@ -277,8 +279,8 @@ runs: cached_result="$(mktemp -d)/$(basename $results_file)" mv "$results_file" "$cached_result" - git reset --hard "origin/$results_branch" - git pull origin "$results_branch" + git reset --hard "origin/$BENCHMARK_RESULTS_BRANCH" + git pull mv "$cached_result" "$results_file" fi