From 3c0a9e0862f982de942f70c1d6468a1d573fa06b Mon Sep 17 00:00:00 2001 From: Alan Mishchenko Date: Thu, 21 Jun 2012 20:20:26 -0700 Subject: Switch -A to specify file name for dumping abstrated model with &vta -d. --- src/aig/gia/gia.h | 1 + src/aig/gia/giaAbsVta.c | 5 +++-- src/base/abci/abc.c | 42 +++++++++++++++++++++++++++--------------- 3 files changed, 31 insertions(+), 17 deletions(-) diff --git a/src/aig/gia/gia.h b/src/aig/gia/gia.h index eec6dd22..1bb883fa 100644 --- a/src/aig/gia/gia.h +++ b/src/aig/gia/gia.h @@ -211,6 +211,7 @@ struct Gia_ParVta_t_ int fUseTermVars; // use terminal variables int fUseRollback; // use rollback to the starting number of frames int fDumpVabs; // dumps the abstracted model + char * pFileVabs; // dumps the abstracted model into this file int fVerbose; // verbose flag int iFrame; // the number of frames covered }; diff --git a/src/aig/gia/giaAbsVta.c b/src/aig/gia/giaAbsVta.c index 5aeca72e..6bc5bd4f 100644 --- a/src/aig/gia/giaAbsVta.c +++ b/src/aig/gia/giaAbsVta.c @@ -1441,9 +1441,10 @@ void Gia_VtaSendCancel( 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; 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() ) // return; // create obj classes @@ -1457,7 +1458,7 @@ void Gia_VtaDumpAbsracted( Vta_Man_t * p, int fVerbose ) pAbs = Gia_ManDupAbsGates( p->pGia, p->pGia->vGateClasses ); Vec_IntFreeP( &p->pGia->vGateClasses ); // send it out - Gia_WriteAiger( pAbs, "vabs.aig", 0, 0 ); + Gia_WriteAiger( pAbs, pFileName, 0, 0 ); Gia_ManStop( pAbs ); } diff --git a/src/base/abci/abc.c b/src/base/abci/abc.c index 955ba66b..d3fb8d5a 100644 --- a/src/base/abci/abc.c +++ b/src/base/abci/abc.c @@ -27311,7 +27311,7 @@ int Abc_CommandAbc9Vta( Abc_Frame_t * pAbc, int argc, char ** argv ) int c; Gia_VtaSetDefaultParams( pPars ); Extra_UtilGetoptReset(); - while ( ( c = Extra_UtilGetopt( argc, argv, "FSPCLTRtrdvh" ) ) != EOF ) + while ( ( c = Extra_UtilGetopt( argc, argv, "FSPCLTRAtrdvh" ) ) != EOF ) { switch ( c ) { @@ -27392,6 +27392,15 @@ int Abc_CommandAbc9Vta( Abc_Frame_t * pAbc, int argc, char ** argv ) if ( pPars->nRatioMin < 0 ) goto usage; 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': pPars->fUseTermVars ^= 1; break; @@ -27440,26 +27449,29 @@ int Abc_CommandAbc9Vta( Abc_Frame_t * pAbc, int argc, char ** argv ) Abc_Print( 1, "The starting frame should be 1 or larger.\n" ); return 0; } +// if ( argc == globalUtilOptind + 1 ) +// pPars->pFileVabs = argv[globalUtilOptind]; pAbc->Status = Gia_VtaPerform( pAbc->pGia, pPars ); pAbc->nFrames = pPars->iFrame; Abc_FrameReplaceCex( pAbc, &pAbc->pGia->pCexSeq ); return 0; usage: - Abc_Print( -2, "usage: &vta [-FSPCLTR num] [-trdvh]\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-S num : the starting time frame (0=unused) [default = %d]\n", pPars->nFramesStart ); - Abc_Print( -2, "\t-P num : the number of previous frames for UNSAT core [default = %d]\n", pPars->nFramesPast ); - Abc_Print( -2, "\t-C num : the max number of SAT solver conflicts (0=unused) [default = %d]\n", pPars->nConfLimit ); - 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-R num : minimum percentage of abstracted objects (0<=num<=100) [default = %d]\n", pPars->nRatioMin ); - 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-d : toggle dumping abstracted model into file \"vabs.aig\" [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-h : print the command usage\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-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-P num : the number of previous frames for UNSAT core [default = %d]\n", pPars->nFramesPast ); + Abc_Print( -2, "\t-C num : the max number of SAT solver conflicts (0=unused) [default = %d]\n", pPars->nConfLimit ); + 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-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-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 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-h : print the command usage\n"); return 1; } -- cgit v1.2.3