Commit 3c0a9e08 by Alan Mishchenko

Switch -A <file_name> to specify file name for dumping abstrated model with &vta -d.

parent 675b0892
...@@ -211,6 +211,7 @@ struct Gia_ParVta_t_ ...@@ -211,6 +211,7 @@ struct Gia_ParVta_t_
int fUseTermVars; // use terminal variables int fUseTermVars; // use terminal variables
int fUseRollback; // use rollback to the starting number of frames int fUseRollback; // use rollback to the starting number of frames
int fDumpVabs; // dumps the abstracted model int fDumpVabs; // dumps the abstracted model
char * pFileVabs; // dumps the abstracted model into this file
int fVerbose; // verbose flag int fVerbose; // verbose flag
int iFrame; // the number of frames covered int iFrame; // the number of frames covered
}; };
......
...@@ -1441,9 +1441,10 @@ void Gia_VtaSendCancel( Vta_Man_t * p, int fVerbose ) ...@@ -1441,9 +1441,10 @@ void Gia_VtaSendCancel( Vta_Man_t * p, int fVerbose )
***********************************************************************/ ***********************************************************************/
void Gia_VtaDumpAbsracted( Vta_Man_t * p, int fVerbose ) void Gia_VtaDumpAbsracted( Vta_Man_t * p, int fVerbose )
{ {
char * pFileName = p->pPars->pFileVabs ? p->pPars->pFileVabs : "vabs.aig";
Gia_Man_t * pAbs; Gia_Man_t * pAbs;
if ( fVerbose ) if ( fVerbose )
Abc_Print( 1, "Dumping abstracted model into file \"vabs.aig\"...\n" ); Abc_Print( 1, "Dumping abstracted model into file \"%s\"...\n", pFileName );
// if ( !Abc_FrameIsBridgeMode() ) // if ( !Abc_FrameIsBridgeMode() )
// return; // return;
// create obj classes // create obj classes
...@@ -1457,7 +1458,7 @@ void Gia_VtaDumpAbsracted( Vta_Man_t * p, int fVerbose ) ...@@ -1457,7 +1458,7 @@ void Gia_VtaDumpAbsracted( Vta_Man_t * p, int fVerbose )
pAbs = Gia_ManDupAbsGates( p->pGia, p->pGia->vGateClasses ); pAbs = Gia_ManDupAbsGates( p->pGia, p->pGia->vGateClasses );
Vec_IntFreeP( &p->pGia->vGateClasses ); Vec_IntFreeP( &p->pGia->vGateClasses );
// send it out // send it out
Gia_WriteAiger( pAbs, "vabs.aig", 0, 0 ); Gia_WriteAiger( pAbs, pFileName, 0, 0 );
Gia_ManStop( pAbs ); Gia_ManStop( pAbs );
} }
......
...@@ -27311,7 +27311,7 @@ int Abc_CommandAbc9Vta( Abc_Frame_t * pAbc, int argc, char ** argv ) ...@@ -27311,7 +27311,7 @@ int Abc_CommandAbc9Vta( Abc_Frame_t * pAbc, int argc, char ** argv )
int c; int c;
Gia_VtaSetDefaultParams( pPars ); Gia_VtaSetDefaultParams( pPars );
Extra_UtilGetoptReset(); Extra_UtilGetoptReset();
while ( ( c = Extra_UtilGetopt( argc, argv, "FSPCLTRtrdvh" ) ) != EOF ) while ( ( c = Extra_UtilGetopt( argc, argv, "FSPCLTRAtrdvh" ) ) != EOF )
{ {
switch ( c ) switch ( c )
{ {
...@@ -27392,6 +27392,15 @@ int Abc_CommandAbc9Vta( Abc_Frame_t * pAbc, int argc, char ** argv ) ...@@ -27392,6 +27392,15 @@ int Abc_CommandAbc9Vta( Abc_Frame_t * pAbc, int argc, char ** argv )
if ( pPars->nRatioMin < 0 ) if ( pPars->nRatioMin < 0 )
goto usage; goto usage;
break; break;
case 'A':
if ( globalUtilOptind >= argc )
{
Abc_Print( -1, "Command line switch \"-A\" should be followed by a file name.\n" );
goto usage;
}
pPars->pFileVabs = argv[globalUtilOptind];
globalUtilOptind++;
break;
case 't': case 't':
pPars->fUseTermVars ^= 1; pPars->fUseTermVars ^= 1;
break; break;
...@@ -27440,13 +27449,15 @@ int Abc_CommandAbc9Vta( Abc_Frame_t * pAbc, int argc, char ** argv ) ...@@ -27440,13 +27449,15 @@ int Abc_CommandAbc9Vta( Abc_Frame_t * pAbc, int argc, char ** argv )
Abc_Print( 1, "The starting frame should be 1 or larger.\n" ); Abc_Print( 1, "The starting frame should be 1 or larger.\n" );
return 0; return 0;
} }
// if ( argc == globalUtilOptind + 1 )
// pPars->pFileVabs = argv[globalUtilOptind];
pAbc->Status = Gia_VtaPerform( pAbc->pGia, pPars ); pAbc->Status = Gia_VtaPerform( pAbc->pGia, pPars );
pAbc->nFrames = pPars->iFrame; pAbc->nFrames = pPars->iFrame;
Abc_FrameReplaceCex( pAbc, &pAbc->pGia->pCexSeq ); Abc_FrameReplaceCex( pAbc, &pAbc->pGia->pCexSeq );
return 0; return 0;
usage: usage:
Abc_Print( -2, "usage: &vta [-FSPCLTR num] [-trdvh]\n" ); Abc_Print( -2, "usage: &vta [-FSPCLTR num] [-A file] [-trdvh]\n" );
Abc_Print( -2, "\t refines abstracted object map with proof-based abstraction\n" ); Abc_Print( -2, "\t refines abstracted object map with proof-based abstraction\n" );
Abc_Print( -2, "\t-F num : the max number of timeframes to unroll [default = %d]\n", pPars->nFramesMax ); Abc_Print( -2, "\t-F num : the max number of timeframes to unroll [default = %d]\n", pPars->nFramesMax );
Abc_Print( -2, "\t-S num : the starting time frame (0=unused) [default = %d]\n", pPars->nFramesStart ); Abc_Print( -2, "\t-S num : the starting time frame (0=unused) [default = %d]\n", pPars->nFramesStart );
...@@ -27455,9 +27466,10 @@ usage: ...@@ -27455,9 +27466,10 @@ usage:
Abc_Print( -2, "\t-L num : the max number of learned clauses to keep (0=unused) [default = %d]\n", pPars->nLearntMax ); Abc_Print( -2, "\t-L num : the max number of learned clauses to keep (0=unused) [default = %d]\n", pPars->nLearntMax );
Abc_Print( -2, "\t-T num : an approximate timeout, in seconds [default = %d]\n", pPars->nTimeOut ); Abc_Print( -2, "\t-T num : an approximate timeout, in seconds [default = %d]\n", pPars->nTimeOut );
Abc_Print( -2, "\t-R num : minimum percentage of abstracted objects (0<=num<=100) [default = %d]\n", pPars->nRatioMin ); Abc_Print( -2, "\t-R num : minimum percentage of abstracted objects (0<=num<=100) [default = %d]\n", pPars->nRatioMin );
Abc_Print( -2, "\t-A file : file name for dumping abstrated model [default = \"vabs.aig\"]\n" );
Abc_Print( -2, "\t-t : toggle using terminal variables [default = %s]\n", pPars->fUseTermVars? "yes": "no" ); Abc_Print( -2, "\t-t : toggle using terminal variables [default = %s]\n", pPars->fUseTermVars? "yes": "no" );
Abc_Print( -2, "\t-r : toggle using rollback after the starting frames [default = %s]\n", pPars->fUseRollback? "yes": "no" ); Abc_Print( -2, "\t-r : toggle using rollback after the starting frames [default = %s]\n", pPars->fUseRollback? "yes": "no" );
Abc_Print( -2, "\t-d : toggle dumping abstracted model into file \"vabs.aig\" [default = %s]\n", pPars->fDumpVabs? "yes": "no" ); Abc_Print( -2, "\t-d : toggle dumping abstracted model into a file [default = %s]\n", pPars->fDumpVabs? "yes": "no" );
Abc_Print( -2, "\t-v : toggle printing verbose information [default = %s]\n", pPars->fVerbose? "yes": "no" ); Abc_Print( -2, "\t-v : toggle printing verbose information [default = %s]\n", pPars->fVerbose? "yes": "no" );
Abc_Print( -2, "\t-h : print the command usage\n"); Abc_Print( -2, "\t-h : print the command usage\n");
return 1; return 1;
......
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