diff options
Diffstat (limited to 'src/map/if/ifTruth.c')
| -rw-r--r-- | src/map/if/ifTruth.c | 673 |
1 files changed, 48 insertions, 625 deletions
diff --git a/src/map/if/ifTruth.c b/src/map/if/ifTruth.c index 95831f66..ad8a4773 100644 --- a/src/map/if/ifTruth.c +++ b/src/map/if/ifTruth.c @@ -36,7 +36,7 @@ ABC_NAMESPACE_IMPL_START /**Function************************************************************* - Synopsis [Several simple procedures working with truth tables.] + Synopsis [Sorts the pins in the decreasing order of delays.] Description [] @@ -45,634 +45,42 @@ ABC_NAMESPACE_IMPL_START SeeAlso [] ***********************************************************************/ -static inline void If_TruthNot( unsigned * pOut, unsigned * pIn, int nVars ) +void If_CutTruthPermute( word * pTruth, int nLeaves, int nVars, int nWords, float * pDelays, int * pVars ) { - int w; - for ( w = If_CutTruthWords(nVars)-1; w >= 0; w-- ) - pOut[w] = ~pIn[w]; -} -static inline void If_TruthCopy( unsigned * pOut, unsigned * pIn, int nVars ) -{ - int w; - for ( w = If_CutTruthWords(nVars)-1; w >= 0; w-- ) - pOut[w] = pIn[w]; -} -static inline void If_TruthNand( unsigned * pOut, unsigned * pIn0, unsigned * pIn1, int nVars ) -{ - int w; - for ( w = If_CutTruthWords(nVars)-1; w >= 0; w-- ) - pOut[w] = ~(pIn0[w] & pIn1[w]); -} -static inline void If_TruthAnd( unsigned * pOut, unsigned * pIn0, unsigned * pIn1, int nVars ) -{ - int w; - for ( w = If_CutTruthWords(nVars)-1; w >= 0; w-- ) - pOut[w] = pIn0[w] & pIn1[w]; -} - -/**Function************************************************************* - - Synopsis [Swaps two adjacent variables in the truth table.] - - Description [Swaps var number Start and var number Start+1 (0-based numbers). - The input truth table is pIn. The output truth table is pOut.] - - SideEffects [] - - SeeAlso [] - -***********************************************************************/ -void If_TruthSwapAdjacentVars( unsigned * pOut, unsigned * pIn, int nVars, int iVar ) -{ - static unsigned PMasks[4][3] = { - { 0x99999999, 0x22222222, 0x44444444 }, - { 0xC3C3C3C3, 0x0C0C0C0C, 0x30303030 }, - { 0xF00FF00F, 0x00F000F0, 0x0F000F00 }, - { 0xFF0000FF, 0x0000FF00, 0x00FF0000 } - }; - int nWords = If_CutTruthWords( nVars ); - int i, k, Step, Shift; - - assert( iVar < nVars - 1 ); - if ( iVar < 4 ) - { - Shift = (1 << iVar); - for ( i = 0; i < nWords; i++ ) - pOut[i] = (pIn[i] & PMasks[iVar][0]) | ((pIn[i] & PMasks[iVar][1]) << Shift) | ((pIn[i] & PMasks[iVar][2]) >> Shift); - } - else if ( iVar > 4 ) - { - Step = (1 << (iVar - 5)); - for ( k = 0; k < nWords; k += 4*Step ) - { - for ( i = 0; i < Step; i++ ) - pOut[i] = pIn[i]; - for ( i = 0; i < Step; i++ ) - pOut[Step+i] = pIn[2*Step+i]; - for ( i = 0; i < Step; i++ ) - pOut[2*Step+i] = pIn[Step+i]; - for ( i = 0; i < Step; i++ ) - pOut[3*Step+i] = pIn[3*Step+i]; - pIn += 4*Step; - pOut += 4*Step; - } - } - else // if ( iVar == 4 ) + while ( 1 ) { - for ( i = 0; i < nWords; i += 2 ) - { - pOut[i] = (pIn[i] & 0x0000FFFF) | ((pIn[i+1] & 0x0000FFFF) << 16); - pOut[i+1] = (pIn[i+1] & 0xFFFF0000) | ((pIn[i] & 0xFFFF0000) >> 16); - } - } -} - -/**Function************************************************************* - - Synopsis [Implements given permutation of variables.] - - Description [Permutes truth table in-place (returns it in pIn).] - - SideEffects [] - - SeeAlso [] - -***********************************************************************/ -void If_CutTruthPermute( unsigned * pOut, unsigned * pIn, int nVars, float * pDelays, int * pVars ) -{ - unsigned * pTemp; - float tTemp; - int i, Temp, Counter = 0, fChange = 1; - while ( fChange ) - { - fChange = 0; - for ( i = 0; i < nVars - 1; i++ ) + int i, fChange = 0; + for ( i = 0; i < nLeaves - 1; i++ ) { if ( pDelays[i] >= pDelays[i+1] ) -// if ( pDelays[i] <= pDelays[i+1] ) continue; - tTemp = pDelays[i]; pDelays[i] = pDelays[i+1]; pDelays[i+1] = tTemp; - Temp = pVars[i]; pVars[i] = pVars[i+1]; pVars[i+1] = Temp; - if ( pOut && pIn ) - If_TruthSwapAdjacentVars( pOut, pIn, nVars, i ); - pTemp = pOut; pOut = pIn; pIn = pTemp; + ABC_SWAP( float, pDelays[i], pDelays[i+1] ); + ABC_SWAP( int, pVars[i], pVars[i+1] ); + if ( pTruth ) + Abc_TtSwapAdjacent( pTruth, nWords, i ); fChange = 1; - Counter++; - } - } - if ( pOut && pIn && (Counter & 1) ) - If_TruthCopy( pOut, pIn, nVars ); -} - - -/**Function************************************************************* - - Synopsis [Expands the truth table according to the phase.] - - Description [The input and output truth tables are in pIn/pOut. The current number - of variables is nVars. The total number of variables in nVarsAll. The last argument - (Phase) contains shows where the variables should go.] - - SideEffects [] - - SeeAlso [] - -***********************************************************************/ -void If_TruthStretch( unsigned * pOut, unsigned * pIn, int nVars, int nVarsAll, unsigned Phase ) -{ - unsigned * pTemp; - int i, k, Var = nVars - 1, Counter = 0; - for ( i = nVarsAll - 1; i >= 0; i-- ) - if ( Phase & (1 << i) ) - { - for ( k = Var; k < i; k++ ) - { - If_TruthSwapAdjacentVars( pOut, pIn, nVarsAll, k ); - pTemp = pIn; pIn = pOut; pOut = pTemp; - Counter++; - } - Var--; - } - assert( Var == -1 ); - // swap if it was moved an even number of times - if ( !(Counter & 1) ) - If_TruthCopy( pOut, pIn, nVarsAll ); -} - -/**Function************************************************************* - - Synopsis [Shrinks the truth table according to the phase.] - - Description [The input and output truth tables are in pIn/pOut. The current number - of variables is nVars. The total number of variables in nVarsAll. The last argument - (Phase) contains shows what variables should remain.] - - SideEffects [] - - SeeAlso [] - -***********************************************************************/ -void If_TruthShrink( unsigned * pOut, unsigned * pIn, int nVars, int nVarsAll, unsigned Phase, int fReturnIn ) -{ - unsigned * pTemp; - int i, k, Var = 0, Counter = 0; - for ( i = 0; i < nVarsAll; i++ ) - if ( Phase & (1 << i) ) - { - for ( k = i-1; k >= Var; k-- ) - { - If_TruthSwapAdjacentVars( pOut, pIn, nVarsAll, k ); - pTemp = pIn; pIn = pOut; pOut = pTemp; - Counter++; - } - Var++; - } - assert( Var == nVars ); - // swap if it was moved an even number of times - if ( fReturnIn ^ !(Counter & 1) ) - If_TruthCopy( pOut, pIn, nVarsAll ); -} - -/**Function************************************************************* - - Synopsis [Returns 1 if TT depends on the given variable.] - - Description [] - - SideEffects [] - - SeeAlso [] - -***********************************************************************/ -int If_CutTruthVarInSupport( unsigned * pTruth, int nVars, int iVar ) -{ - int nWords = If_CutTruthWords( nVars ); - int i, k, Step; - - assert( iVar < nVars ); - switch ( iVar ) - { - case 0: - for ( i = 0; i < nWords; i++ ) - if ( (pTruth[i] & 0x55555555) != ((pTruth[i] & 0xAAAAAAAA) >> 1) ) - return 1; - return 0; - case 1: - for ( i = 0; i < nWords; i++ ) - if ( (pTruth[i] & 0x33333333) != ((pTruth[i] & 0xCCCCCCCC) >> 2) ) - return 1; - return 0; - case 2: - for ( i = 0; i < nWords; i++ ) - if ( (pTruth[i] & 0x0F0F0F0F) != ((pTruth[i] & 0xF0F0F0F0) >> 4) ) - return 1; - return 0; - case 3: - for ( i = 0; i < nWords; i++ ) - if ( (pTruth[i] & 0x00FF00FF) != ((pTruth[i] & 0xFF00FF00) >> 8) ) - return 1; - return 0; - case 4: - for ( i = 0; i < nWords; i++ ) - if ( (pTruth[i] & 0x0000FFFF) != ((pTruth[i] & 0xFFFF0000) >> 16) ) - return 1; - return 0; - default: - Step = (1 << (iVar - 5)); - for ( k = 0; k < nWords; k += 2*Step ) - { - for ( i = 0; i < Step; i++ ) - if ( pTruth[i] != pTruth[Step+i] ) - return 1; - pTruth += 2*Step; - } - return 0; - } -} - -/**Function************************************************************* - - Synopsis [Returns support of the function.] - - Description [] - - SideEffects [] - - SeeAlso [] - -***********************************************************************/ -unsigned If_CutTruthSupport( unsigned * pTruth, int nVars, int * pnSuppSize ) -{ - int i, Support = 0; - int nSuppSize = 0; - for ( i = 0; i < nVars; i++ ) - if ( If_CutTruthVarInSupport( pTruth, nVars, i ) ) - { - Support |= (1 << i); - nSuppSize++; - } - *pnSuppSize = nSuppSize; - return Support; -} - - -/**Function************************************************************* - - Synopsis [Computes the stretching phase of the cut w.r.t. the merged cut.] - - Description [] - - SideEffects [] - - SeeAlso [] - -***********************************************************************/ -static inline unsigned If_CutTruthPhase( If_Cut_t * pCut, If_Cut_t * pCut1 ) -{ - unsigned uPhase = 0; - int i, k; - for ( i = k = 0; i < (int)pCut->nLeaves; i++ ) - { - if ( k == (int)pCut1->nLeaves ) - break; - if ( pCut->pLeaves[i] < pCut1->pLeaves[k] ) - continue; - assert( pCut->pLeaves[i] == pCut1->pLeaves[k] ); - uPhase |= (1 << i); - k++; - } - return uPhase; -} - -//static FILE * pTruths; - -/**Function************************************************************* - - Synopsis [Performs truth table computation.] - - Description [] - - SideEffects [] - - SeeAlso [] - -***********************************************************************/ -int If_CutComputeTruth( If_Man_t * p, If_Cut_t * pCut, If_Cut_t * pCut0, If_Cut_t * pCut1, int fCompl0, int fCompl1 ) -{ - extern void If_CutFactorTest( unsigned * pTruth, int nVars ); - - // permute the first table - if ( fCompl0 ^ pCut0->fCompl ) - If_TruthNot( p->puTemp[0], If_CutTruth(pCut0), pCut->nLimit ); - else - If_TruthCopy( p->puTemp[0], If_CutTruth(pCut0), pCut->nLimit ); - If_TruthStretch( p->puTemp[2], p->puTemp[0], pCut0->nLeaves, pCut->nLimit, If_CutTruthPhase(pCut, pCut0) ); - // permute the second table - if ( fCompl1 ^ pCut1->fCompl ) - If_TruthNot( p->puTemp[1], If_CutTruth(pCut1), pCut->nLimit ); - else - If_TruthCopy( p->puTemp[1], If_CutTruth(pCut1), pCut->nLimit ); - If_TruthStretch( p->puTemp[3], p->puTemp[1], pCut1->nLeaves, pCut->nLimit, If_CutTruthPhase(pCut, pCut1) ); - // produce the resulting table - assert( pCut->fCompl == 0 ); - if ( pCut->fCompl ) - If_TruthNand( If_CutTruth(pCut), p->puTemp[2], p->puTemp[3], pCut->nLimit ); - else - If_TruthAnd( If_CutTruth(pCut), p->puTemp[2], p->puTemp[3], pCut->nLimit ); -/* - if ( pCut->nLeaves == 5 ) - { - if ( pTruths == NULL ) - pTruths = fopen( "fun5var.txt", "w" ); - Extra_PrintHex( pTruths, If_CutTruth(pCut), pCut->nLeaves ); - fprintf( pTruths, "\n" ); - } -*/ - // minimize the support of the cut - if ( p->pPars->fCutMin ) - return If_CutTruthMinimize( p, pCut ); - - // perform -// If_CutFactorTest( If_CutTruth(pCut), pCut->nLimit ); -// printf( "%d ", If_CutLeaveNum(pCut) - If_CutTruthSupportSize(If_CutTruth(pCut), If_CutLeaveNum(pCut)) ); - return 0; -} - - -/**Function************************************************************* - - Synopsis [Minimize support of the cut.] - - Description [Returns 1 if the node's support has changed] - - SideEffects [] - - SeeAlso [] - -***********************************************************************/ -int If_CutTruthMinimize( If_Man_t * p, If_Cut_t * pCut ) -{ - unsigned uSupport; - int nSuppSize, i, k; - // compute the support of the cut's function - uSupport = If_CutTruthSupport( If_CutTruth(pCut), If_CutLeaveNum(pCut), &nSuppSize ); - if ( nSuppSize == If_CutLeaveNum(pCut) ) - return 0; - -// TEMPORARY - if ( nSuppSize < 2 ) - { - p->nSmallSupp++; - return 2; - } -// if ( If_CutLeaveNum(pCut) - nSuppSize > 1 ) -// return 0; -//printf( "%d %d ", If_CutLeaveNum(pCut), nSuppSize ); -// pCut->fUseless = 1; - - // shrink the truth table - If_TruthShrink( p->puTemp[0], If_CutTruth(pCut), nSuppSize, pCut->nLimit, uSupport, 1 ); - // update leaves and signature - pCut->uSign = 0; - for ( i = k = 0; i < If_CutLeaveNum(pCut); i++ ) - { - if ( !(uSupport & (1 << i)) ) - continue; - pCut->pLeaves[k++] = pCut->pLeaves[i]; - pCut->uSign |= If_ObjCutSign( pCut->pLeaves[i] ); - } - assert( k == nSuppSize ); - pCut->nLeaves = nSuppSize; - // verify the result -// uSupport = If_CutTruthSupport( If_CutTruth(pCut), If_CutLeaveNum(pCut), &nSuppSize ); -// assert( nSuppSize == If_CutLeaveNum(pCut) ); - return 1; -} - - - - -/**Function************************************************************* - - Synopsis [Performs truth table computation.] - - Description [] - - SideEffects [] - - SeeAlso [] - -***********************************************************************/ -static inline int If_CutTruthMinimize6( If_Man_t * p, If_Cut_t * pCut ) -{ - unsigned uSupport; - int i, k, nSuppSize; - int nVars = If_CutLeaveNum(pCut); - // compute the support of the cut's function - uSupport = Abc_Tt6SupportAndSize( *If_CutTruthW(pCut), nVars, &nSuppSize ); - if ( nSuppSize == If_CutLeaveNum(pCut) ) - return 0; -// TEMPORARY - if ( nSuppSize < 2 ) - { -//printf( "Small supp\n" ); - p->nSmallSupp++; - return 2; - } - // update leaves and signature - pCut->uSign = 0; - for ( i = k = 0; i < nVars; i++ ) - { - if ( !(uSupport & (1 << i)) ) - continue; - pCut->uSign |= If_ObjCutSign( pCut->pLeaves[i] ); - if ( k < i ) - { - pCut->pLeaves[k] = pCut->pLeaves[i]; - Abc_TtSwapVars( If_CutTruthW(pCut), pCut->nLimit, k, i ); - } - k++; - } - assert( k == nSuppSize ); - pCut->nLeaves = nSuppSize; - // verify the result -// assert( nSuppSize == Abc_TtSupportSize(If_CutTruthW(pCut), nVars) ); - return 1; -} -static inline word If_TruthStretch6_( word Truth, If_Cut_t * pCut, If_Cut_t * pCut0 ) -{ - int i, k; - for ( i = (int)pCut->nLeaves - 1, k = (int)pCut0->nLeaves - 1; i >= 0 && k >= 0; i-- ) - { - if ( pCut0->pLeaves[k] < pCut->pLeaves[i] ) - continue; - assert( pCut0->pLeaves[k] == pCut->pLeaves[i] ); - if ( k < i ) - Abc_TtSwapVars( &Truth, pCut->nLimit, k, i ); - k--; - } - return Truth; -} -static inline word If_TruthStretch6( word Truth, int nVars, int * pPerm, int nVarsCut ) -{ - int i; - for ( i = nVarsCut - 1; i >= 0; i-- ) - if ( i < pPerm[i] ) - Abc_TtSwapVars( &Truth, nVars, i, pPerm[i] ); - return Truth; -} -static inline int If_CutComputeTruth6( If_Man_t * p, If_Cut_t * pCut, If_Cut_t * pCut0, If_Cut_t * pCut1, int fCompl0, int fCompl1 ) -{ - word t0 = (fCompl0 ^ pCut0->fCompl) ? ~*If_CutTruthW(pCut0) : *If_CutTruthW(pCut0); - word t1 = (fCompl1 ^ pCut1->fCompl) ? ~*If_CutTruthW(pCut1) : *If_CutTruthW(pCut1); - assert( pCut->nLimit <= 6 ); -// t0 = If_TruthStretch6( t0, pCut, pCut0 ); -// t1 = If_TruthStretch6( t1, pCut, pCut1 ); - t0 = If_TruthStretch6( t0, pCut->nLimit, p->pPerm[0], pCut0->nLeaves ); - t1 = If_TruthStretch6( t1, pCut->nLimit, p->pPerm[1], pCut1->nLeaves ); - *If_CutTruthW(pCut) = t0 & t1; - -#ifdef IF_TRY_NEW - { - word pCopy[1024]; - char pCanonPerm[16]; - memcpy( pCopy, If_CutTruthW(pCut), sizeof(word) * 1 ); - Abc_TtCanonicize( pCopy, pCut->nLimit, pCanonPerm ); - } -#endif - - if ( p->pPars->fCutMin ) - return If_CutTruthMinimize6( p, pCut ); - return 0; -} - - -/**Function************************************************************* - - Synopsis [Performs truth table computation.] - - Description [] - - SideEffects [] - - SeeAlso [] - -***********************************************************************/ -// this procedure handles special case reductions -static inline int If_CutTruthMinimize21( If_Man_t * p, If_Cut_t * pCut ) -{ - word * pTruth = If_CutTruthW(pCut); - int i, k, nVars = If_CutLeaveNum(pCut); - unsigned uSign = 0; - for ( i = k = 0; i < nVars; i++ ) - { - if ( !Abc_TtHasVar( pTruth, nVars, i ) ) - continue; - uSign |= If_ObjCutSign( pCut->pLeaves[i] ); - if ( k < i ) - { - pCut->pLeaves[k] = pCut->pLeaves[i]; - Abc_TtSwapVars( pTruth, nVars, k, i ); } - k++; - } - if ( k == nVars ) - return 0; - assert( k < nVars ); - pCut->nLeaves = k; - pCut->uSign = uSign; -// TEMPORARY - if ( pCut->nLeaves < 2 ) - { - p->nSmallSupp++; - return 2; + if ( !fChange ) + return; } - // verify the result - assert( If_CutLeaveNum(pCut) == Abc_TtSupportSize(pTruth, nVars) ); - return 1; } -static inline int If_CutTruthMinimize2( If_Man_t * p, If_Cut_t * pCut ) +void If_CutRotatePins( If_Man_t * p, If_Cut_t * pCut ) { - unsigned uSupport; - int i, k, nSuppSize; - int nVars = If_CutLeaveNum(pCut); - // compute the support of the cut's function - uSupport = Abc_TtSupportAndSize( If_CutTruthW(pCut), nVars, &nSuppSize ); - if ( nSuppSize == If_CutLeaveNum(pCut) ) - return 0; -// TEMPORARY - if ( nSuppSize < 2 ) - { -//printf( "Small supp\n" ); - p->nSmallSupp++; - return 2; - } - // update leaves and signature - pCut->uSign = 0; - for ( i = k = 0; i < nVars; i++ ) + If_Obj_t * pLeaf; + float PinDelays[IF_MAX_LUTSIZE]; + int i, truthId; + If_CutForEachLeaf( p, pCut, pLeaf, i ) + PinDelays[i] = If_ObjCutBest(pLeaf)->Delay; + if ( p->vTtMem == NULL ) { - if ( !(uSupport & (1 << i)) ) - continue; - pCut->uSign |= If_ObjCutSign( pCut->pLeaves[i] ); - if ( k < i ) - { - pCut->pLeaves[k] = pCut->pLeaves[i]; - Abc_TtSwapVars( If_CutTruthW(pCut), pCut->nLimit, k, i ); - } - k++; + If_CutTruthPermute( NULL, If_CutLeaveNum(pCut), pCut->nLimit, p->nTruth6Words, PinDelays, If_CutLeaves(pCut) ); + return; } - assert( k == nSuppSize ); - pCut->nLeaves = nSuppSize; - // verify the result -// assert( nSuppSize == Abc_TtSupportSize(If_CutTruthW(pCut), nVars) ); - return 1; -} -static inline void If_TruthStretch2_( word * pTruth, If_Cut_t * pCut, If_Cut_t * pCut0 ) -{ - int i, k; - for ( i = (int)pCut->nLeaves - 1, k = (int)pCut0->nLeaves - 1; i >= 0 && k >= 0; i-- ) - { - if ( pCut0->pLeaves[k] < pCut->pLeaves[i] ) - continue; - assert( pCut0->pLeaves[k] == pCut->pLeaves[i] ); - if ( k < i ) - Abc_TtSwapVars( pTruth, pCut->nLimit, k, i ); - k--; - } -} -static inline void If_TruthStretch2( word * pTruth, int nVars, int * pPerm, int nVarsCut ) -{ - int i; - for ( i = nVarsCut - 1; i >= 0; i-- ) - if ( i < pPerm[i] ) - Abc_TtSwapVars( pTruth, nVars, i, pPerm[i] ); -} -int If_CutComputeTruth2( If_Man_t * p, If_Cut_t * pCut, If_Cut_t * pCut0, If_Cut_t * pCut1, int fCompl0, int fCompl1 ) -{ - int nWords; - if ( pCut->nLimit < 7 ) - return If_CutComputeTruth6( p, pCut, pCut0, pCut1, fCompl0, fCompl1 ); - nWords = Abc_TtWordNum( pCut->nLimit ); - Abc_TtCopy( (word *)p->puTemp[0], If_CutTruthW(pCut0), nWords, fCompl0 ^ pCut0->fCompl ); - Abc_TtCopy( (word *)p->puTemp[1], If_CutTruthW(pCut1), nWords, fCompl1 ^ pCut1->fCompl ); -// If_TruthStretch2( (word *)p->puTemp[0], pCut, pCut0 ); -// If_TruthStretch2( (word *)p->puTemp[1], pCut, pCut1 ); - If_TruthStretch2( (word *)p->puTemp[0], pCut->nLimit, p->pPerm[0], pCut0->nLeaves ); - If_TruthStretch2( (word *)p->puTemp[1], pCut->nLimit, p->pPerm[1], pCut1->nLeaves ); - Abc_TtAnd( If_CutTruthW(pCut), (word *)p->puTemp[0], (word *)p->puTemp[1], nWords, 0 ); - -#ifdef IF_TRY_NEW - { - word pCopy[1024]; - char pCanonPerm[16]; - memcpy( pCopy, If_CutTruthW(pCut), sizeof(word) * nWords ); - Abc_TtCanonicize( pCopy, pCut->nLimit, pCanonPerm ); - } -#endif - - if ( p->pPars->fCutMin ) - return If_CutTruthMinimize2( p, pCut ); - return 0; + Abc_TtCopy( p->puTempW, If_CutTruthWR(p, pCut), p->nTruth6Words, 0 ); + If_CutTruthPermute( p->puTempW, If_CutLeaveNum(pCut), pCut->nLimit, p->nTruth6Words, PinDelays, If_CutLeaves(pCut) ); + truthId = Vec_MemHashInsert( p->vTtMem, p->puTempW ); + pCut->iCutFunc = Abc_Var2Lit( truthId, If_CutTruthIsCompl(pCut) ); + assert( (p->puTempW[0] & 1) == 0 ); } /**Function************************************************************* @@ -686,12 +94,11 @@ int If_CutComputeTruth2( If_Man_t * p, If_Cut_t * pCut, If_Cut_t * pCut0, If_Cut SeeAlso [] ***********************************************************************/ -/* -int If_CutComputeTruth3( If_Man_t * p, If_Cut_t * pCut, If_Cut_t * pCut0, If_Cut_t * pCut1, int fCompl0, int fCompl1 ) +int If_CutComputeTruth( If_Man_t * p, If_Cut_t * pCut, If_Cut_t * pCut0, If_Cut_t * pCut1, int fCompl0, int fCompl1 ) { - int fCompl, truthId; - int iFuncLit0 = pCut0->iDsd; - int iFuncLit1 = pCut1->iDsd; + int fCompl, truthId, nLeavesNew; + int iFuncLit0 = pCut0->iCutFunc; + int iFuncLit1 = pCut1->iCutFunc; int nWords = Abc_TtWordNum( pCut->nLimit ); word * pTruth0s = Vec_MemReadEntry( p->vTtMem, Abc_Lit2Var(iFuncLit0) ); word * pTruth1s = Vec_MemReadEntry( p->vTtMem, Abc_Lit2Var(iFuncLit1) ); @@ -704,13 +111,29 @@ int If_CutComputeTruth3( If_Man_t * p, If_Cut_t * pCut, If_Cut_t * pCut0, If_Cut Abc_TtStretch( pTruth1, pCut->nLimit, pCut1->pLeaves, pCut1->nLeaves, pCut->pLeaves, pCut->nLeaves ); fCompl = (pTruth0[0] & pTruth1[0] & 1); Abc_TtAnd( pTruth, pTruth0, pTruth1, nWords, fCompl ); - pCut->nLeaves = Abc_TtMinBase( pTruth, pCut->pLeaves, pCut->nLeaves, pCut->nLimit ); + if ( p->pPars->fCutMin ) + { + nLeavesNew = Abc_TtMinBase( pTruth, pCut->pLeaves, pCut->nLeaves, pCut->nLimit ); + if ( nLeavesNew < If_CutLeaveNum(pCut) ) + { + pCut->nLeaves = nLeavesNew; + pCut->uSign = If_ObjCutSignCompute( pCut ); + } + } truthId = Vec_MemHashInsert( p->vTtMem, pTruth ); - pCut->iDsd = Abc_Var2Lit( truthId, fCompl ); + pCut->iCutFunc = Abc_Var2Lit( truthId, fCompl ); assert( (pTruth[0] & 1) == 0 ); +#ifdef IF_TRY_NEW + { + word pCopy[1024]; + char pCanonPerm[16]; + memcpy( pCopy, If_CutTruthW(pCut), sizeof(word) * nWords ); + Abc_TtCanonicize( pCopy, pCut->nLimit, pCanonPerm ); + } +#endif return 1; } -*/ + //////////////////////////////////////////////////////////////////////// /// END OF FILE /// |