Skip to content

A
abc
Commit ca87c1a6 by Alan Mishchenko
Options

Unfold several timeframes at the same time in &bmcs.

parent 1f5ab6d7
Showing with 118 additions and 91 deletions
src/base/abci/abc.c
...@@ -39991,7 +39991,7 @@ int Abc_CommandAbc9SBmc( Abc_Frame_t * pAbc, int argc, char ** argv ) ...@@ -39991,7 +39991,7 @@ int Abc_CommandAbc9SBmc( Abc_Frame_t * pAbc, int argc, char ** argv )
memset( pPars, 0, sizeof(Bmc_AndPar_t) ); memset( pPars, 0, sizeof(Bmc_AndPar_t) );
pPars->nStart = 0; // starting timeframe pPars->nStart = 0; // starting timeframe
pPars->nFramesMax = 0; // maximum number of timeframes pPars->nFramesMax = 0; // maximum number of timeframes
pPars->nFramesAdd = 0; // the number of additional frames pPars->nFramesAdd = 1; // the number of additional frames
pPars->nConfLimit = 0; // maximum number of conflicts at a node pPars->nConfLimit = 0; // maximum number of conflicts at a node
pPars->nTimeOut = 0; // timeout in seconds pPars->nTimeOut = 0; // timeout in seconds
pPars->nLutSize = 0; // max LUT size for CNF computation pPars->nLutSize = 0; // max LUT size for CNF computation
...@@ -40009,7 +40009,7 @@ int Abc_CommandAbc9SBmc( Abc_Frame_t * pAbc, int argc, char ** argv ) ...@@ -40009,7 +40009,7 @@ int Abc_CommandAbc9SBmc( Abc_Frame_t * pAbc, int argc, char ** argv )
pPars->pFuncOnFrameDone = pAbc->pFuncOnFrameDone; // frame done callback pPars->pFuncOnFrameDone = pAbc->pFuncOnFrameDone; // frame done callback
Extra_UtilGetoptReset(); Extra_UtilGetoptReset();
while ( ( c = Extra_UtilGetopt( argc, argv, "PCFTvwh" ) ) != EOF ) while ( ( c = Extra_UtilGetopt( argc, argv, "PCFATvwh" ) ) != EOF )
{ {
switch ( c ) switch ( c )
{ {
...@@ -40046,6 +40046,17 @@ int Abc_CommandAbc9SBmc( Abc_Frame_t * pAbc, int argc, char ** argv ) ...@@ -40046,6 +40046,17 @@ int Abc_CommandAbc9SBmc( Abc_Frame_t * pAbc, int argc, char ** argv )
if ( pPars->nFramesMax < 0 ) if ( pPars->nFramesMax < 0 )
goto usage; goto usage;
break; break;
case 'A':
if ( globalUtilOptind >= argc )
{
Abc_Print( -1, "Command line switch \"-A\" should be followed by an integer.\n" );
goto usage;
}
pPars->nFramesAdd = atoi(argv[globalUtilOptind]);
globalUtilOptind++;
if ( pPars->nFramesAdd < 0 )
goto usage;
break;
case 'T': case 'T':
if ( globalUtilOptind >= argc ) if ( globalUtilOptind >= argc )
{ {
...@@ -40080,11 +40091,12 @@ int Abc_CommandAbc9SBmc( Abc_Frame_t * pAbc, int argc, char ** argv ) ...@@ -40080,11 +40091,12 @@ int Abc_CommandAbc9SBmc( Abc_Frame_t * pAbc, int argc, char ** argv )
return 0; return 0;
usage: usage:
Abc_Print( -2, "usage: &bmcs [-PCFT num] [-vwh]\n" ); Abc_Print( -2, "usage: &bmcs [-PCFAT num] [-vwh]\n" );
Abc_Print( -2, "\t performs bounded model checking\n" ); Abc_Print( -2, "\t performs bounded model checking\n" );
Abc_Print( -2, "\t-P num : the number of parallel solvers [default = %d]\n", pPars->nProcs ); Abc_Print( -2, "\t-P num : the number of parallel solvers [default = %d]\n", pPars->nProcs );
Abc_Print( -2, "\t-C num : the SAT solver conflict limit [default = %d]\n", pPars->nConfLimit ); Abc_Print( -2, "\t-C num : the SAT solver conflict limit [default = %d]\n", pPars->nConfLimit );
Abc_Print( -2, "\t-F num : the maximum number of timeframes [default = %d]\n", pPars->nFramesMax ); Abc_Print( -2, "\t-F num : the maximum number of timeframes [default = %d]\n", pPars->nFramesMax );
Abc_Print( -2, "\t-A num : the number of additional frames to unroll [default = %d]\n", pPars->nFramesAdd );
Abc_Print( -2, "\t-T num : approximate timeout in seconds [default = %d]\n", pPars->nTimeOut ); Abc_Print( -2, "\t-T num : approximate timeout in seconds [default = %d]\n", pPars->nTimeOut );
Abc_Print( -2, "\t-v : toggle printing verbose information [default = %s]\n", pPars->fVerbose? "yes": "no" ); Abc_Print( -2, "\t-v : toggle printing verbose information [default = %s]\n", pPars->fVerbose? "yes": "no" );
Abc_Print( -2, "\t-w : toggle printing information about unfolding [default = %s]\n", pPars->fVeryVerbose? "yes": "no" ); Abc_Print( -2, "\t-w : toggle printing information about unfolding [default = %s]\n", pPars->fVeryVerbose? "yes": "no" );
src/sat/bmc/bmcBmcS.c
...@@ -453,25 +453,27 @@ int Bmcs_ManCollect_rec( Bmcs_Man_t * p, int iObj ) ...@@ -453,25 +453,27 @@ int Bmcs_ManCollect_rec( Bmcs_Man_t * p, int iObj )
Gia_ObjSetCopyArray( p->pFrames, iObj, iLitClean ); Gia_ObjSetCopyArray( p->pFrames, iObj, iLitClean );
return iLitClean; return iLitClean;
} }
Gia_Man_t * Bmcs_ManUnfold( Bmcs_Man_t * p, int f ) Gia_Man_t * Bmcs_ManUnfold( Bmcs_Man_t * p, int f, int nFramesAdd )
{ {
Gia_Man_t * pNew = NULL; Gia_Obj_t * pObj; Gia_Man_t * pNew = NULL; Gia_Obj_t * pObj;
int i, iLitFrame, iLitClean, fTrivial = 1; int i, k, iLitFrame, iLitClean, fTrivial = 1;
int nFrameObjs = Gia_ManObjNum(p->pFrames); int * pCopies, nFrameObjs = Gia_ManObjNum(p->pFrames);
int * pCopies;
// unfold this timeframe
Vec_PtrPush( &p->vGia2Fr, ABC_FALLOC(int, Gia_ManObjNum(p->pGia)) );
assert( Vec_PtrSize(&p->vGia2Fr) == f+1 );
pCopies = Bmcs_ManCopies( p, f );
//memset( pCopies, 0xFF, sizeof(int)*Gia_ManObjNum(p->pGia) );
pCopies[0] = 0;
assert( Gia_ManPoNum(p->pFrames) == f * Gia_ManPoNum(p->pGia) ); assert( Gia_ManPoNum(p->pFrames) == f * Gia_ManPoNum(p->pGia) );
Gia_ManForEachPo( p->pGia, pObj, i ) for ( k = 0; k < nFramesAdd; k++ )
{ {
iLitFrame = Bmcs_ManUnfold_rec( p, Gia_ObjFaninId0p(p->pGia, pObj), f ); // unfold this timeframe
iLitFrame = Abc_LitNotCond( iLitFrame, Gia_ObjFaninC0(pObj) ); Vec_PtrPush( &p->vGia2Fr, ABC_FALLOC(int, Gia_ManObjNum(p->pGia)) );
pCopies[Gia_ObjId(p->pGia, pObj)] = Gia_ManAppendCo( p->pFrames, iLitFrame ); assert( Vec_PtrSize(&p->vGia2Fr) == f+k+1 );
fTrivial &= (iLitFrame == 0); pCopies = Bmcs_ManCopies( p, f+k );
//memset( pCopies, 0xFF, sizeof(int)*Gia_ManObjNum(p->pGia) );
pCopies[0] = 0;
Gia_ManForEachPo( p->pGia, pObj, i )
{
iLitFrame = Bmcs_ManUnfold_rec( p, Gia_ObjFaninId0p(p->pGia, pObj), f+k );
iLitFrame = Abc_LitNotCond( iLitFrame, Gia_ObjFaninC0(pObj) );
pCopies[Gia_ObjId(p->pGia, pObj)] = Gia_ManAppendCo( p->pFrames, iLitFrame );
fTrivial &= (iLitFrame == 0);
}
} }
if ( fTrivial ) if ( fTrivial )
return NULL; return NULL;
...@@ -482,9 +484,10 @@ Gia_Man_t * Bmcs_ManUnfold( Bmcs_Man_t * p, int f ) ...@@ -482,9 +484,10 @@ Gia_Man_t * Bmcs_ManUnfold( Bmcs_Man_t * p, int f )
Gia_ManStopP( &p->pClean ); Gia_ManStopP( &p->pClean );
p->pClean = Gia_ManStart( Gia_ManObjNum(p->pFrames) - nFrameObjs + 1000 ); p->pClean = Gia_ManStart( Gia_ManObjNum(p->pFrames) - nFrameObjs + 1000 );
Gia_ObjSetCopyArray( p->pFrames, 0, 0 ); Gia_ObjSetCopyArray( p->pFrames, 0, 0 );
for ( k = 0; k < nFramesAdd; k++ )
for ( i = 0; i < Gia_ManPoNum(p->pGia); i++ ) for ( i = 0; i < Gia_ManPoNum(p->pGia); i++ )
{ {
pObj = Gia_ManCo( p->pFrames, f * Gia_ManPoNum(p->pGia) + i ); pObj = Gia_ManCo( p->pFrames, (f+k) * Gia_ManPoNum(p->pGia) + i );
iLitClean = Bmcs_ManCollect_rec( p, Gia_ObjFaninId0p(p->pFrames, pObj) ); iLitClean = Bmcs_ManCollect_rec( p, Gia_ObjFaninId0p(p->pFrames, pObj) );
iLitClean = Abc_LitNotCond( iLitClean, Gia_ObjFaninC0(pObj) ); iLitClean = Abc_LitNotCond( iLitClean, Gia_ObjFaninC0(pObj) );
iLitClean = Gia_ManAppendCo( p->pClean, iLitClean ); iLitClean = Gia_ManAppendCo( p->pClean, iLitClean );
...@@ -496,9 +499,9 @@ Gia_Man_t * Bmcs_ManUnfold( Bmcs_Man_t * p, int f ) ...@@ -496,9 +499,9 @@ Gia_Man_t * Bmcs_ManUnfold( Bmcs_Man_t * p, int f )
Gia_ObjSetCopyArray( p->pFrames, pObj->Value, -1 ); Gia_ObjSetCopyArray( p->pFrames, pObj->Value, -1 );
return pNew; return pNew;
} }
Cnf_Dat_t * Bmcs_ManAddNewCnf( Bmcs_Man_t * p, int f ) Cnf_Dat_t * Bmcs_ManAddNewCnf( Bmcs_Man_t * p, int f, int nFramesAdd )
{ {
Gia_Man_t * pNew = Bmcs_ManUnfold( p, f ); Gia_Man_t * pNew = Bmcs_ManUnfold( p, f, nFramesAdd );
Cnf_Dat_t * pCnf; Cnf_Dat_t * pCnf;
Gia_Obj_t * pObj; Gia_Obj_t * pObj;
int i, iVar, * pMap; int i, iVar, * pMap;
...@@ -577,64 +580,70 @@ int Bmcs_ManPerformOne( Gia_Man_t * pGia, Bmc_AndPar_t * pPars ) ...@@ -577,64 +580,70 @@ int Bmcs_ManPerformOne( Gia_Man_t * pGia, Bmc_AndPar_t * pPars )
{ {
abctime clkStart = Abc_Clock(); abctime clkStart = Abc_Clock();
Bmcs_Man_t * p = Bmcs_ManStart( pGia, pPars ); Bmcs_Man_t * p = Bmcs_ManStart( pGia, pPars );
int f, i = Gia_ManPoNum(pGia), status, RetValue = -1, nClauses = 0; int f, k, i = Gia_ManPoNum(pGia), status, RetValue = -1, nClauses = 0;
Abc_CexFreeP( &pGia->pCexSeq ); Abc_CexFreeP( &pGia->pCexSeq );
for ( f = 0; !pPars->nFramesMax || f < pPars->nFramesMax; f++ ) for ( f = 0; !pPars->nFramesMax || f < pPars->nFramesMax; f += pPars->nFramesAdd )
{ {
Cnf_Dat_t * pCnf = Bmcs_ManAddNewCnf( p, f ); Cnf_Dat_t * pCnf = Bmcs_ManAddNewCnf( p, f, pPars->nFramesAdd );
if ( pCnf == NULL ) if ( pCnf == NULL )
{ {
Bmcs_ManPrintFrame( p, f, nClauses, -1, clkStart ); Bmcs_ManPrintFrame( p, f, nClauses, -1, clkStart );
if( pPars->pFuncOnFrameDone) if( pPars->pFuncOnFrameDone)
for ( k = 0; k < pPars->nFramesAdd; k++ )
for ( i = 0; i < Gia_ManPoNum(pGia); i++ ) for ( i = 0; i < Gia_ManPoNum(pGia); i++ )
pPars->pFuncOnFrameDone(f, i, 0); pPars->pFuncOnFrameDone(f+k, i, 0);
continue; continue;
} }
nClauses += pCnf->nClauses; nClauses += pCnf->nClauses;
Bmcs_ManAddCnf( p->pSats[0], pCnf ); Bmcs_ManAddCnf( p->pSats[0], pCnf );
Cnf_DataFree( pCnf ); Cnf_DataFree( pCnf );
assert( Gia_ManPoNum(p->pFrames) == (f + 1) * Gia_ManPoNum(pGia) ); assert( Gia_ManPoNum(p->pFrames) == (f + pPars->nFramesAdd) * Gia_ManPoNum(pGia) );
for ( i = 0; i < Gia_ManPoNum(pGia); i++ ) for ( k = 0; k < pPars->nFramesAdd; k++ )
{ {
int iObj = Gia_ObjId( p->pFrames, Gia_ManCo(p->pFrames, f * Gia_ManPoNum(pGia) + i) ); for ( i = 0; i < Gia_ManPoNum(pGia); i++ )
int iLit = Abc_Var2Lit( Vec_IntEntry(&p->vFr2Sat, iObj), 0 );
if ( pPars->nTimeOut && (Abc_Clock() - clkStart)/CLOCKS_PER_SEC >= pPars->nTimeOut )
break;
satoko_assump_push( p->pSats[0], iLit );
status = satoko_solve( p->pSats[0] );
satoko_assump_pop( p->pSats[0] );
if ( status == SATOKO_UNSAT )
{
if ( i == Gia_ManPoNum(pGia)-1 )
Bmcs_ManPrintFrame( p, f, nClauses, -1, clkStart );
if( pPars->pFuncOnFrameDone)
pPars->pFuncOnFrameDone(f, i, 0);
continue;
}
if ( status == SATOKO_SAT )
{ {
RetValue = 0; int iObj = Gia_ObjId( p->pFrames, Gia_ManCo(p->pFrames, (f+k) * Gia_ManPoNum(pGia) + i) );
pPars->iFrame = f; int iLit = Abc_Var2Lit( Vec_IntEntry(&p->vFr2Sat, iObj), 0 );
pGia->pCexSeq = Bmcs_ManGenerateCex( p, i, f, 0 ); if ( pPars->nTimeOut && (Abc_Clock() - clkStart)/CLOCKS_PER_SEC >= pPars->nTimeOut )
pPars->nFailOuts++; break;
if ( !pPars->fNotVerbose ) satoko_assump_push( p->pSats[0], iLit );
status = satoko_solve( p->pSats[0] );
satoko_assump_pop( p->pSats[0] );
if ( status == SATOKO_UNSAT )
{
if ( i == Gia_ManPoNum(pGia)-1 )
Bmcs_ManPrintFrame( p, f+k, nClauses, -1, clkStart );
if( pPars->pFuncOnFrameDone)
pPars->pFuncOnFrameDone(f+k, i, 0);
continue;
}
if ( status == SATOKO_SAT )
{ {
int nOutDigits = Abc_Base10Log( Gia_ManPoNum(pGia) ); RetValue = 0;
Abc_Print( 1, "Output %*d was asserted in frame %2d (solved %*d out of %*d outputs). ", pPars->iFrame = f+k;
nOutDigits, i, f, nOutDigits, pPars->nFailOuts, nOutDigits, Gia_ManPoNum(pGia) ); pGia->pCexSeq = Bmcs_ManGenerateCex( p, i, f+k, 0 );
fflush( stdout ); pPars->nFailOuts++;
if ( !pPars->fNotVerbose )
{
int nOutDigits = Abc_Base10Log( Gia_ManPoNum(pGia) );
Abc_Print( 1, "Output %*d was asserted in frame %2d (solved %*d out of %*d outputs). ",
nOutDigits, i, f+k, nOutDigits, pPars->nFailOuts, nOutDigits, Gia_ManPoNum(pGia) );
fflush( stdout );
}
if( pPars->pFuncOnFrameDone)
pPars->pFuncOnFrameDone(f+k, i, 1);
} }
if( pPars->pFuncOnFrameDone) break;
pPars->pFuncOnFrameDone(f, i, 1);
} }
break; if ( i < Gia_ManPoNum(pGia) || f+k == pPars->nFramesMax-1 )
break;
} }
if ( i < Gia_ManPoNum(pGia) ) if ( k < pPars->nFramesAdd )
break; break;
} }
Bmcs_ManStop( p ); Bmcs_ManStop( p );
if ( RetValue == -1 && !pPars->fNotVerbose ) if ( RetValue == -1 && !pPars->fNotVerbose )
printf( "No output failed in %d frames. ", f ); printf( "No output failed in %d frames. ", f + (k < pPars->nFramesAdd ? k+1 : 0) );
Abc_PrintTime( 1, "Time", Abc_Clock() - clkStart ); Abc_PrintTime( 1, "Time", Abc_Clock() - clkStart );
return RetValue; return RetValue;
} }
...@@ -746,7 +755,7 @@ int Bmcs_ManPerformMulti( Gia_Man_t * pGia, Bmc_AndPar_t * pPars ) ...@@ -746,7 +755,7 @@ int Bmcs_ManPerformMulti( Gia_Man_t * pGia, Bmc_AndPar_t * pPars )
pthread_t WorkerThread[PAR_THR_MAX]; pthread_t WorkerThread[PAR_THR_MAX];
Par_ThData_t ThData[PAR_THR_MAX]; Par_ThData_t ThData[PAR_THR_MAX];
Bmcs_Man_t * p = Bmcs_ManStart( pGia, pPars ); Bmcs_Man_t * p = Bmcs_ManStart( pGia, pPars );
int f, i = Gia_ManPoNum(pGia), status, RetValue = -1, nClauses = 0, Solver = 0; int f, k, i = Gia_ManPoNum(pGia), status, RetValue = -1, nClauses = 0, Solver = 0;
Abc_CexFreeP( &pGia->pCexSeq ); Abc_CexFreeP( &pGia->pCexSeq );
// start threads // start threads
for ( i = 0; i < pPars->nProcs; i++ ) for ( i = 0; i < pPars->nProcs; i++ )
...@@ -759,15 +768,16 @@ int Bmcs_ManPerformMulti( Gia_Man_t * pGia, Bmc_AndPar_t * pPars ) ...@@ -759,15 +768,16 @@ int Bmcs_ManPerformMulti( Gia_Man_t * pGia, Bmc_AndPar_t * pPars )
status = pthread_create( WorkerThread + i, NULL, Bmcs_ManWorkerThread, (void *)(ThData + i) ); assert( status == 0 ); status = pthread_create( WorkerThread + i, NULL, Bmcs_ManWorkerThread, (void *)(ThData + i) ); assert( status == 0 );
} }
// solve properties in each timeframe // solve properties in each timeframe
for ( f = 0; !pPars->nFramesMax || f < pPars->nFramesMax; f++ ) for ( f = 0; !pPars->nFramesMax || f < pPars->nFramesMax; f += pPars->nFramesAdd )
{ {
Cnf_Dat_t * pCnf = Bmcs_ManAddNewCnf( p, f ); Cnf_Dat_t * pCnf = Bmcs_ManAddNewCnf( p, f, pPars->nFramesAdd );
if ( pCnf == NULL ) if ( pCnf == NULL )
{ {
Bmcs_ManPrintFrame( p, f, nClauses, 0, clkStart ); Bmcs_ManPrintFrame( p, f, nClauses, 0, clkStart );
if( pPars->pFuncOnFrameDone ) if( pPars->pFuncOnFrameDone )
for ( k = 0; k < pPars->nFramesAdd; k++ )
for ( i = 0; i < Gia_ManPoNum(pGia); i++ ) for ( i = 0; i < Gia_ManPoNum(pGia); i++ )
pPars->pFuncOnFrameDone(f, i, 0); pPars->pFuncOnFrameDone(f+k, i, 0);
continue; continue;
} }
// load CNF into solvers // load CNF into solvers
...@@ -776,41 +786,46 @@ int Bmcs_ManPerformMulti( Gia_Man_t * pGia, Bmc_AndPar_t * pPars ) ...@@ -776,41 +786,46 @@ int Bmcs_ManPerformMulti( Gia_Man_t * pGia, Bmc_AndPar_t * pPars )
Bmcs_ManAddCnf( p->pSats[i], pCnf ); Bmcs_ManAddCnf( p->pSats[i], pCnf );
Cnf_DataFree( pCnf ); Cnf_DataFree( pCnf );
// solve outputs // solve outputs
assert( Gia_ManPoNum(p->pFrames) == (f + 1) * Gia_ManPoNum(pGia) ); assert( Gia_ManPoNum(p->pFrames) == (f + pPars->nFramesAdd) * Gia_ManPoNum(pGia) );
for ( i = 0; i < Gia_ManPoNum(pGia); i++ ) for ( k = 0; k < pPars->nFramesAdd; k++ )
{ {
int iObj = Gia_ObjId( p->pFrames, Gia_ManCo(p->pFrames, f * Gia_ManPoNum(pGia) + i) ); for ( i = 0; i < Gia_ManPoNum(pGia); i++ )
int iLit = Abc_Var2Lit( Vec_IntEntry(&p->vFr2Sat, iObj), 0 );
if ( pPars->nTimeOut && (Abc_Clock() - clkStart)/CLOCKS_PER_SEC >= pPars->nTimeOut )
break;
status = Bmcs_ManPerform_Solve( p, iLit, WorkerThread, ThData, pPars->nProcs, &Solver );
if ( status == SATOKO_UNSAT )
{
if ( i == Gia_ManPoNum(pGia)-1 )
Bmcs_ManPrintFrame( p, f, nClauses, Solver, clkStart );
if( pPars->pFuncOnFrameDone )
pPars->pFuncOnFrameDone(f, i, 0);
continue;
}
if ( status == SATOKO_SAT )
{ {
RetValue = 0; int iObj = Gia_ObjId( p->pFrames, Gia_ManCo(p->pFrames, (f+k) * Gia_ManPoNum(pGia) + i) );
pPars->iFrame = f; int iLit = Abc_Var2Lit( Vec_IntEntry(&p->vFr2Sat, iObj), 0 );
pGia->pCexSeq = Bmcs_ManGenerateCex( p, i, f, Solver ); if ( pPars->nTimeOut && (Abc_Clock() - clkStart)/CLOCKS_PER_SEC >= pPars->nTimeOut )
pPars->nFailOuts++; break;
if ( !pPars->fNotVerbose ) status = Bmcs_ManPerform_Solve( p, iLit, WorkerThread, ThData, pPars->nProcs, &Solver );
if ( status == SATOKO_UNSAT )
{ {
int nOutDigits = Abc_Base10Log( Gia_ManPoNum(pGia) ); if ( i == Gia_ManPoNum(pGia)-1 )
Abc_Print( 1, "Output %*d was asserted in frame %2d (solved %*d out of %*d outputs). ", Bmcs_ManPrintFrame( p, f+k, nClauses, Solver, clkStart );
nOutDigits, i, f, nOutDigits, pPars->nFailOuts, nOutDigits, Gia_ManPoNum(pGia) ); if( pPars->pFuncOnFrameDone )
fflush( stdout ); pPars->pFuncOnFrameDone(f+k, i, 0);
continue;
} }
if( pPars->pFuncOnFrameDone ) if ( status == SATOKO_SAT )
pPars->pFuncOnFrameDone(f, i, 1); {
RetValue = 0;
pPars->iFrame = f+k;
pGia->pCexSeq = Bmcs_ManGenerateCex( p, i, f+k, Solver );
pPars->nFailOuts++;
if ( !pPars->fNotVerbose )
{
int nOutDigits = Abc_Base10Log( Gia_ManPoNum(pGia) );
Abc_Print( 1, "Output %*d was asserted in frame %2d (solved %*d out of %*d outputs). ",
nOutDigits, i, f+k, nOutDigits, pPars->nFailOuts, nOutDigits, Gia_ManPoNum(pGia) );
fflush( stdout );
}
if( pPars->pFuncOnFrameDone )
pPars->pFuncOnFrameDone(f+k, i, 1);
}
break;
} }
break; if ( i < Gia_ManPoNum(pGia) || f+k == pPars->nFramesMax-1 )
break;
} }
if ( i < Gia_ManPoNum(pGia) ) if ( k < pPars->nFramesAdd )
break; break;
} }
// stop threads // stop threads
...@@ -822,7 +837,7 @@ int Bmcs_ManPerformMulti( Gia_Man_t * pGia, Bmc_AndPar_t * pPars ) ...@@ -822,7 +837,7 @@ int Bmcs_ManPerformMulti( Gia_Man_t * pGia, Bmc_AndPar_t * pPars )
} }
Bmcs_ManStop( p ); Bmcs_ManStop( p );
if ( RetValue == -1 && !pPars->fNotVerbose ) if ( RetValue == -1 && !pPars->fNotVerbose )
printf( "No output failed in %d frames. ", f ); printf( "No output failed in %d frames. ", f + (k < pPars->nFramesAdd ? k+1 : 0) );
Abc_PrintTime( 1, "Time", Abc_Clock() - clkStart ); Abc_PrintTime( 1, "Time", Abc_Clock() - clkStart );
return RetValue; return RetValue;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment