diff options
| author | Alan Mishchenko <alanmi@berkeley.edu> | 2012-09-26 08:23:40 -0700 |
|---|---|---|
| committer | Alan Mishchenko <alanmi@berkeley.edu> | 2012-09-26 08:23:40 -0700 |
| commit | 794b4cd8ce1266d5b85f5fc187605915588c1c22 (patch) | |
| tree | ac2a696d021a3b867c37a25ae4b4221b18488dde | |
| parent | e7527a47ba9d6cba9c9e72800aa91817ec923616 (diff) | |
| download | abc-794b4cd8ce1266d5b85f5fc187605915588c1c22.tar.gz abc-794b4cd8ce1266d5b85f5fc187605915588c1c22.tar.bz2 abc-794b4cd8ce1266d5b85f5fc187605915588c1c22.zip | |
Updated version of LMS code.
| -rw-r--r-- | src/base/abci/abcRec2.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/base/abci/abcRec2.c b/src/base/abci/abcRec2.c index 1af48247..169ce1b4 100644 --- a/src/base/abci/abcRec2.c +++ b/src/base/abci/abcRec2.c @@ -23,6 +23,7 @@ #include "bool/kit/kit.h" #include "aig/gia/giaAig.h" #include "misc/vec/vecMem.h" +#include "bool/lucky/lucky.h" ABC_NAMESPACE_IMPL_START @@ -581,7 +582,7 @@ void Abc_NtkRecFilter2(int nLimit) newPGia = Abc_NtkDupWithoutDangling2(pGia); sprintf( fileName, "RecLib%d_Filtered%d.aig", p->nVars, nLimit); Gia_WriteAiger( newPGia, fileName, 0, 0 ); - Abc_Print(1, "Library %s was written."); + Abc_Print(1, "Library %s was written.", fileName); //Gia_ManHashStop(newPGia); Gia_ManStop(newPGia); Abc_NtkRecStop2(); @@ -1530,7 +1531,8 @@ clk = clock(); // semi-canonicize the truth table clk = clock(); - uCanonPhase = Kit_TruthSemiCanonicize( pInOut, pTemp, nLeaves, pCanonPerm ); + //uCanonPhase = Kit_TruthSemiCanonicize( pInOut, pTemp, nLeaves, pCanonPerm ); + uCanonPhase = Kit_TruthSemiCanonicize_new( pInOut, pTemp, nLeaves, pCanonPerm ); If_CutTruthStretch(pInOut, nLeaves, s_pMan->nVars); s_pMan->timeCanon += clock() - clk; // pCanonPerm and uCanonPhase show what was the variable corresponding to each var in the current truth @@ -1880,7 +1882,7 @@ int If_CutDelayRecCost2(If_Man_t* p, If_Cut_t* pCut, If_Obj_t * pObj) //canonicize for (i = 0; i < nLeaves; i++) pCanonPerm[i] = i; - uCanonPhase = Kit_TruthSemiCanonicize(pInOut, pTemp, nLeaves, pCanonPerm); + uCanonPhase = Kit_TruthSemiCanonicize_new(pInOut, pTemp, nLeaves, pCanonPerm); If_CutTruthStretch(pInOut, nLeaves, nVars); s_pMan->timeIfCanonicize += clock() - timeCanonicize; timeDelayComput = clock(); @@ -1991,7 +1993,7 @@ Hop_Obj_t * Abc_RecToHop2( Hop_Man_t * pMan, If_Man_t * pIfMan, If_Cut_t * pCut, for (i = 0; i < nLeaves; i++) pCanonPerm[i] = i; - uCanonPhase = Kit_TruthSemiCanonicize(pInOut, pTemp, nLeaves, pCanonPerm); + uCanonPhase = Kit_TruthSemiCanonicize_new(pInOut, pTemp, nLeaves, pCanonPerm); If_CutTruthStretch(pInOut, nLeaves, nVars); pCandMin = Abc_NtkRecLookUpBest(pIfMan, pCut, pInOut, pCanonPerm, pCompl,NULL); |