Skip to content

[codex] index serialized graph lookups #122

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
0hmX wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

[codex] index serialized graph lookups #122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
50 changes: 26 additions & 24 deletions lib/compat/loadSerializedHyperGraph.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,20 +312,6 @@ const getCentermostPortIdForRegion = (
return sortedPortIds[0]
}

const getSharedPortIdsForConnection = (
serializedHyperGraph: SerializedHyperGraph,
connection: NonNullable<SerializedHyperGraph["connections"]>[number],
): string[] =>
serializedHyperGraph.ports
.filter(
(port) =>
(port.region1Id === connection.startRegionId &&
port.region2Id === connection.endRegionId) ||
(port.region2Id === connection.startRegionId &&
port.region1Id === connection.endRegionId),
)
.map((port) => port.portId)

export const loadSerializedHyperGraph = (
serializedHyperGraph: SerializedHyperGraph,
): {
Expand All @@ -335,8 +321,10 @@ export const loadSerializedHyperGraph = (
} => {
const filteredHyperGraph = filterObstacleRegions(serializedHyperGraph)
const regionIdToIndex = new Map<string, number>()
const regionById = new Map<string, SerializedHyperGraph["regions"][number]>()
const portIdToIndex = new Map<string, number>()
const portById = new Map<string, SerializedHyperGraph["ports"][number]>()
const portIdsByRegionPair = new Map<string, string[]>()
const solvedRouteByConnectionId = new Map(
(filteredHyperGraph.solvedRoutes ?? []).map((route) => [
route.connection.connectionId,
Expand All @@ -346,11 +334,23 @@ export const loadSerializedHyperGraph = (

filteredHyperGraph.regions.forEach((region, regionIndex) => {
regionIdToIndex.set(region.regionId, regionIndex)
regionById.set(region.regionId, region)
})

filteredHyperGraph.ports.forEach((port, portIndex) => {
portIdToIndex.set(port.portId, portIndex)
portById.set(port.portId, port)
const lesserRegionId =
port.region1Id < port.region2Id ? port.region1Id : port.region2Id
const greaterRegionId =
port.region1Id < port.region2Id ? port.region2Id : port.region1Id
const regionPairKey = `${lesserRegionId}\0${greaterRegionId}`
const portIds = portIdsByRegionPair.get(regionPairKey)
if (portIds) {
portIds.push(port.portId)
} else {
portIdsByRegionPair.set(regionPairKey, [port.portId])
}
})

const regionCount = filteredHyperGraph.regions.length
Expand Down Expand Up @@ -485,10 +485,16 @@ export const loadSerializedHyperGraph = (
const routableConnections = connections
.map((connection) => {
const solvedRoute = solvedRouteByConnectionId.get(connection.connectionId)
const sharedPortIds = getSharedPortIdsForConnection(
filteredHyperGraph,
connection,
)
const lesserRegionId =
connection.startRegionId < connection.endRegionId
? connection.startRegionId
: connection.endRegionId
const greaterRegionId =
connection.startRegionId < connection.endRegionId
? connection.endRegionId
: connection.startRegionId
const sharedPortIds =
portIdsByRegionPair.get(`${lesserRegionId}\0${greaterRegionId}`) ?? []

return {
connection,
Expand All @@ -509,15 +515,11 @@ export const loadSerializedHyperGraph = (

routableConnections.forEach(({ connection, solvedRoute }, routeIndex) => {
const fallbackStartPortId = getCentermostPortIdForRegion(
filteredHyperGraph.regions.find(
(region) => region.regionId === connection.startRegionId,
),
regionById.get(connection.startRegionId),
portById,
)
const fallbackEndPortId = getCentermostPortIdForRegion(
filteredHyperGraph.regions.find(
(region) => region.regionId === connection.endRegionId,
),
regionById.get(connection.endRegionId),
portById,
)

Expand Down
14 changes: 7 additions & 7 deletions lib/core.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -566,10 +566,6 @@ export class TinyHyperGraphSolver extends BaseSolver {
if (neighborPortId === currentCandidate.portId) continue
if (problem.portSectionMask[neighborPortId] === 0) continue

const g = this.computeG(currentCandidate, neighborPortId)
if (!Number.isFinite(g)) continue
const h = this.computeH(neighborPortId)

const nextRegionId =
topology.incidentPortRegion[neighborPortId][0] ===
currentCandidate.nextRegionId
Expand All @@ -583,6 +579,13 @@ export class TinyHyperGraphSolver extends BaseSolver {
continue
}

const g = this.computeG(currentCandidate, neighborPortId)
if (!Number.isFinite(g)) continue

const candidateHopId = this.getHopId(neighborPortId, nextRegionId)
if (g >= this.getCandidateBestCost(candidateHopId)) continue

const h = this.computeH(neighborPortId)
const newCandidate = {
prevRegionId: currentCandidate.nextRegionId,
nextRegionId,
Expand All @@ -598,9 +601,6 @@ export class TinyHyperGraphSolver extends BaseSolver {
return
}

const candidateHopId = this.getHopId(neighborPortId, nextRegionId)
if (g >= this.getCandidateBestCost(candidateHopId)) continue

this.setCandidateBestCost(candidateHopId, g)
state.candidateQueue.queue(newCandidate)
}
Expand Down
Loading