diff options
author | Alan Mishchenko <alanmi@berkeley.edu> | 2013-05-09 11:35:04 -0700 |
---|---|---|
committer | Alan Mishchenko <alanmi@berkeley.edu> | 2013-05-09 11:35:04 -0700 |
commit | 7c7d5277553a2a3ae074a767ba870f77e2415e1c (patch) | |
tree | f0447a414b8f0bbc2b5c9d2e0220d369af55966b /src | |
parent | 68566713da1f5eaf712caf06b3750d2e6f92ee43 (diff) | |
download | abc-7c7d5277553a2a3ae074a767ba870f77e2415e1c.tar.gz abc-7c7d5277553a2a3ae074a767ba870f77e2415e1c.tar.bz2 abc-7c7d5277553a2a3ae074a767ba870f77e2415e1c.zip |
Changing per-output runtime limit to be in miliseconds.
Diffstat (limited to 'src')
-rw-r--r-- | src/base/abci/abc.c | 52 | ||||
-rw-r--r-- | src/proof/pdr/pdrCore.c | 2 | ||||
-rw-r--r-- | src/proof/pdr/pdrMan.c | 2 | ||||
-rw-r--r-- | src/sat/bmc/bmcBmc3.c | 4 |
4 files changed, 30 insertions, 30 deletions
diff --git a/src/base/abci/abc.c b/src/base/abci/abc.c index ec8e9e76..cf316ce9 100644 --- a/src/base/abci/abc.c +++ b/src/base/abci/abc.c @@ -21051,7 +21051,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, "SFTGHCDJILaxdruvzh" ) ) != EOF ) + while ( ( c = Extra_UtilGetopt( argc, argv, "SFTHGCDJILaxdruvzh" ) ) != EOF ) { switch ( c ) { @@ -21088,26 +21088,26 @@ int Abc_CommandBmc3( Abc_Frame_t * pAbc, int argc, char ** argv ) if ( pPars->nTimeOut < 0 ) goto usage; break; - case 'G': + case 'H': if ( globalUtilOptind >= argc ) { - Abc_Print( -1, "Command line switch \"-G\" should be followed by an integer.\n" ); + Abc_Print( -1, "Command line switch \"-H\" should be followed by an integer.\n" ); goto usage; } - pPars->nTimeOutGap = atoi(argv[globalUtilOptind]); + pPars->nTimeOutOne = atoi(argv[globalUtilOptind]); globalUtilOptind++; - if ( pPars->nTimeOutGap < 0 ) + if ( pPars->nTimeOutOne < 0 ) goto usage; break; - case 'H': + case 'G': if ( globalUtilOptind >= argc ) { - Abc_Print( -1, "Command line switch \"-H\" should be followed by an integer.\n" ); + Abc_Print( -1, "Command line switch \"-G\" should be followed by an integer.\n" ); goto usage; } - pPars->nTimeOutOne = atoi(argv[globalUtilOptind]); + pPars->nTimeOutGap = atoi(argv[globalUtilOptind]); globalUtilOptind++; - if ( pPars->nTimeOutOne < 0 ) + if ( pPars->nTimeOutGap < 0 ) goto usage; break; case 'C': @@ -21240,13 +21240,13 @@ int Abc_CommandBmc3( Abc_Frame_t * pAbc, int argc, char ** argv ) return 0; usage: - Abc_Print( -2, "usage: bmc3 [-SFTGHCDJI num] [-L file] [-axduvzh]\n" ); + Abc_Print( -2, "usage: bmc3 [-SFTHGCDJI num] [-L file] [-axduvzh]\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 ); - Abc_Print( -2, "\t-T num : approximate runtime limit in seconds [default = %d]\n", pPars->nTimeOut ); - Abc_Print( -2, "\t-G num : approximate runtime gap since the last CEX [default = %d]\n", pPars->nTimeOutGap ); - Abc_Print( -2, "\t-H num : approximate runtime per output (with \"-a\") [default = %d]\n", pPars->nTimeOutOne ); + Abc_Print( -2, "\t-T num : runtime limit, in seconds [default = %d]\n", pPars->nTimeOut ); + Abc_Print( -2, "\t-H num : runtime limit per output, in miliseconds (with \"-a\") [default = %d]\n", pPars->nTimeOutOne ); + Abc_Print( -2, "\t-G num : runtime gap since the last CEX, in seconds [default = %d]\n", pPars->nTimeOutGap ); Abc_Print( -2, "\t-C num : max conflicts at an output [default = %d]\n", pPars->nConfLimit ); Abc_Print( -2, "\t-D num : max conflicts after jumping (0 = infinity) [default = %d]\n", pPars->nConfLimitJump ); Abc_Print( -2, "\t-J num : the number of timeframes to jump (0 = not used) [default = %d]\n", pPars->nFramesJump ); @@ -22648,7 +22648,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, "MFCRTGHaxrmsdgvwzh" ) ) != EOF ) + while ( ( c = Extra_UtilGetopt( argc, argv, "MFCRTHGaxrmsdgvwzh" ) ) != EOF ) { switch ( c ) { @@ -22707,26 +22707,26 @@ int Abc_CommandPdr( Abc_Frame_t * pAbc, int argc, char ** argv ) if ( pPars->nTimeOut < 0 ) goto usage; break; - case 'G': + case 'H': if ( globalUtilOptind >= argc ) { - Abc_Print( -1, "Command line switch \"-G\" should be followed by an integer.\n" ); + Abc_Print( -1, "Command line switch \"-H\" should be followed by an integer.\n" ); goto usage; } - pPars->nTimeOutGap = atoi(argv[globalUtilOptind]); + pPars->nTimeOutOne = atoi(argv[globalUtilOptind]); globalUtilOptind++; - if ( pPars->nTimeOutGap < 0 ) + if ( pPars->nTimeOutOne < 0 ) goto usage; break; - case 'H': + case 'G': if ( globalUtilOptind >= argc ) { - Abc_Print( -1, "Command line switch \"-H\" should be followed by an integer.\n" ); + Abc_Print( -1, "Command line switch \"-G\" should be followed by an integer.\n" ); goto usage; } - pPars->nTimeOutOne = atoi(argv[globalUtilOptind]); + pPars->nTimeOutGap = atoi(argv[globalUtilOptind]); globalUtilOptind++; - if ( pPars->nTimeOutOne < 0 ) + if ( pPars->nTimeOutGap < 0 ) goto usage; break; case 'a': @@ -22792,7 +22792,7 @@ int Abc_CommandPdr( Abc_Frame_t * pAbc, int argc, char ** argv ) return 0; usage: - Abc_Print( -2, "usage: pdr [-MFCRTGH <num>] [-axrmsdgvwzh]\n" ); + Abc_Print( -2, "usage: pdr [-MFCRTHG <num>] [-axrmsdgvwzh]\n" ); Abc_Print( -2, "\t model checking using property directed reachability (aka IC3)\n" ); Abc_Print( -2, "\t pioneered by Aaron Bradley (http://ecee.colorado.edu/~bradleya/ic3/)\n" ); Abc_Print( -2, "\t with improvements by Niklas Een (http://een.se/niklas/)\n" ); @@ -22800,9 +22800,9 @@ usage: Abc_Print( -2, "\t-F num : limit on timeframes explored to stop computation [default = %d]\n", pPars->nFrameMax ); Abc_Print( -2, "\t-C num : limit on conflicts in one SAT call (0 = no limit) [default = %d]\n", pPars->nConfLimit ); Abc_Print( -2, "\t-R num : limit on proof obligations before a restart (0 = no limit) [default = %d]\n", pPars->nRestLimit ); - Abc_Print( -2, "\t-T num : approximate timeout in seconds (0 = no limit) [default = %d]\n", pPars->nTimeOut ); - Abc_Print( -2, "\t-G num : approximate runtime gap since the last CEX (0 = no limit) [default = %d]\n", pPars->nTimeOutGap ); - Abc_Print( -2, "\t-H num : approximate runtime per output (with \"-a\") [default = %d]\n", pPars->nTimeOutOne ); + Abc_Print( -2, "\t-T num : runtime limit, in seconds (0 = no limit) [default = %d]\n", pPars->nTimeOut ); + Abc_Print( -2, "\t-H num : runtime limit per output, in miliseconds (with \"-a\") [default = %d]\n", pPars->nTimeOutOne ); + Abc_Print( -2, "\t-G num : runtime gap since the last CEX (0 = no limit) [default = %d]\n", pPars->nTimeOutGap ); Abc_Print( -2, "\t-a : toggle solving all outputs even if one of them is SAT [default = %s]\n", pPars->fSolveAll? "yes": "no" ); Abc_Print( -2, "\t-x : toggle storing CEXes when solving all outputs [default = %s]\n", pPars->fStoreCex? "yes": "no" ); Abc_Print( -2, "\t-r : toggle using more effort in generalization [default = %s]\n", pPars->fTwoRounds? "yes": "no" ); diff --git a/src/proof/pdr/pdrCore.c b/src/proof/pdr/pdrCore.c index 43cc4527..afcb45b4 100644 --- a/src/proof/pdr/pdrCore.c +++ b/src/proof/pdr/pdrCore.c @@ -839,7 +839,7 @@ int Pdr_ManSolve( Aig_Man_t * pAig, Pdr_Par_t * pPars ) int RetValue; clock_t clk = clock(); if ( pPars->nTimeOutOne ) - pPars->nTimeOut = pPars->nTimeOutOne * Saig_ManPoNum(pAig); + pPars->nTimeOut = pPars->nTimeOutOne * Saig_ManPoNum(pAig) / 1000 + 1; if ( pPars->nTimeOutOne && !pPars->fSolveAll ) pPars->nTimeOutOne = 0; if ( pPars->fVerbose ) diff --git a/src/proof/pdr/pdrMan.c b/src/proof/pdr/pdrMan.c index 51be5e17..ef930beb 100644 --- a/src/proof/pdr/pdrMan.c +++ b/src/proof/pdr/pdrMan.c @@ -79,7 +79,7 @@ Pdr_Man_t * Pdr_ManStart( Aig_Man_t * pAig, Pdr_Par_t * pPars, Vec_Int_t * vPrio int i; p->pTime4Outs = ABC_ALLOC( clock_t, Saig_ManPoNum(pAig) ); for ( i = 0; i < Saig_ManPoNum(pAig); i++ ) - p->pTime4Outs[i] = pPars->nTimeOutOne * CLOCKS_PER_SEC; + p->pTime4Outs[i] = pPars->nTimeOutOne * CLOCKS_PER_SEC / 1000 + 1; } if ( pPars->fSolveAll ) { diff --git a/src/sat/bmc/bmcBmc3.c b/src/sat/bmc/bmcBmc3.c index 424e08c9..b3a92950 100644 --- a/src/sat/bmc/bmcBmc3.c +++ b/src/sat/bmc/bmcBmc3.c @@ -742,7 +742,7 @@ Gia_ManBmc_t * Saig_Bmc3ManStart( Aig_Man_t * pAig, int nTimeOutOne ) { p->pTime4Outs = ABC_ALLOC( clock_t, Saig_ManPoNum(pAig) ); for ( i = 0; i < Saig_ManPoNum(pAig); i++ ) - p->pTime4Outs[i] = nTimeOutOne * CLOCKS_PER_SEC; + p->pTime4Outs[i] = nTimeOutOne * CLOCKS_PER_SEC / 1000 + 1; } return p; } @@ -1396,7 +1396,7 @@ int Saig_ManBmcScalable( Aig_Man_t * pAig, Saig_ParBmc_t * pPars ) clock_t nTimeUnsat = 0, nTimeSat = 0, nTimeUndec = 0, clkOne = 0; clock_t nTimeToStopNG, nTimeToStop; if ( pPars->nTimeOutOne ) - pPars->nTimeOut = pPars->nTimeOutOne * Saig_ManPoNum(pAig); + pPars->nTimeOut = pPars->nTimeOutOne * Saig_ManPoNum(pAig) / 1000 + 1; if ( pPars->nTimeOutOne && !pPars->fSolveAll ) pPars->nTimeOutOne = 0; nTimeToStopNG = pPars->nTimeOut ? pPars->nTimeOut * CLOCKS_PER_SEC + clock(): 0; |