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

Adding support for not merging some flops after &scorr.

This commit is contained in:
Alan Mishchenko 2026-02-02 17:12:15 -08:00
parent 367b407fba
commit b50fd7a10a
2 changed files with 56 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/aig/gia/giaIf.c
View File

@ -2842,11 +2842,12 @@ void Gia_ManTransferTiming( Gia_Man_t * p, Gia_Man_t * pGia )
} }
if ( pGia->pManTime == NULL ) if ( pGia->pManTime == NULL )
return; return;
p->pManTime = pGia->pManTime; pGia->pManTime = NULL; p->pManTime = pGia->pManTime; pGia->pManTime = NULL;
p->pAigExtra = pGia->pAigExtra; pGia->pAigExtra = NULL; p->pAigExtra = pGia->pAigExtra; pGia->pAigExtra = NULL;
p->vRegClasses = pGia->vRegClasses; pGia->vRegClasses = NULL; p->vRegClasses = pGia->vRegClasses; pGia->vRegClasses = NULL;
p->vRegInits = pGia->vRegInits; pGia->vRegInits = NULL; p->vRegInits = pGia->vRegInits; pGia->vRegInits = NULL;
p->nAnd2Delay = pGia->nAnd2Delay; pGia->nAnd2Delay = 0; p->vFlopClasses = pGia->vFlopClasses; pGia->vFlopClasses = NULL;
p->nAnd2Delay = pGia->nAnd2Delay; pGia->nAnd2Delay = 0;
} }
/**Function************************************************************* /**Function*************************************************************

50
src/aig/gia/giaSweep.c
View File

@ -483,7 +483,7 @@ int * Gia_ManFraigSelectReprs( Gia_Man_t * p, Gia_Man_t * pClp, int fVerbose, in
int * pReprs = ABC_FALLOC( int, Gia_ManObjNum(p) ); int * pReprs = ABC_FALLOC( int, Gia_ManObjNum(p) );
int * pClp2Gia = ABC_FALLOC( int, Gia_ManObjNum(pClp) ); int * pClp2Gia = ABC_FALLOC( int, Gia_ManObjNum(pClp) );
int i, iLitClp, iLitClp2, iReprClp, fCompl; int i, iLitClp, iLitClp2, iReprClp, fCompl;
int nConsts = 0, nReprs = 0; int nConsts = 0, nReprs = 0, nSkipped = 0;
assert( pManTime != NULL ); assert( pManTime != NULL );
// count the number of equivalent objects // count the number of equivalent objects
Gia_ManForEachObj1( pClp, pObj, i ) Gia_ManForEachObj1( pClp, pObj, i )
@ -552,6 +552,50 @@ int * Gia_ManFraigSelectReprs( Gia_Man_t * p, Gia_Man_t * pClp, int fVerbose, in
{ {
iLitClp2 = Gia_ObjValue( Gia_ManObj(p, pClp2Gia[iReprClp]) ); iLitClp2 = Gia_ObjValue( Gia_ManObj(p, pClp2Gia[iReprClp]) );
assert( Gia_ObjReprSelf(pClp, Abc_Lit2Var(iLitClp)) == Gia_ObjReprSelf(pClp, Abc_Lit2Var(iLitClp2)) ); assert( Gia_ObjReprSelf(pClp, Abc_Lit2Var(iLitClp)) == Gia_ObjReprSelf(pClp, Abc_Lit2Var(iLitClp2)) );
// Check vFlopClasses restrictions if both are flops
// vFlopClasses specifies which flops can be merged:
// - Class 0: unmergeable flops (never merge)
// - Class N>0: flops in group N (can merge within same group)
// - NULL: no restrictions (all flops can be merged)
if ( p->vFlopClasses && Gia_ObjIsCi(pObj) )
{
// In unnormalized AIGs (used during &scorr with boxes):
// CIs are ordered as: PIs + FlopOutputs
// BoxOutputs are spread through the AIG as internal nodes
int iFlopCur = -1, iFlopRepr = -1;
int nPis = Gia_ManPiNum(p);
int nFlops = Gia_ManRegBoxNum(p);
// Check if current object is a flop output
// In unnormalized AIG: flop outputs are CIs from nPis to nPis+nFlops
if ( i >= nPis && i < nPis + nFlops )
iFlopCur = i - nPis;
// Check if representative is a flop output
int iRepr = pClp2Gia[iReprClp];
if ( iRepr >= nPis && iRepr < nPis + nFlops )
iFlopRepr = iRepr - nPis;
// Apply merging restrictions
if ( iFlopCur >= 0 && iFlopRepr >= 0 )
{
// Make sure indices are valid
assert( iFlopCur < Vec_IntSize(p->vFlopClasses) );
assert( iFlopRepr < Vec_IntSize(p->vFlopClasses) );
int ClassCur = Vec_IntEntry(p->vFlopClasses, iFlopCur);
int ClassRepr = Vec_IntEntry(p->vFlopClasses, iFlopRepr);
// Skip merging if classes don't match or class is 0 (unmergeable)
if ( ClassCur == 0 || ClassRepr == 0 || ClassCur != ClassRepr )
{
nSkipped++;
continue; // Skip this merging
}
}
}
fCompl = Abc_LitIsCompl(iLitClp) ^ Abc_LitIsCompl(iLitClp2); fCompl = Abc_LitIsCompl(iLitClp) ^ Abc_LitIsCompl(iLitClp2);
fCompl ^= Gia_ManObj(pClp, Abc_Lit2Var(iLitClp))->fPhase; fCompl ^= Gia_ManObj(pClp, Abc_Lit2Var(iLitClp))->fPhase;
fCompl ^= Gia_ManObj(pClp, Abc_Lit2Var(iLitClp2))->fPhase; fCompl ^= Gia_ManObj(pClp, Abc_Lit2Var(iLitClp2))->fPhase;
@ -567,7 +611,11 @@ int * Gia_ManFraigSelectReprs( Gia_Man_t * p, Gia_Man_t * pClp, int fVerbose, in
Gia_ManForEachCi( p, pObj, i ) Gia_ManForEachCi( p, pObj, i )
pObj->fMark0 = 0; pObj->fMark0 = 0;
if ( fVerbose ) if ( fVerbose )
{
printf( "Found %d const objects and %d other objects.\n", nConsts, nReprs ); printf( "Found %d const objects and %d other objects.\n", nConsts, nReprs );
if ( p->vFlopClasses && nSkipped > 0 )
printf( "Skipped %d flop mergings due to vFlopClasses restrictions.\n", nSkipped );
}
return pReprs; return pReprs;
} }