Commit e52dc774 by Alan Mishchenko

Improved DSD.

parent 1116313d
...@@ -28,6 +28,7 @@ ABC_NAMESPACE_IMPL_START ...@@ -28,6 +28,7 @@ ABC_NAMESPACE_IMPL_START
/// DECLARATIONS /// /// DECLARATIONS ///
//////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////
//#define IF_TRY_NEW
//////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////
/// FUNCTION DEFINITIONS /// /// FUNCTION DEFINITIONS ///
...@@ -520,13 +521,14 @@ static inline int If_CutComputeTruth6( If_Man_t * p, If_Cut_t * pCut, If_Cut_t * ...@@ -520,13 +521,14 @@ static inline int If_CutComputeTruth6( If_Man_t * p, If_Cut_t * pCut, If_Cut_t *
t1 = If_TruthStretch6( t1, pCut, pCut1 ); t1 = If_TruthStretch6( t1, pCut, pCut1 );
*If_CutTruthW(pCut) = t0 & t1; *If_CutTruthW(pCut) = t0 & t1;
if ( 0 ) #ifdef IF_TRY_NEW
{ {
word pCopy[1024]; word pCopy[1024];
char pCanonPerm[16]; char pCanonPerm[16];
memcpy( pCopy, If_CutTruthW(pCut), sizeof(word) * 1 ); memcpy( pCopy, If_CutTruthW(pCut), sizeof(word) * 1 );
Abc_TtCanonicize( pCopy, pCut->nLimit, pCanonPerm ); Abc_TtCanonicize( pCopy, pCut->nLimit, pCanonPerm );
} }
#endif
if ( p->pPars->fCutMin ) if ( p->pPars->fCutMin )
return If_CutTruthMinimize6( p, pCut ); return If_CutTruthMinimize6( p, pCut );
...@@ -638,13 +640,14 @@ inline int If_CutComputeTruth2( If_Man_t * p, If_Cut_t * pCut, If_Cut_t * pCut0, ...@@ -638,13 +640,14 @@ inline int If_CutComputeTruth2( If_Man_t * p, If_Cut_t * pCut, If_Cut_t * pCut0,
If_TruthStretch2( (word *)p->puTemp[1], pCut, pCut1 ); If_TruthStretch2( (word *)p->puTemp[1], pCut, pCut1 );
Abc_TtAnd( If_CutTruthW(pCut), (word *)p->puTemp[0], (word *)p->puTemp[1], nWords, 0 ); Abc_TtAnd( If_CutTruthW(pCut), (word *)p->puTemp[0], (word *)p->puTemp[1], nWords, 0 );
if ( 0 ) #ifdef IF_TRY_NEW
{ {
word pCopy[1024]; word pCopy[1024];
char pCanonPerm[16]; char pCanonPerm[16];
memcpy( pCopy, If_CutTruthW(pCut), sizeof(word) * nWords ); memcpy( pCopy, If_CutTruthW(pCut), sizeof(word) * nWords );
Abc_TtCanonicize( pCopy, pCut->nLimit, pCanonPerm ); Abc_TtCanonicize( pCopy, pCut->nLimit, pCanonPerm );
} }
#endif
if ( p->pPars->fCutMin ) if ( p->pPars->fCutMin )
return If_CutTruthMinimize2( p, pCut ); return If_CutTruthMinimize2( p, pCut );
......
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