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

Yet another optimization on "extresist", to remove the calls to 

DBPaint() and DBErase(), which are meant as high-level calls from
the "paint" and "erase" commands and are not appropriate for low-
level tasks like erasing all contacts out of a database.  This
cut maybe 40 to 50% time off of the resistance extraction.
This commit is contained in:
R. Timothy Edwards 2026-05-22 12:02:03 -04:00
parent 7a3717b02a
commit e45399d347
2 changed files with 31 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -1 +1 @@
8.3.647
8.3.648

44
resis/ResMain.c
View File

@ -148,33 +148,49 @@ void
ResDissolveContacts(contacts)
ResContactPoint *contacts;
{
TileType t, oldtype, lasttype = TT_SPACE;
TileType t, conttype;
Tile *tp;
TileTypeBitMask residues;
TileType residue[NP][NT];
int pNum;
bzero((char *)residue, NP * NT * sizeof(TileType));
for (; contacts != (ResContactPoint *)NULL; contacts = contacts->cp_nextcontact)
{
oldtype = contacts->cp_type;
conttype = contacts->cp_type;
#ifdef PARANOID
if (oldtype == TT_SPACE)
if (conttype == TT_SPACE)
TxError("Error in Contact Dissolving for %s \n",ResCurrentNode);
#endif
if (oldtype != lasttype)
/* Fill in details of the residue types for each contact type.
* This is done only once per contact type. This could be refined
* further by temporarily changing the paint table directly or
* creating a separate paint table which erases contact cuts and
* replaces them with the residues.
*/
if (residue[DBPlane(conttype)][conttype] == TT_SPACE)
for (pNum = PL_TECHDEPBASE; pNum < DBNumPlanes; pNum++)
residue[pNum][conttype] = DBPlaneToResidue(conttype, pNum);
for (pNum = PL_TECHDEPBASE; pNum < DBNumPlanes; pNum++)
{
lasttype = oldtype;
DBFullResidueMask(oldtype, &residues);
if (DBTypeOnPlane(conttype, pNum))
{
DBPaintPlane(ResUse->cu_def->cd_planes[pNum], &(contacts->cp_rect),
DBStdEraseTbl(conttype, pNum), (PaintUndoInfo *)NULL);
DBPaintPlane(ResUse->cu_def->cd_planes[pNum], &(contacts->cp_rect),
DBStdPaintTbl(residue[pNum][conttype], pNum),
(PaintUndoInfo *)NULL);
}
}
DBErase(ResUse->cu_def, &(contacts->cp_rect), oldtype);
for (t = TT_TECHDEPBASE; t < DBNumTypes; t++)
if (TTMaskHasType(&residues, t))
DBPaint(ResUse->cu_def, &(contacts->cp_rect), t);
#ifdef PARANOID
tp = PlaneGetHint(ResDef->cd_planes[DBPlane(contacts->cp_type)]);
tp = PlaneGetHint(ResDef->cd_planes[DBPlane(conttype)]);
GOTOPOINT(tp, &(contacts->cp_rect.r_ll));
if (TiGetTypeExact(tp) == contacts->cp_type)
if (TiGetTypeExact(tp) == conttype)
TxError("Error in Contact Preprocess Routines\n");
#endif
}