From 22bdf624655bfb1673840937e81eea199ddf512c Mon Sep 17 00:00:00 2001 From: Alan Mishchenko Date: Mon, 27 May 2013 15:14:42 -0700 Subject: Adding a wrapper around clock() for more accurate time counting in ABC. --- src/misc/util/abc_global.h | 2 +- src/sat/bmc/bmcBmc3.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/misc/util/abc_global.h b/src/misc/util/abc_global.h index f824ea43..5d6a8aeb 100644 --- a/src/misc/util/abc_global.h +++ b/src/misc/util/abc_global.h @@ -268,7 +268,7 @@ static inline int Abc_Lit2LitL( int * pMap, int Lit ) { return Abc_LitNo // time counting -typedef ABC_UINT64_T abctime; +typedef ABC_INT64_T abctime; static inline abctime Abc_Clock() { static abctime PeriodNum = 0; diff --git a/src/sat/bmc/bmcBmc3.c b/src/sat/bmc/bmcBmc3.c index 9d399a20..e312e3be 100644 --- a/src/sat/bmc/bmcBmc3.c +++ b/src/sat/bmc/bmcBmc3.c @@ -1248,7 +1248,7 @@ abctime Saig_ManBmcTimeToStop( Saig_ParBmc_t * pPars, abctime nTimeToStopNG ) abctime nTimeToStopGap = pPars->nTimeOutGap ? pPars->nTimeOutGap * CLOCKS_PER_SEC + Abc_Clock(): 0; abctime nTimeToStop = 0; if ( nTimeToStopNG && nTimeToStopGap ) - nTimeToStop = Abc_MinInt( nTimeToStopNG, nTimeToStopGap ); + nTimeToStop = nTimeToStopNG < nTimeToStopGap ? nTimeToStopNG : nTimeToStopGap; else if ( nTimeToStopNG ) nTimeToStop = nTimeToStopNG; else if ( nTimeToStopGap ) -- cgit v1.2.3