Keep topology capacity opt-in

Author: ShiboSoftwareDev

lib/core.ts

@@ -1446,6 +1446,7 @@ export class TinyHyperGraphSolver extends BaseSolver {
       ),
       MAX_NEGOTIATION_PASSES: maxNegotiationPasses,
       SKIP_UNROUTABLE_ROUTES: true,
+      USE_TOPOLOGY_CAPACITY: true,
     })
     regionPathSolver.solve()
 

lib/region-graph/graph.ts

@@ -18,6 +18,7 @@ export interface RegionGraph {
   regionWidth: Float64Array
   regionHeight: Float64Array
   regionCapacity: Float64Array
+  regionTrackCapacity: Int32Array
   regionMetadata?: any[]
   edges: RegionGraphEdge[]
   incidentEdges: RegionGraphEdge[][]
@@ -155,7 +156,7 @@ export const createRegionGraph = (
     incidentEdges[edge.regionIdB]!.push(edge)
   }
 
-  const regionCapacity = Float64Array.from(
+  const regionTrackCapacity = Int32Array.from(
     { length: topology.regionCount },
     (_, regionId) => {
       const boundaryPortCount = incidentEdges[regionId]!.reduce(
@@ -177,7 +178,15 @@ export const createRegionGraph = (
     regionCenterY: topology.regionCenterY,
     regionWidth: topology.regionWidth,
     regionHeight: topology.regionHeight,
-    regionCapacity,
+    regionCapacity: Float64Array.from(
+      { length: topology.regionCount },
+      (_, regionId) =>
+        Math.max(
+          1e-6,
+          topology.regionWidth[regionId] * topology.regionHeight[regionId],
+        ),
+    ),
+    regionTrackCapacity,
     regionMetadata: topology.regionMetadata,
     edges,
     incidentEdges,

lib/region-graph/region-path-solver.ts

@@ -20,6 +20,7 @@ export interface RegionPathSolverOptions {
   USE_TOPOLOGY_CAPACITY?: boolean
   MAX_NEGOTIATION_PASSES?: number
   SKIP_UNROUTABLE_ROUTES?: boolean
+  USE_TOPOLOGY_CAPACITY?: boolean
 }
 
 export interface RegionPathCandidate {
@@ -78,6 +79,7 @@ export class RegionPathSolver extends BaseSolver {
   USE_TOPOLOGY_CAPACITY = false
   MAX_NEGOTIATION_PASSES = 4
   SKIP_UNROUTABLE_ROUTES = false
+  USE_TOPOLOGY_CAPACITY = false
   skippedRouteIds: RouteId[] = []
   negotiationPass = 0
 
@@ -108,6 +110,9 @@ export class RegionPathSolver extends BaseSolver {
     if (options?.SKIP_UNROUTABLE_ROUTES !== undefined) {
       this.SKIP_UNROUTABLE_ROUTES = options.SKIP_UNROUTABLE_ROUTES
     }
+    if (options?.USE_TOPOLOGY_CAPACITY !== undefined) {
+      this.USE_TOPOLOGY_CAPACITY = options.USE_TOPOLOGY_CAPACITY
+    }
 
     this.state = {
       regionUsage: new Int32Array(this.regionGraph.regionCount),
@@ -325,7 +330,8 @@ export class RegionPathSolver extends BaseSolver {
         ? 0
         : 1)
     const regionCapacity = this.regionGraph.regionCapacity[regionId]
-    const overflow = Math.max(0, nextUsage - regionCapacity)
+    const trackCapacity = this.getRegionCapacity(regionId)
+    const overflow = Math.max(0, nextUsage - trackCapacity)
     return (
       (nextUsage / regionCapacity) * this.MM_COST_FOR_FULL_REGION +
       overflow * this.getOverCapacityCost() +
@@ -334,6 +340,8 @@ export class RegionPathSolver extends BaseSolver {
   }
 
   computeEdgeEntryCost(edgeId: number): number {
+    if (!this.USE_TOPOLOGY_CAPACITY) return 0
+
     const currentNetId = this.state.currentRouteNetId
     const nextUsage =
       this.state.edgeUsage[edgeId] +
@@ -344,23 +352,29 @@ export class RegionPathSolver extends BaseSolver {
     const edgeCapacity = this.regionGraph.edges[edgeId]!.portIds.length
     const overflow = Math.max(0, nextUsage - edgeCapacity)
     return (
-      (nextUsage / edgeCapacity) * this.MM_COST_FOR_FULL_REGION +
       overflow * this.getOverCapacityCost() +
       this.state.edgeHistoricalCost[edgeId]
     )
   }
 
+  getRegionCapacity(regionId: RegionId): number {
+    return this.USE_TOPOLOGY_CAPACITY
+      ? this.regionGraph.regionTrackCapacity[regionId]!
+      : this.regionGraph.regionCapacity[regionId]!
+  }
+
   getOverCapacityCost(): number {
     // A simple path visits at most one region and one boundary per graph hop.
     // This makes one overflow more expensive than any capacity-respecting path.
     return this.regionGraph.regionCount * this.MM_COST_FOR_FULL_REGION * 2
   }
 
   hasOverloadedResources(): boolean {
+    if (!this.USE_TOPOLOGY_CAPACITY) return false
+
     for (let regionId = 0; regionId < this.regionGraph.regionCount; regionId++) {
       if (
-        this.state.regionUsage[regionId] >
-        this.regionGraph.regionCapacity[regionId]
+        this.state.regionUsage[regionId] > this.getRegionCapacity(regionId)
       ) {
         return true
       }
@@ -377,7 +391,7 @@ export class RegionPathSolver extends BaseSolver {
     for (let regionId = 0; regionId < regionGraph.regionCount; regionId++) {
       const overflow = Math.max(
         0,
-        state.regionUsage[regionId] - regionGraph.regionCapacity[regionId],
+        state.regionUsage[regionId] - this.getRegionCapacity(regionId),
       )
       state.regionHistoricalCost[regionId] += overflow * overCapacityCost
     }
@@ -477,7 +491,7 @@ export class RegionPathSolver extends BaseSolver {
 
     for (let regionId = 0; regionId < regionGraph.regionCount; regionId++) {
       const usage = state.regionUsage[regionId]
-      const utilization = usage / regionGraph.regionCapacity[regionId]
+      const utilization = usage / this.getRegionCapacity(regionId)
       maxRegionUsage = Math.max(maxRegionUsage, usage)
       maxUtilization = Math.max(maxUtilization, utilization)
     }

lib/region-graph/visualizeRegionGraph.ts

@@ -165,7 +165,7 @@ const getRegionFill = (
   regionId: RegionId,
 ) => {
   const regionUsage = usage.regionUsage[regionId]
-  const capacity = solver.regionGraph.regionCapacity[regionId]
+  const capacity = solver.getRegionCapacity(regionId)
   const utilization = clamp01(regionUsage / capacity)
   const red = Math.round(216 + (239 - 216) * utilization)
   const green = Math.round(240 - 112 * utilization)
@@ -181,7 +181,7 @@ const getRegionLabel = (
   regionId: RegionId,
 ) => {
   const regionUsage = usage.regionUsage[regionId]
-  const capacity = solver.regionGraph.regionCapacity[regionId]
+  const capacity = solver.getRegionCapacity(regionId)
   const utilization = regionUsage / capacity
   const reservedNetId = solver.regionProblem.regionNetId[regionId]
   const assignedRoutes = solver.state.regionAssignedRoutes[regionId]
@@ -265,7 +265,7 @@ const pushSmallGraphRegionLabels = (
       {
         x: center.x,
         y: center.y,
-        text: `${usage.regionUsage[regionId]}/${solver.regionGraph.regionCapacity[regionId]} nets`,
+        text: `${usage.regionUsage[regionId]}/${solver.getRegionCapacity(regionId)} nets`,
         fontSize: 0.11,
         color: "rgb(15, 23, 42)",
         anchorSide: "center",