From 1e32bb9df1df055512ad9c395f7a585bfbbdd5ad Mon Sep 17 00:00:00 2001 From: Alan Forbes Date: Fri, 8 Nov 2024 15:49:23 +0000 Subject: [PATCH 01/16] Add clang-tidy prereqs: checkout, setup, initial build --- .github/workflows/run_pr_tests.yml | 83 ++++++++++++++++++++++++++++-- 1 file changed, 80 insertions(+), 3 deletions(-) diff --git a/.github/workflows/run_pr_tests.yml b/.github/workflows/run_pr_tests.yml index 987fcd386..1b2249088 100644 --- a/.github/workflows/run_pr_tests.yml +++ b/.github/workflows/run_pr_tests.yml @@ -26,11 +26,12 @@ 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: - name: Checkout repo - uses: actions/checkout@v4 + uses: actions/checkout@v4.1.0 # installs tools, ninja, installs llvm and sets up sccahe - name: setup-ubuntu @@ -70,12 +71,13 @@ jobs: # build and run riscv m1, execute UnitCL and lit tests run_riscv_m1: + if: false runs-on: ubuntu-22.04 steps: - name: Checkout repo - uses: actions/checkout@v4 + uses: actions/checkout@v4.1.0 # installs tools, ninja, installs llvm and sets up sccahe - name: setup-ubuntu @@ -96,14 +98,83 @@ jobs: run: ninja -C build check-ock-UnitCL + # build and run clang-tidy + run_clang_tidy_changes: + + runs-on: ubuntu-22.04 + + steps: + - name: Checkout repo + uses: actions/checkout@v4.1.0 + + # installs tools, ninja, installs llvm and sets up sccahe + - name: setup-ubuntu + uses: ./.github/actions/setup_ubuntu_build + with: + llvm_version: 19 + llvm_build_type: RelAssert + + # These need to match the configurations of build_pr_cache to use the cache effectively + - name: build initial config files + uses: ./.github/actions/do_build_ock + with: + build_type: ReleaseAssert + host_image: ON + build_targets: build.ninja + + # Make a good guess as to the generated targets we require. + # + # Here we compute the set difference between the output of the two + # temporary file descriptors using `awk`. Awk processes both files line by + # line, going through the first file, then the second file. The NR==FNR + # predicate executes its block only on the records of the first file, + # ensuring to call `next` (equivalent to `return`) to avoid running the + # second block on each line in the first file. + # + # The first input to `awk` lists all targets reported by ninja. + # + # The second input to awk collects all targets on which `tidy-` targets + # depend. This may include targets which are guarded by if() statements in + # CMake, hence why we need to compute a set difference with the targets that + # ninja reports. + - name: build actual targets needed + if: false + run: + ninja -C build + $( + awk -F':' 'NR==FNR { targets[$1] = 1; next } $1 in targets { print $1 }' + <(ninja -C build -t targets) + <( + find modules source -type f -name CMakeLists.txt -exec + awk -F"[()]" '/add_dependencies\(tidy-/ {sub(/[^ ]*/, "", $2);print $2}' + {} \+ | tr ' ' '\n' + ) + ) + + - name: run clang-tidy + if: false + run: | + git fetch origin ${{ github.base_ref }} + ./scripts/compute-dependants.py \ + --exclude-filter='(/build/.*\.s$)|(.*/(external|cookie)/.*)' \ + --build-dir="$PWD/build" \ + `git diff --name-only --diff-filter=d \ + HEAD..origin/${{ github.base_ref }} | \ + grep -P '\.(c|cc|cxx|cpp|h|hh|hpp|hxx)$'` | \ + tee /dev/stderr | \ + parallel --verbose -- clang-tidy-19 --quiet -p "$PWD/build/" "{}" + # ^ When updating the clang-tidy version, the version used by the cmake + # target should match updated c.f. the `tidy` target + # run clang-format-diff on the repo run_clang_format: + if: false runs-on: ubuntu-22.04 steps: - name: Checkout repo - uses: actions/checkout@v4 + uses: actions/checkout@v4.1.0 - name: setup-ubuntu-clang-format run: @@ -120,6 +191,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 @@ -165,6 +237,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: @@ -194,6 +267,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: @@ -233,6 +307,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: @@ -264,6 +339,7 @@ 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: @@ -288,6 +364,7 @@ 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: From e6755831c4bf0935e9e641c44826b8d24578513c Mon Sep 17 00:00:00 2001 From: Alan Forbes Date: Fri, 8 Nov 2024 15:53:27 +0000 Subject: [PATCH 02/16] Fix setup_build action name --- .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 1b2249088..122fb1dcf 100644 --- a/.github/workflows/run_pr_tests.yml +++ b/.github/workflows/run_pr_tests.yml @@ -109,7 +109,7 @@ jobs: # installs tools, ninja, installs llvm and sets up sccahe - name: setup-ubuntu - uses: ./.github/actions/setup_ubuntu_build + uses: ./.github/actions/setup_build with: llvm_version: 19 llvm_build_type: RelAssert From 6dbc81ae5c093257e811582aab133e9628203386 Mon Sep 17 00:00:00 2001 From: Alan Forbes Date: Fri, 8 Nov 2024 16:55:29 +0000 Subject: [PATCH 03/16] Add logging - ninja target build and list --- .github/workflows/run_pr_tests.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/run_pr_tests.yml b/.github/workflows/run_pr_tests.yml index 122fb1dcf..23f588cba 100644 --- a/.github/workflows/run_pr_tests.yml +++ b/.github/workflows/run_pr_tests.yml @@ -137,6 +137,15 @@ jobs: # depend. This may include targets which are guarded by if() statements in # CMake, hence why we need to compute a set difference with the targets that # ninja reports. + + - name: build ninja targets + run: + ninja -C build -t targets + + - name: list ninja targets + run: + find modules source -type f -name CMakeLists.txt -exec awk -F"[()]" '/add_dependencies\(tidy-/ {sub(/[^ ]*/, "", $2);print $2}' {} \+ | tr ' ' '\n' + - name: build actual targets needed if: false run: From 36154f56e7933bd3ba65b1f0da735eb7df497f04 Mon Sep 17 00:00:00 2001 From: Alan Forbes Date: Fri, 8 Nov 2024 17:06:14 +0000 Subject: [PATCH 04/16] Add logging - awk ninja targets --- .github/workflows/run_pr_tests.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.github/workflows/run_pr_tests.yml b/.github/workflows/run_pr_tests.yml index 23f588cba..4cfb991c3 100644 --- a/.github/workflows/run_pr_tests.yml +++ b/.github/workflows/run_pr_tests.yml @@ -146,6 +146,16 @@ jobs: run: find modules source -type f -name CMakeLists.txt -exec awk -F"[()]" '/add_dependencies\(tidy-/ {sub(/[^ ]*/, "", $2);print $2}' {} \+ | tr ' ' '\n' + - name: awk ninja targets + run: + awk -F':' 'NR==FNR { targets[$1] = 1; next } $1 in targets { print $1 }' + <(ninja -C build -t targets) + <( + find modules source -type f -name CMakeLists.txt -exec + awk -F"[()]" '/add_dependencies\(tidy-/ {sub(/[^ ]*/, "", $2);print $2}' + {} \+ | tr ' ' '\n' + ) + - name: build actual targets needed if: false run: From 30f85895ed931c14ba7de0421e1799a6ff0c473e Mon Sep 17 00:00:00 2001 From: Alan Forbes Date: Mon, 11 Nov 2024 10:34:12 +0000 Subject: [PATCH 05/16] build actual targets needed --- .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 4cfb991c3..9f9bb8cf0 100644 --- a/.github/workflows/run_pr_tests.yml +++ b/.github/workflows/run_pr_tests.yml @@ -157,7 +157,7 @@ jobs: ) - name: build actual targets needed - if: false + #if: false run: ninja -C build $( From 79d4bee85f9fb81ecf0b7f642de6f3e748f7e871 Mon Sep 17 00:00:00 2001 From: Alan Forbes Date: Mon, 11 Nov 2024 11:16:12 +0000 Subject: [PATCH 06/16] echo clang-tidy calls --- .github/workflows/run_pr_tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/run_pr_tests.yml b/.github/workflows/run_pr_tests.yml index 9f9bb8cf0..555caba54 100644 --- a/.github/workflows/run_pr_tests.yml +++ b/.github/workflows/run_pr_tests.yml @@ -171,7 +171,7 @@ jobs: ) - name: run clang-tidy - if: false + #if: false run: | git fetch origin ${{ github.base_ref }} ./scripts/compute-dependants.py \ @@ -181,7 +181,7 @@ jobs: HEAD..origin/${{ github.base_ref }} | \ grep -P '\.(c|cc|cxx|cpp|h|hh|hpp|hxx)$'` | \ tee /dev/stderr | \ - parallel --verbose -- clang-tidy-19 --quiet -p "$PWD/build/" "{}" + parallel --verbose -- echo clang-tidy-19 --quiet -p "$PWD/build/" "{}" # ^ When updating the clang-tidy version, the version used by the cmake # target should match updated c.f. the `tidy` target From 3539c83caf3a10ed7fc6e0c17fd0acf9a12a90c4 Mon Sep 17 00:00:00 2001 From: Alan Forbes Date: Mon, 11 Nov 2024 13:33:54 +0000 Subject: [PATCH 07/16] add fake comment; run diff --- .github/workflows/run_pr_tests.yml | 12 ++++++++++-- modules/mux/source/command_buffer.cpp | 2 +- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/.github/workflows/run_pr_tests.yml b/.github/workflows/run_pr_tests.yml index 555caba54..18be449a2 100644 --- a/.github/workflows/run_pr_tests.yml +++ b/.github/workflows/run_pr_tests.yml @@ -170,8 +170,16 @@ jobs: ) ) - - name: run clang-tidy + - name: run clang-tidy diff #if: false + run: | + git fetch origin ${{ github.base_ref }} + git diff --name-only --diff-filter=d \ + HEAD..origin/${{ github.base_ref }} | \ + grep -P '\.(c|cc|cxx|cpp|h|hh|hpp|hxx)$' + + - name: run clang-tidy + if: false run: | git fetch origin ${{ github.base_ref }} ./scripts/compute-dependants.py \ @@ -181,7 +189,7 @@ jobs: HEAD..origin/${{ github.base_ref }} | \ grep -P '\.(c|cc|cxx|cpp|h|hh|hpp|hxx)$'` | \ tee /dev/stderr | \ - parallel --verbose -- echo clang-tidy-19 --quiet -p "$PWD/build/" "{}" + parallel --verbose -- clang-tidy-19 --quiet -p "$PWD/build/" "{}" # ^ When updating the clang-tidy version, the version used by the cmake # target should match updated c.f. the `tidy` target diff --git a/modules/mux/source/command_buffer.cpp b/modules/mux/source/command_buffer.cpp index 92f961fb6..476ebe561 100644 --- a/modules/mux/source/command_buffer.cpp +++ b/modules/mux/source/command_buffer.cpp @@ -73,7 +73,7 @@ mux_result_t muxFinalizeCommandBuffer(mux_command_buffer_t command_buffer) { return mux_error_invalid_value; } - return muxSelectFinalizeCommandBuffer(command_buffer); + return muxSelectFinalizeCommandBuffer(/*alan=*/ command_buffer); } mux_result_t muxCloneCommandBuffer(mux_device_t device, From 2481ab36b826137368aabdd4b709c676e3391423 Mon Sep 17 00:00:00 2001 From: Alan Forbes Date: Mon, 11 Nov 2024 13:37:46 +0000 Subject: [PATCH 08/16] Echo clang-tidy commands --- .github/workflows/run_pr_tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/run_pr_tests.yml b/.github/workflows/run_pr_tests.yml index 18be449a2..0d6241e9c 100644 --- a/.github/workflows/run_pr_tests.yml +++ b/.github/workflows/run_pr_tests.yml @@ -179,7 +179,7 @@ jobs: grep -P '\.(c|cc|cxx|cpp|h|hh|hpp|hxx)$' - name: run clang-tidy - if: false + #if: false run: | git fetch origin ${{ github.base_ref }} ./scripts/compute-dependants.py \ @@ -189,7 +189,7 @@ jobs: HEAD..origin/${{ github.base_ref }} | \ grep -P '\.(c|cc|cxx|cpp|h|hh|hpp|hxx)$'` | \ tee /dev/stderr | \ - parallel --verbose -- clang-tidy-19 --quiet -p "$PWD/build/" "{}" + parallel --verbose -- echo clang-tidy-19 --quiet -p "$PWD/build/" "{}" # ^ When updating the clang-tidy version, the version used by the cmake # target should match updated c.f. the `tidy` target From a63aa4ab60318ec4e30e505dc57c0959d537b0b4 Mon Sep 17 00:00:00 2001 From: Alan Forbes Date: Mon, 11 Nov 2024 13:48:17 +0000 Subject: [PATCH 09/16] Add more fake clang-tidy issues; run commands --- .github/workflows/run_pr_tests.yml | 2 +- modules/mux/source/buffer.cpp | 2 +- modules/mux/source/command_buffer.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/run_pr_tests.yml b/.github/workflows/run_pr_tests.yml index 0d6241e9c..8dd1319ad 100644 --- a/.github/workflows/run_pr_tests.yml +++ b/.github/workflows/run_pr_tests.yml @@ -189,7 +189,7 @@ jobs: HEAD..origin/${{ github.base_ref }} | \ grep -P '\.(c|cc|cxx|cpp|h|hh|hpp|hxx)$'` | \ tee /dev/stderr | \ - parallel --verbose -- echo clang-tidy-19 --quiet -p "$PWD/build/" "{}" + parallel --verbose -- clang-tidy-19 --quiet -p "$PWD/build/" "{}" # ^ When updating the clang-tidy version, the version used by the cmake # target should match updated c.f. the `tidy` target diff --git a/modules/mux/source/buffer.cpp b/modules/mux/source/buffer.cpp index 0b16fd084..b6baefbdd 100644 --- a/modules/mux/source/buffer.cpp +++ b/modules/mux/source/buffer.cpp @@ -92,5 +92,5 @@ mux_result_t muxBindBufferMemory(mux_device_t device, mux_memory_t memory, return mux_error_invalid_value; } - return muxSelectBindBufferMemory(device, memory, buffer, offset); + return muxSelectBindBufferMemory(/*alan=*/ device, memory, buffer, offset); } diff --git a/modules/mux/source/command_buffer.cpp b/modules/mux/source/command_buffer.cpp index 476ebe561..d953ff719 100644 --- a/modules/mux/source/command_buffer.cpp +++ b/modules/mux/source/command_buffer.cpp @@ -136,7 +136,7 @@ mux_result_t muxResetCommandBuffer(mux_command_buffer_t command_buffer) { return mux_error_invalid_value; } - return muxSelectResetCommandBuffer(command_buffer); + return muxSelectResetCommandBuffer(/*alan=*/ command_buffer); } mux_result_t muxCommandCopyBuffer(mux_command_buffer_t command_buffer, From 061a5e5fb1f33ac8f36c2898aa71017b81f54548 Mon Sep 17 00:00:00 2001 From: Alan Forbes Date: Mon, 11 Nov 2024 13:56:08 +0000 Subject: [PATCH 10/16] add clang-tidy-19 install --- .github/actions/setup_build/action.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/actions/setup_build/action.yml b/.github/actions/setup_build/action.yml index 1d108ead0..9483d9e95 100644 --- a/.github/actions/setup_build/action.yml +++ b/.github/actions/setup_build/action.yml @@ -40,6 +40,7 @@ runs: if [ "${{ inputs.ubuntu_version }}" = "24.04" ]; then sudo wget -qO /etc/apt/sources.list.d/lunarg-vulkan-noble.list https://packages.lunarg.com/vulkan/lunarg-vulkan-noble.list; fi sudo apt-get update pip install lit clang-format==19.1.0 virtualenv + sudo apt-get install --yes clang-tidy-19 sudo apt-get install --yes doxygen sudo apt-get install --yes vulkan-sdk if [ "${{ inputs.cross_arch }}" = "x86" ]; then \ From c5855cbc1c1923b0324204d5fcb3aaf4ed903343 Mon Sep 17 00:00:00 2001 From: Alan Forbes Date: Mon, 11 Nov 2024 14:07:48 +0000 Subject: [PATCH 11/16] install clang-tidy via pip --- .github/actions/setup_build/action.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/actions/setup_build/action.yml b/.github/actions/setup_build/action.yml index 9483d9e95..93c3a0b3c 100644 --- a/.github/actions/setup_build/action.yml +++ b/.github/actions/setup_build/action.yml @@ -39,8 +39,7 @@ runs: if [ "${{ inputs.ubuntu_version }}" = "22.04" ]; then sudo wget -qO /etc/apt/sources.list.d/lunarg-vulkan-1.3.243-jammy.list https://packages.lunarg.com/vulkan/1.3.243/lunarg-vulkan-1.3.243-jammy.list; fi if [ "${{ inputs.ubuntu_version }}" = "24.04" ]; then sudo wget -qO /etc/apt/sources.list.d/lunarg-vulkan-noble.list https://packages.lunarg.com/vulkan/lunarg-vulkan-noble.list; fi sudo apt-get update - pip install lit clang-format==19.1.0 virtualenv - sudo apt-get install --yes clang-tidy-19 + pip install lit clang-format==19.1.0 clang-tidy==19.1.0 virtualenv sudo apt-get install --yes doxygen sudo apt-get install --yes vulkan-sdk if [ "${{ inputs.cross_arch }}" = "x86" ]; then \ From e60cacb85500d5c213efbf396d80a2485ac9401e Mon Sep 17 00:00:00 2001 From: Alan Forbes Date: Mon, 11 Nov 2024 14:17:39 +0000 Subject: [PATCH 12/16] clang-tidy version set during setup_build action --- .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 8dd1319ad..5692038ab 100644 --- a/.github/workflows/run_pr_tests.yml +++ b/.github/workflows/run_pr_tests.yml @@ -189,9 +189,7 @@ jobs: HEAD..origin/${{ github.base_ref }} | \ grep -P '\.(c|cc|cxx|cpp|h|hh|hpp|hxx)$'` | \ tee /dev/stderr | \ - parallel --verbose -- clang-tidy-19 --quiet -p "$PWD/build/" "{}" - # ^ When updating the clang-tidy version, the version used by the cmake - # target should match updated c.f. the `tidy` target + parallel --verbose -- clang-tidy --quiet -p "$PWD/build/" "{}" # run clang-format-diff on the repo run_clang_format: From 0478e0dbdf77bdbd969ebb2010106eff02f0a60b Mon Sep 17 00:00:00 2001 From: Alan Forbes Date: Mon, 11 Nov 2024 14:41:06 +0000 Subject: [PATCH 13/16] Remove clang-tidy logging steps --- .github/workflows/run_pr_tests.yml | 31 ------------------------------ 1 file changed, 31 deletions(-) diff --git a/.github/workflows/run_pr_tests.yml b/.github/workflows/run_pr_tests.yml index 5692038ab..a10b230ce 100644 --- a/.github/workflows/run_pr_tests.yml +++ b/.github/workflows/run_pr_tests.yml @@ -122,8 +122,6 @@ jobs: host_image: ON build_targets: build.ninja - # Make a good guess as to the generated targets we require. - # # Here we compute the set difference between the output of the two # temporary file descriptors using `awk`. Awk processes both files line by # line, going through the first file, then the second file. The NR==FNR @@ -137,27 +135,7 @@ jobs: # depend. This may include targets which are guarded by if() statements in # CMake, hence why we need to compute a set difference with the targets that # ninja reports. - - - name: build ninja targets - run: - ninja -C build -t targets - - - name: list ninja targets - run: - find modules source -type f -name CMakeLists.txt -exec awk -F"[()]" '/add_dependencies\(tidy-/ {sub(/[^ ]*/, "", $2);print $2}' {} \+ | tr ' ' '\n' - - - name: awk ninja targets - run: - awk -F':' 'NR==FNR { targets[$1] = 1; next } $1 in targets { print $1 }' - <(ninja -C build -t targets) - <( - find modules source -type f -name CMakeLists.txt -exec - awk -F"[()]" '/add_dependencies\(tidy-/ {sub(/[^ ]*/, "", $2);print $2}' - {} \+ | tr ' ' '\n' - ) - - name: build actual targets needed - #if: false run: ninja -C build $( @@ -170,16 +148,7 @@ jobs: ) ) - - name: run clang-tidy diff - #if: false - run: | - git fetch origin ${{ github.base_ref }} - git diff --name-only --diff-filter=d \ - HEAD..origin/${{ github.base_ref }} | \ - grep -P '\.(c|cc|cxx|cpp|h|hh|hpp|hxx)$' - - name: run clang-tidy - #if: false run: | git fetch origin ${{ github.base_ref }} ./scripts/compute-dependants.py \ From 21b690eb7eddc8670881074df145edfcab0f59d5 Mon Sep 17 00:00:00 2001 From: Alan Forbes Date: Mon, 11 Nov 2024 15:09:31 +0000 Subject: [PATCH 14/16] Remove fake clang-tidy issues added for test --- modules/mux/source/buffer.cpp | 3 ++- modules/mux/source/command_buffer.cpp | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/modules/mux/source/buffer.cpp b/modules/mux/source/buffer.cpp index b6baefbdd..1825aec1c 100644 --- a/modules/mux/source/buffer.cpp +++ b/modules/mux/source/buffer.cpp @@ -92,5 +92,6 @@ mux_result_t muxBindBufferMemory(mux_device_t device, mux_memory_t memory, return mux_error_invalid_value; } - return muxSelectBindBufferMemory(/*alan=*/ device, memory, buffer, offset); + // comment: return muxSelectBindBufferMemory(/*alan=*/ device, memory, buffer, offset); + return muxSelectBindBufferMemory(device, memory, buffer, offset); } diff --git a/modules/mux/source/command_buffer.cpp b/modules/mux/source/command_buffer.cpp index d953ff719..ce4a975d5 100644 --- a/modules/mux/source/command_buffer.cpp +++ b/modules/mux/source/command_buffer.cpp @@ -73,7 +73,8 @@ mux_result_t muxFinalizeCommandBuffer(mux_command_buffer_t command_buffer) { return mux_error_invalid_value; } - return muxSelectFinalizeCommandBuffer(/*alan=*/ command_buffer); + // Comment: return muxSelectFinalizeCommandBuffer(/*alan=*/ command_buffer); + return muxSelectFinalizeCommandBuffer(command_buffer); } mux_result_t muxCloneCommandBuffer(mux_device_t device, @@ -136,7 +137,8 @@ mux_result_t muxResetCommandBuffer(mux_command_buffer_t command_buffer) { return mux_error_invalid_value; } - return muxSelectResetCommandBuffer(/*alan=*/ command_buffer); + // Comment: return muxSelectResetCommandBuffer(/*alan=*/ command_buffer); + return muxSelectResetCommandBuffer(command_buffer); } mux_result_t muxCommandCopyBuffer(mux_command_buffer_t command_buffer, From 6b1de035f2658db0fd4c3066287809a8c95ffc2f Mon Sep 17 00:00:00 2001 From: Alan Forbes Date: Mon, 11 Nov 2024 15:33:46 +0000 Subject: [PATCH 15/16] Restore excluded jobs; delete added clang-tidy issues --- .github/workflows/run_pr_tests.yml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/.github/workflows/run_pr_tests.yml b/.github/workflows/run_pr_tests.yml index a10b230ce..f30b9718e 100644 --- a/.github/workflows/run_pr_tests.yml +++ b/.github/workflows/run_pr_tests.yml @@ -26,7 +26,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: @@ -71,7 +70,6 @@ jobs: # build and run riscv m1, execute UnitCL and lit tests run_riscv_m1: - if: false runs-on: ubuntu-22.04 @@ -114,7 +112,6 @@ jobs: llvm_version: 19 llvm_build_type: RelAssert - # These need to match the configurations of build_pr_cache to use the cache effectively - name: build initial config files uses: ./.github/actions/do_build_ock with: @@ -162,7 +159,6 @@ jobs: # run clang-format-diff on the repo run_clang_format: - if: false runs-on: ubuntu-22.04 @@ -185,7 +181,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 @@ -231,7 +226,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: @@ -261,7 +255,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: @@ -301,7 +294,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: @@ -333,7 +325,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: @@ -358,7 +349,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: From 6706c21c78a76ef0a1884de18251edf44b9c1dc1 Mon Sep 17 00:00:00 2001 From: Alan Forbes Date: Mon, 11 Nov 2024 15:36:53 +0000 Subject: [PATCH 16/16] Delete added clang-tidy issues (mssed last time) --- modules/mux/source/buffer.cpp | 1 - modules/mux/source/command_buffer.cpp | 2 -- 2 files changed, 3 deletions(-) diff --git a/modules/mux/source/buffer.cpp b/modules/mux/source/buffer.cpp index 1825aec1c..0b16fd084 100644 --- a/modules/mux/source/buffer.cpp +++ b/modules/mux/source/buffer.cpp @@ -92,6 +92,5 @@ mux_result_t muxBindBufferMemory(mux_device_t device, mux_memory_t memory, return mux_error_invalid_value; } - // comment: return muxSelectBindBufferMemory(/*alan=*/ device, memory, buffer, offset); return muxSelectBindBufferMemory(device, memory, buffer, offset); } diff --git a/modules/mux/source/command_buffer.cpp b/modules/mux/source/command_buffer.cpp index ce4a975d5..92f961fb6 100644 --- a/modules/mux/source/command_buffer.cpp +++ b/modules/mux/source/command_buffer.cpp @@ -73,7 +73,6 @@ mux_result_t muxFinalizeCommandBuffer(mux_command_buffer_t command_buffer) { return mux_error_invalid_value; } - // Comment: return muxSelectFinalizeCommandBuffer(/*alan=*/ command_buffer); return muxSelectFinalizeCommandBuffer(command_buffer); } @@ -137,7 +136,6 @@ mux_result_t muxResetCommandBuffer(mux_command_buffer_t command_buffer) { return mux_error_invalid_value; } - // Comment: return muxSelectResetCommandBuffer(/*alan=*/ command_buffer); return muxSelectResetCommandBuffer(command_buffer); }