summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlan Mishchenko <alanmi@berkeley.edu>2013-09-09 00:24:56 -0700
committerAlan Mishchenko <alanmi@berkeley.edu>2013-09-09 00:24:56 -0700
commitfba43b50655b41f3a12dc910a475e4e3568e4de7 (patch)
tree4bd24d355bfdaf8bcfce0396dc363b77e9b9bcb8
parent48db1c3a0469f831cf6229721edb801756bce67d (diff)
downloadabc-fba43b50655b41f3a12dc910a475e4e3568e4de7.tar.gz
abc-fba43b50655b41f3a12dc910a475e4e3568e4de7.tar.bz2
abc-fba43b50655b41f3a12dc910a475e4e3568e4de7.zip
Improvements to the new technology mapper.
-rw-r--r--src/aig/gia/giaJf.c5
-rw-r--r--src/map/if/ifTime.c2
2 files changed, 4 insertions, 3 deletions
diff --git a/src/aig/gia/giaJf.c b/src/aig/gia/giaJf.c
index 9bd12601..8779c9b8 100644
--- a/src/aig/gia/giaJf.c
+++ b/src/aig/gia/giaJf.c
@@ -40,7 +40,7 @@ struct Jf_Cut_t_
int Time;
int iFunc;
int Cost;
- int pCut[JF_LEAF_MAX+2];
+ int pCut[JF_LEAF_MAX+1];
};
typedef struct Jf_Man_t_ Jf_Man_t;
@@ -765,6 +765,7 @@ void Jf_ObjComputeCuts( Jf_Man_t * p, Gia_Obj_t * pObj )
p->CutCount[1]++;
if ( !(Config = Jf_CutMerge(pCut0, pCut1, pSto[c]->pCut, LutSize)) )
continue;
+ pSto[c]->iFunc = pSto[c]->Cost = 0;
if ( p->pPars->fCutMin )
{
int iDsdLit0 = Abc_LitNotCond( Jf_CutFunc(pCut0), Gia_ObjFaninC0(pObj) );
@@ -773,7 +774,7 @@ void Jf_ObjComputeCuts( Jf_Man_t * p, Gia_Obj_t * pObj )
// pSto[c]->iFunc = Sdm_ManComputeFunc( p->pDsd, iDsdLit0, iDsdLit1, NULL, Config, 0 );
if ( pSto[c]->iFunc == -1 )
continue;
- pSto[c]->Cost = 0;//Sdm_ManReadCnfSize( p->pDsd, Abc_Lit2Var(pSto[c]->iFunc) );
+ //pSto[c]->Cost = Sdm_ManReadCnfSize( p->pDsd, Abc_Lit2Var(pSto[c]->iFunc) );
}
// Jf_CutCheck( pSto[c]->pCut );
p->CutCount[2]++;
diff --git a/src/map/if/ifTime.c b/src/map/if/ifTime.c
index d42a874d..f0fd3046 100644
--- a/src/map/if/ifTime.c
+++ b/src/map/if/ifTime.c
@@ -28,7 +28,7 @@ ABC_NAMESPACE_IMPL_START
/// DECLARATIONS ///
////////////////////////////////////////////////////////////////////////
-static float s_ExtraDel[2][3] = { {1.0, 1.0, (float)0.1}, {1.0, 1.0, (float)0.1} };
+//static float s_ExtraDel[2][3] = { {1.0, 1.0, (float)0.1}, {1.0, 1.0, (float)0.1} };
static void If_CutSortInputPins( If_Man_t * p, If_Cut_t * pCut, int * pPinPerm, float * pPinDelays );