Rework benchmarks

.github/scripts/check-skip-label.sh

@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+# Check if the "skip-validate-benchmarks" label is present on a PR.
+# Usage: check-skip-label.sh <PR_NUMBER>
+# Exits 0 normally, or exits 0 after cancelling the workflow if label found.
+
+set -euo pipefail
+
+PR_NUMBER="${1:-}"
+[[ -z "$PR_NUMBER" ]] && exit 0
+
+REPO="${GITHUB_REPOSITORY:-}"
+[[ -z "$REPO" ]] && exit 0
+
+labels=$(gh pr view "$PR_NUMBER" --repo "$REPO" --json labels --jq '.labels[].name' 2>/dev/null || true)
+
+if echo "$labels" | grep -q "skip-validate-benchmarks"; then
+  echo "skip-validate-benchmarks label found — exiting."
+  exit 1
+fi

.github/workflows/run-benchmarks.yml

@@ -18,157 +18,65 @@ jobs:
   validate-benchmarks:
     runs-on: Benchmarking
 
-    env:
-      SKIP_BENCHMARKS: "0"
-
     steps:
       - name: Check out PR branch
-        if: ${{ env.SKIP_BENCHMARKS != '1' }}
         uses: actions/checkout@v4
         with:
           repository: ${{ github.event.pull_request.head.repo.full_name }}
           ref: ${{ github.event.pull_request.head.ref }}
           fetch-depth: 0
 
       - name: Install GitHub CLI
-        if: ${{ env.SKIP_BENCHMARKS != '1' }}
         run: |
           sudo DEBIAN_FRONTEND=noninteractive NEEDRESTART_MODE=a apt-get update
-          sudo DEBIAN_FRONTEND=noninteractive NEEDRESTART_MODE=a apt-get install -y --no-install-recommends -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" gh
+          sudo DEBIAN_FRONTEND=noninteractive NEEDRESTART_MODE=a apt-get install -y --no-install-recommends \
+            -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" gh
           echo "${{ secrets.GITHUB_TOKEN }}" | gh auth login --with-token
 
-      # (1) — first skip‑label check
-      - name: Check skip label
-        if: ${{ env.SKIP_BENCHMARKS != '1' }}
-        run: |
-          labels=$(gh pr view ${{ github.event.pull_request.number }} \
-                         --repo "${{ github.repository }}" \
-                         --json labels --jq '.labels[].name')
-          if echo "$labels" | grep -q "skip-validate-benchmarks"; then
-            echo "skip-validate-benchmarks label found — skipping benchmarks."
-            echo "SKIP_BENCHMARKS=1" >> "$GITHUB_ENV"
-          fi
-
       - name: Install system dependencies
-        if: ${{ env.SKIP_BENCHMARKS != '1' }}
         run: |
-          sudo DEBIAN_FRONTEND=noninteractive NEEDRESTART_MODE=a apt-get update
-          sudo DEBIAN_FRONTEND=noninteractive NEEDRESTART_MODE=a apt-get install -y --no-install-recommends -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" build-essential clang curl libssl-dev llvm libudev-dev protobuf-compiler pkg-config
-
-      # (2)
-      - name: Check skip label
-        if: ${{ env.SKIP_BENCHMARKS != '1' }}
-        run: |
-          labels=$(gh pr view ${{ github.event.pull_request.number }} \
-                         --repo "${{ github.repository }}" \
-                         --json labels --jq '.labels[].name')
-          if echo "$labels" | grep -q "skip-validate-benchmarks"; then
-            echo "skip-validate-benchmarks label found — skipping benchmarks."
-            echo "SKIP_BENCHMARKS=1" >> "$GITHUB_ENV"
-          fi
+          sudo DEBIAN_FRONTEND=noninteractive NEEDRESTART_MODE=a apt-get install -y --no-install-recommends \
+            -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" \
+            build-essential clang curl libssl-dev llvm libudev-dev protobuf-compiler pkg-config
 
       - name: Install Rust toolchain
