diff options
| -rw-r--r-- | abclib.dsp | 4 | ||||
| -rw-r--r-- | src/base/wlc/module.make | 1 | ||||
| -rw-r--r-- | src/base/wlc/wlc.h | 3 | ||||
| -rw-r--r-- | src/base/wlc/wlcAbs.c | 8 | ||||
| -rw-r--r-- | src/base/wlc/wlcAbs2.c | 2 | ||||
| -rw-r--r-- | src/base/wlc/wlcBlast.c | 4 | ||||
| -rw-r--r-- | src/base/wlc/wlcCom.c | 50 | ||||
| -rw-r--r-- | src/base/wlc/wlcGraft.c | 294 | ||||
| -rw-r--r-- | src/base/wlc/wlcReadVer.c | 2 | ||||
| -rw-r--r-- | src/base/wlc/wlcSim.c | 2 |
10 files changed, 359 insertions, 11 deletions
@@ -799,6 +799,10 @@ SOURCE=.\src\base\wlc\wlcCom.c # End Source File # Begin Source File +SOURCE=.\src\base\wlc\wlcGraft.c +# End Source File +# Begin Source File + SOURCE=.\src\base\wlc\wlcJson.c # End Source File # Begin Source File diff --git a/src/base/wlc/module.make b/src/base/wlc/module.make index c4330264..29770937 100644 --- a/src/base/wlc/module.make +++ b/src/base/wlc/module.make @@ -3,6 +3,7 @@ SRC += src/base/wlc/wlcAbs.c \ src/base/wlc/wlcAbc.c \ src/base/wlc/wlcBlast.c \ src/base/wlc/wlcCom.c \ + src/base/wlc/wlcGraft.c \ src/base/wlc/wlcJson.c \ src/base/wlc/wlcNtk.c \ src/base/wlc/wlcReadSmt.c \ diff --git a/src/base/wlc/wlc.h b/src/base/wlc/wlc.h index e1ec0d06..53936cc9 100644 --- a/src/base/wlc/wlc.h +++ b/src/base/wlc/wlc.h @@ -206,6 +206,7 @@ static inline int Wlc_ObjIsCo( Wlc_Obj_t * p ) static inline int Wlc_ObjId( Wlc_Ntk_t * p, Wlc_Obj_t * pObj ) { return pObj - p->pObjs; } static inline int Wlc_ObjCiId( Wlc_Obj_t * p ) { assert( Wlc_ObjIsCi(p) ); return p->Fanins[1]; } +static inline int Wlc_ObjType( Wlc_Obj_t * pObj ) { return pObj->Type; } static inline int Wlc_ObjFaninNum( Wlc_Obj_t * p ) { return p->nFanins; } static inline int Wlc_ObjHasArray( Wlc_Obj_t * p ) { return p->nFanins > 2 || p->Type == WLC_OBJ_CONST || p->Type == WLC_OBJ_BIT_SELECT; } static inline int * Wlc_ObjFanins( Wlc_Obj_t * p ) { return Wlc_ObjHasArray(p) ? p->pFanins[0] : p->Fanins; } @@ -291,7 +292,7 @@ extern int Wlc_NtkPdrAbs( Wlc_Ntk_t * p, Wlc_Par_t * pPars ); /*=== wlcAbs2.c ========================================================*/ extern int Wlc_NtkAbsCore2( Wlc_Ntk_t * p, Wlc_Par_t * pPars ); /*=== wlcBlast.c ========================================================*/ -extern Gia_Man_t * Wlc_NtkBitBlast( Wlc_Ntk_t * p, Vec_Int_t * vBoxIds, int iOutput, int nRange, int fGiaSimple, int fAddOutputs, int fBooth ); +extern Gia_Man_t * Wlc_NtkBitBlast( Wlc_Ntk_t * p, Vec_Int_t * vBoxIds, int iOutput, int nRange, int fGiaSimple, int fAddOutputs, int fBooth, int fNoCleanup ); /*=== wlcCom.c ========================================================*/ extern void Wlc_SetNtk( Abc_Frame_t * pAbc, Wlc_Ntk_t * pNtk ); /*=== wlcNtk.c ========================================================*/ diff --git a/src/base/wlc/wlcAbs.c b/src/base/wlc/wlcAbs.c index ca1d14a9..12c8de87 100644 --- a/src/base/wlc/wlcAbs.c +++ b/src/base/wlc/wlcAbs.c @@ -150,7 +150,7 @@ static Vec_Int_t * Wlc_NtkGetCoreSels( Gia_Man_t * pFrames, int nFrames, int num static Gia_Man_t * Wlc_NtkUnrollWithCex(Wlc_Ntk_t * pChoice, Abc_Cex_t * pCex, int nbits_old_pis, int num_sel_pis, int * p_num_ppis, int sel_pi_first, int fUsePPI) { - Gia_Man_t * pGiaChoice = Wlc_NtkBitBlast( pChoice, NULL, -1, 0, 0, 0, 0 ); + Gia_Man_t * pGiaChoice = Wlc_NtkBitBlast( pChoice, NULL, -1, 0, 0, 0, 0, 0 ); int nbits_new_pis = Wlc_NtkNumPiBits( pChoice ); int num_ppis = nbits_new_pis - nbits_old_pis - num_sel_pis; int num_undc_pis = Gia_ManPiNum(pGiaChoice) - nbits_new_pis; @@ -315,7 +315,7 @@ Wlc_Ntk_t * Wlc_NtkIntroduceChoices( Wlc_Ntk_t * pNtk, Vec_Int_t * vBlacks ) static int Wlc_NtkCexIsReal( Wlc_Ntk_t * pOrig, Abc_Cex_t * pCex ) { - Gia_Man_t * pGiaOrig = Wlc_NtkBitBlast( pOrig, NULL, -1, 0, 0, 0, 0 ); + Gia_Man_t * pGiaOrig = Wlc_NtkBitBlast( pOrig, NULL, -1, 0, 0, 0, 0, 0 ); int f, i; Gia_Obj_t * pObj, * pObjRi; @@ -1093,7 +1093,7 @@ int Wlc_NtkPdrAbs( Wlc_Ntk_t * p, Wlc_Par_t * pPars ) pAbs = Wlc_NtkAbs( p, pPars, vUnmark, &vPisNew, &vFfNew, pPars->fVerbose ); } - pGia = Wlc_NtkBitBlast( pAbs, NULL, -1, 0, 0, 0, 0 ); + pGia = Wlc_NtkBitBlast( pAbs, NULL, -1, 0, 0, 0, 0, 0 ); // map old flops into new flops if ( vFfOld ) @@ -1391,7 +1391,7 @@ int Wlc_NtkAbsCore( Wlc_Ntk_t * p, Wlc_Par_t * pPars ) pAbs = Wlc_NtkAbs( p, pPars, vUnmark, &vPisNew, NULL, pPars->fVerbose ); } - pGia = Wlc_NtkBitBlast( pAbs, NULL, -1, 0, 0, 0, 0 ); + pGia = Wlc_NtkBitBlast( pAbs, NULL, -1, 0, 0, 0, 0, 0 ); // if the abstraction has flops with DC-init state, // new PIs were introduced by bit-blasting at the end of the PI list diff --git a/src/base/wlc/wlcAbs2.c b/src/base/wlc/wlcAbs2.c index 9bccdf62..ff0092e6 100644 --- a/src/base/wlc/wlcAbs2.c +++ b/src/base/wlc/wlcAbs2.c @@ -328,7 +328,7 @@ int Wlc_NtkAbsCore2( Wlc_Ntk_t * p, Wlc_Par_t * pPars ) // get abstracted GIA and the set of pseudo-PIs (vPisNew) pAbs = Wlc_NtkAbs( p, pPars, vUnmark, &vPisNew, pPars->fVerbose ); - pGia = Wlc_NtkBitBlast( pAbs, NULL, -1, 0, 0, 0, 0 ); + pGia = Wlc_NtkBitBlast( pAbs, NULL, -1, 0, 0, 0, 0, 0 ); // if the abstraction has flops with DC-init state, // new PIs were introduced by bit-blasting at the end of the PI list diff --git a/src/base/wlc/wlcBlast.c b/src/base/wlc/wlcBlast.c index f4de8ee6..02cb2b1c 100644 --- a/src/base/wlc/wlcBlast.c +++ b/src/base/wlc/wlcBlast.c @@ -868,7 +868,7 @@ void Wlc_BlastBooth( Gia_Man_t * pNew, int * pArgA, int * pArgB, int nArgA, int SeeAlso [] ***********************************************************************/ -Gia_Man_t * Wlc_NtkBitBlast( Wlc_Ntk_t * p, Vec_Int_t * vBoxIds, int iOutput, int nOutputRange, int fGiaSimple, int fAddOutputs, int fBooth ) +Gia_Man_t * Wlc_NtkBitBlast( Wlc_Ntk_t * p, Vec_Int_t * vBoxIds, int iOutput, int nOutputRange, int fGiaSimple, int fAddOutputs, int fBooth, int fNoCleanup ) { int fVerbose = 0; int fUseOldMultiplierBlasting = 0; @@ -1401,7 +1401,7 @@ Gia_Man_t * Wlc_NtkBitBlast( Wlc_Ntk_t * p, Vec_Int_t * vBoxIds, int iOutput, in assert( nFFins == nFFouts ); Gia_ManSetRegNum( pNew, nFFins ); // finalize AIG - if ( !fGiaSimple ) + if ( !fGiaSimple && !fNoCleanup ) { pNew = Gia_ManCleanup( pTemp = pNew ); Gia_ManDupRemapLiterals( vBits, pTemp ); diff --git a/src/base/wlc/wlcCom.c b/src/base/wlc/wlcCom.c index 8f474f45..209a3865 100644 --- a/src/base/wlc/wlcCom.c +++ b/src/base/wlc/wlcCom.c @@ -36,6 +36,7 @@ static int Abc_CommandAbs ( Abc_Frame_t * pAbc, int argc, char ** argv ) static int Abc_CommandPdrAbs ( Abc_Frame_t * pAbc, int argc, char ** argv ); static int Abc_CommandAbs2 ( Abc_Frame_t * pAbc, int argc, char ** argv ); static int Abc_CommandBlast ( Abc_Frame_t * pAbc, int argc, char ** argv ); +static int Abc_CommandGraft ( Abc_Frame_t * pAbc, int argc, char ** argv ); static int Abc_CommandProfile ( Abc_Frame_t * pAbc, int argc, char ** argv ); static int Abc_CommandShortNames ( Abc_Frame_t * pAbc, int argc, char ** argv ); static int Abc_CommandShow ( Abc_Frame_t * pAbc, int argc, char ** argv ); @@ -79,6 +80,7 @@ void Wlc_Init( Abc_Frame_t * pAbc ) Cmd_CommandAdd( pAbc, "Word level", "%pdra", Abc_CommandPdrAbs, 0 ); Cmd_CommandAdd( pAbc, "Word level", "%abs2", Abc_CommandAbs2, 0 ); Cmd_CommandAdd( pAbc, "Word level", "%blast", Abc_CommandBlast, 0 ); + Cmd_CommandAdd( pAbc, "Word level", "%graft", Abc_CommandGraft, 0 ); Cmd_CommandAdd( pAbc, "Word level", "%profile", Abc_CommandProfile, 0 ); Cmd_CommandAdd( pAbc, "Word level", "%short_names", Abc_CommandShortNames, 0 ); Cmd_CommandAdd( pAbc, "Word level", "%show", Abc_CommandShow, 0 ); @@ -933,7 +935,7 @@ int Abc_CommandBlast( Abc_Frame_t * pAbc, int argc, char ** argv ) return 0; } // transform - pNew = Wlc_NtkBitBlast( pNtk, vBoxIds, iOutput, nOutputRange, fGiaSimple, fAddOutputs, fBooth ); + pNew = Wlc_NtkBitBlast( pNtk, vBoxIds, iOutput, nOutputRange, fGiaSimple, fAddOutputs, fBooth, 0 ); Vec_IntFreeP( &vBoxIds ); if ( pNew == NULL ) { @@ -967,6 +969,52 @@ usage: SeeAlso [] ******************************************************************************/ +int Abc_CommandGraft( Abc_Frame_t * pAbc, int argc, char ** argv ) +{ + extern Wlc_Ntk_t * Wlc_NtkGraftMulti( Wlc_Ntk_t * p, int fVerbose ); + Wlc_Ntk_t * pNtk = Wlc_AbcGetNtk(pAbc); + int c, fVerbose = 0; + Extra_UtilGetoptReset(); + while ( ( c = Extra_UtilGetopt( argc, argv, "vh" ) ) != EOF ) + { + switch ( c ) + { + case 'v': + fVerbose ^= 1; + break; + case 'h': + goto usage; + default: + goto usage; + } + } + if ( pNtk == NULL ) + { + Abc_Print( 1, "Abc_CommandGraft(): There is no current design.\n" ); + return 0; + } + pNtk = Wlc_NtkGraftMulti( pNtk, fVerbose ); + Wlc_AbcUpdateNtk( pAbc, pNtk ); + return 0; +usage: + Abc_Print( -2, "usage: %%graft [-vh]\n" ); + Abc_Print( -2, "\t detects multipliers in LHS of the miter and moves them to RHS\n" ); + Abc_Print( -2, "\t-v : toggle printing verbose information [default = %s]\n", fVerbose? "yes": "no" ); + Abc_Print( -2, "\t-h : print the command usage\n"); + return 1; +} + +/**Function******************************************************************** + + Synopsis [] + + Description [] + + SideEffects [] + + SeeAlso [] + +******************************************************************************/ int Abc_CommandProfile( Abc_Frame_t * pAbc, int argc, char ** argv ) { Wlc_Ntk_t * pNtk = Wlc_AbcGetNtk(pAbc); diff --git a/src/base/wlc/wlcGraft.c b/src/base/wlc/wlcGraft.c new file mode 100644 index 00000000..8ac825fc --- /dev/null +++ b/src/base/wlc/wlcGraft.c @@ -0,0 +1,294 @@ +/**CFile**************************************************************** + + FileName [wlcGraft.c] + + SystemName [ABC: Logic synthesis and verification system.] + + PackageName [Verilog parser.] + + Synopsis [Parses several flavors of word-level Verilog.] + + Author [Alan Mishchenko] + + Affiliation [UC Berkeley] + + Date [Ver. 1.0. Started - August 22, 2014.] + + Revision [$Id: wlcGraft.c,v 1.00 2014/09/12 00:00:00 alanmi Exp $] + +***********************************************************************/ + +#include "wlc.h" +#include "sat/bsat/satStore.h" + +ABC_NAMESPACE_IMPL_START + +//////////////////////////////////////////////////////////////////////// +/// DECLARATIONS /// +//////////////////////////////////////////////////////////////////////// + +//////////////////////////////////////////////////////////////////////// +/// FUNCTION DEFINITIONS /// +//////////////////////////////////////////////////////////////////////// + +/**Function************************************************************* + + Synopsis [Internal simulation APIs.] + + Description [] + + SideEffects [] + + SeeAlso [] + +***********************************************************************/ +static inline word * Wlc_ObjSim( Gia_Man_t * p, int iObj ) +{ + return Vec_WrdEntryP( p->vSims, p->nSimWords * iObj ); +} +static inline void Wlc_ObjSimPi( Gia_Man_t * p, int iObj ) +{ + int w; + word * pSim = Wlc_ObjSim( p, iObj ); + for ( w = 0; w < p->nSimWords; w++ ) + pSim[w] = Gia_ManRandomW( 0 ); + pSim[0] <<= 1; +} +static inline void Wlc_ObjSimRo( Gia_Man_t * p, int iObj ) +{ + int w; + word * pSimRo = Wlc_ObjSim( p, iObj ); + word * pSimRi = Wlc_ObjSim( p, Gia_ObjRoToRiId(p, iObj) ); + for ( w = 0; w < p->nSimWords; w++ ) + pSimRo[w] = pSimRi[w]; +} +static inline void Wlc_ObjSimCo( Gia_Man_t * p, int iObj ) +{ + int w; + Gia_Obj_t * pObj = Gia_ManObj( p, iObj ); + word * pSimCo = Wlc_ObjSim( p, iObj ); + word * pSimDri = Wlc_ObjSim( p, Gia_ObjFaninId0(pObj, iObj) ); + if ( Gia_ObjFaninC0(pObj) ) + for ( w = 0; w < p->nSimWords; w++ ) + pSimCo[w] = ~pSimDri[w]; + else + for ( w = 0; w < p->nSimWords; w++ ) + pSimCo[w] = pSimDri[w]; +} +static inline void Wlc_ObjSimAnd( Gia_Man_t * p, int iObj ) +{ + int w; + Gia_Obj_t * pObj = Gia_ManObj( p, iObj ); + word * pSim = Wlc_ObjSim( p, iObj ); + word * pSim0 = Wlc_ObjSim( p, Gia_ObjFaninId0(pObj, iObj) ); + word * pSim1 = Wlc_ObjSim( p, Gia_ObjFaninId1(pObj, iObj) ); + if ( Gia_ObjFaninC0(pObj) && Gia_ObjFaninC1(pObj) ) + for ( w = 0; w < p->nSimWords; w++ ) + pSim[w] = ~pSim0[w] & ~pSim1[w]; + else if ( Gia_ObjFaninC0(pObj) && !Gia_ObjFaninC1(pObj) ) + for ( w = 0; w < p->nSimWords; w++ ) + pSim[w] = ~pSim0[w] & pSim1[w]; + else if ( !Gia_ObjFaninC0(pObj) && Gia_ObjFaninC1(pObj) ) + for ( w = 0; w < p->nSimWords; w++ ) + pSim[w] = pSim0[w] & ~pSim1[w]; + else + for ( w = 0; w < p->nSimWords; w++ ) + pSim[w] = pSim0[w] & pSim1[w]; +} + +/**Function************************************************************* + + Synopsis [] + + Description [] + + SideEffects [] + + SeeAlso [] + +***********************************************************************/ +int Wlc_NtkCollectObjs_rec( Wlc_Ntk_t * p, Wlc_Obj_t * pObj, Vec_Int_t * vObjs ) +{ + int i, iFanin, Count = 0; + if ( Wlc_ObjIsCi(pObj) ) + return 0; + if ( pObj->Mark ) + return 0; + pObj->Mark = 1; + Wlc_ObjForEachFanin( pObj, iFanin, i ) + Count += Wlc_NtkCollectObjs_rec( p, Wlc_NtkObj(p, iFanin), vObjs ); + Vec_IntPush( vObjs, Wlc_ObjId(p, pObj) ); + return Count + (int)(pObj->Type == WLC_OBJ_ARI_MULTI); +} +Vec_Int_t * Wlc_NtkCollectObjs( Wlc_Ntk_t * p, int fEven, int * pCount ) +{ + Vec_Int_t * vObjs = Vec_IntAlloc( 100 ); + Wlc_Obj_t * pObj; + int i, Count = 0; + Wlc_NtkCleanMarks( p ); + Wlc_NtkForEachCo( p, pObj, i ) + if ( (i & 1) == fEven ) + Count += Wlc_NtkCollectObjs_rec( p, pObj, vObjs ); + Wlc_NtkCleanMarks( p ); + if ( pCount ) + *pCount = Count; + return vObjs; +} + +/**Function************************************************************* + + Synopsis [] + + Description [] + + SideEffects [] + + SeeAlso [] + +***********************************************************************/ +void Wlc_NtkSaveOneNode( Wlc_Ntk_t * p, Wlc_Obj_t * pWlcObj, Gia_Man_t * pGia, Vec_Mem_t * vTtMem ) +{ + int k, Entry; + int nWords = Vec_MemEntrySize(vTtMem); + int nBits = Wlc_ObjRange(pWlcObj); + int iFirst = Vec_IntEntry( &p->vCopies, Wlc_ObjId(p, pWlcObj) ); + for ( k = 0; k < nBits; k++ ) + { + int iLit = Vec_IntEntry( &p->vBits, iFirst + k ); + word * pInfoObj = Wlc_ObjSim( pGia, Abc_Lit2Var(iLit) ); + int fCompl = pInfoObj[0] & 1; + if ( fCompl ) Abc_TtNot( pInfoObj, nWords ); + Entry = Vec_MemHashInsert( vTtMem, pInfoObj ); + if ( fCompl ) Abc_TtNot( pInfoObj, nWords ); + printf( "%2d(%d) ", Entry, fCompl ^ Abc_LitIsCompl(iLit) ); + Extra_PrintHex( stdout, (unsigned*)pInfoObj, 8 ); + printf( "\n" ); + } + printf( "\n" ); +} +void Wlc_NtkFindOneNode( Wlc_Ntk_t * p, Wlc_Obj_t * pWlcObj, Gia_Man_t * pGia, Vec_Mem_t * vTtMem ) +{ + int k, Entry; + int nWords = Vec_MemEntrySize(vTtMem); + int nBits = Wlc_ObjRange(pWlcObj); + int iFirst = Vec_IntEntry( &p->vCopies, Wlc_ObjId(p, pWlcObj) ); + for ( k = 0; k < nBits; k++ ) + { + int iLit = Vec_IntEntry( &p->vBits, iFirst + k ); + word * pInfoObj = Wlc_ObjSim( pGia, Abc_Lit2Var(iLit) ); + int fCompl = pInfoObj[0] & 1; + if ( fCompl ) Abc_TtNot( pInfoObj, nWords ); + Entry = *Vec_MemHashLookup( vTtMem, pInfoObj ); + if ( Entry > 0 ) + printf( "Obj %4d. Range = %2d. Bit %2d. Entry %d(%d). %s\n", Wlc_ObjId(p, pWlcObj), Wlc_ObjRange(pWlcObj), k, Entry, fCompl ^ Abc_LitIsCompl(iLit), Wlc_ObjName(p, Wlc_ObjId(p, pWlcObj)) ); + if ( fCompl ) Abc_TtNot( pInfoObj, nWords ); + //printf( "%2d ", Entry ); + //Extra_PrintHex( stdout, (unsigned*)pInfoObj, 8 ); + //printf( "\n" ); + } + //printf( "\n" ); +} + +/**Function************************************************************* + + Synopsis [] + + Description [] + + SideEffects [] + + SeeAlso [] + +***********************************************************************/ +Wlc_Ntk_t * Wlc_NtkGraftMulti( Wlc_Ntk_t * p, int fVerbose ) +{ + int nWords = 4; + int i, nMultiLHS, nMultiRHS; + word * pInfoObj; + Wlc_Ntk_t * pNew = NULL; + Wlc_Obj_t * pWlcObj; + Gia_Obj_t * pObj; + Vec_Int_t * vObjsLHS = Wlc_NtkCollectObjs( p, 0, &nMultiLHS ); + Vec_Int_t * vObjsRHS = Wlc_NtkCollectObjs( p, 1, &nMultiRHS ); + Gia_Man_t * pGia = Wlc_NtkBitBlast( p, NULL, -1, 0, 0, 0, 0, 1 ); + Vec_Mem_t * vTtMem = Vec_MemAlloc( nWords, 10 ); + Vec_MemHashAlloc( vTtMem, 10000 ); + + // check if there are multipliers + if ( nMultiLHS == 0 && nMultiRHS == 0 ) + { + printf( "No multipliers are present.\n" ); + return NULL; + } + // compare multipliers + if ( nMultiLHS > 0 && nMultiRHS > 0 ) + { + printf( "Multipliers are present in both sides of the miter.\n" ); + return NULL; + } + // swap if wrong side + if ( nMultiRHS > 0 ) + { + ABC_SWAP( Vec_Int_t *, vObjsLHS, vObjsRHS ); + ABC_SWAP( int, nMultiLHS, nMultiRHS ); + } + assert( nMultiLHS > 0 ); + assert( nMultiRHS == 0 ); + + // allocate simulation info for one timeframe + Vec_WrdFreeP( &pGia->vSims ); + pGia->vSims = Vec_WrdStart( Gia_ManObjNum(pGia) * nWords ); + pGia->nSimWords = nWords; + // perform simulation + Gia_ManRandomW( 1 ); + Gia_ManForEachObj1( pGia, pObj, i ) + { + if ( Gia_ObjIsAnd(pObj) ) + Wlc_ObjSimAnd( pGia, i ); + else if ( Gia_ObjIsCo(pObj) ) + Wlc_ObjSimCo( pGia, i ); + else if ( Gia_ObjIsCi(pObj) ) + Wlc_ObjSimPi( pGia, i ); + else assert( 0 ); + } + + // hash constant 0 + pInfoObj = Wlc_ObjSim( pGia, 0 ); + Vec_MemHashInsert( vTtMem, pInfoObj ); + + // hash sim info on the multiplier boundary + Wlc_NtkForEachObjVec( vObjsLHS, p, pWlcObj, i ) + if ( Wlc_ObjType(pWlcObj) == WLC_OBJ_ARI_MULTI ) + { + Wlc_NtkSaveOneNode( p, Wlc_ObjFanin0(p, pWlcObj), pGia, vTtMem ); + Wlc_NtkSaveOneNode( p, Wlc_ObjFanin1(p, pWlcObj), pGia, vTtMem ); + Wlc_NtkSaveOneNode( p, pWlcObj, pGia, vTtMem ); + } + + // check if there are similar signals in LHS + Wlc_NtkForEachObjVec( vObjsRHS, p, pWlcObj, i ) + Wlc_NtkFindOneNode( p, pWlcObj, pGia, vTtMem ); + + // perform grafting + + + Vec_MemHashFree( vTtMem ); + Vec_MemFreeP( &vTtMem ); + + // cleanup + Vec_WrdFreeP( &pGia->vSims ); + pGia->nSimWords = 0; + + Vec_IntFree( vObjsLHS ); + Vec_IntFree( vObjsRHS ); + Gia_ManStop( pGia ); + return pNew; +} + +//////////////////////////////////////////////////////////////////////// +/// END OF FILE /// +//////////////////////////////////////////////////////////////////////// + + +ABC_NAMESPACE_IMPL_END + diff --git a/src/base/wlc/wlcReadVer.c b/src/base/wlc/wlcReadVer.c index e4a65ecf..63a6926b 100644 --- a/src/base/wlc/wlcReadVer.c +++ b/src/base/wlc/wlcReadVer.c @@ -1292,7 +1292,7 @@ void Io_ReadWordTest( char * pFileName ) return; Wlc_WriteVer( pNtk, "test.v", 0, 0 ); - pNew = Wlc_NtkBitBlast( pNtk, NULL, -1, 0, 0, 0, 0 ); + pNew = Wlc_NtkBitBlast( pNtk, NULL, -1, 0, 0, 0, 0, 0 ); Gia_AigerWrite( pNew, "test.aig", 0, 0 ); Gia_ManStop( pNew ); diff --git a/src/base/wlc/wlcSim.c b/src/base/wlc/wlcSim.c index e2fcd1f8..2ae3c86e 100644 --- a/src/base/wlc/wlcSim.c +++ b/src/base/wlc/wlcSim.c @@ -129,7 +129,7 @@ Vec_Ptr_t * Wlc_NtkSimulate( Wlc_Ntk_t * p, Vec_Int_t * vNodes, int nWords, int { Gia_Obj_t * pObj; Vec_Ptr_t * vOne, * vRes; - Gia_Man_t * pGia = Wlc_NtkBitBlast( p, NULL, -1, 0, 0, 0, 0 ); + Gia_Man_t * pGia = Wlc_NtkBitBlast( p, NULL, -1, 0, 0, 0, 0, 0 ); Wlc_Obj_t * pWlcObj; int f, i, k, w, nBits, Counter = 0; // allocate simulation info for one timeframe |