diff options
| author | Alan Mishchenko <alanmi@berkeley.edu> | 2017-03-26 21:46:09 -0700 |
|---|---|---|
| committer | Alan Mishchenko <alanmi@berkeley.edu> | 2017-03-26 21:46:09 -0700 |
| commit | 2ccd0f9b85cb42d3e6e894a71cd8e962b2d3bd12 (patch) | |
| tree | 82c6fdc7c57af683b9d9e89ab248ba8d07d620b0 /src/base/acb | |
| parent | 23151498faa67c0dd7de23d8fedb1a2976f12a88 (diff) | |
| download | abc-2ccd0f9b85cb42d3e6e894a71cd8e962b2d3bd12.tar.gz abc-2ccd0f9b85cb42d3e6e894a71cd8e962b2d3bd12.tar.bz2 abc-2ccd0f9b85cb42d3e6e894a71cd8e962b2d3bd12.zip | |
Experiments with don't-cares.
Diffstat (limited to 'src/base/acb')
| -rw-r--r-- | src/base/acb/acbAbc.c | 12 | ||||
| -rw-r--r-- | src/base/acb/acbMfs.c | 2 | ||||
| -rw-r--r-- | src/base/acb/acbUtil.c | 1 |
3 files changed, 12 insertions, 3 deletions
diff --git a/src/base/acb/acbAbc.c b/src/base/acb/acbAbc.c index b6604a54..169532e5 100644 --- a/src/base/acb/acbAbc.c +++ b/src/base/acb/acbAbc.c @@ -86,15 +86,23 @@ Abc_Ntk_t * Acb_NtkToAbc( Abc_Ntk_t * pNtk, Acb_Ntk_t * p ) int i, k, iObj, iFanin; Abc_Ntk_t * pNtkNew = Abc_NtkStartFrom( pNtk, ABC_NTK_LOGIC, ABC_FUNC_SOP ); Mem_Flex_t * pMan = (Mem_Flex_t *)pNtkNew->pManFunc; + Vec_Int_t * vCover = Vec_IntAlloc( 1000 ); Acb_NtkCleanObjCopies( p ); Acb_NtkForEachCi( p, iObj, i ) Acb_ObjSetCopy( p, iObj, Abc_ObjId(Abc_NtkCi(pNtkNew, i)) ); Acb_NtkForEachNode( p, iObj ) { Abc_Obj_t * pObjNew = Abc_NtkCreateNode( pNtkNew ); + pObjNew->pData = Abc_SopCreateFromTruthIsop( pMan, Acb_ObjFaninNum(p, iObj), Acb_ObjTruthP(p, iObj), vCover ); + Acb_ObjSetCopy( p, iObj, Abc_ObjId(pObjNew) ); + } + Vec_IntFree( vCover ); + Acb_NtkForEachNode( p, iObj ) + { + Abc_Obj_t * pObjNew = Abc_NtkObj(pNtkNew, Acb_ObjCopy(p, iObj)); Acb_ObjForEachFanin( p, iObj, iFanin, k ) Abc_ObjAddFanin( pObjNew, Abc_NtkObj(pNtkNew, Acb_ObjCopy(p, iFanin)) ); - pObjNew->pData = Abc_SopCreateFromTruth( pMan, Acb_ObjFaninNum(p, iObj), (unsigned *)Acb_ObjTruthP(p, iObj) ); + assert( Abc_SopGetVarNum((char *)pObjNew->pData) == Abc_ObjFaninNum(pObjNew) ); } Acb_NtkForEachCoDriver( p, iFanin, i ) Abc_ObjAddFanin( Abc_NtkCo(pNtkNew, i), Abc_NtkObj(pNtkNew, Acb_ObjCopy(p, iFanin)) ); @@ -222,7 +230,7 @@ Abc_Ntk_t * Abc_NtkOptMfse( Abc_Ntk_t * pNtk, Acb_Par_t * pPars ) extern void Acb_NtkOpt( Acb_Ntk_t * p, Acb_Par_t * pPars ); Abc_Ntk_t * pNtkNew; Acb_Ntk_t * p = Acb_NtkFromAbc( pNtk ); - Acb_NtkOpt( p, pPars ); + //Acb_NtkOpt( p, pPars ); pNtkNew = Acb_NtkToAbc( pNtk, p ); Acb_ManFree( p->pDesign ); return pNtkNew; diff --git a/src/base/acb/acbMfs.c b/src/base/acb/acbMfs.c index 9a1ff847..7b86a686 100644 --- a/src/base/acb/acbMfs.c +++ b/src/base/acb/acbMfs.c @@ -95,7 +95,7 @@ Vec_Wec_t * Acb_DeriveCnfForWindow( Acb_Ntk_t * p, Vec_Int_t * vWin, int PivotVa if ( Abc_LitIsCompl(iObj) && i < PivotVar ) continue; vCnfBase = (Vec_Str_t *)Vec_WecEntry( vCnfs, iObj ); - if ( vCnfBase != NULL ) + if ( Vec_StrSize(vCnfBase) > 0 ) continue; if ( vCnf == NULL ) vCnf = Vec_StrAlloc( 1000 ); diff --git a/src/base/acb/acbUtil.c b/src/base/acb/acbUtil.c index fab63124..ab9bf44c 100644 --- a/src/base/acb/acbUtil.c +++ b/src/base/acb/acbUtil.c @@ -362,6 +362,7 @@ void Acb_NtkUpdateNode( Acb_Ntk_t * p, int Pivot, word uTruth, Vec_Int_t * vSupp Acb_ObjAddFanin( p, Pivot, iFanin ); Acb_ObjAddFanout( p, Pivot ); Acb_NtkUpdateTiming( p, Pivot ); + Vec_IntErase( Vec_WecEntry(&p->vCnfs, Pivot) ); } |