diff options
author | Alan Mishchenko <alanmi@berkeley.edu> | 2013-09-16 22:57:50 -0700 |
---|---|---|
committer | Alan Mishchenko <alanmi@berkeley.edu> | 2013-09-16 22:57:50 -0700 |
commit | 105648bf7c5ce5825d7b62ffbc05cbbf821c5ced (patch) | |
tree | 24848ba7ac54921aeee9ea15b3e9219ecbd92871 /src | |
parent | 2ba12a76ff7992b5d1221d5926605d928691c053 (diff) | |
download | abc-105648bf7c5ce5825d7b62ffbc05cbbf821c5ced.tar.gz abc-105648bf7c5ce5825d7b62ffbc05cbbf821c5ced.tar.bz2 abc-105648bf7c5ce5825d7b62ffbc05cbbf821c5ced.zip |
Adding switch to enable reuse of proof-obligations in the last timeframe.
Diffstat (limited to 'src')
-rw-r--r-- | src/base/abci/abc.c | 6 | ||||
-rw-r--r-- | src/proof/pdr/pdr.h | 1 | ||||
-rw-r--r-- | src/proof/pdr/pdrCore.c | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/src/base/abci/abc.c b/src/base/abci/abc.c index 6deba68d..8773f9d1 100644 --- a/src/base/abci/abc.c +++ b/src/base/abci/abc.c @@ -23622,7 +23622,7 @@ int Abc_CommandPdr( Abc_Frame_t * pAbc, int argc, char ** argv ) int c; Pdr_ManSetDefaultParams( pPars ); Extra_UtilGetoptReset(); - while ( ( c = Extra_UtilGetopt( argc, argv, "MFCRTHGaxrmsdgvwzh" ) ) != EOF ) + while ( ( c = Extra_UtilGetopt( argc, argv, "MFCRTHGaxrmspdgvwzh" ) ) != EOF ) { switch ( c ) { @@ -23718,6 +23718,9 @@ int Abc_CommandPdr( Abc_Frame_t * pAbc, int argc, char ** argv ) case 's': pPars->fShortest ^= 1; break; + case 'p': + pPars->fReuseProofOblig ^= 1; + break; case 'd': pPars->fDumpInv ^= 1; break; @@ -23781,6 +23784,7 @@ usage: Abc_Print( -2, "\t-r : toggle using more effort in generalization [default = %s]\n", pPars->fTwoRounds? "yes": "no" ); Abc_Print( -2, "\t-m : toggle using monolythic CNF computation [default = %s]\n", pPars->fMonoCnf? "yes": "no" ); Abc_Print( -2, "\t-s : toggle creating only shortest counter-examples [default = %s]\n", pPars->fShortest? "yes": "no" ); + Abc_Print( -2, "\t-p : toggle using proof-obligations from the last timeframe [default = %s]\n", pPars->fReuseProofOblig? "yes": "no" ); Abc_Print( -2, "\t-d : toggle dumping inductive invariant [default = %s]\n", pPars->fDumpInv? "yes": "no" ); Abc_Print( -2, "\t-g : toggle skipping expensive generalization step [default = %s]\n", pPars->fSkipGeneral? "yes": "no" ); Abc_Print( -2, "\t-v : toggle printing optimization summary [default = %s]\n", pPars->fVerbose? "yes": "no" ); diff --git a/src/proof/pdr/pdr.h b/src/proof/pdr/pdr.h index 83c71b1d..dcf5b534 100644 --- a/src/proof/pdr/pdr.h +++ b/src/proof/pdr/pdr.h @@ -52,6 +52,7 @@ struct Pdr_Par_t_ int fMonoCnf; // monolythic CNF int fDumpInv; // dump inductive invariant int fShortest; // forces bug traces to be shortest + int fReuseProofOblig; // reuses proof-obligationgs in the last timeframe int fSkipGeneral; // skips expensive generalization step int fVerbose; // verbose output` int fVeryVerbose; // very verbose output diff --git a/src/proof/pdr/pdrCore.c b/src/proof/pdr/pdrCore.c index 6d2f1c43..accc779c 100644 --- a/src/proof/pdr/pdrCore.c +++ b/src/proof/pdr/pdrCore.c @@ -525,7 +525,7 @@ int Pdr_ManBlockCube( Pdr_Man_t * p, Pdr_Set_t * pCube ) for ( i = 1; i <= k; i++ ) Pdr_ManSolverAddClause( p, i, pCubeMin ); // schedule proof obligation - if ( !p->pPars->fShortest ) + if ( (k < kMax || p->pPars->fReuseProofOblig) && !p->pPars->fShortest ) { pThis->iFrame = k+1; pThis->prio = Prio--; |