diff options
| author | Alan Mishchenko <alanmi@berkeley.edu> | 2014-06-12 21:27:14 -0700 |
|---|---|---|
| committer | Alan Mishchenko <alanmi@berkeley.edu> | 2014-06-12 21:27:14 -0700 |
| commit | fcdd9148b456e7efec1db8b4cf81adbb305401d7 (patch) | |
| tree | 99b8147233b967ecba6ba18fcaf16fffb40801ba /src/map | |
| parent | 865f6fd43fb55f4873275c2ceeae79d32f4f4d9b (diff) | |
| download | abc-fcdd9148b456e7efec1db8b4cf81adbb305401d7.tar.gz abc-fcdd9148b456e7efec1db8b4cf81adbb305401d7.tar.bz2 abc-fcdd9148b456e7efec1db8b4cf81adbb305401d7.zip | |
Various modifications.
Diffstat (limited to 'src/map')
| -rw-r--r-- | src/map/if/ifMap.c | 8 | ||||
| -rw-r--r-- | src/map/if/ifReduce.c | 7 | ||||
| -rw-r--r-- | src/map/mpm/mpmCore.c | 2 | ||||
| -rw-r--r-- | src/map/mpm/mpmGates.c | 2 |
4 files changed, 12 insertions, 7 deletions
diff --git a/src/map/if/ifMap.c b/src/map/if/ifMap.c index c368cbf9..9f709411 100644 --- a/src/map/if/ifMap.c +++ b/src/map/if/ifMap.c @@ -500,9 +500,11 @@ int If_ManPerformMappingRound( If_Man_t * p, int nCutsUsed, int Mode, int fPrepr if ( p->pPars->fVerbose ) { char Symb = fPreprocess? 'P' : ((Mode == 0)? 'D' : ((Mode == 1)? 'F' : 'A')); - Abc_Print( 1, "%c: Del = %7.2f. Ar = %9.1f. Edge = %8d. Switch = %7.2f. Cut = %8d. ", - Symb, p->RequiredGlo, p->AreaGlo, p->nNets, p->dPower, p->nCutsMerged ); -// printf( "Cut0 =%4d. Cut1 =%4d. ", p->nBestCutSmall[0], p->nBestCutSmall[1] ); + Abc_Print( 1, "%c: Del = %7.2f. Ar = %9.1f. Edge = %8d. ", + Symb, p->RequiredGlo, p->AreaGlo, p->nNets ); + if ( p->dPower ) + Abc_Print( 1, "Switch = %7.2f. ", p->dPower ); + Abc_Print( 1, "Cut = %8d. ", p->nCutsMerged ); Abc_PrintTime( 1, "T", Abc_Clock() - clk ); // Abc_Print( 1, "Max number of cuts = %d. Average number of cuts = %5.2f.\n", // p->nCutsMax, 1.0 * p->nCutsMerged / If_ManAndNum(p) ); diff --git a/src/map/if/ifReduce.c b/src/map/if/ifReduce.c index fec999cb..d50bc40c 100644 --- a/src/map/if/ifReduce.c +++ b/src/map/if/ifReduce.c @@ -57,8 +57,11 @@ void If_ManImproveMapping( If_Man_t * p ) If_ManComputeRequired( p ); if ( p->pPars->fVerbose ) { - Abc_Print( 1, "E: Del = %7.2f. Ar = %9.1f. Edge = %8d. Switch = %7.2f. Cut = %8d. ", - p->RequiredGlo, p->AreaGlo, p->nNets, p->dPower, p->nCutsMerged ); + Abc_Print( 1, "E: Del = %7.2f. Ar = %9.1f. Edge = %8d. ", + p->RequiredGlo, p->AreaGlo, p->nNets ); + if ( p->dPower ) + Abc_Print( 1, "Switch = %7.2f. ", p->dPower ); + Abc_Print( 1, "Cut = %8d. ", p->nCutsMerged ); Abc_PrintTime( 1, "T", Abc_Clock() - clk ); } } diff --git a/src/map/mpm/mpmCore.c b/src/map/mpm/mpmCore.c index de2d7bc7..1395d1d0 100644 --- a/src/map/mpm/mpmCore.c +++ b/src/map/mpm/mpmCore.c @@ -95,7 +95,7 @@ Gia_Man_t * Mpm_ManLutMapping( Gia_Man_t * pGia, Mpm_Par_t * pPars ) assert( pPars->nNumCuts <= MPM_CUT_MAX ); if ( pPars->fUseGates ) { - pGia = Gia_ManDupMuxes( pGia ); + pGia = Gia_ManDupMuxes( pGia, 2 ); p = Mig_ManCreate( pGia ); Gia_ManStop( pGia ); } diff --git a/src/map/mpm/mpmGates.c b/src/map/mpm/mpmGates.c index aa70e143..d2af268d 100644 --- a/src/map/mpm/mpmGates.c +++ b/src/map/mpm/mpmGates.c @@ -287,7 +287,7 @@ Abc_Ntk_t * Mpm_ManCellMapping( Gia_Man_t * pGia, Mpm_Par_t * pPars, void * pMio assert( pPars->nNumCuts <= MPM_CUT_MAX ); if ( pPars->fUseGates ) { - pGia = Gia_ManDupMuxes( pGia ); + pGia = Gia_ManDupMuxes( pGia, 2 ); p = Mig_ManCreate( pGia ); Gia_ManStop( pGia ); } |