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

Changes to several APIs.

This commit is contained in:
Alan Mishchenko 2019-11-01 00:58:12 +02:00
parent 7f503dc737
commit 6b2fe00cd8
3 changed files with 31 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/aig/gia/giaMan.c
View File

@ -1315,18 +1315,21 @@ void Gia_ManDumpVerilog( Gia_Man_t * p, char * pFileName, Vec_Int_t * vObjs )
fprintf( pFile, "\n" );
Gia_ManForEachAnd( p, pObj, i )
{
int fSkip = 0;
if ( vObjs )
{
Vec_IntForEachEntry( vObjs, iObj, k )
if ( iObj == i )
break;
if ( k < Vec_IntSize(vObjs) )
continue;
fSkip = 1;
}
if ( !fSkip )
{
fprintf( pFile, " and( %s,", Gia_ObjGetDumpName(NULL, 'n', i, nDigits) );
fprintf( pFile, " %s,", Gia_ObjGetDumpName(NULL, (char)(Gia_ObjFaninC0(pObj)? 'i':'n'), Gia_ObjFaninId0(pObj, i), nDigits) );
fprintf( pFile, " %s );\n", Gia_ObjGetDumpName(NULL, (char)(Gia_ObjFaninC1(pObj)? 'i':'n'), Gia_ObjFaninId1(pObj, i), nDigits) );
}
fprintf( pFile, " and( %s,", Gia_ObjGetDumpName(NULL, 'n', i, nDigits) );
fprintf( pFile, " %s,", Gia_ObjGetDumpName(NULL, (char)(Gia_ObjFaninC0(pObj)? 'i':'n'), Gia_ObjFaninId0(pObj, i), nDigits) );
fprintf( pFile, " %s );\n", Gia_ObjGetDumpName(NULL, (char)(Gia_ObjFaninC1(pObj)? 'i':'n'), Gia_ObjFaninId1(pObj, i), nDigits) );
if ( Vec_BitEntry(vInvs, i) )
{
fprintf( pFile, " not( %s,", Gia_ObjGetDumpName(NULL, 'i', i, nDigits) );

1
src/base/acb/acb.h
View File

@ -416,6 +416,7 @@ static inline int Acb_ObjWhatFanin( Acb_Ntk_t * p, int iObj, int iFaninGiven )
static inline void Acb_ObjAddFanin( Acb_Ntk_t * p, int iObj, int iFanin )
{
int * pFanins = Acb_ObjFanins( p, iObj );
assert( iFanin > 0 );
assert( pFanins[ 1 + pFanins[0] ] == -1 );
pFanins[ 1 + pFanins[0]++ ] = iFanin;
}

28
src/sat/bsat/satSolver.c
View File

@ -217,16 +217,32 @@ static inline int order_select(sat_solver* s, float random_var_freq) // selectv
void sat_solver_set_var_activity(sat_solver* s, int * pVars, int nVars)
{
int i;
assert( s->VarActType == 1 );
for (i = 0; i < s->size; i++)
s->activity[i] = 0;
s->var_inc = Abc_Dbl2Word(1);
for ( i = 0; i < nVars; i++ )
if ( s->VarActType == 0 )
{
int iVar = pVars ? pVars[i] : i;
s->activity[iVar] = Abc_Dbl2Word(nVars-i);
order_update( s, iVar );
s->var_inc = (1 << 5);
s->var_decay = -1;
for ( i = 0; i < nVars; i++ )
{
int iVar = pVars ? pVars[i] : i;
s->activity[iVar] = s->var_inc*(nVars-i);
if (s->orderpos[iVar] != -1)
order_update( s, iVar );
}
}
else if ( s->VarActType == 1 )
{
s->var_inc = Abc_Dbl2Word(1);
for ( i = 0; i < nVars; i++ )
{
int iVar = pVars ? pVars[i] : i;
s->activity[iVar] = Abc_Dbl2Word(nVars-i);
if (s->orderpos[iVar] != -1)
order_update( s, iVar );
}
}
else assert( 0 );
}
//=================================================================================================