From d9cf81bcfe5d4d058e6aace93786a25ae3af5113 Mon Sep 17 00:00:00 2001 From: Pavel V Chupin Date: Thu, 11 Aug 2022 15:56:21 -0700 Subject: [PATCH 01/13] [CI] Update GPU driver uplift process * Adding abilility to self test task on pull_request made * Adding commit description containing driver version * Removing linux_staging drivers update. linux_staging versions are used to produce "unstable" containers in SYCL nightly workflow, but in fact "unstable" matching "latest" currently and there are no testing processes in the CI currently which use "unstable" containers. Not sure what the original intention was, but until we have any *separate* testing processes for "unstable" containers it doesn't make sense to update the versions. * Use personal access token to kick off pre-commit testing automatically --- .github/workflows/sycl_update_gpu_driver.yml | 35 ++++---------------- 1 file changed, 7 insertions(+), 28 deletions(-) diff --git a/.github/workflows/sycl_update_gpu_driver.yml b/.github/workflows/sycl_update_gpu_driver.yml index 4127bf873921f..ed6d34c793318 100644 --- a/.github/workflows/sycl_update_gpu_driver.yml +++ b/.github/workflows/sycl_update_gpu_driver.yml @@ -3,6 +3,11 @@ name: Update GPU driver on: schedule: - cron: '0 3 * * 2' + pull_request: + branches: + - sycl + paths: + - .github/workflows/sycl_update_gpu_driver.yml workflow_dispatch: jobs: @@ -19,7 +24,7 @@ jobs: env: BRANCH: ci/update_gpu_driver-linux-${{ env.NEW_DRIVER_VERSION }} LLVMBOT_TOKEN: ${{ secrets.LLVM_MAIN_SYNC_BBSYCL_TOKEN }} - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITHUB_TOKEN: ${{ secrets.LLVM_MAIN_SYNC_BBSYCL_TOKEN }} run: | cd $GITHUB_WORKSPACE # Set fake identity to fulfil git requirements @@ -27,32 +32,6 @@ jobs: git config --global user.email "actions@github.com" git checkout -B $BRANCH git add -u - git commit -m "[GHA] Uplift GPU RT version for Linux CI" || exit 0 # exit if commit is empty + git commit -m "[GHA] Uplift GPU RT version for Linux CI" -m "Uplift GPU RT version for Linux to $NEW_DRIVER_VERSION" || exit 0 # exit if commit is empty git push https://$LLVMBOT_TOKEN@github.com/${{ github.repository }} ${BRANCH} gh pr create --head $BRANCH --title "[GHA] Uplift GPU RT version for Linux CI" --body "Uplift GPU RT version for Linux to $NEW_DRIVER_VERSION" - - update_driver_linux_staging: - runs-on: ubuntu-latest - if: github.repository == 'intel/llvm' - steps: - - uses: actions/checkout@v2 - - name: Update dependencies file - run: | - version="$(python3 devops/scripts/update_drivers.py linux_staging)" - echo 'NEW_DRIVER_VERSION='$version >> $GITHUB_ENV - - name: Update sycl Branch - env: - BRANCH: ci/update_gpu_driver-linux_staging-${{ env.NEW_DRIVER_VERSION }} - LLVMBOT_TOKEN: ${{ secrets.LLVM_MAIN_SYNC_BBSYCL_TOKEN }} - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - run: | - cd $GITHUB_WORKSPACE - # Set fake identity to fulfil git requirements - git config --global user.name "GitHub Actions" - git config --global user.email "actions@github.com" - git checkout -B $BRANCH - git add -u - git commit -m "[GHA] Uplift GPU RT version for Nightly Builds" || exit 0 # exit if commit is empty - git push https://$LLVMBOT_TOKEN@github.com/${{ github.repository }} ${BRANCH} - gh pr create --head $BRANCH --title "[GHA] Uplift GPU RT version for Nightly Builds" --body "Uplift GPU RT version for Linux to $NEW_DRIVER_VERSION" - From 9d5ddcd1dd04ca05df45a72832682709b743dcd8 Mon Sep 17 00:00:00 2001 From: Pavel Chupin Date: Mon, 15 Aug 2022 14:52:53 -0700 Subject: [PATCH 02/13] Update .github/workflows/sycl_update_gpu_driver.yml Co-authored-by: Alexey Bader --- .github/workflows/sycl_update_gpu_driver.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/sycl_update_gpu_driver.yml b/.github/workflows/sycl_update_gpu_driver.yml index ed6d34c793318..05d8351c26141 100644 --- a/.github/workflows/sycl_update_gpu_driver.yml +++ b/.github/workflows/sycl_update_gpu_driver.yml @@ -32,6 +32,6 @@ jobs: git config --global user.email "actions@github.com" git checkout -B $BRANCH git add -u - git commit -m "[GHA] Uplift GPU RT version for Linux CI" -m "Uplift GPU RT version for Linux to $NEW_DRIVER_VERSION" || exit 0 # exit if commit is empty + git commit -m "[GHA] Uplift Linux GPU RT version to $NEW_DRIVER_VERSION" || exit 0 # exit if commit is empty git push https://$LLVMBOT_TOKEN@github.com/${{ github.repository }} ${BRANCH} gh pr create --head $BRANCH --title "[GHA] Uplift GPU RT version for Linux CI" --body "Uplift GPU RT version for Linux to $NEW_DRIVER_VERSION" From 176ac41e271a856d05693988f829cd0fc7140930 Mon Sep 17 00:00:00 2001 From: Pavel V Chupin Date: Mon, 15 Aug 2022 14:55:12 -0700 Subject: [PATCH 03/13] Don't trigger full pre-commit testing on sycl_update_gpu_driver.yml change This is not required on the workflow change. Workflow sycl_update_gpu_driver.yml when run will produce a new PR for driver uplift, that's where full testing is expected in fact. --- .github/workflows/sycl_precommit.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/sycl_precommit.yml b/.github/workflows/sycl_precommit.yml index e9539f9a0d13a..16398a01113d1 100644 --- a/.github/workflows/sycl_precommit.yml +++ b/.github/workflows/sycl_precommit.yml @@ -8,6 +8,7 @@ on: paths-ignore: - '.github/ISSUE_TEMPLATE/**' - '.github/CODEOWNERS' + - '.github/workflows/sycl_update_gpu_driver.yml' - 'devops/containers/**' - 'devops/scripts/install_drivers.sh' - 'devops/scripts/install_build_tools.sh' From 386f822ba22ec3f761fc3d628e0b98fcbf55b136 Mon Sep 17 00:00:00 2001 From: Pavel V Chupin Date: Mon, 15 Aug 2022 15:19:11 -0700 Subject: [PATCH 04/13] Minor fix for env vars used --- .github/workflows/sycl_update_gpu_driver.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/sycl_update_gpu_driver.yml b/.github/workflows/sycl_update_gpu_driver.yml index 05d8351c26141..69e788d2ef7a0 100644 --- a/.github/workflows/sycl_update_gpu_driver.yml +++ b/.github/workflows/sycl_update_gpu_driver.yml @@ -23,7 +23,6 @@ jobs: - name: Create Pull Request env: BRANCH: ci/update_gpu_driver-linux-${{ env.NEW_DRIVER_VERSION }} - LLVMBOT_TOKEN: ${{ secrets.LLVM_MAIN_SYNC_BBSYCL_TOKEN }} GITHUB_TOKEN: ${{ secrets.LLVM_MAIN_SYNC_BBSYCL_TOKEN }} run: | cd $GITHUB_WORKSPACE @@ -33,5 +32,5 @@ jobs: git checkout -B $BRANCH git add -u git commit -m "[GHA] Uplift Linux GPU RT version to $NEW_DRIVER_VERSION" || exit 0 # exit if commit is empty - git push https://$LLVMBOT_TOKEN@github.com/${{ github.repository }} ${BRANCH} + git push https://$GITHUB_TOKEN@github.com/${{ github.repository }} ${BRANCH} gh pr create --head $BRANCH --title "[GHA] Uplift GPU RT version for Linux CI" --body "Uplift GPU RT version for Linux to $NEW_DRIVER_VERSION" From 0a82a6d757c4e8d5749b6686f75a5db051b5265d Mon Sep 17 00:00:00 2001 From: Pavel V Chupin Date: Wed, 17 Aug 2022 15:11:36 -0700 Subject: [PATCH 05/13] Revert "Minor fix for env vars used" This reverts commit 386f822ba22ec3f761fc3d628e0b98fcbf55b136. --- .github/workflows/sycl_update_gpu_driver.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/sycl_update_gpu_driver.yml b/.github/workflows/sycl_update_gpu_driver.yml index 69e788d2ef7a0..05d8351c26141 100644 --- a/.github/workflows/sycl_update_gpu_driver.yml +++ b/.github/workflows/sycl_update_gpu_driver.yml @@ -23,6 +23,7 @@ jobs: - name: Create Pull Request env: BRANCH: ci/update_gpu_driver-linux-${{ env.NEW_DRIVER_VERSION }} + LLVMBOT_TOKEN: ${{ secrets.LLVM_MAIN_SYNC_BBSYCL_TOKEN }} GITHUB_TOKEN: ${{ secrets.LLVM_MAIN_SYNC_BBSYCL_TOKEN }} run: | cd $GITHUB_WORKSPACE @@ -32,5 +33,5 @@ jobs: git checkout -B $BRANCH git add -u git commit -m "[GHA] Uplift Linux GPU RT version to $NEW_DRIVER_VERSION" || exit 0 # exit if commit is empty - git push https://$GITHUB_TOKEN@github.com/${{ github.repository }} ${BRANCH} + git push https://$LLVMBOT_TOKEN@github.com/${{ github.repository }} ${BRANCH} gh pr create --head $BRANCH --title "[GHA] Uplift GPU RT version for Linux CI" --body "Uplift GPU RT version for Linux to $NEW_DRIVER_VERSION" From 141eadc893d4e7a30a11bac0bdc40e42e11bc94b Mon Sep 17 00:00:00 2001 From: Pavel V Chupin Date: Wed, 17 Aug 2022 15:18:20 -0700 Subject: [PATCH 06/13] Fix issues --- .github/workflows/sycl_update_gpu_driver.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/sycl_update_gpu_driver.yml b/.github/workflows/sycl_update_gpu_driver.yml index 05d8351c26141..f6c4eb65347c2 100644 --- a/.github/workflows/sycl_update_gpu_driver.yml +++ b/.github/workflows/sycl_update_gpu_driver.yml @@ -23,15 +23,11 @@ jobs: - name: Create Pull Request env: BRANCH: ci/update_gpu_driver-linux-${{ env.NEW_DRIVER_VERSION }} - LLVMBOT_TOKEN: ${{ secrets.LLVM_MAIN_SYNC_BBSYCL_TOKEN }} GITHUB_TOKEN: ${{ secrets.LLVM_MAIN_SYNC_BBSYCL_TOKEN }} run: | cd $GITHUB_WORKSPACE - # Set fake identity to fulfil git requirements - git config --global user.name "GitHub Actions" - git config --global user.email "actions@github.com" git checkout -B $BRANCH git add -u git commit -m "[GHA] Uplift Linux GPU RT version to $NEW_DRIVER_VERSION" || exit 0 # exit if commit is empty - git push https://$LLVMBOT_TOKEN@github.com/${{ github.repository }} ${BRANCH} + git push https://$GITHUB_TOKEN@github.com/${{ github.repository }} ${BRANCH} gh pr create --head $BRANCH --title "[GHA] Uplift GPU RT version for Linux CI" --body "Uplift GPU RT version for Linux to $NEW_DRIVER_VERSION" From fec9d18f0f9203d6c25346441e7eba520a161240 Mon Sep 17 00:00:00 2001 From: Pavel V Chupin Date: Wed, 17 Aug 2022 15:31:47 -0700 Subject: [PATCH 07/13] Fix issues --- .github/workflows/sycl_update_gpu_driver.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/sycl_update_gpu_driver.yml b/.github/workflows/sycl_update_gpu_driver.yml index f6c4eb65347c2..e14762a3e4b4c 100644 --- a/.github/workflows/sycl_update_gpu_driver.yml +++ b/.github/workflows/sycl_update_gpu_driver.yml @@ -26,6 +26,8 @@ jobs: GITHUB_TOKEN: ${{ secrets.LLVM_MAIN_SYNC_BBSYCL_TOKEN }} run: | cd $GITHUB_WORKSPACE + git config --global user.name "Buildbot for SYCL" + git config --global user.email "bb-sycl@github.com" git checkout -B $BRANCH git add -u git commit -m "[GHA] Uplift Linux GPU RT version to $NEW_DRIVER_VERSION" || exit 0 # exit if commit is empty From f0b5c195aa32c9d27eeb1d0ec5db255c033ea6e5 Mon Sep 17 00:00:00 2001 From: Pavel V Chupin Date: Wed, 17 Aug 2022 16:19:08 -0700 Subject: [PATCH 08/13] Debugging... --- .github/workflows/sycl_update_gpu_driver.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/sycl_update_gpu_driver.yml b/.github/workflows/sycl_update_gpu_driver.yml index e14762a3e4b4c..249527dfc2c7f 100644 --- a/.github/workflows/sycl_update_gpu_driver.yml +++ b/.github/workflows/sycl_update_gpu_driver.yml @@ -31,5 +31,10 @@ jobs: git checkout -B $BRANCH git add -u git commit -m "[GHA] Uplift Linux GPU RT version to $NEW_DRIVER_VERSION" || exit 0 # exit if commit is empty + echo AAAA + echo ${#GITHUB_TOKEN} + echo AAAAAA git push https://$GITHUB_TOKEN@github.com/${{ github.repository }} ${BRANCH} + echo BBBB gh pr create --head $BRANCH --title "[GHA] Uplift GPU RT version for Linux CI" --body "Uplift GPU RT version for Linux to $NEW_DRIVER_VERSION" + echo CCCC From 180bf89fc73bf5d4d7bb5eb01277032be78f1456 Mon Sep 17 00:00:00 2001 From: Pavel V Chupin Date: Wed, 17 Aug 2022 16:35:03 -0700 Subject: [PATCH 09/13] Debugging... --- .github/workflows/sycl_update_gpu_driver.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/sycl_update_gpu_driver.yml b/.github/workflows/sycl_update_gpu_driver.yml index 249527dfc2c7f..97a17d1844f66 100644 --- a/.github/workflows/sycl_update_gpu_driver.yml +++ b/.github/workflows/sycl_update_gpu_driver.yml @@ -14,6 +14,7 @@ jobs: update_driver_linux: runs-on: ubuntu-latest if: github.repository == 'intel/llvm' + environment: deps_aaaaa steps: - uses: actions/checkout@v2 - name: Update dependencies file @@ -24,6 +25,7 @@ jobs: env: BRANCH: ci/update_gpu_driver-linux-${{ env.NEW_DRIVER_VERSION }} GITHUB_TOKEN: ${{ secrets.LLVM_MAIN_SYNC_BBSYCL_TOKEN }} + MYTOKEN: ${{ secrets.GH_PERSONAL_ACCESS_TOKEN }} run: | cd $GITHUB_WORKSPACE git config --global user.name "Buildbot for SYCL" @@ -32,7 +34,7 @@ jobs: git add -u git commit -m "[GHA] Uplift Linux GPU RT version to $NEW_DRIVER_VERSION" || exit 0 # exit if commit is empty echo AAAA - echo ${#GITHUB_TOKEN} + echo ${#MYTOKEN} echo AAAAAA git push https://$GITHUB_TOKEN@github.com/${{ github.repository }} ${BRANCH} echo BBBB From 74acdc8d2d0f5cda0fc8fad352a5609b06848592 Mon Sep 17 00:00:00 2001 From: Pavel V Chupin Date: Wed, 17 Aug 2022 16:38:15 -0700 Subject: [PATCH 10/13] Debugging... --- .github/workflows/sycl_update_gpu_driver.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/sycl_update_gpu_driver.yml b/.github/workflows/sycl_update_gpu_driver.yml index 97a17d1844f66..bc0bd0f75ef13 100644 --- a/.github/workflows/sycl_update_gpu_driver.yml +++ b/.github/workflows/sycl_update_gpu_driver.yml @@ -14,7 +14,7 @@ jobs: update_driver_linux: runs-on: ubuntu-latest if: github.repository == 'intel/llvm' - environment: deps_aaaaa + environment: deps_uplift steps: - uses: actions/checkout@v2 - name: Update dependencies file From ec0238a7ce83c6593a365ccf734ab8b115539b7a Mon Sep 17 00:00:00 2001 From: Pavel V Chupin Date: Wed, 17 Aug 2022 17:03:52 -0700 Subject: [PATCH 11/13] Debugging... --- .github/workflows/sycl_update_gpu_driver.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/sycl_update_gpu_driver.yml b/.github/workflows/sycl_update_gpu_driver.yml index bc0bd0f75ef13..29aa84b73ca16 100644 --- a/.github/workflows/sycl_update_gpu_driver.yml +++ b/.github/workflows/sycl_update_gpu_driver.yml @@ -34,6 +34,8 @@ jobs: git add -u git commit -m "[GHA] Uplift Linux GPU RT version to $NEW_DRIVER_VERSION" || exit 0 # exit if commit is empty echo AAAA + echo ${#BRANCH} + echo AAAAA echo ${#MYTOKEN} echo AAAAAA git push https://$GITHUB_TOKEN@github.com/${{ github.repository }} ${BRANCH} From 755f0227b6042fd9e395bd843de40795ef6cbe5b Mon Sep 17 00:00:00 2001 From: Pavel V Chupin Date: Wed, 17 Aug 2022 17:14:13 -0700 Subject: [PATCH 12/13] Moving testing to temporary branch --- .github/workflows/sycl_update_gpu_driver.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/sycl_update_gpu_driver.yml b/.github/workflows/sycl_update_gpu_driver.yml index 29aa84b73ca16..fd6f56402e881 100644 --- a/.github/workflows/sycl_update_gpu_driver.yml +++ b/.github/workflows/sycl_update_gpu_driver.yml @@ -3,6 +3,9 @@ name: Update GPU driver on: schedule: - cron: '0 3 * * 2' + push: + branches: + - driver-upgrade pull_request: branches: - sycl From 49153dc3540e9db72f982545dac7af543f36a4ab Mon Sep 17 00:00:00 2001 From: Buildbot for SYCL Date: Thu, 18 Aug 2022 00:15:37 +0000 Subject: [PATCH 13/13] [GHA] Uplift Linux GPU RT version to 22.32.23937 --- devops/dependencies.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/devops/dependencies.json b/devops/dependencies.json index 792f5364a5b1a..2a4d49091fed1 100644 --- a/devops/dependencies.json +++ b/devops/dependencies.json @@ -1,15 +1,15 @@ { "linux": { "compute_runtime": { - "github_tag": "22.31.23852", - "version": "22.31.23852", - "url": "https://github.com/intel/compute-runtime/releases/tag/22.31.23852", + "github_tag": "22.32.23937", + "version": "22.32.23937", + "url": "https://github.com/intel/compute-runtime/releases/tag/22.32.23937", "root": "{DEPS_ROOT}/opencl/runtime/linux/oclgpu" }, "igc": { - "github_tag": "igc-1.0.11485", - "version": "1.0.11485", - "url": "https://github.com/intel/intel-graphics-compiler/releases/tag/igc-1.0.11485", + "github_tag": "igc-1.0.11702.1", + "version": "1.0.11702.1", + "url": "https://github.com/intel/intel-graphics-compiler/releases/tag/igc-1.0.11702.1", "root": "{DEPS_ROOT}/opencl/runtime/linux/oclgpu" }, "cm": {