Add remill and gap portfiles

.github/workflows/vcpkg_ci_amd64.yml

@@ -39,9 +39,8 @@ jobs:
       matrix:
         image:
           # 'name' is Docker image name whereas 'os' is more generic
-          - { os: 'ubuntu', name: 'ubuntu-v2', tag: '20.04' }
           - { os: 'ubuntu', name: 'ubuntu-v2', tag: '22.04' }
-        llvm: [ 'llvm-15', 'llvm-16[pasta]', 'llvm-16' ]
+        llvm: [ 'llvm-16[pasta]', 'llvm-16' ]
         target_arch: [ 'x64', 'arm64' ]
 
     container:
@@ -119,6 +118,12 @@ jobs:
           echo "VCPKG_ROOT=$(pwd)/${{ env.ARTIFACT_NAME }}" >> $GITHUB_ENV
           echo "TARGET_TRIPLET=${{ matrix.target_arch }}-linux-rel" >> $GITHUB_ENV
 
+      - name: Cleanup NuGet
+        shell: 'bash'
+        run: |
+          du -sh ~/.nuget || true
+          rm -rf ~/.nuget || true
+
       - name: Upload CMake logs on error
         if: failure()
         uses: actions/upload-artifact@v3
@@ -175,7 +180,7 @@ jobs:
       - name: 'Rellic build'
         shell: 'bash'
         working-directory: rellic
-        if: contains(matrix.llvm, 'llvm-15') && matrix.target_arch == 'x64'
+        if: matrix.target_arch == 'x64'
         run: |
           # Does not compile with gcc
           export CC="$(which clang)"
@@ -191,10 +196,10 @@ jobs:
           cmake --build build --target install
       - name: 'Rellic test'
         shell: 'bash'
-        working-directory: rellic/build
-        if: contains(matrix.llvm, 'llvm-15') && matrix.target_arch == 'x64'
+        working-directory: rellic
+        if: matrix.target_arch == 'x64'
         run: |
-          ../scripts/roundtrip.py ./tools/rellic-decomp ../tests/tools/decomp "${VCPKG_ROOT}/installed/${TARGET_TRIPLET}/tools/llvm/clang"
+          cmake --build build --target test
 
       - name: 'Remill dependencies'
         shell: 'bash'
@@ -211,11 +216,6 @@ jobs:
         if: matrix.target_arch == 'x64'
         working-directory: remill
         run: |
-          if [[ '${{ matrix.image.tag }}' == '20.04' ]]; then
-            # Remill uses C++20 concepts that aren't supported by gcc-9 in 20.04
-            export CC="$(which clang)"
-            export CXX="$(which clang++)"
-          fi
           cmake -G Ninja \
             -DCMAKE_VERBOSE_MAKEFILE=ON \
             "-DCMAKE_TOOLCHAIN_FILE=${VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake" \
@@ -237,7 +237,7 @@ jobs:
       - name: 'Anvill build'
         shell: 'bash'
         working-directory: anvill
-        if: contains(matrix.llvm, 'llvm-15') && matrix.target_arch == 'x64'
+        if: matrix.target_arch == 'x64'
         run: |
           # TODO: Does not support compilation with gcc
           export CC="$(which clang)"
@@ -257,17 +257,16 @@ 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
-      #  if: contains(matrix.llvm, 'llvm-15') && 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: 'Anvill test'
+        shell: 'bash'
+        working-directory: anvill
+        if: matrix.target_arch == 'x64'
+        run: |
+          cmake --build build --target test
 
       - name: Cache cleanup and reporting
         shell: 'bash'
         run: |
           rm -rf vcpkg/{buildtrees,installed,packages}
           ccache --show-stats
+          df -h

.github/workflows/vcpkg_ci_mac.yml

@@ -37,7 +37,7 @@ jobs:
       matrix:
         os:
           - { runner: 'macos-12', xcode: '14.2' }
-        llvm: [ 'llvm-15', 'llvm-16[pasta]', 'llvm-16' ]
+        llvm: [ 'llvm-16[pasta]', 'llvm-16' ]
         target_arch: [ 'x64', 'arm64' ]
 
     runs-on: ${{ matrix.os.runner }}
@@ -177,7 +177,7 @@ jobs:
       - name: 'Rellic build'
         shell: 'bash'
         working-directory: rellic
-        if: contains(matrix.llvm, 'llvm-15') && matrix.target_arch == 'x64'
+        if: matrix.target_arch == 'x64'
         run: |
           cmake -G Ninja \
             -DCMAKE_VERBOSE_MAKEFILE=ON \
@@ -191,11 +191,10 @@ jobs:
           cmake --install build
       - name: 'Rellic test'
         shell: 'bash'
-        working-directory: rellic/build
-        if: contains(matrix.llvm, 'llvm-15') && matrix.target_arch == 'x64'
+        working-directory: rellic
+        if: matrix.target_arch == 'x64'
         run: |
