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

Merged in ysho/abc (pull request #73) 

Improvements to %pdra
This commit is contained in:
Alan Mishchenko 2017-04-12 01:24:22 +00:00
parent 000e51f323 2c443d20de
commit 0d53eece0a
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/base/wlc/wlc.h
View File

@ -185,6 +185,8 @@ struct Wlc_Par_t_
int fShrinkScratch; // Restart pdr from scratch after shrinking
int fVerbose; // verbose output
int fPdrVerbose; // verbose output
int RunId; // id in this run
int (*pFuncStop)(int); // callback to terminate
};
typedef struct Wla_Man_t_ Wla_Man_t;

6
src/base/wlc/wlcAbs.c
View File

@ -587,6 +587,8 @@ static Abc_Cex_t * Wlc_NtkCexIsReal( Wlc_Ntk_t * pOrig, Abc_Cex_t * pCex )
if (pObj->Value==1) {
Abc_Print( 1, "CEX is real on the original model.\n" );
Gia_ManStop(pGiaOrig);
pCexReal->iFrame = f;
pCexReal->iPo = i;
return pCexReal;
}
}
@ -1659,6 +1661,8 @@ Wla_Man_t * Wla_ManStart( Wlc_Ntk_t * pNtk, Wlc_Par_t * pPars )
Pdr_ManSetDefaultParams( pPdrPars );
pPdrPars->fVerbose = pPars->fPdrVerbose;
pPdrPars->fVeryVerbose = 0;
pPdrPars->pFuncStop = pPars->pFuncStop;
pPdrPars->RunId = pPars->RunId;
if ( pPars->fPdra )
{
pPdrPars->fUseAbs = 1; // use 'pdr -t' (on-the-fly abstraction)
@ -1713,7 +1717,7 @@ int Wla_ManSolve( Wla_Man_t * pWla, Wlc_Par_t * pPars )
RetValue = Wla_ManSolveInt( pWla, pAig );
Aig_ManStop( pAig );
if ( RetValue != -1 )
if ( RetValue != -1 || (pPars->pFuncStop && pPars->pFuncStop( pPars->RunId)) )
break;
Wla_ManRefine( pWla );