Commit 794b4cd8 by Alan Mishchenko

Updated version of LMS code.

parent e7527a47
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
#include "bool/kit/kit.h" #include "bool/kit/kit.h"
#include "aig/gia/giaAig.h" #include "aig/gia/giaAig.h"
#include "misc/vec/vecMem.h" #include "misc/vec/vecMem.h"
#include "bool/lucky/lucky.h"
ABC_NAMESPACE_IMPL_START ABC_NAMESPACE_IMPL_START
...@@ -581,7 +582,7 @@ void Abc_NtkRecFilter2(int nLimit) ...@@ -581,7 +582,7 @@ void Abc_NtkRecFilter2(int nLimit)
newPGia = Abc_NtkDupWithoutDangling2(pGia); newPGia = Abc_NtkDupWithoutDangling2(pGia);
sprintf( fileName, "RecLib%d_Filtered%d.aig", p->nVars, nLimit); sprintf( fileName, "RecLib%d_Filtered%d.aig", p->nVars, nLimit);
Gia_WriteAiger( newPGia, fileName, 0, 0 ); 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_ManHashStop(newPGia);
Gia_ManStop(newPGia); Gia_ManStop(newPGia);
Abc_NtkRecStop2(); Abc_NtkRecStop2();
...@@ -1530,7 +1531,8 @@ clk = clock(); ...@@ -1530,7 +1531,8 @@ clk = clock();
// semi-canonicize the truth table // semi-canonicize the truth table
clk = clock(); 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); If_CutTruthStretch(pInOut, nLeaves, s_pMan->nVars);
s_pMan->timeCanon += clock() - clk; s_pMan->timeCanon += clock() - clk;
// pCanonPerm and uCanonPhase show what was the variable corresponding to each var in the current truth // 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) ...@@ -1880,7 +1882,7 @@ int If_CutDelayRecCost2(If_Man_t* p, If_Cut_t* pCut, If_Obj_t * pObj)
//canonicize //canonicize
for (i = 0; i < nLeaves; i++) for (i = 0; i < nLeaves; i++)
pCanonPerm[i] = i; pCanonPerm[i] = i;
uCanonPhase = Kit_TruthSemiCanonicize(pInOut, pTemp, nLeaves, pCanonPerm); uCanonPhase = Kit_TruthSemiCanonicize_new(pInOut, pTemp, nLeaves, pCanonPerm);
If_CutTruthStretch(pInOut, nLeaves, nVars); If_CutTruthStretch(pInOut, nLeaves, nVars);
s_pMan->timeIfCanonicize += clock() - timeCanonicize; s_pMan->timeIfCanonicize += clock() - timeCanonicize;
timeDelayComput = clock(); timeDelayComput = clock();
...@@ -1991,7 +1993,7 @@ Hop_Obj_t * Abc_RecToHop2( Hop_Man_t * pMan, If_Man_t * pIfMan, If_Cut_t * pCut, ...@@ -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++) for (i = 0; i < nLeaves; i++)
pCanonPerm[i] = i; pCanonPerm[i] = i;
uCanonPhase = Kit_TruthSemiCanonicize(pInOut, pTemp, nLeaves, pCanonPerm); uCanonPhase = Kit_TruthSemiCanonicize_new(pInOut, pTemp, nLeaves, pCanonPerm);
If_CutTruthStretch(pInOut, nLeaves, nVars); If_CutTruthStretch(pInOut, nLeaves, nVars);
pCandMin = Abc_NtkRecLookUpBest(pIfMan, pCut, pInOut, pCanonPerm, pCompl,NULL); pCandMin = Abc_NtkRecLookUpBest(pIfMan, pCut, pInOut, pCanonPerm, pCompl,NULL);
......
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