diff options
| author | Alan Mishchenko <alanmi@berkeley.edu> | 2017-09-24 23:38:01 -0700 |
|---|---|---|
| committer | Alan Mishchenko <alanmi@berkeley.edu> | 2017-09-24 23:38:01 -0700 |
| commit | c696ae95d0130204bedfb9cb7209748fa6ab0f2e (patch) | |
| tree | 7822cba08644f83bc76e6dd9fe42f7bb7758fb0a /src/aig/gia | |
| parent | 287f9efcceb540fb09f5d81250699a9277967ec5 (diff) | |
| download | abc-c696ae95d0130204bedfb9cb7209748fa6ab0f2e.tar.gz abc-c696ae95d0130204bedfb9cb7209748fa6ab0f2e.tar.bz2 abc-c696ae95d0130204bedfb9cb7209748fa6ab0f2e.zip | |
Maintenance and updates.
Diffstat (limited to 'src/aig/gia')
| -rw-r--r-- | src/aig/gia/giaIf.c | 8 | ||||
| -rw-r--r-- | src/aig/gia/giaIiff.c | 6 |
2 files changed, 10 insertions, 4 deletions
diff --git a/src/aig/gia/giaIf.c b/src/aig/gia/giaIf.c index 16b9d6b7..0c39cae4 100644 --- a/src/aig/gia/giaIf.c +++ b/src/aig/gia/giaIf.c @@ -1856,7 +1856,7 @@ Gia_Man_t * Gia_ManFromIfLogic( If_Man_t * pIfMan ) { pIfObj->iCopy = Gia_ManFromIfLogicCofVars( pNew, pIfMan, pCutBest, vLeaves, vLeaves2, vCover, vMapping, vMapping2 ); } - else if ( (pIfMan->pPars->fDeriveLuts && pIfMan->pPars->fTruth) || pIfMan->pPars->fUseDsd || pIfMan->pPars->fUseTtPerm ) + else if ( (pIfMan->pPars->fDeriveLuts && pIfMan->pPars->fTruth) || pIfMan->pPars->fUseDsd || pIfMan->pPars->fUseTtPerm || pIfMan->pPars->pFuncCell2 ) { word * pTruth = If_CutTruthW(pIfMan, pCutBest); if ( pIfMan->pPars->fUseTtPerm ) @@ -2251,7 +2251,7 @@ Gia_Man_t * Gia_ManPerformMappingInt( Gia_Man_t * p, If_Par_t * pPars ) ABC_FREE( p->pCellStr ); Vec_IntFreeP( &p->vConfigs ); // disable cut minimization when GIA strucure is needed - if ( !pPars->fDelayOpt && !pPars->fDelayOptLut && !pPars->fDsdBalance && !pPars->fUserRecLib && !pPars->fUserSesLib && !pPars->fDeriveLuts && !pPars->fUseDsd && !pPars->fUseTtPerm ) + if ( !pPars->fDelayOpt && !pPars->fDelayOptLut && !pPars->fDsdBalance && !pPars->fUserRecLib && !pPars->fUserSesLib && !pPars->fDeriveLuts && !pPars->fUseDsd && !pPars->fUseTtPerm && !pPars->pFuncCell2 ) pPars->fCutMin = 0; // translate into the mapper pIfMan = Gia_ManToIf( p, pPars ); @@ -2291,6 +2291,8 @@ Gia_Man_t * Gia_ManPerformMappingInt( Gia_Man_t * p, If_Par_t * pPars ) If_ManStop( pIfMan ); return NULL; } + if ( pPars->pFuncWrite ) + pPars->pFuncWrite( pIfMan ); // transform the result of mapping into the new network if ( pIfMan->pPars->fDelayOpt || pIfMan->pPars->fDsdBalance || pIfMan->pPars->fUserRecLib || pIfMan->pPars->fUserSesLib ) pNew = Gia_ManFromIfAig( pIfMan ); @@ -2304,8 +2306,6 @@ Gia_Man_t * Gia_ManPerformMappingInt( Gia_Man_t * p, If_Par_t * pPars ) If_ManForEachCo( pIfMan, pIfObj, i ) Vec_IntPush( p->vCoArrs, (int)If_ObjArrTime(If_ObjFanin0(pIfObj)) ); } - if ( pPars->pFuncWrite ) - pPars->pFuncWrite( pIfMan ); If_ManStop( pIfMan ); // transfer name assert( pNew->pName == NULL ); diff --git a/src/aig/gia/giaIiff.c b/src/aig/gia/giaIiff.c index 6be38b94..cb1db0d3 100644 --- a/src/aig/gia/giaIiff.c +++ b/src/aig/gia/giaIiff.c @@ -19,6 +19,8 @@ ***********************************************************************/ #include "gia.h" +#include "misc/st/st.h" +#include "map/mio/mio.h" ABC_NAMESPACE_IMPL_START @@ -42,6 +44,10 @@ ABC_NAMESPACE_IMPL_START SeeAlso [] ***********************************************************************/ +int Gia_ManDeriveMatches( Mio_Library_t * pLib, Vec_Ptr_t ** pvNames, Vec_Wrd_t ** pvTruths, Vec_Mem_t ** pvTtMem, Vec_Int_t ** pvTt2Match, Vec_Int_t ** pvTt2Match4, Vec_Int_t ** pvConfigs ) +{ + return 0; +} Gia_Man_t * Gia_ManIiffTest( char * pFileName, Gia_Man_t * pGia, int nLutSize, int nNumCuts, int fUseGates, int fUseCells, int fVerbose ) { return NULL; |