Merge branch 'tscircuit:main' into main

Author: AnasSarkiz

.github/workflows/benchmark.yml

@@ -30,28 +30,32 @@ jobs:
             \`\`\`
 
             **Examples:**
-            - \`/benchmark\` - Run with default solver, all scenarios
+            - \`/benchmark\` - Run all solvers, all scenarios
             - \`/benchmark AutoroutingPipelineSolver3_HgPortPointPathing\` - Run with specific solver
             - \`/benchmark AutoroutingPipelineSolver3_HgPortPointPathing 10\` - Run with specific solver, 10 scenarios
-            - \`/benchmark _ 20\` - Run with default solver, 20 scenarios`
+            - \`/benchmark _ 20\` - Run all solvers, 20 scenarios`
             });
 
-  benchmark:
-    name: Run autorouting benchmark
-    # Only run on PR comments with /benchmark command from maintainers (not bots)
+  setup:
+    name: Setup benchmark
     if: |
       github.event_name == 'issue_comment' &&
       github.event.issue.pull_request &&
       github.event.comment.user.type != 'Bot' &&
-      contains(github.event.comment.body, '/benchmark') &&
+      startsWith(github.event.comment.body, '/benchmark') &&
       (
         github.event.comment.author_association == 'OWNER' ||
         github.event.comment.author_association == 'MEMBER' ||
         github.event.comment.author_association == 'COLLABORATOR'
       )
     runs-on: ubuntu-latest
-    timeout-minutes: 30
+    timeout-minutes: 360
 
+    outputs:
+      solvers: ${{ steps.discover.outputs.solvers }}
+      scenario_limit: ${{ steps.parse.outputs.scenario_limit }}
+      comment_id: ${{ steps.running-comment.outputs.comment_id }}
+      sha: ${{ steps.parse.outputs.sha }}
     steps:
       - name: React to comment and post running status
         id: running-comment
@@ -74,8 +78,8 @@ jobs:
             });
             core.setOutput('comment_id', comment.data.id);
 
-      - name: Get PR branch and parse solver name
-        id: pr-info
+      - name: Parse command and get PR info
+        id: parse
         uses: actions/github-script@v7
         with:
           script: |
@@ -84,11 +88,8 @@ jobs:
               repo: context.repo.repo,
               pull_number: context.issue.number
             });
-            core.setOutput('ref', pr.data.head.ref);
             core.setOutput('sha', pr.data.head.sha);
 
-            // Parse solver name and scenario limit from comment: /benchmark [SolverName] [limit]
-            // Examples: /benchmark, /benchmark SolverName, /benchmark SolverName 50, /benchmark _ 50
             const comment = context.payload.comment.body;
             const match = comment.match(/\/benchmark(?:\s+(\S+))?(?:\s+(\d+))?/);
             const solverName = match && match[1] && match[1] !== '_' ? match[1] : '';
@@ -101,6 +102,48 @@ jobs:
         with:
           ref: refs/pull/${{ github.event.issue.number }}/head
 
+      - name: Discover solvers from exports
+        id: discover
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const fs = require('fs');
+
+            // Read the pipeline solvers index - this is the source of truth for benchmarkable solvers
+            const pipelineIndex = fs.readFileSync('lib/autorouter-pipelines/index.ts', 'utf8');
+            const pipelineNames = [...pipelineIndex.matchAll(/export\s*\{\s*(\w+)\s*\}/g)].map(m => m[1]);
+
+            // Read lib/index.ts to find aliases (e.g. "X as Y")
+            const libIndex = fs.readFileSync('lib/index.ts', 'utf8');
+
+            // Build a map of original name -> exported name (alias or original)
+            const solvers = [];
+            for (const name of pipelineNames) {
+              const aliasMatch = libIndex.match(new RegExp(`${name}\\s+as\\s+(\\w+)`));
+              solvers.push(aliasMatch ? aliasMatch[1] : name);
+            }
+
+            const solverName = '${{ steps.parse.outputs.solver_name }}';
+            const finalSolvers = solverName ? [solverName] : solvers;
+
+            console.log('Discovered solvers:', finalSolvers);
+            core.setOutput('solvers', JSON.stringify(finalSolvers));
+
+  benchmark:
+    name: Benchmark ${{ matrix.solver }}
+    needs: setup
+    runs-on: ubuntu-latest
+    timeout-minutes: 360
+    strategy:
+      fail-fast: false
+      matrix:
+        solver: ${{ fromJson(needs.setup.outputs.solvers) }}
+    steps:
+      - name: Checkout PR branch
+        uses: actions/checkout@v4
+        with:
+          ref: refs/pull/${{ github.event.issue.number }}/head
+
       - name: Setup bun
         uses: oven-sh/setup-bun@v2
         with:
