luke
/
magic
mirror of https://github.com/RTimothyEdwards/magic.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revised the routine ResSortByGate() in ResRex.c so that it sorts 

using qsort() instead of its own linked-list-based sorting, which
is horribly inefficient.  This change allows power nets (which
tend to be connected to all transistors) to be extracted in a
reasonable amount of time (hours instead of days).
This commit is contained in:
Tim Edwards 2021-10-10 19:20:24 -04:00
parent 2f7813094b
commit bb8f7e6960
2 changed files with 27 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -1 +1 @@
8.3.218 8.3.219

36
resis/ResRex.c
View File

@ -51,6 +51,10 @@ HashTable ResIgnoreTable; /* Hash table of nodes to ignore */
HashTable ResIncludeTable; /* Hash table of nodes to include */ HashTable ResIncludeTable; /* Hash table of nodes to include */
/* Table of cells that have been processed */
HashTable ResProcessedTable;
/* ResSimNode is a node read in from a sim file */ /* ResSimNode is a node read in from a sim file */
HashTable ResNodeTable; /* Hash table of sim file nodes */ HashTable ResNodeTable; /* Hash table of sim file nodes */
@ -114,6 +118,10 @@ ExtResisForDef(celldef, resisdata)
ResRDevList = NULL; ResRDevList = NULL;
ResOriginalNodes = NULL; ResOriginalNodes = NULL;
/* Check if this cell has been processed */
if (HashLookOnly(&ResProcessedTable, celldef->cd_name)) return;
HashFind(&ResProcessedTable, celldef->cd_name);
/* Get device information from the current extraction style */ /* Get device information from the current extraction style */
idx = 0; idx = 0;
while (ExtGetDevInfo(idx++, &devname, NULL, NULL, NULL, NULL, NULL)) while (ExtGetDevInfo(idx++, &devname, NULL, NULL, NULL, NULL, NULL))
@ -621,10 +629,12 @@ typedef enum {
resisdata.mainDef = mainDef; resisdata.mainDef = mainDef;
/* Do subcircuits (if any) first */ /* Do subcircuits (if any) first */
HashInit(&ResProcessedTable, INITFLATSIZE, HT_STRINGKEYS);
if (!(ResOptionsFlags & ResOpt_Blackbox)) if (!(ResOptionsFlags & ResOpt_Blackbox))
DBCellEnum(mainDef, resSubcircuitFunc, (ClientData) &resisdata); DBCellEnum(mainDef, resSubcircuitFunc, (ClientData) &resisdata);
ExtResisForDef(mainDef, &resisdata); ExtResisForDef(mainDef, &resisdata);
HashKill(&ResProcessedTable);
/* turn back on undo stuff */ /* turn back on undo stuff */
UndoEnable(); UndoEnable();
@ -663,10 +673,12 @@ typedef enum {
*/ */
int int
resSubcircuitFunc(cellDef, rdata) resSubcircuitFunc(cellUse, rdata)
CellDef *cellDef; CellUse *cellUse;
ResisData *rdata; ResisData *rdata;
{ {
CellDef *cellDef = cellUse->cu_def;
if (DBIsSubcircuit(cellDef)) if (DBIsSubcircuit(cellDef))
{ {
ExtResisForDef(cellDef, rdata); ExtResisForDef(cellDef, rdata);
@ -1495,7 +1507,7 @@ ResFixDevName(line, type, device, layoutnode)
} }
} }
#if 1 #if 0
/* /*
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
@ -1600,7 +1612,7 @@ ResSortByGate(DevpointerList)
} }
} }
/* Add the GATE list back to the end of Devpointerlist */ /* Add the GATE list back to the end of DevpointerList */
if (working == NULL) if (working == NULL)
{ {
@ -1615,9 +1627,9 @@ ResSortByGate(DevpointerList)
} }
} }
#endif /* 1 */ #endif /* 0 */
#if 0 #if 1
/* /*
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
@ -1639,9 +1651,11 @@ ResSortByGate(DevpointerList)
*/ */
int int
devSortFunc(dev1, dev2) devSortFunc(rec1, rec2)
devPtr *dev1, *dev2; devPtr **rec1, **rec2;
{ {
devPtr *dev1 = *rec1;
devPtr *dev2 = *rec2;
RDev *rd1 = dev1->thisDev; RDev *rd1 = dev1->thisDev;
RDev *rd2 = dev2->thisDev; RDev *rd2 = dev2->thisDev;
@ -1699,6 +1713,8 @@ ResSortByGate(DevpointerList)
listlen = 0; listlen = 0;
for (working = *DevpointerList; working; working = working->nextDev) listlen++; for (working = *DevpointerList; working; working = working->nextDev) listlen++;
if (listlen == 0) return;
Devindexed = (devPtr **)mallocMagic(listlen * sizeof(devPtr *)); Devindexed = (devPtr **)mallocMagic(listlen * sizeof(devPtr *));
listidx = 0; listidx = 0;
for (working = *DevpointerList; working; working = working->nextDev) for (working = *DevpointerList; working; working = working->nextDev)
@ -1710,11 +1726,11 @@ ResSortByGate(DevpointerList)
Devindexed[listidx]->nextDev = Devindexed[listidx + 1]; Devindexed[listidx]->nextDev = Devindexed[listidx + 1];
Devindexed[listidx]->nextDev = NULL; Devindexed[listidx]->nextDev = NULL;
*Devpointerlist = Devindexed[0]; *DevpointerList = Devindexed[0];
freeMagic(Devindexed); freeMagic(Devindexed);
} }
#endif /* 0 */ #endif /* 1 */
/* /*
*------------------------------------------------------------------------- *-------------------------------------------------------------------------