From eab06009f44594e40c9d0b65179edcd13d131d00 Mon Sep 17 00:00:00 2001 From: Alan Forbes Date: Thu, 14 Nov 2024 12:31:41 +0000 Subject: [PATCH 01/18] Add first cut of clik jobs --- .github/workflows/run_pr_tests.yml | 64 +++++++++++++++++++++++++++++- 1 file changed, 62 insertions(+), 2 deletions(-) diff --git a/.github/workflows/run_pr_tests.yml b/.github/workflows/run_pr_tests.yml index 000b5419d..71e80eec7 100644 --- a/.github/workflows/run_pr_tests.yml +++ b/.github/workflows/run_pr_tests.yml @@ -33,6 +33,7 @@ jobs: # build and run host x86_64, execute UnitCL and lit tests and build and run offline run_host_x86_64: + if: false runs-on: ubuntu-22.04 steps: @@ -77,6 +78,7 @@ jobs: # build and run riscv m1, execute UnitCL and lit tests run_riscv_m1: + if: false runs-on: ubuntu-22.04 @@ -105,6 +107,7 @@ jobs: # build and run clang-tidy run_clang_tidy_changes: + if: false runs-on: ubuntu-22.04 @@ -167,6 +170,7 @@ jobs: # run clang-format-diff on the repo run_clang_format: + if: false runs-on: ubuntu-22.04 @@ -189,6 +193,7 @@ jobs: # Based on: mr-windows-msvc-x86_64-llvm-previous-cl3.0-offline run_windows_msvc_x86_64_llvm_latest_cl3_0_offline: + if: false runs-on: windows-2019 @@ -235,6 +240,7 @@ jobs: # Based on: mr-ubuntu-gcc-x86_64-riscv-fp16-cl3.0-unitcl_vecz run_ubuntu_gcc_x86_64_riscv_fp16_cl3_0_unitcl_vecz: + if: false runs-on: ubuntu-22.04 timeout-minutes: 60 steps: @@ -264,6 +270,7 @@ jobs: # Based on: mr-ubuntu-clang-x86-llvm-previous-cl3-0-offline run-ubuntu-clang-x86-llvm-latest-cl3-0-offline: + if: false runs-on: ubuntu-22.04 timeout-minutes: 90 # offline needs longer timeout steps: @@ -303,6 +310,7 @@ jobs: # Based on: mr-ubuntu-gcc-x86_64-riscv-fp16-cl3-0 run-ubuntu-gcc-x86_64-riscv-fp16-cl3-0: + if: false runs-on: ubuntu-22.04 timeout-minutes: 60 steps: @@ -332,8 +340,9 @@ jobs: hal_refsi_thread_mode: WG debug_support: ON - # Based on: mr-ubuntu-gcc-x86-llvm-latest-x86_64-images-cl3-0-release: + # Based on: mr-ubuntu-gcc-x86-llvm-latest-x86_64-images-cl3-0-release run-ubuntu-gcc-x86-llvm-latest-x86_64-images-cl3-0-release: + if: false runs-on: ubuntu-22.04 timeout-minutes: 60 steps: @@ -356,8 +365,9 @@ jobs: enable_api: "" builtin_kernel: ON - # Based on: mr-ubuntu-gcc-aarch64-llvm-previous-cl3-0-fp16: + # Based on: mr-ubuntu-gcc-aarch64-llvm-previous-cl3-0-fp16 run-ubuntu-gcc-aarch64-llvm-latest-cl3-0-fp16: + if: false runs-on: ubuntu-22.04 timeout-minutes: 90 # aarch64 needs longer timeout steps: @@ -390,3 +400,53 @@ jobs: toolchain_file: "scripts/../platform/arm-linux/aarch64-toolchain.cmake" extra_flags: -DCA_BUILTINS_TOOLS_DIR=${{ github.workspace }}/llvm_install_native/bin + # Based on: mr-ubuntu-gcc-x86_64-clik + run-ubuntu-gcc-x86_64-clik: + runs-on: ubuntu-22.04 + timeout-minutes: 60 + steps: + - name: Checkout repo + uses: actions/checkout@v4.1.0 + - name: setup-ubuntu + uses: ./.github/actions/setup_build + with: + llvm_version: '19' + llvm_build_type: RelAssert + save: ${{ inputs.update_cache }} + - run: echo WORKSPACE is $GITHUB_WORKSPACE && echo PWD is `pwd` && ls -al + - run: cmake -Bbuild_clik -GNinja -DCMAKE_INSTALL_PREFIX=install clik + - run: LD_PRELOAD=/lib/x86_64-linux-gnu/libpthread.so.0 ninja -Cbuild_clik check + +############### JOB mr-ubuntu-gcc-x86_64-clik-refsi: + + mr-ubuntu-gcc-x86_64-clik-refsi: + if: false + runs-on: ubuntu-22.04 + timeout-minutes: 60 + env: + LLVM_LATEST: release_180 + LLVM_PREVIOUS: release_170 + Arch: x86_64 + Target: check-ock + Images: OFF + CommandBuffer: ON + USM: ON + FP16: OFF + Compiler: gcc-9 + CXXCompiler: llvm_install/bin/clang++ + steps: + - name: Checkout repo + uses: actions/checkout@v4.1.0 + with: + path: code + - run: cp -R code/.github .github + - name: setup-ubuntu + uses: ./.github/actions/setup_ubuntu_build + with: + llvm_version: '17' + llvm_build_type: RelAssert + - run: echo WORKSPACE is $GITHUB_WORKSPACE && echo PWD is `pwd` && ls -al + - run: cmake -Bbuild_clik -GNinja -DCMAKE_INSTALL_PREFIX=install -DCLIK_HAL_NAME=refsi -DHAL_REFSI_SOC=M1 -DCLIK_EXTERNAL_HAL_DIR=${{ github.workspace }}/code/examples/refsi/hal_refsi clik + - run: LD_PRELOAD=/lib/x86_64-linux-gnu/libpthread.so.0 ninja -Cbuild_clik check + + From 0472ceee0467cebd40524a7c6b03878ddd81c525 Mon Sep 17 00:00:00 2001 From: Alan Forbes Date: Thu, 14 Nov 2024 12:51:09 +0000 Subject: [PATCH 02/18] Second cut of clik jobs --- .github/workflows/run_pr_tests.yml | 26 +++++--------------------- 1 file changed, 5 insertions(+), 21 deletions(-) diff --git a/.github/workflows/run_pr_tests.yml b/.github/workflows/run_pr_tests.yml index 71e80eec7..1ec26cba3 100644 --- a/.github/workflows/run_pr_tests.yml +++ b/.github/workflows/run_pr_tests.yml @@ -417,36 +417,20 @@ jobs: - run: cmake -Bbuild_clik -GNinja -DCMAKE_INSTALL_PREFIX=install clik - run: LD_PRELOAD=/lib/x86_64-linux-gnu/libpthread.so.0 ninja -Cbuild_clik check -############### JOB mr-ubuntu-gcc-x86_64-clik-refsi: - - mr-ubuntu-gcc-x86_64-clik-refsi: - if: false + # Based on: mr-ubuntu-gcc-x86_64-clik-refsi + run-ubuntu-gcc-x86_64-clik-refsi: runs-on: ubuntu-22.04 timeout-minutes: 60 - env: - LLVM_LATEST: release_180 - LLVM_PREVIOUS: release_170 - Arch: x86_64 - Target: check-ock - Images: OFF - CommandBuffer: ON - USM: ON - FP16: OFF - Compiler: gcc-9 - CXXCompiler: llvm_install/bin/clang++ steps: - name: Checkout repo uses: actions/checkout@v4.1.0 - with: - path: code - - run: cp -R code/.github .github - name: setup-ubuntu - uses: ./.github/actions/setup_ubuntu_build + uses: ./.github/actions/setup_build with: - llvm_version: '17' + llvm_version: '19' llvm_build_type: RelAssert - run: echo WORKSPACE is $GITHUB_WORKSPACE && echo PWD is `pwd` && ls -al - - run: cmake -Bbuild_clik -GNinja -DCMAKE_INSTALL_PREFIX=install -DCLIK_HAL_NAME=refsi -DHAL_REFSI_SOC=M1 -DCLIK_EXTERNAL_HAL_DIR=${{ github.workspace }}/code/examples/refsi/hal_refsi clik + - run: cmake -Bbuild_clik -GNinja -DCMAKE_INSTALL_PREFIX=install -DCLIK_HAL_NAME=refsi -DHAL_REFSI_SOC=M1 -DCLIK_EXTERNAL_HAL_DIR=${{ github.workspace }}/examples/refsi/hal_refsi clik - run: LD_PRELOAD=/lib/x86_64-linux-gnu/libpthread.so.0 ninja -Cbuild_clik check From 8f30c9efb11f0a3329c9d94fa82530af3fbdef4c Mon Sep 17 00:00:00 2001 From: Alan Forbes Date: Thu, 14 Nov 2024 13:18:21 +0000 Subject: [PATCH 03/18] Specify compilers. --- .github/workflows/run_pr_tests.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/run_pr_tests.yml b/.github/workflows/run_pr_tests.yml index 1ec26cba3..f83e4a7d8 100644 --- a/.github/workflows/run_pr_tests.yml +++ b/.github/workflows/run_pr_tests.yml @@ -430,7 +430,5 @@ jobs: llvm_version: '19' llvm_build_type: RelAssert - run: echo WORKSPACE is $GITHUB_WORKSPACE && echo PWD is `pwd` && ls -al - - run: cmake -Bbuild_clik -GNinja -DCMAKE_INSTALL_PREFIX=install -DCLIK_HAL_NAME=refsi -DHAL_REFSI_SOC=M1 -DCLIK_EXTERNAL_HAL_DIR=${{ github.workspace }}/examples/refsi/hal_refsi clik + - run: cmake -Bbuild_clik -GNinja -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_INSTALL_PREFIX=install -DCLIK_HAL_NAME=refsi -DHAL_REFSI_SOC=M1 -DCLIK_EXTERNAL_HAL_DIR=${{ github.workspace }}/examples/refsi/hal_refsi clik - run: LD_PRELOAD=/lib/x86_64-linux-gnu/libpthread.so.0 ninja -Cbuild_clik check - - From 1782aa6c78775764fe9835dee8a5287a9693eda6 Mon Sep 17 00:00:00 2001 From: Alan Forbes Date: Thu, 14 Nov 2024 14:31:49 +0000 Subject: [PATCH 04/18] Remove setup_build action --- .github/workflows/run_pr_tests.yml | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/.github/workflows/run_pr_tests.yml b/.github/workflows/run_pr_tests.yml index f83e4a7d8..252c1f565 100644 --- a/.github/workflows/run_pr_tests.yml +++ b/.github/workflows/run_pr_tests.yml @@ -407,12 +407,12 @@ jobs: steps: - name: Checkout repo uses: actions/checkout@v4.1.0 - - name: setup-ubuntu - uses: ./.github/actions/setup_build - with: - llvm_version: '19' - llvm_build_type: RelAssert - save: ${{ inputs.update_cache }} +# - name: setup-ubuntu +# uses: ./.github/actions/setup_build +# with: +# llvm_version: '19' +# llvm_build_type: RelAssert +# save: ${{ inputs.update_cache }} - run: echo WORKSPACE is $GITHUB_WORKSPACE && echo PWD is `pwd` && ls -al - run: cmake -Bbuild_clik -GNinja -DCMAKE_INSTALL_PREFIX=install clik - run: LD_PRELOAD=/lib/x86_64-linux-gnu/libpthread.so.0 ninja -Cbuild_clik check @@ -424,11 +424,12 @@ jobs: steps: - name: Checkout repo uses: actions/checkout@v4.1.0 - - name: setup-ubuntu - uses: ./.github/actions/setup_build - with: - llvm_version: '19' - llvm_build_type: RelAssert +# - name: setup-ubuntu +# uses: ./.github/actions/setup_build +# with: +# llvm_version: '19' +# llvm_build_type: RelAssert +# save: ${{ inputs.update_cache }} - run: echo WORKSPACE is $GITHUB_WORKSPACE && echo PWD is `pwd` && ls -al - - run: cmake -Bbuild_clik -GNinja -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_INSTALL_PREFIX=install -DCLIK_HAL_NAME=refsi -DHAL_REFSI_SOC=M1 -DCLIK_EXTERNAL_HAL_DIR=${{ github.workspace }}/examples/refsi/hal_refsi clik + - run: cmake -Bbuild_clik -GNinja -DCMAKE_INSTALL_PREFIX=install -DCLIK_HAL_NAME=refsi -DHAL_REFSI_SOC=M1 -DCLIK_EXTERNAL_HAL_DIR=${{ github.workspace }}/examples/refsi/hal_refsi clik - run: LD_PRELOAD=/lib/x86_64-linux-gnu/libpthread.so.0 ninja -Cbuild_clik check From 1c6f37c61057ff9d96bf030b076c09ea6047c28f Mon Sep 17 00:00:00 2001 From: Alan Forbes Date: Thu, 14 Nov 2024 14:39:54 +0000 Subject: [PATCH 05/18] Install ninja --- .github/workflows/run_pr_tests.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/run_pr_tests.yml b/.github/workflows/run_pr_tests.yml index 252c1f565..941d8dd78 100644 --- a/.github/workflows/run_pr_tests.yml +++ b/.github/workflows/run_pr_tests.yml @@ -413,6 +413,8 @@ jobs: # llvm_version: '19' # llvm_build_type: RelAssert # save: ${{ inputs.update_cache }} + - name: Install Ninja + uses: llvm/actions/install-ninja@main - run: echo WORKSPACE is $GITHUB_WORKSPACE && echo PWD is `pwd` && ls -al - run: cmake -Bbuild_clik -GNinja -DCMAKE_INSTALL_PREFIX=install clik - run: LD_PRELOAD=/lib/x86_64-linux-gnu/libpthread.so.0 ninja -Cbuild_clik check @@ -430,6 +432,8 @@ jobs: # llvm_version: '19' # llvm_build_type: RelAssert # save: ${{ inputs.update_cache }} + - name: Install Ninja + uses: llvm/actions/install-ninja@main - run: echo WORKSPACE is $GITHUB_WORKSPACE && echo PWD is `pwd` && ls -al - run: cmake -Bbuild_clik -GNinja -DCMAKE_INSTALL_PREFIX=install -DCLIK_HAL_NAME=refsi -DHAL_REFSI_SOC=M1 -DCLIK_EXTERNAL_HAL_DIR=${{ github.workspace }}/examples/refsi/hal_refsi clik - run: LD_PRELOAD=/lib/x86_64-linux-gnu/libpthread.so.0 ninja -Cbuild_clik check From cf23283d48a3a9a8e853fb59c4aa5a38684e97c4 Mon Sep 17 00:00:00 2001 From: Alan Forbes Date: Thu, 14 Nov 2024 15:01:39 +0000 Subject: [PATCH 06/18] Add combo job for clik jobs --- .github/workflows/run_pr_tests.yml | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/.github/workflows/run_pr_tests.yml b/.github/workflows/run_pr_tests.yml index 941d8dd78..4e0f57ddf 100644 --- a/.github/workflows/run_pr_tests.yml +++ b/.github/workflows/run_pr_tests.yml @@ -407,12 +407,6 @@ jobs: steps: - name: Checkout repo uses: actions/checkout@v4.1.0 -# - name: setup-ubuntu -# uses: ./.github/actions/setup_build -# with: -# llvm_version: '19' -# llvm_build_type: RelAssert -# save: ${{ inputs.update_cache }} - name: Install Ninja uses: llvm/actions/install-ninja@main - run: echo WORKSPACE is $GITHUB_WORKSPACE && echo PWD is `pwd` && ls -al @@ -426,14 +420,22 @@ jobs: steps: - name: Checkout repo uses: actions/checkout@v4.1.0 -# - name: setup-ubuntu -# uses: ./.github/actions/setup_build -# with: -# llvm_version: '19' -# llvm_build_type: RelAssert -# save: ${{ inputs.update_cache }} - name: Install Ninja uses: llvm/actions/install-ninja@main - run: echo WORKSPACE is $GITHUB_WORKSPACE && echo PWD is `pwd` && ls -al - run: cmake -Bbuild_clik -GNinja -DCMAKE_INSTALL_PREFIX=install -DCLIK_HAL_NAME=refsi -DHAL_REFSI_SOC=M1 -DCLIK_EXTERNAL_HAL_DIR=${{ github.workspace }}/examples/refsi/hal_refsi clik - run: LD_PRELOAD=/lib/x86_64-linux-gnu/libpthread.so.0 ninja -Cbuild_clik check + + combo: + runs-on: ubuntu-22.04 + timeout-minutes: 60 + steps: + - name: Checkout repo + uses: actions/checkout@v4.1.0 + - name: Install Ninja + uses: llvm/actions/install-ninja@main + - run: echo WORKSPACE is $GITHUB_WORKSPACE && echo PWD is `pwd` && ls -al + - run: cmake -Bbuild_clik -GNinja -DCMAKE_INSTALL_PREFIX=install clik + - run: LD_PRELOAD=/lib/x86_64-linux-gnu/libpthread.so.0 ninja -Cbuild_clik check + - run: cmake -Bbuild_clik -GNinja -DCMAKE_INSTALL_PREFIX=install -DCLIK_HAL_NAME=refsi -DHAL_REFSI_SOC=M1 -DCLIK_EXTERNAL_HAL_DIR=${{ github.workspace }}/examples/refsi/hal_refsi clik + - run: LD_PRELOAD=/lib/x86_64-linux-gnu/libpthread.so.0 ninja -Cbuild_clik check From 9b0cc4434926995b009de8a7798a816c84f21b83 Mon Sep 17 00:00:00 2001 From: Alan Forbes Date: Thu, 14 Nov 2024 15:11:40 +0000 Subject: [PATCH 07/18] Add clean between combo job builds --- .github/workflows/run_pr_tests.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/run_pr_tests.yml b/.github/workflows/run_pr_tests.yml index 4e0f57ddf..f98a31a61 100644 --- a/.github/workflows/run_pr_tests.yml +++ b/.github/workflows/run_pr_tests.yml @@ -437,5 +437,7 @@ jobs: - run: echo WORKSPACE is $GITHUB_WORKSPACE && echo PWD is `pwd` && ls -al - run: cmake -Bbuild_clik -GNinja -DCMAKE_INSTALL_PREFIX=install clik - run: LD_PRELOAD=/lib/x86_64-linux-gnu/libpthread.so.0 ninja -Cbuild_clik check + - run: git clean -d -f -x + - run: echo WORKSPACE is $GITHUB_WORKSPACE && echo PWD is `pwd` && ls -al - run: cmake -Bbuild_clik -GNinja -DCMAKE_INSTALL_PREFIX=install -DCLIK_HAL_NAME=refsi -DHAL_REFSI_SOC=M1 -DCLIK_EXTERNAL_HAL_DIR=${{ github.workspace }}/examples/refsi/hal_refsi clik - run: LD_PRELOAD=/lib/x86_64-linux-gnu/libpthread.so.0 ninja -Cbuild_clik check From a6a37ff506a57001c27207aca65f7d4d607b5749 Mon Sep 17 00:00:00 2001 From: Alan Forbes Date: Thu, 14 Nov 2024 15:28:59 +0000 Subject: [PATCH 08/18] Tidy combo clik job --- .github/workflows/run_pr_tests.yml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/run_pr_tests.yml b/.github/workflows/run_pr_tests.yml index f98a31a61..f32d1a2be 100644 --- a/.github/workflows/run_pr_tests.yml +++ b/.github/workflows/run_pr_tests.yml @@ -401,7 +401,7 @@ jobs: extra_flags: -DCA_BUILTINS_TOOLS_DIR=${{ github.workspace }}/llvm_install_native/bin # Based on: mr-ubuntu-gcc-x86_64-clik - run-ubuntu-gcc-x86_64-clik: + delete-run-ubuntu-gcc-x86_64-clik: runs-on: ubuntu-22.04 timeout-minutes: 60 steps: @@ -414,7 +414,7 @@ jobs: - run: LD_PRELOAD=/lib/x86_64-linux-gnu/libpthread.so.0 ninja -Cbuild_clik check # Based on: mr-ubuntu-gcc-x86_64-clik-refsi - run-ubuntu-gcc-x86_64-clik-refsi: + delete-run-ubuntu-gcc-x86_64-clik-refsi: runs-on: ubuntu-22.04 timeout-minutes: 60 steps: @@ -426,7 +426,9 @@ jobs: - run: cmake -Bbuild_clik -GNinja -DCMAKE_INSTALL_PREFIX=install -DCLIK_HAL_NAME=refsi -DHAL_REFSI_SOC=M1 -DCLIK_EXTERNAL_HAL_DIR=${{ github.workspace }}/examples/refsi/hal_refsi clik - run: LD_PRELOAD=/lib/x86_64-linux-gnu/libpthread.so.0 ninja -Cbuild_clik check - combo: + # Based on a combination of: mr-ubuntu-gcc-x86_64-clik, and ... + # mr-ubuntu-gcc-x86_64-clik-refsi + run-ubuntu-gcc-x86_64-clik-refsi: runs-on: ubuntu-22.04 timeout-minutes: 60 steps: @@ -434,10 +436,13 @@ jobs: uses: actions/checkout@v4.1.0 - name: Install Ninja uses: llvm/actions/install-ninja@main + - name: Run Clik - run: echo WORKSPACE is $GITHUB_WORKSPACE && echo PWD is `pwd` && ls -al - run: cmake -Bbuild_clik -GNinja -DCMAKE_INSTALL_PREFIX=install clik - run: LD_PRELOAD=/lib/x86_64-linux-gnu/libpthread.so.0 ninja -Cbuild_clik check + - name: Clean - run: git clean -d -f -x + - name: Run Clik-Refsi - run: echo WORKSPACE is $GITHUB_WORKSPACE && echo PWD is `pwd` && ls -al - run: cmake -Bbuild_clik -GNinja -DCMAKE_INSTALL_PREFIX=install -DCLIK_HAL_NAME=refsi -DHAL_REFSI_SOC=M1 -DCLIK_EXTERNAL_HAL_DIR=${{ github.workspace }}/examples/refsi/hal_refsi clik - run: LD_PRELOAD=/lib/x86_64-linux-gnu/libpthread.so.0 ninja -Cbuild_clik check From fe58d8e25dff8d49fafc2bdc3f6b4794f5691bfe Mon Sep 17 00:00:00 2001 From: Alan Forbes Date: Thu, 14 Nov 2024 15:36:33 +0000 Subject: [PATCH 09/18] Fix steps syntax --- .github/workflows/run_pr_tests.yml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/.github/workflows/run_pr_tests.yml b/.github/workflows/run_pr_tests.yml index f32d1a2be..49f615fc1 100644 --- a/.github/workflows/run_pr_tests.yml +++ b/.github/workflows/run_pr_tests.yml @@ -437,12 +437,14 @@ jobs: - name: Install Ninja uses: llvm/actions/install-ninja@main - name: Run Clik - - run: echo WORKSPACE is $GITHUB_WORKSPACE && echo PWD is `pwd` && ls -al - - run: cmake -Bbuild_clik -GNinja -DCMAKE_INSTALL_PREFIX=install clik - - run: LD_PRELOAD=/lib/x86_64-linux-gnu/libpthread.so.0 ninja -Cbuild_clik check + run: | + echo WORKSPACE is $GITHUB_WORKSPACE && echo PWD is `pwd` && ls -al + cmake -Bbuild_clik -GNinja -DCMAKE_INSTALL_PREFIX=install clik + LD_PRELOAD=/lib/x86_64-linux-gnu/libpthread.so.0 ninja -Cbuild_clik check - name: Clean - - run: git clean -d -f -x + run: git clean -d -f -x - name: Run Clik-Refsi - - run: echo WORKSPACE is $GITHUB_WORKSPACE && echo PWD is `pwd` && ls -al - - run: cmake -Bbuild_clik -GNinja -DCMAKE_INSTALL_PREFIX=install -DCLIK_HAL_NAME=refsi -DHAL_REFSI_SOC=M1 -DCLIK_EXTERNAL_HAL_DIR=${{ github.workspace }}/examples/refsi/hal_refsi clik - - run: LD_PRELOAD=/lib/x86_64-linux-gnu/libpthread.so.0 ninja -Cbuild_clik check + run: | + echo WORKSPACE is $GITHUB_WORKSPACE && echo PWD is `pwd` && ls -al + cmake -Bbuild_clik -GNinja -DCMAKE_INSTALL_PREFIX=install -DCLIK_HAL_NAME=refsi -DHAL_REFSI_SOC=M1 -DCLIK_EXTERNAL_HAL_DIR=${{ github.workspace }}/examples/refsi/hal_refsi clik + LD_PRELOAD=/lib/x86_64-linux-gnu/libpthread.so.0 ninja -Cbuild_clik check From 5b964f7baa401b448ea9cf5c715b84cd398002ec Mon Sep 17 00:00:00 2001 From: Alan Forbes Date: Thu, 14 Nov 2024 16:13:15 +0000 Subject: [PATCH 10/18] Final combo version of clik --- .github/workflows/run_pr_tests.yml | 30 ++---------------------------- 1 file changed, 2 insertions(+), 28 deletions(-) diff --git a/.github/workflows/run_pr_tests.yml b/.github/workflows/run_pr_tests.yml index 49f615fc1..f1ac7a606 100644 --- a/.github/workflows/run_pr_tests.yml +++ b/.github/workflows/run_pr_tests.yml @@ -400,34 +400,8 @@ jobs: toolchain_file: "scripts/../platform/arm-linux/aarch64-toolchain.cmake" extra_flags: -DCA_BUILTINS_TOOLS_DIR=${{ github.workspace }}/llvm_install_native/bin - # Based on: mr-ubuntu-gcc-x86_64-clik - delete-run-ubuntu-gcc-x86_64-clik: - runs-on: ubuntu-22.04 - timeout-minutes: 60 - steps: - - name: Checkout repo - uses: actions/checkout@v4.1.0 - - name: Install Ninja - uses: llvm/actions/install-ninja@main - - run: echo WORKSPACE is $GITHUB_WORKSPACE && echo PWD is `pwd` && ls -al - - run: cmake -Bbuild_clik -GNinja -DCMAKE_INSTALL_PREFIX=install clik - - run: LD_PRELOAD=/lib/x86_64-linux-gnu/libpthread.so.0 ninja -Cbuild_clik check - - # Based on: mr-ubuntu-gcc-x86_64-clik-refsi - delete-run-ubuntu-gcc-x86_64-clik-refsi: - runs-on: ubuntu-22.04 - timeout-minutes: 60 - steps: - - name: Checkout repo - uses: actions/checkout@v4.1.0 - - name: Install Ninja - uses: llvm/actions/install-ninja@main - - run: echo WORKSPACE is $GITHUB_WORKSPACE && echo PWD is `pwd` && ls -al - - run: cmake -Bbuild_clik -GNinja -DCMAKE_INSTALL_PREFIX=install -DCLIK_HAL_NAME=refsi -DHAL_REFSI_SOC=M1 -DCLIK_EXTERNAL_HAL_DIR=${{ github.workspace }}/examples/refsi/hal_refsi clik - - run: LD_PRELOAD=/lib/x86_64-linux-gnu/libpthread.so.0 ninja -Cbuild_clik check - - # Based on a combination of: mr-ubuntu-gcc-x86_64-clik, and ... - # mr-ubuntu-gcc-x86_64-clik-refsi + # Based on a combination of: mr-ubuntu-gcc-x86_64-clik + # and: mr-ubuntu-gcc-x86_64-clik-refsi run-ubuntu-gcc-x86_64-clik-refsi: runs-on: ubuntu-22.04 timeout-minutes: 60 From d128209c5002d6ed167acddbb0e3e5e1a1f374d3 Mon Sep 17 00:00:00 2001 From: Alan Forbes Date: Thu, 14 Nov 2024 16:24:23 +0000 Subject: [PATCH 11/18] Build to different dirs rather than clean --- .github/workflows/run_pr_tests.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/run_pr_tests.yml b/.github/workflows/run_pr_tests.yml index f1ac7a606..9d4340302 100644 --- a/.github/workflows/run_pr_tests.yml +++ b/.github/workflows/run_pr_tests.yml @@ -415,10 +415,8 @@ jobs: echo WORKSPACE is $GITHUB_WORKSPACE && echo PWD is `pwd` && ls -al cmake -Bbuild_clik -GNinja -DCMAKE_INSTALL_PREFIX=install clik LD_PRELOAD=/lib/x86_64-linux-gnu/libpthread.so.0 ninja -Cbuild_clik check - - name: Clean - run: git clean -d -f -x - name: Run Clik-Refsi run: | echo WORKSPACE is $GITHUB_WORKSPACE && echo PWD is `pwd` && ls -al - cmake -Bbuild_clik -GNinja -DCMAKE_INSTALL_PREFIX=install -DCLIK_HAL_NAME=refsi -DHAL_REFSI_SOC=M1 -DCLIK_EXTERNAL_HAL_DIR=${{ github.workspace }}/examples/refsi/hal_refsi clik - LD_PRELOAD=/lib/x86_64-linux-gnu/libpthread.so.0 ninja -Cbuild_clik check + cmake -Bbuild_clik_refsi -GNinja -DCMAKE_INSTALL_PREFIX=install_refsi -DCLIK_HAL_NAME=refsi -DHAL_REFSI_SOC=M1 -DCLIK_EXTERNAL_HAL_DIR=${{ github.workspace }}/examples/refsi/hal_refsi clik + LD_PRELOAD=/lib/x86_64-linux-gnu/libpthread.so.0 ninja -Cbuild_clik_refsi check From e34d4dd9cf8b97852663c4e3349b886314400cd4 Mon Sep 17 00:00:00 2001 From: Alan Forbes Date: Fri, 15 Nov 2024 10:02:50 +0000 Subject: [PATCH 12/18] First cut of refsi-wi build --- .github/workflows/run_pr_tests.yml | 47 +++++++++++++++++++++++++++++- 1 file changed, 46 insertions(+), 1 deletion(-) diff --git a/.github/workflows/run_pr_tests.yml b/.github/workflows/run_pr_tests.yml index 9d4340302..1651e5f52 100644 --- a/.github/workflows/run_pr_tests.yml +++ b/.github/workflows/run_pr_tests.yml @@ -403,6 +403,7 @@ jobs: # Based on a combination of: mr-ubuntu-gcc-x86_64-clik # and: mr-ubuntu-gcc-x86_64-clik-refsi run-ubuntu-gcc-x86_64-clik-refsi: + if: false runs-on: ubuntu-22.04 timeout-minutes: 60 steps: @@ -415,8 +416,52 @@ jobs: echo WORKSPACE is $GITHUB_WORKSPACE && echo PWD is `pwd` && ls -al cmake -Bbuild_clik -GNinja -DCMAKE_INSTALL_PREFIX=install clik LD_PRELOAD=/lib/x86_64-linux-gnu/libpthread.so.0 ninja -Cbuild_clik check - - name: Run Clik-Refsi + - name: Run Clik-Refsi # No clean - just point o/p at new dirs run: | echo WORKSPACE is $GITHUB_WORKSPACE && echo PWD is `pwd` && ls -al cmake -Bbuild_clik_refsi -GNinja -DCMAKE_INSTALL_PREFIX=install_refsi -DCLIK_HAL_NAME=refsi -DHAL_REFSI_SOC=M1 -DCLIK_EXTERNAL_HAL_DIR=${{ github.workspace }}/examples/refsi/hal_refsi clik LD_PRELOAD=/lib/x86_64-linux-gnu/libpthread.so.0 ninja -Cbuild_clik_refsi check + + # Based on: mr-ubuntu-gcc-x86_64-refsi-g1-wi-cl3-0 + run-ubuntu-gcc-x86_64-refsi-g1-wi-cl3-0: + runs-on: ubuntu-22.04 + timeout-minutes: 60 + steps: + - name: Checkout repo + uses: actions/checkout@v4.1.0 + - name: setup-ubuntu + uses: ./.github/actions/setup_build + with: + llvm_version: '19' + llvm_build_type: RelAssert + save: ${{ inputs.update_cache }} + - run: echo WORKSPACE is $GITHUB_WORKSPACE && echo PWD is `pwd` && ls -al + - name: build ock + uses: ./.github/actions/do_build_ock + with: + build_targets: install + mux_targets_enable: riscv + external_compiler_dirs: ${{ github.workspace }}/examples/refsi/refsi_g1_wi/compiler/refsi_g1_wi + mux_compilers_enable: refsi_g1_wi + riscv_enabled: ON + disable_unitcl_vecz_checks: ON + enable_rvv_scalable_vecz_check: ON + enable_rvv_scalable_vp_vecz_check: ON + use_linker: gold + hal_description: RV64GCV + hal_refsi_soc: G1 + hal_refsi_thread_mode: WI + debug_support: ON +# DO POST BUILD STEPS WHEN IT RUNS ... note: import tool seems to have mangled the last step slightly? +# - run: python -u scripts/storage.py pull artefact.ca-opencl-cts --verbose --clean --path CA-OpenCL-CTS Ubuntu20 x86_64 14 Release +# - run: echo 'Subgroups,subgroups/test_subgroups barrier_functions_core' >> skipped.txt +# - run: python scripts/testing/run_cities.py -s scripts/jenkins/cts_summary/opencl_conformance_tests_wimpy_very_quick.csv -i skipped.txt -b CA-OpenCL-CTS/bin -L build/lib -e OCL_ICD_FILENAMES=$PWD/build/lib/libCL.so -e OCL_ICD_VENDORS=/dev/null --timeout 00:10:00 --verbose -l build/cts.log -f build/cts.fail -r build/cts_refsi_g1_wi.xml +# - run: ninja -C build check-ock +# - run: ninja -C build check-ock-UnitCL-half +# - uses: actions/upload-artifact@v4.1.0 +# if: success() +# with: +# name: ${{ github.job }} +# path: 'oneapi-construction-kit/build/*.fail +# +# oneapi-construction-kit/''build/*.log''' From 1c8902315d2076248c4802937a07616181614b9b Mon Sep 17 00:00:00 2001 From: Alan Forbes Date: Fri, 15 Nov 2024 16:18:13 +0000 Subject: [PATCH 13/18] Suppress ninja as part of build_ock and run it directly --- .github/actions/do_build_ock/action.yml | 4 ++++ .github/workflows/run_pr_tests.yml | 7 ++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/actions/do_build_ock/action.yml b/.github/actions/do_build_ock/action.yml index 9c40bf81c..e89260f40 100644 --- a/.github/actions/do_build_ock/action.yml +++ b/.github/actions/do_build_ock/action.yml @@ -110,6 +110,9 @@ inputs: toolchain_file: description: "Path to toolchain file" default: "" + no_ninja_run: + description: "Run cmake only, no ninja" + default: "false" runs: # We don't want a new docker just a list of steps, so mark as composite @@ -170,6 +173,7 @@ runs: ${{ inputs.extra_flags }} . - name: build_ock + if: ${{ inputs.no_ninja_run }} == 'false' shell: ${{ inputs.shell_to_use }} run: ninja -C ${{ inputs.build_dir }} ${{ inputs.build_targets }} diff --git a/.github/workflows/run_pr_tests.yml b/.github/workflows/run_pr_tests.yml index 1651e5f52..32e438d2e 100644 --- a/.github/workflows/run_pr_tests.yml +++ b/.github/workflows/run_pr_tests.yml @@ -439,7 +439,8 @@ jobs: - name: build ock uses: ./.github/actions/do_build_ock with: - build_targets: install +# build_targets: install # build install to catch any compilation errors + no_ninja_run: true mux_targets_enable: riscv external_compiler_dirs: ${{ github.workspace }}/examples/refsi/refsi_g1_wi/compiler/refsi_g1_wi mux_compilers_enable: refsi_g1_wi @@ -456,8 +457,8 @@ jobs: # - run: python -u scripts/storage.py pull artefact.ca-opencl-cts --verbose --clean --path CA-OpenCL-CTS Ubuntu20 x86_64 14 Release # - run: echo 'Subgroups,subgroups/test_subgroups barrier_functions_core' >> skipped.txt # - run: python scripts/testing/run_cities.py -s scripts/jenkins/cts_summary/opencl_conformance_tests_wimpy_very_quick.csv -i skipped.txt -b CA-OpenCL-CTS/bin -L build/lib -e OCL_ICD_FILENAMES=$PWD/build/lib/libCL.so -e OCL_ICD_VENDORS=/dev/null --timeout 00:10:00 --verbose -l build/cts.log -f build/cts.fail -r build/cts_refsi_g1_wi.xml -# - run: ninja -C build check-ock -# - run: ninja -C build check-ock-UnitCL-half + - run: ninja -C build check-ock + - run: ninja -C build check-ock-UnitCL-half # - uses: actions/upload-artifact@v4.1.0 # if: success() # with: From c08dcd487ecc2430cca17cabb1b67ec8fa33c856 Mon Sep 17 00:00:00 2001 From: Alan Forbes Date: Fri, 15 Nov 2024 16:35:00 +0000 Subject: [PATCH 14/18] Fix ninja_run --- .github/actions/do_build_ock/action.yml | 8 ++++---- .github/workflows/run_pr_tests.yml | 3 +-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/actions/do_build_ock/action.yml b/.github/actions/do_build_ock/action.yml index e89260f40..0289ffc6f 100644 --- a/.github/actions/do_build_ock/action.yml +++ b/.github/actions/do_build_ock/action.yml @@ -110,9 +110,9 @@ inputs: toolchain_file: description: "Path to toolchain file" default: "" - no_ninja_run: - description: "Run cmake only, no ninja" - default: "false" + ninja_run: + description: "Run ninja command" + default: "true" runs: # We don't want a new docker just a list of steps, so mark as composite @@ -173,7 +173,7 @@ runs: ${{ inputs.extra_flags }} . - name: build_ock - if: ${{ inputs.no_ninja_run }} == 'false' + if: ${{ inputs.ninja_run == 'true' }} shell: ${{ inputs.shell_to_use }} run: ninja -C ${{ inputs.build_dir }} ${{ inputs.build_targets }} diff --git a/.github/workflows/run_pr_tests.yml b/.github/workflows/run_pr_tests.yml index 32e438d2e..3d7e65fec 100644 --- a/.github/workflows/run_pr_tests.yml +++ b/.github/workflows/run_pr_tests.yml @@ -403,7 +403,6 @@ jobs: # Based on a combination of: mr-ubuntu-gcc-x86_64-clik # and: mr-ubuntu-gcc-x86_64-clik-refsi run-ubuntu-gcc-x86_64-clik-refsi: - if: false runs-on: ubuntu-22.04 timeout-minutes: 60 steps: @@ -440,7 +439,7 @@ jobs: uses: ./.github/actions/do_build_ock with: # build_targets: install # build install to catch any compilation errors - no_ninja_run: true + ninja_run: false mux_targets_enable: riscv external_compiler_dirs: ${{ github.workspace }}/examples/refsi/refsi_g1_wi/compiler/refsi_g1_wi mux_compilers_enable: refsi_g1_wi From 2af3a317e159b592c399a203c4116dc5b76a24ca Mon Sep 17 00:00:00 2001 From: Alan Forbes Date: Fri, 15 Nov 2024 16:55:18 +0000 Subject: [PATCH 15/18] restore install target; remove build_ock ninja_run param --- .github/actions/do_build_ock/action.yml | 4 ---- .github/workflows/run_pr_tests.yml | 4 ++-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/actions/do_build_ock/action.yml b/.github/actions/do_build_ock/action.yml index 0289ffc6f..9c40bf81c 100644 --- a/.github/actions/do_build_ock/action.yml +++ b/.github/actions/do_build_ock/action.yml @@ -110,9 +110,6 @@ inputs: toolchain_file: description: "Path to toolchain file" default: "" - ninja_run: - description: "Run ninja command" - default: "true" runs: # We don't want a new docker just a list of steps, so mark as composite @@ -173,7 +170,6 @@ runs: ${{ inputs.extra_flags }} . - name: build_ock - if: ${{ inputs.ninja_run == 'true' }} shell: ${{ inputs.shell_to_use }} run: ninja -C ${{ inputs.build_dir }} ${{ inputs.build_targets }} diff --git a/.github/workflows/run_pr_tests.yml b/.github/workflows/run_pr_tests.yml index 3d7e65fec..578072de5 100644 --- a/.github/workflows/run_pr_tests.yml +++ b/.github/workflows/run_pr_tests.yml @@ -403,6 +403,7 @@ jobs: # Based on a combination of: mr-ubuntu-gcc-x86_64-clik # and: mr-ubuntu-gcc-x86_64-clik-refsi run-ubuntu-gcc-x86_64-clik-refsi: + if: false runs-on: ubuntu-22.04 timeout-minutes: 60 steps: @@ -438,8 +439,7 @@ jobs: - name: build ock uses: ./.github/actions/do_build_ock with: -# build_targets: install # build install to catch any compilation errors - ninja_run: false + build_targets: install mux_targets_enable: riscv external_compiler_dirs: ${{ github.workspace }}/examples/refsi/refsi_g1_wi/compiler/refsi_g1_wi mux_compilers_enable: refsi_g1_wi From 65a1bcd6b90b1ac630b771111c28eff2b48148a0 Mon Sep 17 00:00:00 2001 From: Alan Forbes Date: Wed, 20 Nov 2024 15:32:26 +0000 Subject: [PATCH 16/18] Restore all PR jobs and format clik/refsi jobs --- .github/workflows/run_pr_tests.yml | 41 +++++++++++------------------- 1 file changed, 15 insertions(+), 26 deletions(-) diff --git a/.github/workflows/run_pr_tests.yml b/.github/workflows/run_pr_tests.yml index 578072de5..0d02000cd 100644 --- a/.github/workflows/run_pr_tests.yml +++ b/.github/workflows/run_pr_tests.yml @@ -33,7 +33,6 @@ jobs: # build and run host x86_64, execute UnitCL and lit tests and build and run offline run_host_x86_64: - if: false runs-on: ubuntu-22.04 steps: @@ -78,7 +77,6 @@ jobs: # build and run riscv m1, execute UnitCL and lit tests run_riscv_m1: - if: false runs-on: ubuntu-22.04 @@ -107,7 +105,6 @@ jobs: # build and run clang-tidy run_clang_tidy_changes: - if: false runs-on: ubuntu-22.04 @@ -170,7 +167,6 @@ jobs: # run clang-format-diff on the repo run_clang_format: - if: false runs-on: ubuntu-22.04 @@ -193,7 +189,6 @@ jobs: # Based on: mr-windows-msvc-x86_64-llvm-previous-cl3.0-offline run_windows_msvc_x86_64_llvm_latest_cl3_0_offline: - if: false runs-on: windows-2019 @@ -240,7 +235,6 @@ jobs: # Based on: mr-ubuntu-gcc-x86_64-riscv-fp16-cl3.0-unitcl_vecz run_ubuntu_gcc_x86_64_riscv_fp16_cl3_0_unitcl_vecz: - if: false runs-on: ubuntu-22.04 timeout-minutes: 60 steps: @@ -270,7 +264,6 @@ jobs: # Based on: mr-ubuntu-clang-x86-llvm-previous-cl3-0-offline run-ubuntu-clang-x86-llvm-latest-cl3-0-offline: - if: false runs-on: ubuntu-22.04 timeout-minutes: 90 # offline needs longer timeout steps: @@ -310,7 +303,6 @@ jobs: # Based on: mr-ubuntu-gcc-x86_64-riscv-fp16-cl3-0 run-ubuntu-gcc-x86_64-riscv-fp16-cl3-0: - if: false runs-on: ubuntu-22.04 timeout-minutes: 60 steps: @@ -342,7 +334,6 @@ jobs: # Based on: mr-ubuntu-gcc-x86-llvm-latest-x86_64-images-cl3-0-release run-ubuntu-gcc-x86-llvm-latest-x86_64-images-cl3-0-release: - if: false runs-on: ubuntu-22.04 timeout-minutes: 60 steps: @@ -367,7 +358,6 @@ jobs: # Based on: mr-ubuntu-gcc-aarch64-llvm-previous-cl3-0-fp16 run-ubuntu-gcc-aarch64-llvm-latest-cl3-0-fp16: - if: false runs-on: ubuntu-22.04 timeout-minutes: 90 # aarch64 needs longer timeout steps: @@ -403,7 +393,6 @@ jobs: # Based on a combination of: mr-ubuntu-gcc-x86_64-clik # and: mr-ubuntu-gcc-x86_64-clik-refsi run-ubuntu-gcc-x86_64-clik-refsi: - if: false runs-on: ubuntu-22.04 timeout-minutes: 60 steps: @@ -411,14 +400,13 @@ jobs: uses: actions/checkout@v4.1.0 - name: Install Ninja uses: llvm/actions/install-ninja@main + - run: echo WORKSPACE is $GITHUB_WORKSPACE && echo PWD is `pwd` && ls -al - name: Run Clik run: | - echo WORKSPACE is $GITHUB_WORKSPACE && echo PWD is `pwd` && ls -al cmake -Bbuild_clik -GNinja -DCMAKE_INSTALL_PREFIX=install clik LD_PRELOAD=/lib/x86_64-linux-gnu/libpthread.so.0 ninja -Cbuild_clik check - - name: Run Clik-Refsi # No clean - just point o/p at new dirs + - name: Run Clik-Refsi # No initial clean - just point o/p at new dirs run: | - echo WORKSPACE is $GITHUB_WORKSPACE && echo PWD is `pwd` && ls -al cmake -Bbuild_clik_refsi -GNinja -DCMAKE_INSTALL_PREFIX=install_refsi -DCLIK_HAL_NAME=refsi -DHAL_REFSI_SOC=M1 -DCLIK_EXTERNAL_HAL_DIR=${{ github.workspace }}/examples/refsi/hal_refsi clik LD_PRELOAD=/lib/x86_64-linux-gnu/libpthread.so.0 ninja -Cbuild_clik_refsi check @@ -439,7 +427,7 @@ jobs: - name: build ock uses: ./.github/actions/do_build_ock with: - build_targets: install + build_targets: install # Build the install target so we don't miss compilation errors mux_targets_enable: riscv external_compiler_dirs: ${{ github.workspace }}/examples/refsi/refsi_g1_wi/compiler/refsi_g1_wi mux_compilers_enable: refsi_g1_wi @@ -452,16 +440,17 @@ jobs: hal_refsi_soc: G1 hal_refsi_thread_mode: WI debug_support: ON -# DO POST BUILD STEPS WHEN IT RUNS ... note: import tool seems to have mangled the last step slightly? -# - run: python -u scripts/storage.py pull artefact.ca-opencl-cts --verbose --clean --path CA-OpenCL-CTS Ubuntu20 x86_64 14 Release -# - run: echo 'Subgroups,subgroups/test_subgroups barrier_functions_core' >> skipped.txt -# - run: python scripts/testing/run_cities.py -s scripts/jenkins/cts_summary/opencl_conformance_tests_wimpy_very_quick.csv -i skipped.txt -b CA-OpenCL-CTS/bin -L build/lib -e OCL_ICD_FILENAMES=$PWD/build/lib/libCL.so -e OCL_ICD_VENDORS=/dev/null --timeout 00:10:00 --verbose -l build/cts.log -f build/cts.fail -r build/cts_refsi_g1_wi.xml + # For now DO NOT include run_cities.py testing. Run commands generated by the import tool are: + #- run: python -u scripts/storage.py pull artefact.ca-opencl-cts --verbose --clean --path CA-OpenCL-CTS Ubuntu20 x86_64 14 Release + #- run: echo 'Subgroups,subgroups/test_subgroups barrier_functions_core' >> skipped.txt + #- run: python scripts/testing/run_cities.py -s scripts/jenkins/cts_summary/opencl_conformance_tests_wimpy_very_quick.csv -i skipped.txt -b CA-OpenCL-CTS/bin -L build/lib -e OCL_ICD_FILENAMES=$PWD/build/lib/libCL.so -e OCL_ICD_VENDORS=/dev/null --timeout 00:10:00 --verbose -l build/cts.log -f build/cts.fail -r build/cts_refsi_g1_wi.xml - run: ninja -C build check-ock - run: ninja -C build check-ock-UnitCL-half -# - uses: actions/upload-artifact@v4.1.0 -# if: success() -# with: -# name: ${{ github.job }} -# path: 'oneapi-construction-kit/build/*.fail -# -# oneapi-construction-kit/''build/*.log''' + # For now DO NOT include upload of run_cities.py testing logs. Action commands generated by the import tool are: + #- uses: actions/upload-artifact@v4.1.0 + # if: success() + # with: + # name: ${{ github.job }} + # path: | + # oneapi-construction-kit/build/*.fail + # oneapi-construction-kit/build/*.log From 70d6a541d7e478ac8bba53ce20ef9fa82e2373c0 Mon Sep 17 00:00:00 2001 From: Alan Forbes Date: Thu, 21 Nov 2024 11:05:56 +0000 Subject: [PATCH 17/18] Exclude run-ubuntu-gcc-x86_64-refsi-g1-wi-cl3-0 from PR jobs --- .github/workflows/run_pr_tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/run_pr_tests.yml b/.github/workflows/run_pr_tests.yml index 0d02000cd..455f6ea29 100644 --- a/.github/workflows/run_pr_tests.yml +++ b/.github/workflows/run_pr_tests.yml @@ -412,6 +412,7 @@ jobs: # Based on: mr-ubuntu-gcc-x86_64-refsi-g1-wi-cl3-0 run-ubuntu-gcc-x86_64-refsi-g1-wi-cl3-0: + if: ${{ !inputs.is_pull_request }} # include as PR job when run_cities.py is running - see comment below runs-on: ubuntu-22.04 timeout-minutes: 60 steps: From d22a59677df44908ea73d2ce89adeaf939131b2c Mon Sep 17 00:00:00 2001 From: Alan Forbes Date: Fri, 22 Nov 2024 10:14:00 +0000 Subject: [PATCH 18/18] Update comment re. non-PR (nightly) job --- .github/workflows/run_pr_tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run_pr_tests.yml b/.github/workflows/run_pr_tests.yml index 455f6ea29..a5d70eb92 100644 --- a/.github/workflows/run_pr_tests.yml +++ b/.github/workflows/run_pr_tests.yml @@ -412,7 +412,7 @@ jobs: # Based on: mr-ubuntu-gcc-x86_64-refsi-g1-wi-cl3-0 run-ubuntu-gcc-x86_64-refsi-g1-wi-cl3-0: - if: ${{ !inputs.is_pull_request }} # include as PR job when run_cities.py is running - see comment below + if: ${{ !inputs.is_pull_request }} # do not run as PR job for now to avoid flooding the concurrency runs-on: ubuntu-22.04 timeout-minutes: 60 steps: