From 34b4c71f6814aafc14e2e41626edae90fc7d2957 Mon Sep 17 00:00:00 2001 From: Eric Kilmer Date: Fri, 28 Apr 2023 09:12:25 -0400 Subject: [PATCH 1/5] Test remill and anvill with LLVM 16 --- .github/workflows/vcpkg_ci_amd64.yml | 6 +++--- .github/workflows/vcpkg_ci_mac.yml | 22 +++++++++++++--------- .github/workflows/vcpkg_ci_windows.yml | 4 ++-- anvill | 2 +- remill | 2 +- 5 files changed, 20 insertions(+), 16 deletions(-) diff --git a/.github/workflows/vcpkg_ci_amd64.yml b/.github/workflows/vcpkg_ci_amd64.yml index 1b23b4b2..341d1b30 100644 --- a/.github/workflows/vcpkg_ci_amd64.yml +++ b/.github/workflows/vcpkg_ci_amd64.yml @@ -207,7 +207,7 @@ jobs: - name: 'Remill build' shell: 'bash' working-directory: remill - if: contains(matrix.llvm, 'llvm-15') + # if: contains(matrix.llvm, 'llvm-15') run: | cmake -G Ninja \ -DCMAKE_VERBOSE_MAKEFILE=ON \ @@ -222,7 +222,7 @@ jobs: - name: 'Remill test' shell: 'bash' working-directory: remill/build - if: contains(matrix.llvm, 'llvm-15') + # if: contains(matrix.llvm, 'llvm-15') run: | # Some tests fail on ubuntu 22.04 env CTEST_OUTPUT_ON_FAILURE=1 ctest . || true @@ -230,7 +230,7 @@ jobs: - name: 'Anvill build' shell: 'bash' working-directory: anvill - if: contains(matrix.llvm, 'llvm-15') + # if: contains(matrix.llvm, 'llvm-15') run: | cmake -G Ninja \ -DCMAKE_VERBOSE_MAKEFILE=ON \ diff --git a/.github/workflows/vcpkg_ci_mac.yml b/.github/workflows/vcpkg_ci_mac.yml index 57d95ad5..7696a298 100644 --- a/.github/workflows/vcpkg_ci_mac.yml +++ b/.github/workflows/vcpkg_ci_mac.yml @@ -205,7 +205,8 @@ jobs: - name: 'Remill build' shell: 'bash' working-directory: remill - if: contains(matrix.llvm, 'llvm-15') && matrix.target_arch == 'x64' + # if: contains(matrix.llvm, 'llvm-15') && matrix.target_arch == 'x64' + if: matrix.target_arch == 'x64' run: | cmake -G Ninja \ -DCMAKE_VERBOSE_MAKEFILE=ON \ @@ -221,7 +222,8 @@ jobs: - name: 'Remill test' shell: 'bash' working-directory: remill/build - if: contains(matrix.llvm, 'llvm-15') && matrix.target_arch == 'x64' + # if: contains(matrix.llvm, 'llvm-15') && matrix.target_arch == 'x64' + if: matrix.target_arch == 'x64' run: | # Only run test on x64 env CTEST_OUTPUT_ON_FAILURE=1 ctest . @@ -229,7 +231,8 @@ jobs: - name: 'Anvill build' shell: 'bash' working-directory: anvill - if: contains(matrix.llvm, 'llvm-15') && matrix.target_arch == 'x64' + # if: contains(matrix.llvm, 'llvm-15') && matrix.target_arch == 'x64' + if: matrix.target_arch == 'x64' run: | cmake -G Ninja \ -DCMAKE_VERBOSE_MAKEFILE=ON \ @@ -247,12 +250,13 @@ jobs: cmake --build build cmake --install build - #- name: 'Anvill test' - # shell: 'bash' - # working-directory: anvill/build - # if: contains(matrix.llvm, 'llvm-15') && matrix.target_arch == 'x64' - # run: | - # ./install/bin/anvill-decompile-json -spec ../bin/Decompile/tests/specs/ret0.json -bc_out ./ret0.bc -ir_out ret0.ir + - name: 'Anvill test' + shell: 'bash' + working-directory: anvill/build + # if: contains(matrix.llvm, 'llvm-15') && matrix.target_arch == 'x64' + if: matrix.target_arch == 'x64' + run: | + ./install/bin/anvill-decompile-json -spec ../bin/Decompile/tests/specs/ret0.json -bc_out ./ret0.bc -ir_out ret0.ir - name: Cache cleanup and reporting shell: 'bash' diff --git a/.github/workflows/vcpkg_ci_windows.yml b/.github/workflows/vcpkg_ci_windows.yml index f9f8505c..af8c73bf 100644 --- a/.github/workflows/vcpkg_ci_windows.yml +++ b/.github/workflows/vcpkg_ci_windows.yml @@ -155,7 +155,7 @@ jobs: # python ../scripts/roundtrip.py ( Get-ChildItem tools | Where-Object {$_.name -match "rellic-decomp.exe"} ) ..\tests\tools\decomp "${env:VCPKG_ROOT}\installed\${env:TRIPLET}\tools\${{ matrix.llvm }}\clang.exe" - name: 'Test remill build' - if: ${{ matrix.llvm == 'llvm-15' }} + # if: ${{ matrix.llvm == 'llvm-15' }} run: | cd remill Remove-Item -Recurse -Force -ErrorAction SilentlyContinue .\build @@ -178,7 +178,7 @@ jobs: # env CTEST_OUTPUT_ON_FAILURE=1 cmake --build . --target test || true - name: 'Anvill build' - if: ${{ matrix.llvm == 'llvm-15' }} + # if: ${{ matrix.llvm == 'llvm-15' }} run: | cd anvill Remove-Item -Recurse -Force -ErrorAction SilentlyContinue .\build diff --git a/anvill b/anvill index 232f78fb..6ea80cb1 160000 --- a/anvill +++ b/anvill @@ -1 +1 @@ -Subproject commit 232f78fbc7487cdf3c4f7c73c9af496700602910 +Subproject commit 6ea80cb1a5bf05440a3d12ab4a791886c123c74e diff --git a/remill b/remill index 66832ffe..031305d5 160000 --- a/remill +++ b/remill @@ -1 +1 @@ -Subproject commit 66832ffeaeb6568bd66db289db4045f7479a12b8 +Subproject commit 031305d51948a52129a0990fc4a3e99867909c06 From f9b0a81dae5e17fb3004f7542da358e675690484 Mon Sep 17 00:00:00 2001 From: Eric Kilmer Date: Fri, 28 Apr 2023 15:28:41 -0400 Subject: [PATCH 2/5] Disable anvill test --- .github/workflows/vcpkg_ci_amd64.yml | 6 ++++-- .github/workflows/vcpkg_ci_mac.yml | 16 +++++++++------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/.github/workflows/vcpkg_ci_amd64.yml b/.github/workflows/vcpkg_ci_amd64.yml index 341d1b30..62a67964 100644 --- a/.github/workflows/vcpkg_ci_amd64.yml +++ b/.github/workflows/vcpkg_ci_amd64.yml @@ -246,10 +246,12 @@ jobs: -S . -B build cmake --build build cmake --install build + # NOTE: This is an old test that doesn't make sense anymore + # Need to find some other way to run a smoketest #- name: 'Anvill test' # shell: 'bash' - # working-directory: anvill/build - # # if: matrix.target_arch == 'x64' + # working-directory: anvill + # if: contains(matrix.llvm, 'llvm-15') # run: | # ./install/bin/anvill-decompile-spec --spec ../bin/Decompile/tests/specs/ret0.json --bc_out ./ret0.bc --ir_out ret0.ir diff --git a/.github/workflows/vcpkg_ci_mac.yml b/.github/workflows/vcpkg_ci_mac.yml index 7696a298..f92b74f9 100644 --- a/.github/workflows/vcpkg_ci_mac.yml +++ b/.github/workflows/vcpkg_ci_mac.yml @@ -250,13 +250,15 @@ jobs: cmake --build build cmake --install build - - name: 'Anvill test' - shell: 'bash' - working-directory: anvill/build - # if: contains(matrix.llvm, 'llvm-15') && matrix.target_arch == 'x64' - if: matrix.target_arch == 'x64' - run: | - ./install/bin/anvill-decompile-json -spec ../bin/Decompile/tests/specs/ret0.json -bc_out ./ret0.bc -ir_out ret0.ir + # NOTE: This is an old test that doesn't make sense anymore + # Need to find some other way to run a smoketest + #- name: 'Anvill test' + # shell: 'bash' + # working-directory: anvill + # # if: contains(matrix.llvm, 'llvm-15') && matrix.target_arch == 'x64' + # if: matrix.target_arch == 'x64' + # run: | + # ./install/bin/anvill-decompile-spec -spec ../bin/Decompile/tests/specs/ret0.json -bc_out ./ret0.bc -ir_out ret0.ir - name: Cache cleanup and reporting shell: 'bash' From df1ad9c2f8dbc68cdae388c9fc8d0fc1f2b9f888 Mon Sep 17 00:00:00 2001 From: Eric Kilmer Date: Tue, 9 May 2023 14:02:25 -0400 Subject: [PATCH 3/5] Use latest 'master' --- anvill | 2 +- remill | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anvill b/anvill index 6ea80cb1..232f78fb 160000 --- a/anvill +++ b/anvill @@ -1 +1 @@ -Subproject commit 6ea80cb1a5bf05440a3d12ab4a791886c123c74e +Subproject commit 232f78fbc7487cdf3c4f7c73c9af496700602910 diff --git a/remill b/remill index 031305d5..8dbd5d94 160000 --- a/remill +++ b/remill @@ -1 +1 @@ -Subproject commit 031305d51948a52129a0990fc4a3e99867909c06 +Subproject commit 8dbd5d947df969d644ec8b4ad6d6d53370264d49 From 475c2561841153629520484a9cfb8409dbbcaa31 Mon Sep 17 00:00:00 2001 From: Eric Kilmer Date: Tue, 9 May 2023 14:03:50 -0400 Subject: [PATCH 4/5] Don't build anvill on LLVM 16 --- .github/workflows/vcpkg_ci_amd64.yml | 2 +- .github/workflows/vcpkg_ci_mac.yml | 4 ++-- .github/workflows/vcpkg_ci_windows.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/vcpkg_ci_amd64.yml b/.github/workflows/vcpkg_ci_amd64.yml index 62a67964..fe0b3161 100644 --- a/.github/workflows/vcpkg_ci_amd64.yml +++ b/.github/workflows/vcpkg_ci_amd64.yml @@ -230,7 +230,7 @@ jobs: - name: 'Anvill build' shell: 'bash' working-directory: anvill - # if: contains(matrix.llvm, 'llvm-15') + if: contains(matrix.llvm, 'llvm-15') run: | cmake -G Ninja \ -DCMAKE_VERBOSE_MAKEFILE=ON \ diff --git a/.github/workflows/vcpkg_ci_mac.yml b/.github/workflows/vcpkg_ci_mac.yml index f92b74f9..1d8ab042 100644 --- a/.github/workflows/vcpkg_ci_mac.yml +++ b/.github/workflows/vcpkg_ci_mac.yml @@ -231,8 +231,8 @@ jobs: - name: 'Anvill build' shell: 'bash' working-directory: anvill - # if: contains(matrix.llvm, 'llvm-15') && matrix.target_arch == 'x64' - if: matrix.target_arch == 'x64' + if: contains(matrix.llvm, 'llvm-15') && matrix.target_arch == 'x64' + # if: matrix.target_arch == 'x64' run: | cmake -G Ninja \ -DCMAKE_VERBOSE_MAKEFILE=ON \ diff --git a/.github/workflows/vcpkg_ci_windows.yml b/.github/workflows/vcpkg_ci_windows.yml index af8c73bf..382c0ff0 100644 --- a/.github/workflows/vcpkg_ci_windows.yml +++ b/.github/workflows/vcpkg_ci_windows.yml @@ -178,7 +178,7 @@ jobs: # env CTEST_OUTPUT_ON_FAILURE=1 cmake --build . --target test || true - name: 'Anvill build' - # if: ${{ matrix.llvm == 'llvm-15' }} + if: ${{ matrix.llvm == 'llvm-15' }} run: | cd anvill Remove-Item -Recurse -Force -ErrorAction SilentlyContinue .\build From cd7b7458fa7863e6507d648fcce5b9dc80d298fa Mon Sep 17 00:00:00 2001 From: Eric Kilmer Date: Tue, 9 May 2023 15:07:25 -0400 Subject: [PATCH 5/5] Remove commented GHA conditionals --- .github/workflows/vcpkg_ci_amd64.yml | 2 -- .github/workflows/vcpkg_ci_mac.yml | 3 --- .github/workflows/vcpkg_ci_windows.yml | 1 - 3 files changed, 6 deletions(-) diff --git a/.github/workflows/vcpkg_ci_amd64.yml b/.github/workflows/vcpkg_ci_amd64.yml index fe0b3161..0d7b6dd6 100644 --- a/.github/workflows/vcpkg_ci_amd64.yml +++ b/.github/workflows/vcpkg_ci_amd64.yml @@ -207,7 +207,6 @@ jobs: - name: 'Remill build' shell: 'bash' working-directory: remill - # if: contains(matrix.llvm, 'llvm-15') run: | cmake -G Ninja \ -DCMAKE_VERBOSE_MAKEFILE=ON \ @@ -222,7 +221,6 @@ jobs: - name: 'Remill test' shell: 'bash' working-directory: remill/build - # if: contains(matrix.llvm, 'llvm-15') run: | # Some tests fail on ubuntu 22.04 env CTEST_OUTPUT_ON_FAILURE=1 ctest . || true diff --git a/.github/workflows/vcpkg_ci_mac.yml b/.github/workflows/vcpkg_ci_mac.yml index 1d8ab042..14566355 100644 --- a/.github/workflows/vcpkg_ci_mac.yml +++ b/.github/workflows/vcpkg_ci_mac.yml @@ -205,7 +205,6 @@ jobs: - name: 'Remill build' shell: 'bash' working-directory: remill - # if: contains(matrix.llvm, 'llvm-15') && matrix.target_arch == 'x64' if: matrix.target_arch == 'x64' run: | cmake -G Ninja \ @@ -222,7 +221,6 @@ jobs: - name: 'Remill test' shell: 'bash' working-directory: remill/build - # if: contains(matrix.llvm, 'llvm-15') && matrix.target_arch == 'x64' if: matrix.target_arch == 'x64' run: | # Only run test on x64 @@ -232,7 +230,6 @@ jobs: shell: 'bash' working-directory: anvill if: contains(matrix.llvm, 'llvm-15') && matrix.target_arch == 'x64' - # if: matrix.target_arch == 'x64' run: | cmake -G Ninja \ -DCMAKE_VERBOSE_MAKEFILE=ON \ diff --git a/.github/workflows/vcpkg_ci_windows.yml b/.github/workflows/vcpkg_ci_windows.yml index 382c0ff0..2d5ee902 100644 --- a/.github/workflows/vcpkg_ci_windows.yml +++ b/.github/workflows/vcpkg_ci_windows.yml @@ -155,7 +155,6 @@ jobs: # python ../scripts/roundtrip.py ( Get-ChildItem tools | Where-Object {$_.name -match "rellic-decomp.exe"} ) ..\tests\tools\decomp "${env:VCPKG_ROOT}\installed\${env:TRIPLET}\tools\${{ matrix.llvm }}\clang.exe" - name: 'Test remill build' - # if: ${{ matrix.llvm == 'llvm-15' }} run: | cd remill Remove-Item -Recurse -Force -ErrorAction SilentlyContinue .\build