luke
/
abc
mirror of https://github.com/YosysHQ/abc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Allow for skipping structural hashing when reading GIA from file.

This commit is contained in:
Alan Mishchenko 2012-07-25 12:37:19 -07:00
parent 160b196a70
commit b2ad079a2a
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/aig/gia/giaAiger.c
View File

@ -747,7 +747,7 @@ Gia_Man_t * Gia_ReadAigerFromMemory( char * pContents, int nFileSize, int fSkipS
}
// create the AND gates
if ( fSkipStrash )
if ( !fSkipStrash )
Gia_ManHashAlloc( pNew );
for ( i = 0; i < nAnds; i++ )
{
@ -763,7 +763,7 @@ Gia_Man_t * Gia_ReadAigerFromMemory( char * pContents, int nFileSize, int fSkipS
else
Vec_IntPush( vNodes, Gia_ManHashAnd(pNew, iNode0, iNode1) );
}
if ( fSkipStrash )
if ( !fSkipStrash )
Gia_ManHashStop( pNew );
// remember the place where symbols begin

12
src/base/abci/abc.c
View File

@ -840,7 +840,6 @@ void Abc_Init( Abc_Frame_t * pAbc )
{
extern void Dar_LibStart();
// char * pMem = malloc( (1<<30) * 3 / 2 );
Dar_LibStart();
}
{
@ -22690,11 +22689,15 @@ int Abc_CommandAbc9Read( Abc_Frame_t * pAbc, int argc, char ** argv )
char * FileName, * pTemp;
int nArgcNew;
int c, fVerbose = 0;
int fSkipStrash = 0;
Extra_UtilGetoptReset();
while ( ( c = Extra_UtilGetopt( argc, argv, "vh" ) ) != EOF )
while ( ( c = Extra_UtilGetopt( argc, argv, "svh" ) ) != EOF )
{
switch ( c )
{
case 's':
fSkipStrash ^= 1;
break;
case 'v':
fVerbose ^= 1;
break;
@ -22726,13 +22729,14 @@ int Abc_CommandAbc9Read( Abc_Frame_t * pAbc, int argc, char ** argv )
}
fclose( pFile );
pAig = Gia_ReadAiger( FileName, 0, 0 );
pAig = Gia_ReadAiger( FileName, fSkipStrash, 0 );
Abc_CommandUpdate9( pAbc, pAig );
return 0;
usage:
Abc_Print( -2, "usage: &r [-vh] <file>\n" );
Abc_Print( -2, "usage: &r [-svh] <file>\n" );
Abc_Print( -2, "\t reads the current AIG from the AIGER file\n" );
Abc_Print( -2, "\t-s : toggles structural hashing while reading [default = %s]\n", !fSkipStrash? "yes": "no" );
Abc_Print( -2, "\t-v : toggles additional verbose output [default = %s]\n", fVerbose? "yes": "no" );
Abc_Print( -2, "\t-h : print the command usage\n");
Abc_Print( -2, "\t<file> : the file name\n");