luke
/
abc
mirror of https://github.com/YosysHQ/abc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Making report about the number of correcty covered frames consistent across the engines.

This commit is contained in:
Alan Mishchenko 2012-10-09 15:42:25 -07:00
parent fed18333e2
commit daeffe791c
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/aig/saig/saigBmc2.c
View File

@ -833,7 +833,7 @@ int Saig_BmcPerform( Aig_Man_t * pAig, int nStart, int nFramesMax, int nNodesMax
p->iOutputFail, p->pAig->pName, p->iFrameFail );
Status = 0;
if ( piFrames )
*piFrames = p->iFrameFail;
*piFrames = p->iFrameFail - 1;
}
else // if ( RetValue == l_False || RetValue == l_Undef )
{
@ -842,9 +842,9 @@ int Saig_BmcPerform( Aig_Man_t * pAig, int nStart, int nFramesMax, int nNodesMax
if ( piFrames )
{
if ( p->iOutputLast > 0 )
*piFrames = p->iFramePrev - 1;
*piFrames = p->iFramePrev - 2;
else
*piFrames = p->iFramePrev;
*piFrames = p->iFramePrev - 1;
}
}
if ( !fSilent )

2
src/aig/saig/saigBmc3.c
View File

@ -1551,7 +1551,7 @@ clkOther += clock() - clk2;
if ( nJumpFrame && pPars->nStart == 0 )
pPars->iFrame = nJumpFrame - pPars->nFramesJump;
else if ( RetValue == -1 && pPars->nStart == 0 )
pPars->iFrame = f;
pPars->iFrame = f-1;
//ABC_PRT( "CNF generation runtime", clkOther );
if ( pPars->fVerbose )
{

4
src/proof/int/intCore.c
View File

@ -97,7 +97,7 @@ int Inter_ManPerformInterpolation( Aig_Man_t * pAig, Inter_ManParams_t * pPars,
if ( Inter_ManCheckInitialState(pAig) )
{
*piFrame = 0;
*piFrame = -1;
printf( "Property trivially fails in the initial state.\n" );
return 0;
}
@ -223,7 +223,7 @@ p->timeEqu += clock() - clk;
ABC_PRT( "Time", clock() - clk );
}
// remember the number of timeframes completed
pPars->iFrameMax = i + 1 + p->nFrames;
pPars->iFrameMax = i - 1 + p->nFrames;
if ( RetValue == 0 ) // found a (spurious?) counter-example
{
if ( i == 0 ) // real counterexample

1
src/proof/pdr/pdrCore.c
View File

@ -709,6 +709,7 @@ int Pdr_ManSolve_( Aig_Man_t * pAig, Pdr_Par_t * pPars, Vec_Int_t ** pvPrioInit,
p->vPrio = NULL;
}
Pdr_ManStop( p );
pPars->iFrame--;
return RetValue;
}