-        if: ${{ env.SKIP_BENCHMARKS != '1' }}
         uses: actions-rs/toolchain@v1
         with:
           profile: minimal
           toolchain: stable
 
-      # (3)
-      - name: Check skip label
-        if: ${{ env.SKIP_BENCHMARKS != '1' }}
-        run: |
-          labels=$(gh pr view ${{ github.event.pull_request.number }} \
-                         --repo "${{ github.repository }}" \
-                         --json labels --jq '.labels[].name')
-          if echo "$labels" | grep -q "skip-validate-benchmarks"; then
-            echo "skip-validate-benchmarks label found — skipping benchmarks."
-            echo "SKIP_BENCHMARKS=1" >> "$GITHUB_ENV"
-          fi
-
       - name: Cache Rust build
-        if: ${{ env.SKIP_BENCHMARKS != '1' }}
         uses: Swatinem/rust-cache@v2
         with:
           key: bench-${{ hashFiles('**/Cargo.lock') }}
           cache-on-failure: true
 
-      # (4)
-      - name: Check skip label
-        if: ${{ env.SKIP_BENCHMARKS != '1' }}
-        run: |
-          labels=$(gh pr view ${{ github.event.pull_request.number }} \
-                         --repo "${{ github.repository }}" \
-                         --json labels --jq '.labels[].name')
-          if echo "$labels" | grep -q "skip-validate-benchmarks"; then
-            echo "skip-validate-benchmarks label found — skipping benchmarks."
-            echo "SKIP_BENCHMARKS=1" >> "$GITHUB_ENV"
-          fi
-
-      - name: Build node with benchmarks
-        if: ${{ env.SKIP_BENCHMARKS != '1' }}
+      - name: Build node with benchmarks + weight tools
         run: |
+          .github/scripts/check-skip-label.sh ${{ github.event.pull_request.number }}
           cargo build --profile production -p node-subtensor --features runtime-benchmarks
-
-      # (5)
-      - name: Check skip label
-        if: ${{ env.SKIP_BENCHMARKS != '1' }}
-        run: |
-          labels=$(gh pr view ${{ github.event.pull_request.number }} \
-                         --repo "${{ github.repository }}" \
-                         --json labels --jq '.labels[].name')
-          if echo "$labels" | grep -q "skip-validate-benchmarks"; then
-            echo "skip-validate-benchmarks label found — skipping benchmarks."
-            echo "SKIP_BENCHMARKS=1" >> "$GITHUB_ENV"
-          fi
-
-      - name: Ensure artifact folder exists
-        if: ${{ env.SKIP_BENCHMARKS != '1' }}
-        run: mkdir -p .bench_patch
+          .github/scripts/check-skip-label.sh ${{ github.event.pull_request.number }}
+          cargo build --profile production -p subtensor-weight-tools --bin weight-compare
 
       - name: Run & validate benchmarks
-        if: ${{ env.SKIP_BENCHMARKS != '1' }}
         timeout-minutes: 180
         run: |
+          .github/scripts/check-skip-label.sh ${{ github.event.pull_request.number }}
+          mkdir -p .bench_patch
           chmod +x scripts/benchmark_action.sh
           scripts/benchmark_action.sh
 
-      - name: List artifact contents (for debugging)
-        if: ${{ always() }}
-        run: |
-          echo "Workspace: $GITHUB_WORKSPACE"
-          if [ -d ".bench_patch" ]; then
-            echo "== .bench_patch =="
-            ls -la .bench_patch || true
-          else
-            echo ".bench_patch directory is missing"
-          fi
-
       - name: Archive bench patch
-        if: ${{ always() }}
+        if: always()
         run: |
           if [ -d ".bench_patch" ]; then
             tar -czf bench-patch.tgz .bench_patch
-            ls -lh bench-patch.tgz
-          else
-            echo "No .bench_patch directory to archive."
           fi
 
-      - name: Upload patch artifact (if prepared)
-        if: ${{ always() }}
+      - name: Upload patch artifact
+        if: always()
         uses: actions/upload-artifact@v4
         with:
           name: bench-patch
           path: bench-patch.tgz
           if-no-files-found: warn
-
-      # (6) — final check after run
-      - name: Check skip label after run
-        if: ${{ env.SKIP_BENCHMARKS != '1' }}
-        run: |
-          labels=$(gh pr view ${{ github.event.pull_request.number }} \
-                         --repo "${{ github.repository }}" \
-                         --json labels --jq '.labels[].name')
-          if echo "$labels" | grep -q "skip-validate-benchmarks"; then
-            echo "skip-validate-benchmarks label was found — but benchmarks already ran."
-          fi

.maintain/frame-weight-template.hbs

@@ -16,6 +16,7 @@
 #![allow(unused_parens)]
 #![allow(unused_imports)]
 #![allow(missing_docs)]
+#![allow(dead_code)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
 use core::marker::PhantomData;
@@ -33,7 +34,7 @@ pub trait WeightInfo {
 
 /// Weights for `{{pallet}}` using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
-{{#if (eq pallet "frame_system")}}
+{{#if (or (eq pallet "frame_system") (eq pallet "frame_system_extensions"))}}
 impl<T: crate::Config> WeightInfo for SubstrateWeight<T> {
 {{else}}
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
@@ -118,4 +119,4 @@ impl WeightInfo for () {
 			{{/each}}
 	}
 	{{/each}}
-}
+}

chain-extensions/Cargo.toml

@@ -67,3 +67,20 @@ std = [
 	"num_enum/std",
 	"substrate-fixed/std",
 ]
+runtime-benchmarks = [
+	"frame-support/runtime-benchmarks",
+	"frame-system/runtime-benchmarks",
+	"pallet-subtensor/runtime-benchmarks",
+	"pallet-subtensor-swap/runtime-benchmarks",
+	"sp-runtime/runtime-benchmarks",
+	"pallet-balances/runtime-benchmarks",
+	"pallet-contracts/runtime-benchmarks",
+	"pallet-crowdloan/runtime-benchmarks",
+	"pallet-drand/runtime-benchmarks",
+	"pallet-preimage/runtime-benchmarks",
+	"pallet-scheduler/runtime-benchmarks",
+	"pallet-subtensor-proxy/runtime-benchmarks",
+	"pallet-subtensor-utility/runtime-benchmarks",
+	"pallet-timestamp/runtime-benchmarks",
+	"subtensor-runtime-common/runtime-benchmarks"
+]

chain-extensions/src/mock.rs

@@ -420,6 +420,7 @@ impl pallet_subtensor::Config for Test {
     type CommitmentsInterface = CommitmentsI;
     type EvmKeyAssociateRateLimit = EvmKeyAssociateRateLimit;
     type AuthorshipProvider = MockAuthorshipProvider;
+    type WeightInfo = ();
 }
 
 // Swap-related parameter types
@@ -442,6 +443,8 @@ impl pallet_subtensor_swap::Config for Test {
     type MinimumLiquidity = SwapMinimumLiquidity;
     type MinimumReserve = SwapMinimumReserve;
     type WeightInfo = ();
+    #[cfg(feature = "runtime-benchmarks")]
+    type BenchmarkHelper = ();
 }
 
 pub struct OriginPrivilegeCmp;
@@ -586,6 +589,7 @@ impl pallet_drand::Config for Test {
     type Verifier = pallet_drand::verifier::QuicknetVerifier;
     type UnsignedPriority = ConstU64<{ 1 << 20 }>;
     type HttpFetchTimeout = ConstU64<1_000>;
+    type WeightInfo = ();
 }
 
 impl frame_system::offchain::SigningTypes for Test {