diff options
Diffstat (limited to 'src/map')
| -rw-r--r-- | src/map/if/if.h | 12 | ||||
| -rw-r--r-- | src/map/if/ifMap.c | 21 |
2 files changed, 3 insertions, 30 deletions
diff --git a/src/map/if/if.h b/src/map/if/if.h index a3e921cc..26d582db 100644 --- a/src/map/if/if.h +++ b/src/map/if/if.h @@ -590,18 +590,6 @@ extern int If_ManCountSpecialPos( If_Man_t * p ); extern void If_CutTraverse( If_Man_t * p, If_Obj_t * pRoot, If_Cut_t * pCut, Vec_Ptr_t * vNodes ); extern void If_ObjPrint( If_Obj_t * pObj ); -/*=== abcRec.c ============================================================*/ -/*=== abcRec2.c ============================================================*/ -/*=== abcRec3.c ============================================================*/ -extern int If_CutDelayRecCost(If_Man_t* p, If_Cut_t* pCut, If_Obj_t * pObj); -extern int If_CutDelayRecCost2(If_Man_t* p, If_Cut_t* pCut, If_Obj_t * pObj); -extern int If_CutDelayRecCost3(If_Man_t* p, If_Cut_t* pCut, If_Obj_t * pObj); -extern ABC_DLL int Abc_NtkRecIsRunning(); -extern ABC_DLL int Abc_NtkRecIsRunning2(); -extern ABC_DLL int Abc_NtkRecIsRunning3(); - -// othe packages -extern int Bat_ManCellFuncLookup( unsigned * pTruth, int nVars, int nLeaves ); ABC_NAMESPACE_HEADER_END diff --git a/src/map/if/ifMap.c b/src/map/if/ifMap.c index 58f0ad7b..d8f8785f 100644 --- a/src/map/if/ifMap.c +++ b/src/map/if/ifMap.c @@ -28,6 +28,7 @@ ABC_NAMESPACE_IMPL_START //////////////////////////////////////////////////////////////////////// extern char * Dau_DsdMerge( char * pDsd0i, int * pPerm0, char * pDsd1i, int * pPerm1, int fCompl0, int fCompl1, int nVars ); +extern int If_CutDelayRecCost3(If_Man_t* p, If_Cut_t* pCut, If_Obj_t * pObj); //////////////////////////////////////////////////////////////////////// /// FUNCTION DEFINITIONS /// @@ -164,15 +165,7 @@ void If_ObjPerformMappingAnd( If_Man_t * p, If_Obj_t * pObj, int Mode, int fPrep { // recompute the parameters of the best cut if ( p->pPars->fUserRecLib ) - { - assert( Abc_NtkRecIsRunning() + Abc_NtkRecIsRunning2() + Abc_NtkRecIsRunning3() == 1 ); - if ( Abc_NtkRecIsRunning3() ) - pCut->Delay = If_CutDelayRecCost3(p, pCut, pObj); - else if( Abc_NtkRecIsRunning2() ) - pCut->Delay = If_CutDelayRecCost2(p, pCut, pObj); - else - pCut->Delay = If_CutDelayRecCost(p, pCut, pObj); - } + pCut->Delay = If_CutDelayRecCost3(p, pCut, pObj); else if(p->pPars->fDelayOpt) pCut->Delay = If_CutDelaySopCost(p,pCut); else if(p->pPars->nGateSize > 0) @@ -301,15 +294,7 @@ void If_ObjPerformMappingAnd( If_Man_t * p, If_Obj_t * pObj, int Mode, int fPrep /// if ( p->pPars->pLutStruct ) /// pCut->Delay = If_CutDelayLutStruct( p, pCut, p->pPars->pLutStruct, p->pPars->WireDelay ); if ( p->pPars->fUserRecLib ) - { - assert( Abc_NtkRecIsRunning() + Abc_NtkRecIsRunning2() + Abc_NtkRecIsRunning3() == 1 ); - if ( Abc_NtkRecIsRunning3() ) - pCut->Delay = If_CutDelayRecCost3(p, pCut, pObj); - else if( Abc_NtkRecIsRunning2() ) - pCut->Delay = If_CutDelayRecCost2(p, pCut, pObj); - else - pCut->Delay = If_CutDelayRecCost(p, pCut, pObj); - } + pCut->Delay = If_CutDelayRecCost3(p, pCut, pObj); else if (p->pPars->fDelayOpt) pCut->Delay = If_CutDelaySopCost(p, pCut); else if(p->pPars->nGateSize > 0) |