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-run-tests.yml b/.github/workflows/sycl-linux-run-tests.yml index de81af128d58d..3ab62b981855b 100644 --- a/.github/workflows/sycl-linux-run-tests.yml +++ b/.github/workflows/sycl-linux-run-tests.yml @@ -212,7 +212,7 @@ on: - "run-only" permissions: - contents: read + contents: write packages: read jobs: @@ -361,4 +361,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-ur-perf-benchmarking.yml b/.github/workflows/sycl-ur-perf-benchmarking.yml index b5b14cf34ade1..0f73ee7db21ee 100644 --- a/.github/workflows/sycl-ur-perf-benchmarking.yml +++ b/.github/workflows/sycl-ur-perf-benchmarking.yml @@ -174,6 +174,9 @@ jobs: run_benchmarks_build: name: Run Benchmarks on Build needs: [ build_sycl, sanitize_inputs ] + permissions: + contents: write + packages: read strategy: matrix: include: diff --git a/devops/actions/run-tests/benchmark/action.yml b/devops/actions/run-tests/benchmark/action.yml index e09582be0fde6..5ac311fbde950 100644 --- a/devops/actions/run-tests/benchmark/action.yml +++ b/devops/actions/run-tests/benchmark/action.yml @@ -75,6 +75,9 @@ runs: python3 ./devops/scripts/benchmarks/presets.py query "$PRESET" [ "$?" -ne 0 ] && exit 1 # Stop workflow if invalid preset echo "PRESET=$PRESET" >> $GITHUB_ENV + + # Set branch containing benchmark CI results: + echo "BENCHMARK_RESULTS_BRANCH=sycl-benchmark-ci-results" >> $GITHUB_ENV - name: Compute CPU core range to run benchmarks on shell: bash run: | @@ -134,9 +137,10 @@ runs: cd - - name: Checkout results repo - shell: bash - run: | - 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: Run compute-benchmarks env: # Need to append "__" to save name in order to follow @@ -237,9 +241,8 @@ runs: shell: bash run: | 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." @@ -252,7 +255,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 @@ -262,8 +265,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_CI_RESULTS" + git pull mv "$cached_result" "$results_file" fi