test CI: fix cross-build failures

.cargo/config.toml

@@ -1,4 +1,21 @@
-# https://github.com/rui314/mold?tab=readme-ov-file#how-to-use
-[target.'cfg(target_os = "linux")']
-linker = "clang"
-rustflags = ["-C", "link-arg=-fuse-ld=mold"]
+# Link-args like -nostartfiles and -static are in microfetch/build.rs using
+# cargo:rustc-link-arg-bin so they only affect the final binary and don't
+# break proc-macro or build-script linking.
+
+[target.x86_64-unknown-linux-gnu]
+rustflags = [
+  "-C",
+  "force-unwind-tables=no",
+]
+
+[target.aarch64-unknown-linux-gnu]
+rustflags = [
+  "-C",
+  "force-unwind-tables=no",
+]
+
+[target.riscv64gc-unknown-linux-gnu]
+rustflags = [
+  "-C",
+  "force-unwind-tables=no",
+]

.github/workflows/hotpath-comment.yml

@@ -14,49 +14,31 @@ jobs:
   comment:
     runs-on: ubuntu-latest
     if: ${{ github.event.workflow_run.conclusion == 'success' }}
-
     steps:
-      - name: Checkout
-        uses: actions/checkout@v6
+      - uses: actions/checkout@v4
+
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
 
-      - name: Download profiling results
-        uses: actions/download-artifact@v8
+      - uses: actions/download-artifact@v4
         with:
-          name: hotpath-results
-          path: /tmp/
+          name: profile-metrics
+          path: /tmp/metrics/
           github-token: ${{ secrets.GITHUB_TOKEN }}
           run-id: ${{ github.event.workflow_run.id }}
 
-      - name: Setup Rust
-        uses: actions-rust-lang/setup-rust-toolchain@v1
-
-      - name: Install hotpath CLI
-        run: cargo install hotpath
-
-      - name: Post timing comparison comment
-        env:
-          GH_TOKEN: ${{ github.token }}
-        run: |
-          set -euo pipefail
-          HEAD_METRICS=$(cat /tmp/head_timing.json)
-          BASE_METRICS=$(cat /tmp/base_timing.json)
-          PR_NUMBER=$(cat /tmp/pr_number.txt)
-          hotpath profile-pr \
-            --head-metrics "$HEAD_METRICS" \
-            --base-metrics "$BASE_METRICS" \
-            --github-token "$GH_TOKEN" \
-            --pr-number "$PR_NUMBER"
+      - name: Install hotpath-utils CLI
+        run: cargo install hotpath --bin hotpath-utils --features=utils
 
-      - name: Post allocation comparison comment
+      - name: Post PR comment
         env:
           GH_TOKEN: ${{ github.token }}
         run: |
           set -euo pipefail
-          HEAD_METRICS=$(cat /tmp/head_alloc.json)
-          BASE_METRICS=$(cat /tmp/base_alloc.json)
-          PR_NUMBER=$(cat /tmp/pr_number.txt)
-          hotpath profile-pr \
-            --head-metrics "$HEAD_METRICS" \
-            --base-metrics "$BASE_METRICS" \
+          export GITHUB_BASE_REF=$(cat /tmp/metrics/base_ref.txt)
+          export GITHUB_HEAD_REF=$(cat /tmp/metrics/head_ref.txt)
+          hotpath-utils profile-pr \
+            --head-metrics /tmp/metrics/head_timing.json \
+            --base-metrics /tmp/metrics/base_timing.json \
             --github-token "$GH_TOKEN" \
-            --pr-number "$PR_NUMBER"
+            --pr-number "$(cat /tmp/metrics/pr_number.txt)" \
+            --benchmark-id "timing"

.github/workflows/hotpath-profile.yml

@@ -4,62 +4,62 @@ on:
   pull_request:
     branches: [ "main" ]
 
-env:
-  CARGO_TERM_COLOR: always
+permissions:
+  contents: read
 
 jobs:
   profile:
     runs-on: ubuntu-latest
-
     steps:
-      - name: Checkout PR HEAD
-        uses: actions/checkout@v6
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-
-      - name: Setup Rust
-        uses: actions-rust-lang/setup-rust-toolchain@v1
-
-      - name: Run timing profiling on HEAD
+
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
+        with:
+          rustflags: ""
+
+      - name: Make Mold the default linker
+        uses: rui314/setup-mold@v1
+
+      - name: Create metrics directory
+        run: mkdir -p /tmp/metrics
+
+      - name: Head benchmark (timing)
         env:
-          HOTPATH_JSON: "true"
-        run: |
-          cargo run --features='hotpath' 2>&1 | grep '^{"hotpath_profiling_mode"' > /tmp/head_timing.json
-      
-      - name: Run allocation profiling on HEAD
+          HOTPATH_OUTPUT_FORMAT: json
+          HOTPATH_OUTPUT_PATH: /tmp/metrics/head_timing.json
+        run: cargo run -p microfetch --release --features='hotpath'
+
+      - name: Head benchmark (alloc)
         env:
