diff options
| author | Alan Mishchenko <alanmi@berkeley.edu> | 2016-05-19 22:33:40 -0700 |
|---|---|---|
| committer | Alan Mishchenko <alanmi@berkeley.edu> | 2016-05-19 22:33:40 -0700 |
| commit | 2ded89cca5cd0e899d5549476e6774cf7264132d (patch) | |
| tree | 5c0fa2bfa936211c68427deb9f58a15b48b38e78 /src/base | |
| parent | 2d0a8fb4cbb8907e6733728340995e4f93cde86d (diff) | |
| download | abc-2ded89cca5cd0e899d5549476e6774cf7264132d.tar.gz abc-2ded89cca5cd0e899d5549476e6774cf7264132d.tar.bz2 abc-2ded89cca5cd0e899d5549476e6774cf7264132d.zip | |
Added switch 'bmc3 -r' to disable periodic restarts in the SAT solver.
Diffstat (limited to 'src/base')
| -rw-r--r-- | src/base/abci/abc.c | 8 | ||||
| -rw-r--r-- | src/base/wlc/wlcReadSmt.c | 6 |
2 files changed, 9 insertions, 5 deletions
diff --git a/src/base/abci/abc.c b/src/base/abci/abc.c index da3a2d96..259c1b14 100644 --- a/src/base/abci/abc.c +++ b/src/base/abci/abc.c @@ -23269,7 +23269,7 @@ int Abc_CommandBmc3( Abc_Frame_t * pAbc, int argc, char ** argv ) int c; Saig_ParBmcSetDefaultParams( pPars ); Extra_UtilGetoptReset(); - while ( ( c = Extra_UtilGetopt( argc, argv, "SFTHGCDJIPQRLWaxdruvzh" ) ) != EOF ) + while ( ( c = Extra_UtilGetopt( argc, argv, "SFTHGCDJIPQRLWaxdurvzh" ) ) != EOF ) { switch ( c ) { @@ -23435,6 +23435,9 @@ int Abc_CommandBmc3( Abc_Frame_t * pAbc, int argc, char ** argv ) case 'u': fOrDecomp ^= 1; break; + case 'r': + pPars->fNoRestarts ^= 1; + break; case 'v': pPars->fVerbose ^= 1; break; @@ -23501,7 +23504,7 @@ int Abc_CommandBmc3( Abc_Frame_t * pAbc, int argc, char ** argv ) return 0; usage: - Abc_Print( -2, "usage: bmc3 [-SFTHGCDJIPQR num] [-LW file] [-axduvzh]\n" ); + Abc_Print( -2, "usage: bmc3 [-SFTHGCDJIPQR num] [-LW file] [-axdurvzh]\n" ); Abc_Print( -2, "\t performs bounded model checking with dynamic unrolling\n" ); Abc_Print( -2, "\t-S num : the starting time frame [default = %d]\n", pPars->nStart ); Abc_Print( -2, "\t-F num : the max number of time frames (0 = unused) [default = %d]\n", pPars->nFramesMax ); @@ -23521,6 +23524,7 @@ usage: Abc_Print( -2, "\t-x : toggle storing CEXes when solving all outputs [default = %s]\n", pPars->fStoreCex? "yes": "no" ); Abc_Print( -2, "\t-d : toggle dropping (replacing by 0) SAT outputs [default = %s]\n", pPars->fDropSatOuts? "yes": "no" ); Abc_Print( -2, "\t-u : toggle performing structural OR-decomposition [default = %s]\n", fOrDecomp? "yes": "not" ); + Abc_Print( -2, "\t-r : toggle disabling periodic restarts [default = %s]\n", pPars->fNoRestarts? "yes": "no" ); Abc_Print( -2, "\t-v : toggle verbose output [default = %s]\n", pPars->fVerbose? "yes": "no" ); Abc_Print( -2, "\t-z : toggle suppressing report about solved outputs [default = %s]\n", pPars->fNotVerbose? "yes": "no" ); Abc_Print( -2, "\t-h : print the command usage\n"); diff --git a/src/base/wlc/wlcReadSmt.c b/src/base/wlc/wlcReadSmt.c index 8ab043dd..0a8913fe 100644 --- a/src/base/wlc/wlcReadSmt.c +++ b/src/base/wlc/wlcReadSmt.c @@ -738,7 +738,7 @@ int Smt_PrsBuild2_rec( Wlc_Ntk_t * pNtk, Smt_Prs_t * p, int iNode ) if ( Smt_EntryIsName(iRoot0) ) { char * pName, * pStr0 = Abc_NamStr(p->pStrs, Abc_Lit2Var(iRoot0)); - int fSigned = 0, iObj; + int iObj; if ( pStr0[0] == 'l' && pStr0[1] == 'e' && pStr0[2] == 't' && pStr0[3] == '\0' ) { // let ((s35550 (bvor s48 s35549))) @@ -809,8 +809,8 @@ int Smt_PrsBuild2_rec( Wlc_Ntk_t * pNtk, Smt_Prs_t * p, int iNode ) int iRoot3 = Vec_IntEntry( vRoots, 3 ); char * pStr2 = Abc_NamStr(p->pStrs, Abc_Lit2Var(iRoot2)); char * pStr3 = Abc_NamStr(p->pStrs, Abc_Lit2Var(iRoot3)); - int Num1 = atoi( pStr1 ); - int Num2 = atoi( pStr2 ); + int Num1 = atoi( pStr2 ); + int Num2 = atoi( pStr3 ); assert( Num1 >= Num2 ); fSigned = (Type1 == WLC_OBJ_BIT_SIGNEXT); Range = (Num1 - Num2 + 1) + Wlc_ObjRange( Wlc_NtkObj(pNtk, iObj) ); |