Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
86 changes: 58 additions & 28 deletions lib/core.ts
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,8 @@ export interface TinyHyperGraphProblemSetup {
// portHCostToEndOfRoute[portId * routeCount + routeId] = distance from port to end of route
portHCostToEndOfRoute: Float64Array
portEndpointNetIds: Array<Set<NetId>>
/** -1 for no endpoint, -2 for endpoints from multiple nets, otherwise the sole endpoint net. */
portEndpointReservationNetId: Int32Array
}

export interface TinyHyperGraphSolution {
Expand Down Expand Up @@ -428,14 +430,23 @@ export class TinyHyperGraphSolver extends BaseSolver {
{ length: topology.portCount },
() => new Set<NetId>(),
)
const portEndpointReservationNetId = new Int32Array(
topology.portCount,
).fill(-1)
const recordEndpointNet = (portId: PortId, netId: NetId) => {
portEndpointNetIds[portId]!.add(netId)
const reservedNetId = portEndpointReservationNetId[portId]!
if (reservedNetId === -1) {
portEndpointReservationNetId[portId] = netId
} else if (reservedNetId !== netId) {
portEndpointReservationNetId[portId] = -2
}
}

for (let routeId = 0; routeId < problem.routeCount; routeId++) {
portEndpointNetIds[problem.routeStartPort[routeId]]!.add(
problem.routeNet[routeId],
)
portEndpointNetIds[problem.routeEndPort[routeId]]!.add(
problem.routeNet[routeId],
)
const routeNetId = problem.routeNet[routeId]!
recordEndpointNet(problem.routeStartPort[routeId]!, routeNetId)
recordEndpointNet(problem.routeEndPort[routeId]!, routeNetId)

if (portHCostToEndOfRoute) {
const endPortId = problem.routeEndPort[routeId]
Expand All @@ -454,6 +465,7 @@ export class TinyHyperGraphSolver extends BaseSolver {
return {
portHCostToEndOfRoute: portHCostToEndOfRoute as Float64Array,
portEndpointNetIds,
portEndpointReservationNetId,
}
}

Expand Down Expand Up @@ -682,18 +694,12 @@ export class TinyHyperGraphSolver extends BaseSolver {
}

isPortReservedForDifferentNet(portId: PortId): boolean {
const reservedNetIds = this.problemSetup.portEndpointNetIds[portId]
if (!reservedNetIds) {
return false
}

for (const netId of reservedNetIds) {
if (netId !== this.state.currentRouteNetId) {
return true
}
}

return false
const reservedNetId =
this.problemSetup.portEndpointReservationNetId[portId] ?? -1
return (
reservedNetId === -2 ||
(reservedNetId !== -1 && reservedNetId !== this.state.currentRouteNetId)
)
}

isRegionReservedForDifferentNet(regionId: RegionId): boolean {
Expand Down Expand Up @@ -1362,16 +1368,40 @@ export class TinyHyperGraphSolver extends BaseSolver {
}

computeG(currentCandidate: Candidate, neighborPortId: PortId): number {
const { state } = this
const { state, topology } = this

const nextRegionId = currentCandidate.nextRegionId

const regionCache = state.regionIntersectionCaches[nextRegionId]
const segmentGeometry = this.populateSegmentGeometryScratch(
nextRegionId,
currentCandidate.portId,
neighborPortId,
)
const currentPortId = currentCandidate.portId
const currentPortIncidentRegions =
topology.incidentPortRegion[currentPortId]
const neighborPortIncidentRegions =
topology.incidentPortRegion[neighborPortId]
const currentPortAngle =
currentPortIncidentRegions[0] === nextRegionId ||
currentPortIncidentRegions[1] !== nextRegionId
? topology.portAngleForRegion1[currentPortId]
: (topology.portAngleForRegion2?.[currentPortId] ??
topology.portAngleForRegion1[currentPortId])
const neighborPortAngle =
neighborPortIncidentRegions[0] === nextRegionId ||
neighborPortIncidentRegions[1] !== nextRegionId
? topology.portAngleForRegion1[neighborPortId]
: (topology.portAngleForRegion2?.[neighborPortId] ??
topology.portAngleForRegion1[neighborPortId])
const lesserAngle =
currentPortAngle < neighborPortAngle
? currentPortAngle
: neighborPortAngle
const greaterAngle =
currentPortAngle < neighborPortAngle
? neighborPortAngle
: currentPortAngle
const currentPortZ = topology.portZ[currentPortId]
const neighborPortZ = topology.portZ[neighborPortId]
const layerMask = (1 << currentPortZ) | (1 << neighborPortZ)
const entryExitLayerChanges = currentPortZ !== neighborPortZ ? 1 : 0

const [
newSameLayerIntersections,
Expand All @@ -1380,10 +1410,10 @@ export class TinyHyperGraphSolver extends BaseSolver {
] = countNewIntersectionsWithValues(
regionCache,
state.currentRouteNetId!,
segmentGeometry.lesserAngle,
segmentGeometry.greaterAngle,
segmentGeometry.layerMask,
segmentGeometry.entryExitLayerChanges,
lesserAngle,
greaterAngle,
layerMask,
entryExitLayerChanges,
)

if (
Expand Down
44 changes: 44 additions & 0 deletions tests/solver/port-endpoint-reservation.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
import { expect, test } from "bun:test"
import {
TinyHyperGraphSolver,
type TinyHyperGraphProblem,
type TinyHyperGraphTopology,
} from "lib/index"

test("precomputes endpoint reservation behavior for zero, one, and multiple nets", () => {
const topology: TinyHyperGraphTopology = {
portCount: 4,
regionCount: 1,
regionIncidentPorts: [[0, 1, 2, 3]],
incidentPortRegion: [[0], [0], [0], [0]],
regionWidth: new Float64Array([1]),
regionHeight: new Float64Array([1]),
regionCenterX: new Float64Array([0]),
regionCenterY: new Float64Array([0]),
portAngleForRegion1: new Int32Array(4),
portX: new Float64Array(4),
portY: new Float64Array(4),
portZ: new Int32Array(4),
}
const problem: TinyHyperGraphProblem = {
routeCount: 2,
portSectionMask: new Int8Array([1, 1, 1, 1]),
routeStartPort: new Int32Array([0, 0]),
routeEndPort: new Int32Array([1, 2]),
routeNet: new Int32Array([4, 7]),
regionNetId: new Int32Array([-1]),
}
const solver = new TinyHyperGraphSolver(topology, problem, {
STATIC_REACHABILITY_PRECHECK: false,
})

expect([...solver.problemSetup.portEndpointReservationNetId]).toEqual([
-2, 4, 7, -1,
])

solver.state.currentRouteNetId = 4
expect(solver.isPortReservedForDifferentNet(0)).toBe(true)
expect(solver.isPortReservedForDifferentNet(1)).toBe(false)
expect(solver.isPortReservedForDifferentNet(2)).toBe(true)
expect(solver.isPortReservedForDifferentNet(3)).toBe(false)
})
Loading