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

Fix to maintain correct order of boxes after "&mfs".

This commit is contained in:
Alan Mishchenko 2025-11-24 08:01:26 -08:00
parent ba852596b4
commit 7f64516f23
1 changed files with 44 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
src/aig/gia/giaMfs.c
View File

@ -290,15 +290,16 @@ Gia_Man_t * Gia_ManInsertMfs( Gia_Man_t * p, Sfm_Ntk_t * pNtk, int fAllBoxes )
int nBoxes = Gia_ManBoxNum(p); int nBoxes = Gia_ManBoxNum(p);
int nRealPis = nBoxes ? Tim_ManPiNum(pManTime) : Gia_ManPiNum(p); int nRealPis = nBoxes ? Tim_ManPiNum(pManTime) : Gia_ManPiNum(p);
int nRealPos = nBoxes ? Tim_ManPoNum(pManTime) : Gia_ManPoNum(p); int nRealPos = nBoxes ? Tim_ManPoNum(pManTime) : Gia_ManPoNum(p);
int i, k, Id, curCi, curCo, nBoxIns, nBoxOuts, iLitNew, iMfsId, iGroup, Fanin; int i, k, curCi, curCo, nBoxIns, nBoxOuts, iLitNew, iMfsId, iGroup, Fanin, iBox;
int nMfsNodes; int nMfsNodes;
word * pTruth, uTruthVar = ABC_CONST(0xAAAAAAAAAAAAAAAA); word * pTruth, uTruthVar = ABC_CONST(0xAAAAAAAAAAAAAAAA);
Vec_Wec_t * vGroups = Vec_WecStart( nBoxes ); Vec_Wec_t * vGroups = Vec_WecStart( nBoxes );
Vec_Int_t * vMfs2Gia, * vMfs2Old; Vec_Int_t * vMfs2Gia, * vMfs2Old;
Vec_Int_t * vGroupMap; Vec_Int_t * vGroupMap;
Vec_Int_t * vMfsTopo, * vCover, * vBoxesLeft; Vec_Int_t * vMfsTopo, * vCover, * vBoxesLeft, * vBoxKeep;
Vec_Int_t * vArray, * vLeaves; Vec_Int_t * vArray, * vLeaves;
Vec_Int_t * vMapping, * vMapping2; Vec_Int_t * vMapping, * vMapping2;
Vec_Int_t * vCoDrivers;
int nBbIns = 0, nBbOuts = 0; int nBbIns = 0, nBbOuts = 0;
if ( pManTime ) Tim_ManBlackBoxIoNum( pManTime, &nBbIns, &nBbOuts ); if ( pManTime ) Tim_ManBlackBoxIoNum( pManTime, &nBbIns, &nBbOuts );
nMfsNodes = 1 + Gia_ManCiNum(p) + Gia_ManLutNum(p) + Gia_ManCoNum(p) + nBbIns + nBbOuts; nMfsNodes = 1 + Gia_ManCiNum(p) + Gia_ManLutNum(p) + Gia_ManCoNum(p) + nBbIns + nBbOuts;
@ -342,6 +343,10 @@ Gia_Man_t * Gia_ManInsertMfs( Gia_Man_t * p, Sfm_Ntk_t * pNtk, int fAllBoxes )
// collect nodes in the given order // collect nodes in the given order
vBoxesLeft = Vec_IntAlloc( nBoxes ); vBoxesLeft = Vec_IntAlloc( nBoxes );
vMfsTopo = Sfm_NtkDfs( pNtk, vGroups, vGroupMap, vBoxesLeft, fAllBoxes ); vMfsTopo = Sfm_NtkDfs( pNtk, vGroups, vGroupMap, vBoxesLeft, fAllBoxes );
Vec_IntUniqify( vBoxesLeft ); // reduce to sorted unique indices expected by the timing manager
vBoxKeep = Vec_IntStart( nBoxes );
Vec_IntForEachEntry( vBoxesLeft, iBox, i )
Vec_IntWriteEntry( vBoxKeep, iBox, 1 );
assert( Vec_IntSize(vBoxesLeft) <= nBoxes ); assert( Vec_IntSize(vBoxesLeft) <= nBoxes );
assert( Vec_IntSize(vMfsTopo) > 0 ); assert( Vec_IntSize(vMfsTopo) > 0 );
@ -360,13 +365,22 @@ Gia_Man_t * Gia_ManInsertMfs( Gia_Man_t * p, Sfm_Ntk_t * pNtk, int fAllBoxes )
// map constant // map constant
Vec_IntWriteEntry( vMfs2Gia, Gia_ObjCopyArray(p, 0), 0 ); Vec_IntWriteEntry( vMfs2Gia, Gia_ObjCopyArray(p, 0), 0 );
// map primary inputs // map primary inputs (real ones and preserved box outputs)
Gia_ManForEachCiId( p, Id, i ) Gia_ManForEachCi( p, pObj, i )
if ( i < nRealPis ) {
Vec_IntWriteEntry( vMfs2Gia, Gia_ObjCopyArray(p, Id), Gia_ManAppendCi(pNew) ); int iCiId = Gia_ObjId( p, pObj );
int iBox = pManTime ? Tim_ManBoxForCi( pManTime, Gia_ObjCioId(pObj) ) : -1;
if ( iBox >= 0 && !Vec_IntEntry(vBoxKeep, iBox) )
{
Vec_IntWriteEntry( vMfs2Gia, Gia_ObjCopyArray(p, iCiId), -1 );
continue;
}
Vec_IntWriteEntry( vMfs2Gia, Gia_ObjCopyArray(p, iCiId), Gia_ManAppendCi(pNew) );
}
// map internal nodes // map internal nodes
vLeaves = Vec_IntAlloc( 6 ); vLeaves = Vec_IntAlloc( 6 );
vCover = Vec_IntAlloc( 1 << 16 ); vCover = Vec_IntAlloc( 1 << 16 );
vCoDrivers = Vec_IntStartFull( Gia_ManCoNum(p) );
Vec_IntForEachEntry( vMfsTopo, iMfsId, i ) Vec_IntForEachEntry( vMfsTopo, iMfsId, i )
{ {
pTruth = Sfm_NodeReadTruth( pNtk, iMfsId ); pTruth = Sfm_NodeReadTruth( pNtk, iMfsId );
@ -374,10 +388,13 @@ Gia_Man_t * Gia_ManInsertMfs( Gia_Man_t * p, Sfm_Ntk_t * pNtk, int fAllBoxes )
vArray = Sfm_NodeReadFanins( pNtk, iMfsId ); // belongs to pNtk vArray = Sfm_NodeReadFanins( pNtk, iMfsId ); // belongs to pNtk
if ( Vec_IntSize(vArray) == 1 && Vec_IntEntry(vArray,0) < nBbOuts ) // skip unreal inputs if ( Vec_IntSize(vArray) == 1 && Vec_IntEntry(vArray,0) < nBbOuts ) // skip unreal inputs
{ {
// create CI for the output of black box
assert( Abc_LitIsCompl(iGroup) ); assert( Abc_LitIsCompl(iGroup) );
iLitNew = Gia_ManAppendCi( pNew ); iLitNew = Vec_IntEntry( vMfs2Gia, iMfsId );
Vec_IntWriteEntry( vMfs2Gia, iMfsId, iLitNew ); if ( iLitNew == -1 )
{
iLitNew = Gia_ManAppendCi( pNew );
Vec_IntWriteEntry( vMfs2Gia, iMfsId, iLitNew );
}
continue; continue;
} }
Vec_IntClear( vLeaves ); Vec_IntClear( vLeaves );
@ -411,36 +428,36 @@ Gia_Man_t * Gia_ManInsertMfs( Gia_Man_t * p, Sfm_Ntk_t * pNtk, int fAllBoxes )
Abc_TtFlipVar5( pTruth, Vec_IntSize(vLeaves) ); Abc_TtFlipVar5( pTruth, Vec_IntSize(vLeaves) );
} }
} }
else if ( Abc_LitIsCompl(iGroup) ) // internal CI else if ( Abc_LitIsCompl(iGroup) ) // internal CI (box output)
{ {
//Dau_DsdPrintFromTruth( pTruth, Vec_IntSize(vLeaves) ); iLitNew = Vec_IntEntry( vMfs2Gia, iMfsId );
iLitNew = Gia_ManAppendCi( pNew ); if ( iLitNew < 0 )
continue;
} }
else // internal CO else // internal CO
{ {
int iObjOld = Vec_IntEntry( vMfs2Old, iMfsId );
int iCoIdx;
assert( iObjOld >= 0 );
assert( pTruth[0] == uTruthVar || pTruth[0] == ~uTruthVar ); assert( pTruth[0] == uTruthVar || pTruth[0] == ~uTruthVar );
iLitNew = Gia_ManAppendCo( pNew, Abc_LitNotCond(Vec_IntEntry(vLeaves, 0), pTruth[0] == ~uTruthVar) ); iLitNew = Abc_LitNotCond( Vec_IntEntry(vLeaves, 0), pTruth[0] == ~uTruthVar );
//printf("Group = %d. po = %d\n", iGroup>>1, iMfsId ); iCoIdx = Gia_ObjCioId( Gia_ManObj(p, iObjOld) );
Vec_IntWriteEntry( vCoDrivers, iCoIdx, iLitNew );
} }
Vec_IntWriteEntry( vMfs2Gia, iMfsId, iLitNew ); Vec_IntWriteEntry( vMfs2Gia, iMfsId, iLitNew );
} }
Vec_IntFree( vCover ); Vec_IntFree( vCover );
Vec_IntFree( vLeaves ); Vec_IntFree( vLeaves );
// map primary outputs // map primary outputs (internal box inputs followed by real POs)
Gia_ManForEachCo( p, pObj, i ) Gia_ManForEachCo( p, pObj, i )
{ {
if ( i < Gia_ManCoNum(p) - nRealPos ) // internal COs if ( i < Gia_ManCoNum(p) - nRealPos )
{ {
iMfsId = Gia_ObjCopyArray( p, Gia_ObjId(p, pObj) ); iLitNew = Vec_IntEntry( vCoDrivers, i );
iGroup = Vec_IntEntry( vGroupMap, iMfsId ); if ( iLitNew == -1 )
if ( Vec_IntFind(vMfsTopo, iGroup) >= 0 ) continue;
{ Gia_ManAppendCo( pNew, iLitNew );
iLitNew = Vec_IntEntry( vMfs2Gia, iMfsId );
if ( iLitNew < 0 )
continue;
assert( iLitNew >= 0 );
}
continue; continue;
} }
iLitNew = Vec_IntEntry( vMfs2Gia, Gia_ObjCopyArray(p, Gia_ObjFaninId0p(p, pObj)) ); iLitNew = Vec_IntEntry( vMfs2Gia, Gia_ObjCopyArray(p, Gia_ObjFaninId0p(p, pObj)) );
@ -483,6 +500,8 @@ Gia_Man_t * Gia_ManInsertMfs( Gia_Man_t * p, Sfm_Ntk_t * pNtk, int fAllBoxes )
Vec_IntFree( vMfs2Gia ); Vec_IntFree( vMfs2Gia );
Vec_IntFree( vMfs2Old ); Vec_IntFree( vMfs2Old );
Vec_IntFree( vBoxesLeft ); Vec_IntFree( vBoxesLeft );
Vec_IntFree( vBoxKeep );
Vec_IntFree( vCoDrivers );
return pNew; return pNew;
} }
@ -550,4 +569,3 @@ Gia_Man_t * Gia_ManPerformMfs( Gia_Man_t * p, Sfm_Par_t * pPars )
//////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////
ABC_NAMESPACE_IMPL_END ABC_NAMESPACE_IMPL_END