-          HOTPATH_JSON: "true"
-        run: |
-          cargo run --features='hotpath,hotpath-alloc' 2>&1 | grep '^{"hotpath_profiling_mode"' > /tmp/head_alloc.json
-
-      - name: Checkout base branch
-        run: |
-          git checkout ${{ github.event.pull_request.base.sha }}
-
-      - name: Run timing profiling on base
+          HOTPATH_OUTPUT_FORMAT: json
+          HOTPATH_OUTPUT_PATH: /tmp/metrics/head_alloc.json
+        run: cargo run -p microfetch --release --features='hotpath,hotpath-alloc'
+
+      - name: Checkout base
+        run: git checkout ${{ github.event.pull_request.base.sha }}
+
+      - name: Base benchmark (timing)
         env:
-          HOTPATH_JSON: "true"
-        run: |
-          cargo run --features='hotpath' 2>&1 | grep '^{"hotpath_profiling_mode"' > /tmp/base_timing.json || echo '{}' > /tmp/base_timing.json
-      
-      - name: Run allocation profiling on base
+          HOTPATH_OUTPUT_FORMAT: json
+          HOTPATH_OUTPUT_PATH: /tmp/metrics/base_timing.json
+        run: cargo run -p microfetch --release --features='hotpath' || echo '{}' > /tmp/metrics/base_timing.json
+
+      - name: Base benchmark (alloc)
         env:
-          HOTPATH_JSON: "true"
-        run: |
-          cargo run --features='hotpath,hotpath-alloc' 2>&1 | grep '^{"hotpath_profiling_mode"' > /tmp/base_alloc.json || echo '{}' > /tmp/base_alloc.json
-      
-      - name: Save PR number
+          HOTPATH_OUTPUT_FORMAT: json
+          HOTPATH_OUTPUT_PATH: /tmp/metrics/base_alloc.json
+        run: cargo run -p microfetch --release --features='hotpath,hotpath-alloc' || echo '{}' > /tmp/metrics/base_alloc.json
+
+      - name: Save PR metadata
         run: |
-          echo '${{ github.event.pull_request.number }}' > /tmp/pr_number.txt
-
-      - name: Upload profiling results
-        uses: actions/upload-artifact@v7
+          echo '${{ github.event.pull_request.number }}' > /tmp/metrics/pr_number.txt
+          echo '${{ github.base_ref }}' > /tmp/metrics/base_ref.txt
+          echo '${{ github.head_ref }}' > /tmp/metrics/head_ref.txt
+
+      - uses: actions/upload-artifact@v4
         with:
-          name: hotpath-results
-          path: |
-            /tmp/head_timing.json
-            /tmp/head_alloc.json
-            /tmp/base_timing.json
-            /tmp/base_alloc.json
-            /tmp/pr_number.txt
+          name: profile-metrics
+          path: /tmp/metrics/
           retention-days: 1

.github/workflows/rust.yml

@@ -12,15 +12,14 @@ env:
 jobs:
   test:
     name: Test on ${{ matrix.target }}
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        include:
-          - os: ubuntu-latest
-            target: x86_64-unknown-linux-gnu
-          - os: ubuntu-latest
-            target: aarch64-unknown-linux-gnu
+        target:
+          - x86_64-unknown-linux-gnu
+          - aarch64-unknown-linux-gnu
+          - riscv64gc-unknown-linux-gnu
 
     steps:
     - name: "Checkout"
@@ -30,25 +29,17 @@ jobs:
       uses: actions-rust-lang/setup-rust-toolchain@v1
       with:
         target: ${{ matrix.target }}
+        rustflags: ""
 
-    - name: "Install cross-compilation tools"
-      if: matrix.target == 'aarch64-unknown-linux-gnu'
-      run: |
-        sudo apt-get update
-        sudo apt-get install -y gcc-aarch64-linux-gnu
-
-    - name: "Configure linker for aarch64"
-      if: matrix.target == 'aarch64-unknown-linux-gnu'
-      run: |
-        mkdir -p .cargo
-        cat >> .cargo/config.toml << EOF
-        [target.aarch64-unknown-linux-gnu]
-        linker = "aarch64-linux-gnu-gcc"
-        EOF
+    - name: "Make Mold the default linker"
+      uses: rui314/setup-mold@v1
+
+    - name: "Install cross"
+      run: cargo install cross --git https://github.com/cross-rs/cross
 
     - name: "Build"
-      run: cargo build --verbose --target ${{ matrix.target }}
+      run: cross build --verbose --target ${{ matrix.target }}
 
     - name: "Run tests"
       if: matrix.target == 'x86_64-unknown-linux-gnu'
-      run: cargo test --verbose --target ${{ matrix.target }}
+      run: cross test --verbose --target ${{ matrix.target }}

.gitignore

@@ -1,3 +1,3 @@
-/target
+**/target
 result*
 /.direnv

.rustfmt.toml

@@ -2,7 +2,7 @@ condense_wildcard_suffixes   = true
 doc_comment_code_block_width = 80
 edition                      = "2024"               # Keep in sync with Cargo.toml.
 enum_discrim_align_threshold = 60
-force_explicit_abi           = false
+force_explicit_abi           = true
 force_multiline_blocks       = true
 format_code_in_doc_comments  = true
 format_macro_matchers        = true