diff options
| author | Alan Mishchenko <alanmi@berkeley.edu> | 2021-09-04 19:21:59 -0700 |
|---|---|---|
| committer | Alan Mishchenko <alanmi@berkeley.edu> | 2021-09-04 19:21:59 -0700 |
| commit | e7a029d73fbce3145063f0e65b952b356014cf63 (patch) | |
| tree | 5af31da61093df0d66b455f2d775b3001cdda7c2 | |
| parent | ed9c16d4f5e1484bb287c30a6af50832a62d35ec (diff) | |
| download | abc-e7a029d73fbce3145063f0e65b952b356014cf63.tar.gz abc-e7a029d73fbce3145063f0e65b952b356014cf63.tar.bz2 abc-e7a029d73fbce3145063f0e65b952b356014cf63.zip | |
Various changes.
| -rw-r--r-- | src/aig/gia/giaResub.c | 4 | ||||
| -rw-r--r-- | src/base/abc/abcUtil.c | 2 | ||||
| -rw-r--r-- | src/base/abci/abcFx.c | 2 | ||||
| -rw-r--r-- | src/misc/extra/extraUtilFile.c | 13 |
4 files changed, 12 insertions, 9 deletions
diff --git a/src/aig/gia/giaResub.c b/src/aig/gia/giaResub.c index 660440c3..95ed12cf 100644 --- a/src/aig/gia/giaResub.c +++ b/src/aig/gia/giaResub.c @@ -1472,8 +1472,8 @@ Vec_Int_t * Gia_ManResubOne( Vec_Ptr_t * vDivs, int nWords, int nLimit, int nDiv Gia_ManResubPerform( p, vDivs, nWords, nLimit, nDivsMax, iChoice, fUseXor, fDebug, fVerbose, Depth ); if ( fVerbose ) Gia_ManResubPrint( p->vGates, Vec_PtrSize(vDivs) ); - if ( fVerbose ) - printf( "\n" ); + //if ( fVerbose ) + // printf( "\n" ); if ( !Gia_ManResubVerify(p, pFunc) ) { Gia_ManResubPrint( p->vGates, Vec_PtrSize(vDivs) ); diff --git a/src/base/abc/abcUtil.c b/src/base/abc/abcUtil.c index 51d31527..29753210 100644 --- a/src/base/abc/abcUtil.c +++ b/src/base/abc/abcUtil.c @@ -3153,7 +3153,7 @@ Vec_Wec_t * Abc_GiaSynthesize( Vec_Ptr_t * vGias, Gia_Man_t * pMulti ) int i, k, iNode = 0; Abc_FrameReplaceCurrentNetwork( Abc_FrameReadGlobalFrame(), pNtk ); Abc_FrameSetBatchMode( 1 ); - Cmd_CommandExecute( Abc_FrameGetGlobalFrame(), "compress2rs; dch; map -a; strash; compress2rs; dch; map -a; strash; compress2rs; dch; map -a" ); + Cmd_CommandExecute( Abc_FrameGetGlobalFrame(), "clp; sop; fx; strash; compress2rs; dch; map -a; strash; compress2rs; dch; map -a" ); Abc_FrameSetBatchMode( 0 ); pNtkNew = Abc_FrameReadNtk( Abc_FrameReadGlobalFrame() ); vRes = Vec_WecStart( Abc_NtkPiNum(pNtkNew) + Abc_NtkNodeNum(pNtkNew) + Abc_NtkPoNum(pNtkNew) ); diff --git a/src/base/abci/abcFx.c b/src/base/abci/abcFx.c index 60461a4a..487aee3c 100644 --- a/src/base/abci/abcFx.c +++ b/src/base/abci/abcFx.c @@ -201,7 +201,7 @@ void Abc_NtkFxInsert( Abc_Ntk_t * pNtk, Vec_Wec_t * vCubes ) // quit if nothing changes if ( iNodeMax < Abc_NtkObjNumMax(pNtk) ) { - printf( "The network is unchanged by fast extract.\n" ); + //printf( "The network is unchanged by fast extract.\n" ); return; } // create new nodes diff --git a/src/misc/extra/extraUtilFile.c b/src/misc/extra/extraUtilFile.c index 9d3a2ae4..54e6efc2 100644 --- a/src/misc/extra/extraUtilFile.c +++ b/src/misc/extra/extraUtilFile.c @@ -249,11 +249,14 @@ char * Extra_FilePathWithoutName( char * FileName ) } char * Extra_FileInTheSameDir( char * pPathFile, char * pFileName ) { - static char pBuffer[1000]; - char * pPath = Extra_FilePathWithoutName( pPathFile ); - assert( strlen(pPath) + strlen(pFileName) < 990 ); - sprintf( pBuffer, "%s%s", pPath, pFileName ); - ABC_FREE( pPath ); + static char pBuffer[1000]; char * pThis; + assert( strlen(pPathFile) + strlen(pFileName) < 990 ); + memmove( pBuffer, pPathFile, strlen(pPathFile) ); + for ( pThis = pBuffer + strlen(pPathFile) - 1; pThis >= pBuffer; pThis-- ) + if ( *pThis == '\\' || *pThis == '/' ) + break; + memmove( ++pThis, pFileName, strlen(pFileName) ); + pThis[strlen(pFileName)] = '\0'; return pBuffer; } char * Extra_FileDesignName( char * pFileName ) |