-          # Test only should run when we're not cross compiling
-          ../scripts/roundtrip.py ./tools/rellic-decomp ../tests/tools/decomp "${VCPKG_ROOT}/installed/${TARGET_TRIPLET}/tools/llvm/clang"
+          cmake --build build --target test
 
       - name: 'Remill dependencies'
         shell: 'bash'
@@ -234,7 +233,7 @@ jobs:
       - name: 'Anvill build'
         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 \
@@ -251,16 +250,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
-      #  # 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: 'Anvill test'
+        shell: 'bash'
+        working-directory: anvill
+        if: matrix.target_arch == 'x64'
+        run: |
+          cmake --build build --target test
 
       - name: Cache cleanup and reporting
         shell: 'bash'

README.md

@@ -128,6 +128,8 @@ See [the vcpkg docs](https://github.com/microsoft/vcpkg/blob/master/docs/example
 
 Installing additional dependencies will not update any existing dependencies by default. We do not update/upgrade by default because this could cause unexpected rebuilds that could potentially take hours (in the case of LLVM). To update dependencies, pass the `--upgrade-ports` option to the build script along with the respective options affecting vcpkg triplet selection (like `--release`).
 
+You must specify the exact package/ports you want to upgrade. If the port does not exist, this will fail.
+
 ## Useful manual vcpkg commands
 
 Sometimes it is useful to run vcpkg commands manually for testing a single package. Ideally, someone who wants to do this would read the [vcpkg documentation](https://github.com/microsoft/vcpkg/tree/master/docs), but below we list some commonly used commands. Inspecting the output of the build script will also show all of the vcpkg commands executed.

build_dependencies.sh

@@ -82,7 +82,7 @@ while [[ $# -gt 0 ]] ; do
   esac
   shift
 done
-msg "Passing extra args to 'vcpkg install':"
+msg "Passing extra args to vcpkg:"
 msg " " "${VCPKG_ARGS[@]}"
 
 function die_if_not_installed {
@@ -237,10 +237,19 @@ if [[ ${UPGRADE_PORTS} == "true" ]]; then
     cd "${repo_dir}"
     (
       set -x
-      # shellcheck disable=SC2046
-      "${vcpkg_dir}/vcpkg" upgrade "${extra_vcpkg_args[@]}" "${overlays[@]}" --no-dry-run --allow-unsupported
+      "${vcpkg_dir}/vcpkg" upgrade "${extra_vcpkg_args[@]}" "${overlays[@]}" --allow-unsupported "${VCPKG_ARGS[@]}" || true
+
+      set +x
+      read -p "Are you sure? If so, enter 'y' " -n 1 -r
+      echo ""
+      if [[ $REPLY =~ ^[Yy]$ ]]
+      then
+        set -x
+        "${vcpkg_dir}/vcpkg" upgrade "${extra_vcpkg_args[@]}" "${overlays[@]}" --no-dry-run --allow-unsupported "${VCPKG_ARGS[@]}" || exit 1
+      fi
     )
-  ) || exit 1
+  )
+  exit 0
 fi
 
 deps=()

ports/gap/portfile.cmake

@@ -0,0 +1,39 @@
+vcpkg_from_github(
+  OUT_SOURCE_PATH SOURCE_PATH
+  REPO lifting-bits/gap
+  REF ad8fefaf7235a9cd6670e272ca4487807ed81f8a
+  SHA512 9e9259fd4c3c96e31965613092f7dec9df5e236aa4ef9ac122378fe1708d4efd2fb6bd9837530e8474646dc3b0aa409781fd6f45fc28929d07bb54a95a072566
+  HEAD_REF main
+)
+
+vcpkg_cmake_configure(
+  SOURCE_PATH "${SOURCE_PATH}"
+  OPTIONS
+    -DGAP_ENABLE_COROUTINES=ON
+    -DGAP_ENABLE_TESTING=OFF
+    -DGAP_ENABLE_EXAMPLES=OFF
+    -DGAP_INSTALL=ON
+    -DUSE_SYSTEM_DEPENDENCIES=ON
+)
+
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(
+  PACKAGE_NAME "gap"
+  CONFIG_PATH lib/cmake/gap
+)
+
+file( REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" )
+
+# we do not populate lib folder yet
+file( REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib" )
+
+file(
+  INSTALL "${SOURCE_PATH}/LICENSE"
+  DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}"
+  RENAME copyright
+)
+
+file(
+  INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage"
+  DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}"
+)

ports/gap/usage

@@ -0,0 +1,4 @@
+The package gap provides CMake targets:
+
+    find_package(gap CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE gap::gap gap::gap-core gap::gap-settings)

ports/gap/vcpkg.json

@@ -0,0 +1,17 @@
+{
+    "name": "gap",
+    "version": "0.0.0",
+    "description": "A utility library to bridge llvm and mlir gaps",
+    "homepage": "https://github.com/lifting-bits/gap",
+    "license": "Apache-2.0",
+    "dependencies": [
+        {
+            "name": "vcpkg-cmake",
+            "host": true
+        },
+        {
+            "name": "vcpkg-cmake-config",
+            "host": true
+        }
+    ]
+}