@@ -121,75 +164,138 @@ jobs:
           export * from "./lib"
           EOF
 
-      - name: Run benchmark
+      - name: Run benchmark for ${{ matrix.solver }}
         id: benchmark
         run: |
-          SOLVER_NAME="${{ steps.pr-info.outputs.solver_name }}"
-          SCENARIO_LIMIT="${{ steps.pr-info.outputs.scenario_limit }}"
-
-          # Build command with optional solver name and scenario limit
-          CMD="autorouting-dataset-runner benchmark-solver.ts"
-
-          if [ -n "$SOLVER_NAME" ]; then
-            CMD="$CMD $SOLVER_NAME"
-            echo "Running benchmark with solver: $SOLVER_NAME"
-          else
-            echo "Running benchmark with default solver"
-          fi
+          SCENARIO_LIMIT="${{ needs.setup.outputs.scenario_limit }}"
+          CMD="autorouting-dataset-runner benchmark-solver.ts ${{ matrix.solver }}"
 
           if [ -n "$SCENARIO_LIMIT" ]; then
             CMD="$CMD --scenario-limit $SCENARIO_LIMIT"
-            echo "Scenario limit: $SCENARIO_LIMIT"
-          else
-            echo "Running all scenarios"
           fi
 
-          # Run and capture output while showing live progress
           $CMD 2>&1 | tee /tmp/benchmark_output.txt || true
 
-          # Extract only key info for the comment (to avoid "Argument list too long" error)
-          {
-            echo "BENCHMARK_OUTPUT<<EOFMARKER"
-            # Get loading/using autorouter lines
-            grep -E "^(Loading|✓ Using|✓ From)" /tmp/benchmark_output.txt || true
-            echo ""
-            # Get the results table (lines with + or |)
-            grep -E "^[+|]" /tmp/benchmark_output.txt || true
-            echo ""
-            # Get summary lines
-            grep -E "^(Scenarios:|✓)" /tmp/benchmark_output.txt | tail -3 || true
-            echo "EOFMARKER"
-          } >> $GITHUB_OUTPUT
+          # Extract the data row from the results table and save to file
+          mkdir -p /tmp/benchmark-row
+          grep -E "^\|" /tmp/benchmark_output.txt | grep -v "Completed %" > /tmp/benchmark-row/row.txt || true
 
       - name: Upload benchmark results
         uses: actions/upload-artifact@v4
         with:
-          name: benchmark-results
+          name: results-${{ matrix.solver }}
           path: results/
           retention-days: 30
 
-      - name: Update comment with results
+      - name: Upload benchmark row
+        uses: actions/upload-artifact@v4
+        with:
+          name: benchmark-row-${{ matrix.solver }}
+          path: /tmp/benchmark-row/row.txt
+          retention-days: 1
+
+  report:
+    name: Post benchmark results
+    needs: [setup, benchmark]
+    if: always() && needs.setup.result == 'success'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Download benchmark row artifacts
+        uses: actions/download-artifact@v4
+        with:
+          path: benchmark-rows/
+          pattern: benchmark-row-*
+
+      - name: Download all benchmark result artifacts
+        uses: actions/download-artifact@v4
+        with:
+          path: all-results/
+          pattern: results-*
+          merge-multiple: true
+
+      - name: Upload combined benchmark results
+        uses: actions/upload-artifact@v4
+        with:
+          name: benchmark-results
+          path: all-results/
+          retention-days: 30
+
+      - name: Delete per-solver artifacts
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const artifacts = await github.rest.actions.listArtifactsForRepo({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              per_page: 100
+            });
+            const runArtifacts = artifacts.data.artifacts.filter(a =>
+              a.workflow_run?.id === ${{ github.run_id }} &&
+              (a.name.startsWith('results-') || a.name.startsWith('benchmark-row-'))
+            );
+            for (const artifact of runArtifacts) {
+              await github.rest.actions.deleteArtifact({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                artifact_id: artifact.id
+              });
+            }
+
+      - name: Post combined results
         uses: actions/github-script@v7
         with:
           github-token: ${{ secrets.TSCIRCUIT_BOT_GITHUB_TOKEN }}
           script: |
