diff options
| author | Alan Mishchenko <alanmi@berkeley.edu> | 2014-11-30 12:19:32 -0800 |
|---|---|---|
| committer | Alan Mishchenko <alanmi@berkeley.edu> | 2014-11-30 12:19:32 -0800 |
| commit | 5d1a5f35906fd62f48417490c361905750f744aa (patch) | |
| tree | bf0e4886ec1e63a73cc0dae79ae0c49d7a45d6c6 | |
| parent | 1d20dea11b329227f43c3fa81008b9eace60e3e3 (diff) | |
| download | abc-5d1a5f35906fd62f48417490c361905750f744aa.tar.gz abc-5d1a5f35906fd62f48417490c361905750f744aa.tar.bz2 abc-5d1a5f35906fd62f48417490c361905750f744aa.zip | |
Changes to history recording and other small things.
| -rw-r--r-- | src/aig/gia/giaIf.c | 16 | ||||
| -rw-r--r-- | src/aig/gia/giaSweep.c | 6 | ||||
| -rw-r--r-- | src/base/cmd/cmdHist.c | 2 |
3 files changed, 18 insertions, 6 deletions
diff --git a/src/aig/gia/giaIf.c b/src/aig/gia/giaIf.c index 8440b2ab..ed186c62 100644 --- a/src/aig/gia/giaIf.c +++ b/src/aig/gia/giaIf.c @@ -499,6 +499,7 @@ void Gia_ManPrintMappingStats( Gia_Man_t * p, char * pDumpFile ) if ( nMuxF ) Gia_ManCountDupLut( p ); + return; if ( pDumpFile ) { static char FileNameOld[1000] = {0}; @@ -509,11 +510,18 @@ void Gia_ManPrintMappingStats( Gia_Man_t * p, char * pDumpFile ) sprintf( FileNameOld, "%s", p->pName ); fprintf( pTable, "\n" ); fprintf( pTable, "%s ", p->pName ); - fprintf( pTable, "%d ", Gia_ManCiNum(p) ); - fprintf( pTable, "%d ", Gia_ManCoNum(p) ); - fprintf( pTable, "%d ", Gia_ManAndNum(p) ); +// fprintf( pTable, "%d ", Gia_ManCiNum(p) ); +// fprintf( pTable, "%d ", Gia_ManCoNum(p) ); +// fprintf( pTable, "%d ", Gia_ManAndNum(p) ); + fprintf( pTable, "%d ", Gia_ManPiNum(p) - Gia_ManBoxCiNum(p) - Gia_ManRegBoxNum(p) ); + fprintf( pTable, "%d ", Gia_ManPoNum(p) - Gia_ManBoxCoNum(p) - Gia_ManRegBoxNum(p) ); + fprintf( pTable, "%d ", Gia_ManClockDomainNum(p) ); + + fprintf( pTable, " " ); fprintf( pTable, "%d ", nLuts ); fprintf( pTable, "%d ", LevelMax ); + fprintf( pTable, "%d ", Gia_ManRegBoxNum(p) ); + fprintf( pTable, "%d ", Gia_ManNonRegBoxNum(p) ); clk = Abc_Clock(); } else @@ -521,6 +529,8 @@ void Gia_ManPrintMappingStats( Gia_Man_t * p, char * pDumpFile ) fprintf( pTable, " " ); fprintf( pTable, "%d ", nLuts ); fprintf( pTable, "%d ", LevelMax ); + fprintf( pTable, "%d ", Gia_ManRegBoxNum(p) ); + fprintf( pTable, "%d ", Gia_ManNonRegBoxNum(p) ); fprintf( pTable, "%.2f", 1.0*(Abc_Clock() - clk)/CLOCKS_PER_SEC ); clk = Abc_Clock(); } diff --git a/src/aig/gia/giaSweep.c b/src/aig/gia/giaSweep.c index 70c7a960..ca426e87 100644 --- a/src/aig/gia/giaSweep.c +++ b/src/aig/gia/giaSweep.c @@ -654,7 +654,7 @@ Gia_Man_t * Gia_ManSweepWithBoxesAndDomains( Gia_Man_t * p, void * pParsS, int f pNew = Gia_ManDupWithBoxes( pTemp = pNew, 1 ); Gia_ManStop( pTemp ); // report - //if ( fVerbose ) + if ( fVerbose ) { printf( "Domain %2d : %5d -> %5d : ", iDom, nFlops, Vec_IntCountEntry(pNew->vRegClasses, iDom) ); Gia_ManPrintStats( pNew, NULL ); @@ -687,8 +687,8 @@ Gia_Man_t * Gia_ManSweepWithBoxes( Gia_Man_t * p, void * pParsC, void * pParsS, assert( Gia_ManRegNum(p) == 0 ); assert( p->pAigExtra != NULL ); // consider seq synthesis with multiple clock domains -// if ( pParsC == NULL && Gia_ManClockDomainNum(p) > 1 ) -// return Gia_ManSweepWithBoxesAndDomains( p, pParsS, fConst, fEquiv, fVerbose ); + if ( pParsC == NULL && Gia_ManClockDomainNum(p) > 1 ) + return Gia_ManSweepWithBoxesAndDomains( p, pParsS, fConst, fEquiv, fVerbose ); // order AIG objects pNew = Gia_ManDupUnnormalize( p ); if ( pNew == NULL ) diff --git a/src/base/cmd/cmdHist.c b/src/base/cmd/cmdHist.c index f1b29330..8fa87981 100644 --- a/src/base/cmd/cmdHist.c +++ b/src/base/cmd/cmdHist.c @@ -59,8 +59,10 @@ void Cmd_HistoryAddCommand( Abc_Frame_t * p, const char * command ) Buffer[Len-1] = 0; if ( strlen(Buffer) > 3 && strncmp(Buffer,"set",3) && + strncmp(Buffer,"inset",5) && strncmp(Buffer,"time",4) && strncmp(Buffer,"quit",4) && + strncmp(Buffer,"alias",5) && // strncmp(Buffer,"source",6) && strncmp(Buffer,"history",7) && strncmp(Buffer,"hi ", 3) && strcmp(Buffer,"hi") && Buffer[strlen(Buffer)-1] != '?' ) |