Commit bd4b2521 by Alan Mishchenko

Other improvements to bmc2 and bmc3.

parent 2cc51b4f
...@@ -700,7 +700,7 @@ Gia_ManBmc_t * Saig_Bmc3ManStart( Aig_Man_t * pAig ) ...@@ -700,7 +700,7 @@ Gia_ManBmc_t * Saig_Bmc3ManStart( Aig_Man_t * pAig )
p->nWordNum = Abc_BitWordNum( 2 * Aig_ManObjNumMax(pAig) ); p->nWordNum = Abc_BitWordNum( 2 * Aig_ManObjNumMax(pAig) );
// hash table // hash table
p->nTable = 1000003; p->nTable = 1000003;
p->pTable = ABC_CALLOC( unsigned, 6 * p->nTable ); // 2.4 Mb p->pTable = ABC_CALLOC( int, 6 * p->nTable ); // 2.4 Mb
return p; return p;
} }
...@@ -1001,7 +1001,7 @@ static inline void Saig_ManBmcAddClauses( Gia_ManBmc_t * p, int uTruth, int Lits ...@@ -1001,7 +1001,7 @@ static inline void Saig_ManBmcAddClauses( Gia_ManBmc_t * p, int uTruth, int Lits
SeeAlso [] SeeAlso []
***********************************************************************/ ***********************************************************************/
static inline unsigned Saig_ManBmcHashKey( unsigned * pArray ) static inline unsigned Saig_ManBmcHashKey( int * pArray )
{ {
static int s_Primes[5] = { 12582917, 25165843, 50331653, 100663319, 201326611 }; static int s_Primes[5] = { 12582917, 25165843, 50331653, 100663319, 201326611 };
unsigned i, Key = 0; unsigned i, Key = 0;
...@@ -1097,11 +1097,12 @@ int Saig_ManBmcCreateCnf_rec( Gia_ManBmc_t * p, Aig_Obj_t * pObj, int iFrame ) ...@@ -1097,11 +1097,12 @@ int Saig_ManBmcCreateCnf_rec( Gia_ManBmc_t * p, Aig_Obj_t * pObj, int iFrame )
{ {
*pLookup = toLit( p->nSatVars++ ); *pLookup = toLit( p->nSatVars++ );
Saig_ManBmcAddClauses( p, uTruth, Lits, *pLookup ); Saig_ManBmcAddClauses( p, uTruth, Lits, *pLookup );
/*
if ( (Lits[0] > 1 && (Lits[0] == Lits[1] || Lits[0] == Lits[2] || Lits[0] == Lits[3])) || if ( (Lits[0] > 1 && (Lits[0] == Lits[1] || Lits[0] == Lits[2] || Lits[0] == Lits[3])) ||
(Lits[1] > 1 && (Lits[1] == Lits[2] || Lits[1] == Lits[2])) || (Lits[1] > 1 && (Lits[1] == Lits[2] || Lits[1] == Lits[2])) ||
(Lits[2] > 1 && (Lits[2] == Lits[3])) ) (Lits[2] > 1 && (Lits[2] == Lits[3])) )
p->nDupNum++; p->nDupNum++;
*/
} }
iLit = *pLookup; iLit = *pLookup;
} }
......
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