-            const output = `${{ steps.benchmark.outputs.BENCHMARK_OUTPUT }}`;
-            const solverName = '${{ steps.pr-info.outputs.solver_name }}' || 'default';
-            const scenarioLimit = '${{ steps.pr-info.outputs.scenario_limit }}' || 'all';
+            const fs = require('fs');
+            const solvers = ${{ needs.setup.outputs.solvers }};
+
+            // Parse each solver's result row into columns
+            const results = [];
+            for (const solver of solvers) {
+              const rowFile = `benchmark-rows/benchmark-row-${solver}/row.txt`;
+              let cols = null;
+              if (fs.existsSync(rowFile)) {
+                const row = fs.readFileSync(rowFile, 'utf8').trim();
+                if (row) {
+                  cols = row.split('|').filter(c => c.trim()).map(c => c.trim());
+                }
+              }
+              if (cols && cols.length >= 5) {
+                results.push(cols);
+              } else {
+                results.push([solver, 'failed', 'n/a', 'n/a', 'n/a']);
+              }
+            }
+
+            // Calculate max width for each column
+            const headers = ['Solver', 'Completed %', 'Relaxed DRC Pass %', 'P50 Time', 'P95 Time'];
+            const widths = headers.map((h, i) =>
+              Math.max(h.length, ...results.map(r => (r[i] || '').length))
+            );
+
+            const sep = '+' + widths.map(w => '-'.repeat(w + 2)).join('+') + '+';
+            const headerRow = '|' + headers.map((h, i) => ` ${h.padEnd(widths[i])} `).join('|') + '|';
+            const dataRows = results.map(r =>
+              '|' + r.map((c, i) => ` ${c.padEnd(widths[i])} `).join('|') + '|'
+            ).join('\n');
+
+            const table = [sep, headerRow, sep, dataRows, sep].join('\n');
+
+            const scenarioLimit = '${{ needs.setup.outputs.scenario_limit }}' || 'all';
 
             await github.rest.issues.updateComment({
               owner: context.repo.owner,
               repo: context.repo.repo,
-              comment_id: ${{ steps.running-comment.outputs.comment_id }},
+              comment_id: ${{ needs.setup.outputs.comment_id }},
               body: `## 🏃 Autorouting Benchmark Results
 
-            **Solver:** ${solverName} | **Scenarios:** ${scenarioLimit}
+            **Solvers:** ${solvers.length} | **Scenarios:** ${scenarioLimit}
 
             \`\`\`
-            ${output}
+            ${table}
             \`\`\`
 
             📊 [Download HTML visualization and bundle](${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}#artifacts)
 
-            <sub>Triggered by @${{ github.event.comment.user.login }} • Commit: ${{ steps.pr-info.outputs.sha }}</sub>`
+            <sub>Triggered by @${{ github.event.comment.user.login }} • Commit: ${{ needs.setup.outputs.sha }}</sub>`
             });

lib/autorouter-pipelines/AssignableAutoroutingPipeline2/AssignableAutoroutingPipeline2.ts

@@ -1,58 +1,58 @@
-import type { GraphicsObject, Line } from "graphics-debug"
-import { combineVisualizations } from "../../utils/combineVisualizations"
-import type {
-  CapacityMeshEdge,
-  CapacityMeshNode,
-  ObstacleId,
-  RootConnectionName,
-  SimpleRouteJson,
-  SimplifiedPcbTrace,
-  SimplifiedPcbTraces,
-  TraceId,
-} from "../../types"
-import { BaseSolver } from "../../solvers/BaseSolver"
-import { CapacityMeshEdgeSolver } from "../../solvers/CapacityMeshSolver/CapacityMeshEdgeSolver"
-import { getColorMap } from "../../solvers/colors"
-import { HighDensitySolver as LegacyHighDensitySolver } from "../../solvers/HighDensitySolver/HighDensitySolver"
-import { SimpleHighDensitySolver } from "./SimpleHighDensitySolver"
-import { JumperHighDensitySolver } from "./JumperHighDensitySolver"
+import { RectDiffPipeline } from "@tscircuit/rectdiff"
 import { ConnectivityMap } from "circuit-json-to-connectivity-map"
-import { getConnectivityMapFromSimpleRouteJson } from "lib/utils/getConnectivityMapFromSimpleRouteJson"
-import { CapacityNodeTargetMerger } from "../../solvers/CapacityNodeTargetMerger/CapacityNodeTargetMerger"
-import { calculateOptimalCapacityDepth } from "../../utils/getTunedTotalCapacity1"
-import { NetToPointPairsSolver } from "../../solvers/NetToPointPairsSolver/NetToPointPairsSolver"
-import { convertHdRouteToSimplifiedRoute } from "lib/utils/convertHdRouteToSimplifiedRoute"
-import { MultipleHighDensityRouteStitchSolver } from "../../solvers/RouteStitchingSolver/MultipleHighDensityRouteStitchSolver"
-import { convertSrjToGraphicsObject } from "lib/utils/convertSrjToGraphicsObject"
-import { StrawSolver } from "../../solvers/StrawSolver/StrawSolver"
-import { SingleLayerNodeMergerSolver } from "../../solvers/SingleLayerNodeMerger/SingleLayerNodeMergerSolver"
+import type { GraphicsObject, Line } from "graphics-debug"
+import { getGlobalInMemoryCache } from "lib/cache/setupGlobalCaches"
+import { CacheProvider } from "lib/cache/types"
+import {
+  HyperPortPointPathingSolver,
+  HyperPortPointPathingSolverParams,
+} from "lib/solvers/PortPointPathingSolver/HyperPortPointPathingSolver"
 import {
   HighDensityIntraNodeRoute,
   HighDensityRoute,
 } from "lib/types/high-density-types"
+import { convertHdRouteToSimplifiedRoute } from "lib/utils/convertHdRouteToSimplifiedRoute"
+import { convertSrjToGraphicsObject } from "lib/utils/convertSrjToGraphicsObject"
+import { getConnectivityMapFromSimpleRouteJson } from "lib/utils/getConnectivityMapFromSimpleRouteJson"
+import { AvailableSegmentPointSolver } from "../../solvers/AvailableSegmentPointSolver/AvailableSegmentPointSolver"
+import { BaseSolver } from "../../solvers/BaseSolver"
+import { CapacityMeshEdgeSolver } from "../../solvers/CapacityMeshSolver/CapacityMeshEdgeSolver"
 import { CapacityMeshEdgeSolver2_NodeTreeOptimization } from "../../solvers/CapacityMeshSolver/CapacityMeshEdgeSolver2_NodeTreeOptimization"
+import { CapacityMeshNodeSolver2_NodeUnderObstacle } from "../../solvers/CapacityMeshSolver/CapacityMeshNodeSolver2_NodesUnderObstacles"
+import { CapacityNodeTargetMerger } from "../../solvers/CapacityNodeTargetMerger/CapacityNodeTargetMerger"
 import { DeadEndSolver } from "../../solvers/DeadEndSolver/DeadEndSolver"
-import { CacheProvider } from "lib/cache/types"
-import { getGlobalInMemoryCache } from "lib/cache/setupGlobalCaches"
+import { HighDensitySolver as LegacyHighDensitySolver } from "../../solvers/HighDensitySolver/HighDensitySolver"
+import { MultiSectionPortPointOptimizer } from "../../solvers/MultiSectionPortPointOptimizer"
+import { NetToPointPairsSolver } from "../../solvers/NetToPointPairsSolver/NetToPointPairsSolver"
 import { NetToPointPairsSolver2_OffBoardConnection } from "../../solvers/NetToPointPairsSolver2_OffBoardConnection/NetToPointPairsSolver2_OffBoardConnection"
-import { RectDiffPipeline } from "@tscircuit/rectdiff"
-import { TraceSimplificationSolver } from "../../solvers/TraceSimplificationSolver/TraceSimplificationSolver"
-import { TraceKeepoutSolver } from "../../solvers/TraceKeepoutSolver/TraceKeepoutSolver"
-import { TraceWidthSolver } from "../../solvers/TraceWidthSolver/TraceWidthSolver"
-import { AvailableSegmentPointSolver } from "../../solvers/AvailableSegmentPointSolver/AvailableSegmentPointSolver"
 import {
-  PortPointPathingSolver,
   InputNodeWithPortPoints,
   InputPortPoint,
+  PortPointPathingSolver,
 } from "../../solvers/PortPointPathingSolver/PortPointPathingSolver"
-import { CapacityMeshNodeSolver2_NodeUnderObstacle } from "../../solvers/CapacityMeshSolver/CapacityMeshNodeSolver2_NodesUnderObstacles"
-import { MultiSectionPortPointOptimizer } from "../../solvers/MultiSectionPortPointOptimizer"
+import { MultipleHighDensityRouteStitchSolver } from "../../solvers/RouteStitchingSolver/MultipleHighDensityRouteStitchSolver"
+import { SingleLayerNodeMergerSolver } from "../../solvers/SingleLayerNodeMerger/SingleLayerNodeMergerSolver"
+import { StrawSolver } from "../../solvers/StrawSolver/StrawSolver"
+import { TraceKeepoutSolver } from "../../solvers/TraceKeepoutSolver/TraceKeepoutSolver"
+import { TraceSimplificationSolver } from "../../solvers/TraceSimplificationSolver/TraceSimplificationSolver"
+import { TraceWidthSolver } from "../../solvers/TraceWidthSolver/TraceWidthSolver"
+import { getColorMap } from "../../solvers/colors"
+import type {
+  CapacityMeshEdge,
+  CapacityMeshNode,
+  ObstacleId,
+  RootConnectionName,
+  SimpleRouteJson,
+  SimplifiedPcbTrace,
+  SimplifiedPcbTraces,
+  TraceId,
+} from "../../types"
+import { combineVisualizations } from "../../utils/combineVisualizations"
+import { calculateOptimalCapacityDepth } from "../../utils/getTunedTotalCapacity1"
+import { JumperHighDensitySolver } from "./JumperHighDensitySolver"
 import { PortPointOffboardPathFragmentSolver } from "./PortPointOffboardPathFragmentSolver"
-import {
-  HyperPortPointPathingSolver,
-  HyperPortPointPathingSolverParams,
-} from "lib/solvers/PortPointPathingSolver/HyperPortPointPathingSolver"
 import { RelateNodesToOffBoardConnectionsSolver } from "./RelateNodesToOffBoardConnectionsSolver"
+import { SimpleHighDensitySolver } from "./SimpleHighDensitySolver"
 import { updateConnMapWithOffboardObstacleConnections } from "./updateConnMapWithOffboardObstacleConnections"
 
 interface CapacityMeshSolverOptions {
@@ -400,7 +400,7 @@ export class AssignableAutoroutingPipeline2 extends BaseSolver {
     this.srj = srj
     this.opts = { ...opts }
     this.MAX_ITERATIONS = 100e6
-    this.viaDiameter = srj.minViaDiameter ?? 0.6
+    this.viaDiameter = srj.minViaDiameter ?? 0.3
     this.minTraceWidth = srj.minTraceWidth
     const mutableOpts = this.opts
     this.effort = mutableOpts.effort ?? 1