Commit e7a029d7 by Alan Mishchenko

Various changes.

parent ed9c16d4
......@@ -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) );
......
......@@ -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) );
......
......@@ -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
......
......@@ -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 )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment