Merge pull request #23 from 0hmX/pre-exit-if-fount-an-port-that-contains-an-net-belong-to-same-connection-and-go-to-the-same-obstacle

Pre exit if fount an port that contains an net belong to same connection and go to the same obstacle

Author: seveibar

lib/core.ts

@@ -122,7 +122,7 @@ export interface Candidate {
 }
 
 export interface TinyHyperGraphWorkingState {
-  // portAssignment[portId] = RouteId, -1 means unassigned
+  // portAssignment[portId] = NetId, -1 means unassigned
   portAssignment: Int32Array
 
   // regionSegments[regionId] = Array<Route Assignment and Two Ports>
@@ -381,19 +381,18 @@ export class TinyHyperGraphSolver extends BaseSolver {
       topology.regionIncidentPorts[currentCandidate.nextRegionId]
 
     for (const neighborPortId of neighbors) {
-      const assignedRouteId = state.portAssignment[neighborPortId]
+      const assignedNetId = state.portAssignment[neighborPortId]
       if (this.isPortReservedForDifferentNet(neighborPortId)) continue
       if (neighborPortId === state.goalPortId) {
-        if (
-          assignedRouteId !== -1 &&
-          problem.routeNet[assignedRouteId] !== state.currentRouteNetId
-        ) {
+        if (assignedNetId !== -1 && assignedNetId !== state.currentRouteNetId) {
           continue
         }
         this.onPathFound(currentCandidate)
         return
       }
-      if (assignedRouteId !== -1) continue
+      if (assignedNetId !== -1 && assignedNetId !== state.currentRouteNetId) {
+        continue
+      }
       if (neighborPortId === currentCandidate.portId) continue
       if (problem.portSectionMask[neighborPortId] === 0) continue
 
@@ -765,8 +764,8 @@ export class TinyHyperGraphSolver extends BaseSolver {
         fromPortId,
         toPortId,
       ])
-      state.portAssignment[fromPortId] = currentRouteId
-      state.portAssignment[toPortId] = currentRouteId
+      state.portAssignment[fromPortId] = state.currentRouteNetId!
+      state.portAssignment[toPortId] = state.currentRouteNetId!
       this.appendSegmentToRegionCache(regionId, fromPortId, toPortId)
     }
 

lib/section-solver/index.ts

@@ -374,8 +374,8 @@ const applyRouteSegmentsToSolver = (
         fromPortId,
         toPortId,
       ])
-      solver.state.portAssignment[fromPortId] = routeId
-      solver.state.portAssignment[toPortId] = routeId
+      solver.state.portAssignment[fromPortId] = solver.state.currentRouteNetId
+      solver.state.portAssignment[toPortId] = solver.state.currentRouteNetId
       solver.appendSegmentToRegionCache(regionId, fromPortId, toPortId)
     }
   }
@@ -623,8 +623,8 @@ class TinyHyperGraphSectionSearchSolver extends TinyHyperGraphSolver {
           fromPortId,
           toPortId,
         ])
-        this.state.portAssignment[fromPortId] = routePlan.routeId
-        this.state.portAssignment[toPortId] = routePlan.routeId
+        this.state.portAssignment[fromPortId] = this.state.currentRouteNetId
+        this.state.portAssignment[toPortId] = this.state.currentRouteNetId
         this.appendSegmentToRegionCache(regionId, fromPortId, toPortId)
       }
     }

lib/visualizeTinyGraph.ts

@@ -234,9 +234,9 @@ const getPortNetLabel = (
     return `net: ${solver.problem.routeNet[routeId]}`
   }
 
-  const assignedRouteId = solver.state.portAssignment[portId]
-  if (assignedRouteId >= 0) {
-    return `net: ${solver.problem.routeNet[assignedRouteId]}`
+  const assignedNetId = solver.state.portAssignment[portId]
+  if (assignedNetId >= 0) {
+    return `net: ${assignedNetId}`
   }
 
   const netIds = new Set<number>()

tests/solver/__snapshots__/same-net-shared-bottleneck-repro.snap.svg

@@ -25,6 +25,6 @@ test("repro: two same-net routes must share one bottleneck port to solve", () =>
   )
   expect(stagedSvg).toMatchSvgSnapshot(import.meta.path)
 
-  expect(solver.solved).toBe(false)
-  expect(solver.failed).toBe(true)
+  expect(solver.solved).toBe(true)
+  expect(solver.failed).toBe(false)
 })