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

Bug fix in 'satclp'.

This commit is contained in:
Alan Mishchenko 2015-11-11 17:17:40 -08:00
parent 58cb230855
commit 71847b9d17
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/base/abci/abcCollapse.c
View File

@ -602,7 +602,14 @@ int Abc_NtkCollapseReduce( Vec_Str_t * vSop, Vec_Int_t * vSupp, Vec_Int_t * vCla
{ {
int j = 0, i, k, iCo, iVar, nVars = Vec_IntSize(vSupp); int j = 0, i, k, iCo, iVar, nVars = Vec_IntSize(vSupp);
char * pCube, * pSop = Vec_StrArray(vSop); char * pCube, * pSop = Vec_StrArray(vSop);
Vec_Int_t * vPres = Vec_IntStart( nVars ); Vec_Int_t * vPres;
if ( Vec_StrSize(vSop) == 4 ) // constant
{
Vec_IntForEachEntry( vClass, iCo, i )
Vec_IntClear( Vec_WecEntry(vSupps, iCo) );
return 1;
}
vPres = Vec_IntStart( nVars );
Abc_NtkSopForEachCube( pSop, nVars, pCube ) Abc_NtkSopForEachCube( pSop, nVars, pCube )
for ( k = 0; k < nVars; k++ ) for ( k = 0; k < nVars; k++ )
if ( pCube[k] != '-' ) if ( pCube[k] != '-' )
@ -721,10 +728,7 @@ Vec_Str_t * Abc_NtkClpGiaOne( Gia_Man_t * p, int iCo, int nCubeLim, int nBTLimit
Gia_ManStop( pGia ); Gia_ManStop( pGia );
if ( vSop == NULL ) if ( vSop == NULL )
return NULL; return NULL;
if ( Vec_StrSize(vSop) == 4 ) // constant Abc_NtkCollapseReduce( vSop, vSupp, vClass, vSupps );
Vec_IntClear(vSupp);
else
Abc_NtkCollapseReduce( vSop, vSupp, vClass, vSupps );
if ( fVerbose ) if ( fVerbose )
printf( "Supp new = %4d. Sop = %4d. ", Vec_IntSize(vSupp), Vec_StrSize(vSop)/(Vec_IntSize(vSupp) +3) ); printf( "Supp new = %4d. Sop = %4d. ", Vec_IntSize(vSupp), Vec_StrSize(vSop)/(Vec_IntSize(vSupp) +3) );
if ( fVerbose ) if ( fVerbose )
@ -763,10 +767,7 @@ Vec_Str_t * Abc_NtkClpGiaOne2( Cnf_Dat_t * pCnf, Gia_Man_t * p, int iCo, int nCu
Vec_IntFree( vAnds ); Vec_IntFree( vAnds );
if ( vSop == NULL ) if ( vSop == NULL )
return NULL; return NULL;
if ( Vec_StrSize(vSop) == 4 ) // constant Abc_NtkCollapseReduce( vSop, vSupp, vClass, vSupps );
Vec_IntClear(vSupp);
else
Abc_NtkCollapseReduce( vSop, vSupp, vClass, vSupps );
if ( fVerbose ) if ( fVerbose )
printf( "Supp new = %4d. Sop = %4d. ", Vec_IntSize(vSupp), Vec_StrSize(vSop)/(Vec_IntSize(vSupp) +3) ); printf( "Supp new = %4d. Sop = %4d. ", Vec_IntSize(vSupp), Vec_StrSize(vSop)/(Vec_IntSize(vSupp) +3) );
if ( fVerbose ) if ( fVerbose )