summaryrefslogtreecommitdiffstats
path: root/src/opt
diff options
context:
space:
mode:
authorAlan Mishchenko <alanmi@berkeley.edu>2015-10-13 15:11:08 -0700
committerAlan Mishchenko <alanmi@berkeley.edu>2015-10-13 15:11:08 -0700
commit9df63f529175dba9300ada4e02897b5178235477 (patch)
tree801b147d2a30008daa308ab2d612f1d53b625d70 /src/opt
parent20c46b5a452c08f949929c02d93a060f79144d79 (diff)
downloadabc-9df63f529175dba9300ada4e02897b5178235477.tar.gz
abc-9df63f529175dba9300ada4e02897b5178235477.tar.bz2
abc-9df63f529175dba9300ada4e02897b5178235477.zip
Experiments with precomputation and matching.
Diffstat (limited to 'src/opt')
-rw-r--r--src/opt/sfm/sfmDec.c156
-rw-r--r--src/opt/sfm/sfmInt.h3
-rw-r--r--src/opt/sfm/sfmLib.c113
3 files changed, 222 insertions, 50 deletions
diff --git a/src/opt/sfm/sfmDec.c b/src/opt/sfm/sfmDec.c
index ed3f7942..03f80bf9 100644
--- a/src/opt/sfm/sfmDec.c
+++ b/src/opt/sfm/sfmDec.c
@@ -52,6 +52,7 @@ struct Sfm_Dec_t_
// objects
int nDivs; // the number of divisors
int nMffc; // the number of divisors
+ int AreaMffc; // the area of gates in MFFC
int iTarget; // target node
int fUseLast; // internal switch
Vec_Int_t vObjRoots; // roots of the window
@@ -150,6 +151,7 @@ Sfm_Dec_t * Sfm_DecStart( Sfm_Par_t * pPars )
Abc_TtElemInit( p->pTtElems, SFM_SUPP_MAX );
p->pLib = Sfm_LibPrepare( pPars->nMffcMax + 1, 1, pPars->fVerbose );
if ( pPars->fVeryVerbose )
+// if ( pPars->fVerbose )
Sfm_LibPrint( p->pLib );
return p;
}
@@ -444,7 +446,6 @@ int Sfm_DecPeformDec( Sfm_Dec_t * p )
printf( "Area-reducing decomposition is not found.\n" );
return -1;
}
- p->nNodesChanged++;
// check constant
if ( Vec_IntSize(&p->vObjDec) == 0 )
{
@@ -452,10 +453,6 @@ int Sfm_DecPeformDec( Sfm_Dec_t * p )
// add gate
Vec_IntPush( &p->vObjGates, fConst ? p->GateConst1 : p->GateConst0 );
vLevel = Vec_WecPushLevel( &p->vObjFanins );
- if ( fConst )
- p->nNodesConst1++;
- else
- p->nNodesConst0++;
// report
if ( p->pPars->fVeryVerbose )
printf( "Create constant %d.\n", fConst );
@@ -471,10 +468,6 @@ int Sfm_DecPeformDec( Sfm_Dec_t * p )
Vec_IntPush( &p->vObjGates, Abc_LitIsCompl(Last) ? p->GateInvert : p->GateBuffer );
vLevel = Vec_WecPushLevel( &p->vObjFanins );
Vec_IntPush( vLevel, Abc_Lit2Var(Last) );
- if ( Abc_LitIsCompl(Last) )
- p->nNodesInv++;
- else
- p->nNodesBuf++;
// report
if ( p->pPars->fVeryVerbose )
printf( "Create buf/inv %d = %s%d.\n", nNodes, Abc_LitIsCompl(Last) ? "!":"", Abc_Lit2Var(Last) );
@@ -504,7 +497,6 @@ int Sfm_DecPeformDec( Sfm_Dec_t * p )
nNodes++;
}
//printf( "\n" );
- p->nNodesResyn++;
return Vec_IntSize(&p->vObjDec);
}
@@ -525,7 +517,6 @@ int Sfm_DecCombineDec( Sfm_Dec_t * p, word * pTruth0, word * pTruth1, int * pSup
Vec_Int_t vVec1 = { 2*SFM_SUPP_MAX, nSupp1, pSupp1 };
Vec_Int_t vVec = { 2*SFM_SUPP_MAX, 0, pSupp };
int nWords0 = Abc_TtWordNum(nSupp0);
- int nWords1 = Abc_TtWordNum(nSupp1);
int nSupp, iSuppVar;
// check the case of equal cofactors
if ( nSupp0 == nSupp1 && !memcmp(pSupp0, pSupp1, sizeof(int)*nSupp0) && !memcmp(pTruth0, pTruth1, sizeof(word)*nWords0) )
@@ -553,9 +544,9 @@ int Sfm_DecCombineDec( Sfm_Dec_t * p, word * pTruth0, word * pTruth1, int * pSup
int Sfm_DecPeformDec_rec( Sfm_Dec_t * p, word * pTruth, int * pSupp, int * pAssump, int nAssump, word Masks[2], int fCofactor )
{
int nBTLimit = 0;
- int fVerbose = p->pPars->fVeryVerbose;
+// int fVerbose = p->pPars->fVeryVerbose;
int c, i, d, Var, WeightBest, status;
- Vec_Int_t vAss = { SFM_SUPP_MAX, nAssump, pAssump };
+// Vec_Int_t vAss = { SFM_SUPP_MAX, nAssump, pAssump };
// if ( nAssump > SFM_SUPP_MAX )
if ( nAssump > p->nMffc )
return -2;
@@ -659,8 +650,6 @@ int Sfm_DecPeformDec_rec( Sfm_Dec_t * p, word * pTruth, int * pSupp, int * pAssu
{
word uTruth[2][SFM_WORD_MAX], MasksNext[2];
int Supp[2][2*SFM_SUPP_MAX], nSupp[2], nSuppAll;
- //if ( Abc_TtCountOnes(
-
for ( i = 0; i < 2; i++ )
{
for ( c = 0; c < 2; c++ )
@@ -708,14 +697,34 @@ int Sfm_DecPeformDec2Int( Sfm_Dec_t * p )
}
int Sfm_DecPeformDec2( Sfm_Dec_t * p )
{
+ word uTruth[SFM_WORD_MAX];
+ word Masks[2] = { ~((word)0), ~((word)0) };
+ int pAssump[2*SFM_SUPP_MAX];
+ int pSupp[2*SFM_SUPP_MAX], nSupp, RetValue;
+ p->nPats[0] = p->nPats[1] = 0;
+ p->uMask[0] = p->uMask[1] = 0;
+ Vec_WrdFill( &p->vSets[0], p->iTarget+1, 0 );
+ Vec_WrdFill( &p->vSets[1], p->iTarget+1, 0 );
p->fUseLast = 1;
- Sfm_DecPeformDec2Int( p );
-// p->fUseLast = 0;
-// Sfm_DecPeformDec2Int( p );
-// printf( "\n" );
-
- //Sfm_LibImplement( p->pLib, uTruth, pSupp, nSupp, &p->vObjGates, &p->vObjFanins );
- return -1;
+ nSupp = Sfm_DecPeformDec_rec( p, uTruth, pSupp, pAssump, 0, Masks, 1 );
+ if ( p->pPars->fVeryVerbose )
+ printf( "Node %4d : ", p->iTarget );
+ if ( p->pPars->fVeryVerbose )
+ printf( "MFFC %2d ", p->nMffc );
+ if ( nSupp == -2 )
+ {
+ if ( p->pPars->fVeryVerbose )
+ printf( "NO DEC.\n" );
+ p->nNoDecs++;
+ return -2;
+ }
+ // transform truth table
+ if ( p->pPars->fVeryVerbose )
+ Dau_DsdPrintFromTruth( uTruth, nSupp );
+ RetValue = Sfm_LibImplement( p->pLib, uTruth[0], pSupp, nSupp, p->AreaMffc, &p->vObjGates, &p->vObjFanins );
+ if ( p->pPars->fVeryVerbose )
+ printf( "Implementation %sfound.\n", RetValue < 0 ? "NOT " : "" );
+ return RetValue;
}
/**Function*************************************************************
@@ -805,10 +814,11 @@ void Sfm_DecAddNode( Abc_Obj_t * pObj, Vec_Int_t * vMap, Vec_Int_t * vGates, int
Vec_IntPush( vMap, Abc_ObjId(pObj) );
Vec_IntPush( vGates, fSkip ? -1 : Mio_GateReadValue((Mio_Gate_t *)pObj->pData) );
}
-int Sfm_DecMarkMffc( Abc_Obj_t * pPivot, int nLevelMin, int nMffcMax, int fVeryVerbose )
+int Sfm_DecMarkMffc( Abc_Obj_t * pPivot, int nLevelMin, int nMffcMax, int fVeryVerbose, int * pAreaMffc )
{
Abc_Obj_t * pFanin, * pFanin2;
int i, k, nMffc = 1;
+ *pAreaMffc = (int)(MIO_NUM * Mio_GateReadArea((Mio_Gate_t *)pPivot->pData));
pPivot->iTemp |= SFM_MASK_MFFC;
if ( fVeryVerbose )
printf( "Mffc = %d.\n", pPivot->Id );
@@ -817,6 +827,7 @@ printf( "Mffc = %d.\n", pPivot->Id );
{
if ( nMffc == nMffcMax )
return nMffc;
+ *pAreaMffc += (int)(MIO_NUM * Mio_GateReadArea((Mio_Gate_t *)pFanin->pData));
pFanin->iTemp |= SFM_MASK_MFFC;
nMffc++;
if ( fVeryVerbose )
@@ -832,6 +843,7 @@ printf( "Mffc = %d.\n", pFanin->Id );
{
if ( nMffc == nMffcMax )
return nMffc;
+ *pAreaMffc += (int)(MIO_NUM * Mio_GateReadArea((Mio_Gate_t *)pFanin2->pData));
pFanin2->iTemp |= SFM_MASK_MFFC;
nMffc++;
if ( fVeryVerbose )
@@ -856,8 +868,7 @@ int Abc_NtkDfsCheck_rec( Abc_Obj_t * pObj, Abc_Obj_t * pPivot )
return 0;
return 1;
}
-
-int Sfm_DecExtract( Abc_Ntk_t * pNtk, Sfm_Par_t * pPars, Abc_Obj_t * pPivot, Vec_Int_t * vRoots, Vec_Int_t * vGates, Vec_Wec_t * vFanins, Vec_Int_t * vMap, Vec_Int_t * vTfi, Vec_Int_t * vTfo, int * pnMffc )
+int Sfm_DecExtract( Abc_Ntk_t * pNtk, Sfm_Par_t * pPars, Abc_Obj_t * pPivot, Vec_Int_t * vRoots, Vec_Int_t * vGates, Vec_Wec_t * vFanins, Vec_Int_t * vMap, Vec_Int_t * vTfi, Vec_Int_t * vTfo, int * pnMffc, int * pnAreaMffc )
{
Vec_Int_t * vLevel;
Abc_Obj_t * pObj, * pFanin;
@@ -887,10 +898,10 @@ printf( "\n\nTarget %d\n", Abc_ObjId(pPivot) );
Abc_NtkDfsOne_rec( pPivot, vTfi, nLevelMin, SFM_MASK_PI );
nTfiSize = Vec_IntSize(vTfi);
// additinally mark MFFC
- *pnMffc = Sfm_DecMarkMffc( pPivot, nLevelMin, pPars->nMffcMax, pPars->fVeryVerbose );
+ *pnMffc = Sfm_DecMarkMffc( pPivot, nLevelMin, pPars->nMffcMax, pPars->fVeryVerbose, pnAreaMffc );
assert( *pnMffc <= pPars->nMffcMax );
if ( pPars->fVeryVerbose )
-printf( "Mffc size = %d.\n", *pnMffc );
+printf( "Mffc size = %d. Mffc area = %.2f\n", *pnMffc, *pnAreaMffc*MIO_NUMINV );
// collect TFI(TFO)
Abc_NtkForEachObjVec( vTfo, pNtk, pObj, i )
Abc_NtkDfsOne_rec( pObj, vTfi, nLevelMin, SFM_MASK_INPUT );
@@ -949,27 +960,73 @@ printf( "\n" );
*/
return nDivs;
}
-void Sfm_DecInsert( Abc_Ntk_t * pNtk, Abc_Obj_t * pPivot, int Limit, Vec_Int_t * vGates, Vec_Wec_t * vFanins, Vec_Int_t * vMap, Vec_Ptr_t * vGateHandles )
+void Sfm_DecInsert( Abc_Ntk_t * pNtk, Abc_Obj_t * pPivot, int Limit, Vec_Int_t * vGates, Vec_Wec_t * vFanins, Vec_Int_t * vMap, Vec_Ptr_t * vGateHandles, int GateBuf, int GateInv, Vec_Wrd_t * vFuncs )
{
Abc_Obj_t * pObjNew = NULL;
+ Vec_Int_t * vLevel;
int i, k, iObj, Gate;
// assuming that new gates are appended at the end
assert( Limit < Vec_IntSize(vGates) );
assert( Limit == Vec_IntSize(vMap) );
+ if ( Limit + 1 == Vec_IntSize(vGates) )
+ {
+ Gate = Vec_IntEntryLast(vGates);
+ if ( Gate == GateBuf )
+ {
+ iObj = Vec_WecEntryEntry( vFanins, Limit, 0 );
+ pObjNew = Abc_NtkObj( pNtk, Vec_IntEntry(vMap, iObj) );
+ Abc_ObjReplace( pPivot, pObjNew );
+ // update level
+ pObjNew->Level = 0;
+ Abc_NtkUpdateIncLevel_rec( pObjNew );
+ return;
+ }
+ else if ( Gate == GateInv )
+ {
+ // check if fanouts can be updated
+ Abc_Obj_t * pFanout;
+ Abc_ObjForEachFanout( pPivot, pFanout, i )
+ if ( !Abc_ObjIsNode(pFanout) || Sfm_LibFindComplInputGate(vFuncs, Mio_GateReadValue((Mio_Gate_t*)pFanout->pData), Abc_ObjFaninNum(pFanout), Abc_NodeFindFanin(pFanout, pPivot), NULL) == -1 )
+ break;
+ // update fanouts
+ if ( i == Abc_ObjFanoutNum(pPivot) )
+ {
+ Abc_ObjForEachFanout( pPivot, pFanout, i )
+ {
+ int iFanin = Abc_NodeFindFanin(pFanout, pPivot), iFaninNew = -1;
+ int iGate = Mio_GateReadValue((Mio_Gate_t*)pFanout->pData);
+ int iGateNew = Sfm_LibFindComplInputGate( vFuncs, iGate, Abc_ObjFaninNum(pFanout), iFanin, &iFaninNew );
+ assert( iGateNew >= 0 && iGateNew != iGate && iFaninNew >= 0 );
+ pFanout->pData = Vec_PtrEntry( vGateHandles, iGateNew );
+ //assert( iFanin == iFaninNew );
+ // swap fanins
+ if ( iFanin != iFaninNew )
+ {
+ int * pArray = Vec_IntArray( &pFanout->vFanouts );
+ ABC_SWAP( int, pArray[iFanin], pArray[iFaninNew] );
+ }
+ }
+ iObj = Vec_WecEntryEntry( vFanins, Limit, 0 );
+ pObjNew = Abc_NtkObj( pNtk, Vec_IntEntry(vMap, iObj) );
+ Abc_ObjReplace( pPivot, pObjNew );
+ // update level
+ pObjNew->Level = 0;
+ Abc_NtkUpdateIncLevel_rec( pObjNew );
+ return;
+ }
+ }
+ }
// introduce new gates
Vec_IntForEachEntryStart( vGates, Gate, i, Limit )
{
- Vec_Int_t * vLevel = Vec_WecEntry( vFanins, i );
+ vLevel = Vec_WecEntry( vFanins, i );
pObjNew = Abc_NtkCreateNode( pNtk );
Vec_IntForEachEntry( vLevel, iObj, k )
Abc_ObjAddFanin( pObjNew, Abc_NtkObj(pNtk, Vec_IntEntry(vMap, iObj)) );
pObjNew->pData = Vec_PtrEntry( vGateHandles, Gate );
Vec_IntPush( vMap, Abc_ObjId(pObjNew) );
}
- // transfer the fanout
- Abc_ObjTransferFanout( pPivot, pObjNew );
- assert( Abc_ObjFanoutNum(pPivot) == 0 );
- Abc_NtkDeleteObj_rec( pPivot, 1 );
+ Abc_ObjReplace( pPivot, pObjNew );
// update level
Abc_NtkForEachObjVecStart( vMap, pNtk, pObjNew, i, Limit )
Abc_NtkUpdateIncLevel_rec( pObjNew );
@@ -996,6 +1053,25 @@ void Sfm_DecPrintStats( Sfm_Dec_t * p )
printf( "Edges %6d out of %6d (%6.2f %%) ", p->nTotalEdgesBeg-p->nTotalEdgesEnd, p->nTotalEdgesBeg, 100.0*(p->nTotalEdgesBeg-p->nTotalEdgesEnd)/Abc_MaxInt(1, p->nTotalEdgesBeg) );
printf( "\n" );
}
+void Abc_NtkCountStats( Sfm_Dec_t * p, int Limit )
+{
+ int Gate, nGates = Vec_IntSize(&p->vObjGates);
+ if ( nGates == Limit )
+ return;
+ Gate = Vec_IntEntryLast(&p->vObjGates);
+ if ( nGates > Limit + 1 )
+ p->nNodesResyn++;
+ else if ( Gate == p->GateConst0 )
+ p->nNodesConst0++;
+ else if ( Gate == p->GateConst1 )
+ p->nNodesConst1++;
+ else if ( Gate == p->GateBuffer )
+ p->nNodesBuf++;
+ else if ( Gate == p->GateInvert )
+ p->nNodesInv++;
+ else
+ p->nNodesResyn++;
+}
void Abc_NtkPerformMfs3( Abc_Ntk_t * pNtk, Sfm_Par_t * pPars )
{
extern void Sfm_LibPreprocess( Mio_Library_t * pLib, Vec_Int_t * vGateSizes, Vec_Wrd_t * vGateFuncs, Vec_Wec_t * vGateCnfs, Vec_Ptr_t * vGateHands );
@@ -1004,7 +1080,7 @@ void Abc_NtkPerformMfs3( Abc_Ntk_t * pNtk, Sfm_Par_t * pPars )
Abc_Obj_t * pObj;
abctime clk;
int i = 0, Limit, RetValue, Count = 0, nStop = Abc_NtkObjNumMax(pNtk);
- int iNode = 70; //2341;//8;//70;
+ //int iNode = 8;//70; //2341;//8;//70;
printf( "Running remapping with parameters: " );
printf( "TFO = %d. ", pPars->nTfoLevMax );
printf( "TFI = %d. ", pPars->nTfiLevMax );
@@ -1039,11 +1115,9 @@ void Abc_NtkPerformMfs3( Abc_Ntk_t * pNtk, Sfm_Par_t * pPars )
break;
//if ( i == pPars->nNodesMax )
// pPars->fVeryVerbose = 1;
- //if ( Abc_ObjFaninNum(pObj) == 0 || (Abc_ObjFaninNum(pObj) == 1 && Abc_ObjFanoutNum(Abc_ObjFanin0(pObj)) > 1) )
- // continue;
p->nNodesTried++;
clk = Abc_Clock();
- p->nDivs = Sfm_DecExtract( pNtk, pPars, pObj, &p->vObjRoots, &p->vObjGates, &p->vObjFanins, &p->vObjMap, &p->vTemp, &p->vTemp2, &p->nMffc );
+ p->nDivs = Sfm_DecExtract( pNtk, pPars, pObj, &p->vObjRoots, &p->vObjGates, &p->vObjFanins, &p->vObjMap, &p->vTemp, &p->vTemp2, &p->nMffc, &p->AreaMffc );
p->timeWin += Abc_Clock() - clk;
p->nMaxDivs = Abc_MaxInt( p->nMaxDivs, p->nDivs );
p->nAllDivs += p->nDivs;
@@ -1057,18 +1131,16 @@ p->timeCnf += Abc_Clock() - clk;
if ( !RetValue )
continue;
clk = Abc_Clock();
-
if ( pPars->fRrOnly )
RetValue = Sfm_DecPeformDec( p );
else
RetValue = Sfm_DecPeformDec2( p );
p->timeSat += Abc_Clock() - clk;
-
-//break;
if ( RetValue < 0 )
continue;
- if ( pPars->fRrOnly )
- Sfm_DecInsert( pNtk, pObj, Limit, &p->vObjGates, &p->vObjFanins, &p->vObjMap, &p->vGateHands );
+ p->nNodesChanged++;
+ Abc_NtkCountStats( p, Limit );
+ Sfm_DecInsert( pNtk, pObj, Limit, &p->vObjGates, &p->vObjFanins, &p->vObjMap, &p->vGateHands, p->GateBuffer, p->GateInvert, &p->vGateFuncs );
if ( pPars->fVeryVerbose )
printf( "This was modification %d\n", Count );
//if ( Count == 2 )
diff --git a/src/opt/sfm/sfmInt.h b/src/opt/sfm/sfmInt.h
index 285ab2a6..3bd218a7 100644
--- a/src/opt/sfm/sfmInt.h
+++ b/src/opt/sfm/sfmInt.h
@@ -189,10 +189,11 @@ extern Vec_Wec_t * Sfm_CreateCnf( Sfm_Ntk_t * p );
extern void Sfm_TranslateCnf( Vec_Wec_t * vRes, Vec_Str_t * vCnf, Vec_Int_t * vFaninMap, int iPivotVar );
/*=== sfmCore.c ==========================================================*/
/*=== sfmLib.c ==========================================================*/
+extern int Sfm_LibFindComplInputGate( Vec_Wrd_t * vFuncs, int iGate, int nFanins, int iFanin, int * piFaninNew );
extern Sfm_Lib_t * Sfm_LibPrepare( int nVars, int fTwo, int fVerbose );
extern void Sfm_LibPrint( Sfm_Lib_t * p );
extern void Sfm_LibStop( Sfm_Lib_t * p );
-extern int Sfm_LibImplement( Sfm_Lib_t * p, word uTruth, int * pFanins, int nFanins, Vec_Int_t * vGates, Vec_Wec_t * vFanins );
+extern int Sfm_LibImplement( Sfm_Lib_t * p, word uTruth, int * pFanins, int nFanins, int AreaMffc, Vec_Int_t * vGates, Vec_Wec_t * vFanins );
/*=== sfmNtk.c ==========================================================*/
extern Sfm_Ntk_t * Sfm_ConstructNetwork( Vec_Wec_t * vFanins, int nPis, int nPos );
extern void Sfm_NtkPrepare( Sfm_Ntk_t * p );
diff --git a/src/opt/sfm/sfmLib.c b/src/opt/sfm/sfmLib.c
index 97fd9af3..47a643fe 100644
--- a/src/opt/sfm/sfmLib.c
+++ b/src/opt/sfm/sfmLib.c
@@ -26,6 +26,7 @@
#include "misc/extra/extra.h"
#include "map/mio/exp.h"
#include "opt/dau/dau.h"
+#include "base/main/main.h"
ABC_NAMESPACE_IMPL_START
@@ -124,6 +125,47 @@ void Sfm_LibPreprocess( Mio_Library_t * pLib, Vec_Int_t * vGateSizes, Vec_Wrd_t
}
+/**Function*************************************************************
+
+ Synopsis []
+
+ Description []
+
+ SideEffects []
+
+ SeeAlso []
+
+***********************************************************************/
+int Sfm_LibFindComplInputGate( Vec_Wrd_t * vFuncs, int iGate, int nFanins, int iFanin, int * piFaninNew )
+{
+ word uTruthGate = Vec_WrdEntry(vFuncs, iGate);
+ word uTruth, uTruthNew = Abc_Tt6Flip( uTruthGate, iFanin );
+ int i;
+ assert( iFanin >= 0 && iFanin < nFanins );
+ if ( piFaninNew ) *piFaninNew = iFanin;
+ Vec_WrdForEachEntry( vFuncs, uTruth, i )
+ if ( uTruth == uTruthNew )
+ return i;
+ if ( iFanin-1 >= 0 && Abc_Tt6SwapAdjacent(uTruthGate, iFanin-1) == uTruthGate ) // symmetric with prev
+ {
+ if ( piFaninNew ) *piFaninNew = iFanin-1;
+ uTruthNew = Abc_Tt6Flip( uTruthGate, iFanin-1 );
+ Vec_WrdForEachEntry( vFuncs, uTruth, i )
+ if ( uTruth == uTruthNew )
+ return i;
+ }
+ if ( iFanin+1 < nFanins && Abc_Tt6SwapAdjacent(uTruthGate, iFanin) == uTruthGate ) // symmetric with next
+ {
+ if ( piFaninNew ) *piFaninNew = iFanin+1;
+ uTruthNew = Abc_Tt6Flip( uTruthGate, iFanin+1 );
+ Vec_WrdForEachEntry( vFuncs, uTruth, i )
+ if ( uTruth == uTruthNew )
+ return i;
+ }
+ if ( piFaninNew ) *piFaninNew = -1;
+ return -1;
+}
+
/**Function*************************************************************
@@ -176,7 +218,10 @@ word Sfm_LibTruthTwo( Mio_Cell2_t * pCellBot, Mio_Cell2_t * pCellTop, int InTop
word uFanins[6]; int i, k;
assert( InTop >= 0 && InTop < (int)pCellTop->nFanins );
for ( i = 0, k = pCellBot->nFanins; i < (int)pCellTop->nFanins; i++ )
- uFanins[i] = (i == InTop) ? uTruthBot : s_Truths6[k++];
+ if ( i == InTop )
+ uFanins[i] = uTruthBot;
+ else
+ uFanins[i] = s_Truths6[k++];
assert( (int)pCellBot->nFanins + (int)pCellTop->nFanins == k + 1 );
uTruthBot = Exp_Truth6( pCellTop->nFanins, pCellTop->vExpr, uFanins );
return uTruthBot;
@@ -196,7 +241,7 @@ word Sfm_LibTruthTwo( Mio_Cell2_t * pCellBot, Mio_Cell2_t * pCellTop, int InTop
void Sfm_LibPrepareAdd( Sfm_Lib_t * p, word uTruth, int * Perm, int nFanins, Mio_Cell2_t * pCellBot, Mio_Cell2_t * pCellTop, int InTop )
{
Sfm_Fun_t * pObj;
- int Area = (int)(pCellBot->Area / 1000) + (pCellTop ? (int)(pCellTop->Area / 1000) : 0);
+ int InvPerm[6], Area = (int)pCellBot->Area + (pCellTop ? (int)pCellTop->Area : 0);
int i, k, iFunc = Vec_MemHashInsert( p->vTtMem, &uTruth );
if ( iFunc == Vec_IntSize(&p->vLists) )
{
@@ -210,6 +255,8 @@ void Sfm_LibPrepareAdd( Sfm_Lib_t * p, word uTruth, int * Perm, int nFanins, Mio
if ( Area >= pObj->Area )
return;
}
+ for ( k = 0; k < nFanins; k++ )
+ InvPerm[Perm[k]] = k;
// create new object
if ( p->nObjs == p->nObjsAlloc )
{
@@ -227,13 +274,13 @@ void Sfm_LibPrepareAdd( Sfm_Lib_t * p, word uTruth, int * Perm, int nFanins, Mio
assert( pCellBot->Id < 128 );
pObj->pFansB[0] = (char)pCellBot->Id;
for ( k = 0; k < (int)pCellBot->nFanins; k++ )
- pObj->pFansB[k+1] = Perm[k];
+ pObj->pFansB[k+1] = InvPerm[k];
if ( pCellTop == NULL )
return;
assert( pCellTop->Id < 128 );
pObj->pFansT[0] = (char)pCellTop->Id;
for ( i = 0; i < (int)pCellTop->nFanins; i++ )
- pObj->pFansT[i+1] = (char)(i == InTop ? 16 : Perm[k++]);
+ pObj->pFansT[i+1] = (char)(i == InTop ? 16 : InvPerm[k++]);
assert( k == nFanins );
}
Sfm_Lib_t * Sfm_LibPrepare( int nVars, int fTwo, int fVerbose )
@@ -340,7 +387,7 @@ void Sfm_LibPrintObj( Sfm_Lib_t * p, Sfm_Fun_t * pObj )
Mio_Cell2_t * pCellB = p->pCells + (int)pObj->pFansB[0];
Mio_Cell2_t * pCellT = p->pCells + (int)pObj->pFansT[0];
int nFanins = pCellB->nFanins + (pCellT == p->pCells ? 0 : pCellT->nFanins);
- printf( " Area = %6.2f Fanins = %d ", 0.001*pObj->Area, nFanins );
+ printf( " Area = %6.2f Fanins = %d ", MIO_NUMINV*pObj->Area, nFanins );
if ( pCellT == p->pCells )
Sfm_LibPrintGate( pCellB, pObj->pFansB + 1, NULL, NULL );
else
@@ -381,9 +428,61 @@ void Sfm_LibTest( int nVars, int fTwo, int fVerbose )
SeeAlso []
***********************************************************************/
-int Sfm_LibImplement( Sfm_Lib_t * p, word uTruth, int * pFanins, int nFanins, Vec_Int_t * vGates, Vec_Wec_t * vFanins )
+int Sfm_LibImplement( Sfm_Lib_t * p, word uTruth, int * pFanins, int nFanins, int AreaMffc, Vec_Int_t * vGates, Vec_Wec_t * vFanins )
{
- return 0;
+ Mio_Library_t * pLib = (Mio_Library_t *)Abc_FrameReadLibGen();
+ Mio_Gate_t * pGate;
+ Mio_Cell2_t * pCellB, * pCellT;
+ Vec_Int_t * vLevel;
+ Sfm_Fun_t * pObj, * pObjMin = NULL;
+ int i, iFunc;
+ if ( uTruth == 0 || uTruth == ~(word)0 )
+ {
+ assert( nFanins == 0 );
+ pGate = uTruth ? Mio_LibraryReadConst1(pLib) : Mio_LibraryReadConst0(pLib);
+ Vec_IntPush( vGates, Mio_GateReadValue(pGate) );
+ vLevel = Vec_WecPushLevel( vFanins );
+ return 1;
+ }
+ if ( uTruth == s_Truths6[0] || uTruth == ~s_Truths6[0] )
+ {
+ assert( nFanins == 1 );
+ pGate = uTruth == s_Truths6[0] ? Mio_LibraryReadBuf(pLib) : Mio_LibraryReadInv(pLib);
+ Vec_IntPush( vGates, Mio_GateReadValue(pGate) );
+ vLevel = Vec_WecPushLevel( vFanins );
+ Vec_IntPush( vLevel, pFanins[0] );
+ return 1;
+ }
+ // look for gate
+ iFunc = *Vec_MemHashLookup( p->vTtMem, &uTruth );
+ if ( iFunc == -1 )
+ return -1;
+ Sfm_LibForEachSuper( p, pObj, iFunc )
+ if ( !pObjMin || pObjMin->Area > pObj->Area )
+ pObjMin = pObj;
+ if ( pObjMin == NULL || pObjMin->Area >= AreaMffc )
+ return -1;
+ // get the gates
+ pCellB = p->pCells + (int)pObjMin->pFansB[0];
+ pCellT = p->pCells + (int)pObjMin->pFansT[0];
+ // create bottom gate
+ pGate = Mio_LibraryReadGateByName( pLib, pCellB->pName, NULL );
+ Vec_IntPush( vGates, Mio_GateReadValue(pGate) );
+ vLevel = Vec_WecPushLevel( vFanins );
+ for ( i = 0; i < (int)pCellB->nFanins; i++ )
+ Vec_IntPush( vLevel, pFanins[(int)pObjMin->pFansB[i+1]] );
+ if ( pCellT == p->pCells )
+ return 1;
+ // create top gate
+ pGate = Mio_LibraryReadGateByName( pLib, pCellT->pName, NULL );
+ Vec_IntPush( vGates, Mio_GateReadValue(pGate) );
+ vLevel = Vec_WecPushLevel( vFanins );
+ for ( i = 0; i < (int)pCellT->nFanins; i++ )
+ if ( pObjMin->pFansT[i+1] == (char)16 )
+ Vec_IntPush( vLevel, Vec_WecSize(vFanins)-2 );
+ else
+ Vec_IntPush( vLevel, pFanins[(int)pObjMin->pFansT[i+1]] );
+ return 2;
}
////////////////////////////////////////////////////////////////////////