Various modifications.

This commit is contained in:
Alan Mishchenko
2014-06-12 21:27:14 -07:00
parent 865f6fd43f
commit fcdd9148b4
13 changed files with 141 additions and 104 deletions
+5 -3
View File
@@ -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) );
+5 -2
View File
@@ -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 );
}
}
+1 -1
View File
@@ -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 );
}
+1 -1
View File
@@ -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 );
}