summaryrefslogtreecommitdiffstats
path: root/src/opt/mfs
diff options
context:
space:
mode:
authorAlan Mishchenko <alanmi@berkeley.edu>2012-07-07 18:15:08 -0700
committerAlan Mishchenko <alanmi@berkeley.edu>2012-07-07 18:15:08 -0700
commit4760983a461142eacceeed45ddcf5598e6a389a2 (patch)
tree87afc6370242742e1571cc42ff7824a9d8ce722f /src/opt/mfs
parent3aab7245738a69f1dd4d898493d5dabf6596ea61 (diff)
downloadabc-4760983a461142eacceeed45ddcf5598e6a389a2.tar.gz
abc-4760983a461142eacceeed45ddcf5598e6a389a2.tar.bz2
abc-4760983a461142eacceeed45ddcf5598e6a389a2.zip
Fixing time primtouts throughout the code.
Diffstat (limited to 'src/opt/mfs')
-rw-r--r--src/opt/mfs/mfsCore.c4
-rw-r--r--src/opt/mfs/mfsCore_.c8
-rw-r--r--src/opt/mfs/mfsGia.c3
-rw-r--r--src/opt/mfs/mfsInter.c2
-rw-r--r--src/opt/mfs/mfsResub_.c6
5 files changed, 14 insertions, 9 deletions
diff --git a/src/opt/mfs/mfsCore.c b/src/opt/mfs/mfsCore.c
index 8ca9edcf..8482d7a3 100644
--- a/src/opt/mfs/mfsCore.c
+++ b/src/opt/mfs/mfsCore.c
@@ -86,7 +86,7 @@ int Abc_NtkMfsEdgePower( Mfs_Man_t * p, Abc_Obj_t * pNode )
int Abc_WinNode(Mfs_Man_t * p, Abc_Obj_t *pNode)
{
-// int clk;
+// clock_t clk;
// Abc_Obj_t * pFanin;
// int i;
@@ -119,7 +119,7 @@ int Abc_WinNode(Mfs_Man_t * p, Abc_Obj_t *pNode)
/*
int Abc_NtkMfsPowerResubNode( Mfs_Man_t * p, Abc_Obj_t * pNode )
{
- int clk;
+ clock_t clk;
Abc_Obj_t * pFanin;
int i;
diff --git a/src/opt/mfs/mfsCore_.c b/src/opt/mfs/mfsCore_.c
index 69f64ae5..659a82fc 100644
--- a/src/opt/mfs/mfsCore_.c
+++ b/src/opt/mfs/mfsCore_.c
@@ -74,7 +74,7 @@ void Abc_NtkMfsParsDefault( Mfs_Par_t * pPars )
***********************************************************************/
int Abc_NtkMfsResub( Mfs_Man_t * p, Abc_Obj_t * pNode )
{
- int clk;
+ clock_t clk;
p->nNodesTried++;
// prepare data structure for this node
Mfs_ManClean( p );
@@ -140,7 +140,8 @@ int Abc_NtkMfsNode( Mfs_Man_t * p, Abc_Obj_t * pNode )
float dProb;
extern Hop_Obj_t * Abc_NodeIfNodeResyn( Bdc_Man_t * p, Hop_Man_t * pHop, Hop_Obj_t * pRoot, int nVars, Vec_Int_t * vTruth, unsigned * puCare, float dProb );
- int nGain, clk;
+ int nGain;
+ clock_t clk;
p->nNodesTried++;
// prepare data structure for this node
Mfs_ManClean( p );
@@ -213,7 +214,8 @@ int Abc_NtkMfs( Abc_Ntk_t * pNtk, Mfs_Par_t * pPars )
Abc_Obj_t * pObj;
Vec_Vec_t * vLevels;
Vec_Ptr_t * vNodes;
- int i, k, nNodes, nFaninMax, clk = clock(), clk2;
+ int i, k, nNodes, nFaninMax;
+ clock_t clk = clock(), clk2;
int nTotalNodesBeg = Abc_NtkNodeNum(pNtk);
int nTotalEdgesBeg = Abc_NtkGetTotalFanins(pNtk);
diff --git a/src/opt/mfs/mfsGia.c b/src/opt/mfs/mfsGia.c
index 07c258ab..88c0a45e 100644
--- a/src/opt/mfs/mfsGia.c
+++ b/src/opt/mfs/mfsGia.c
@@ -205,7 +205,8 @@ int Abc_NtkMfsTryResubOnceGia( Mfs_Man_t * p, int * pCands, int nCands )
int fVeryVerbose = 0;
int fUseGia = 1;
unsigned * pData;
- int i, iVar, status, iOut, clk = clock();
+ int i, iVar, status, iOut;
+ clock_t clk = clock();
p->nSatCalls++;
// return -1;
assert( p->pGia != NULL );
diff --git a/src/opt/mfs/mfsInter.c b/src/opt/mfs/mfsInter.c
index b3de7b96..08713c75 100644
--- a/src/opt/mfs/mfsInter.c
+++ b/src/opt/mfs/mfsInter.c
@@ -337,7 +337,7 @@ Hop_Obj_t * Abc_NtkMfsInterplate( Mfs_Man_t * p, int * pCands, int nCands )
Hop_Obj_t * pFunc;
int nFanins, status;
int c, i, * pGloVars;
-// int clk = clock();
+// clock_t clk = clock();
// p->nDcMints += Abc_NtkMfsInterplateEval( p, pCands, nCands );
diff --git a/src/opt/mfs/mfsResub_.c b/src/opt/mfs/mfsResub_.c
index bca1285d..b79ccd9e 100644
--- a/src/opt/mfs/mfsResub_.c
+++ b/src/opt/mfs/mfsResub_.c
@@ -143,7 +143,8 @@ int Abc_NtkMfsSolveSatResub( Mfs_Man_t * p, Abc_Obj_t * pNode, int iFanin, int f
int fVeryVerbose = p->pPars->fVeryVerbose && Vec_PtrSize(p->vDivs) < 80;
unsigned * pData;
int pCands[MFS_FANIN_MAX];
- int RetValue, iVar, i, nCands, nWords, w, clk;
+ int RetValue, iVar, i, nCands, nWords, w;
+ clock_t clk;
Abc_Obj_t * pFanin;
Hop_Obj_t * pFunc;
assert( iFanin >= 0 );
@@ -292,7 +293,8 @@ int Abc_NtkMfsSolveSatResub2( Mfs_Man_t * p, Abc_Obj_t * pNode, int iFanin, int
int fVeryVerbose = p->pPars->fVeryVerbose && Vec_PtrSize(p->vDivs) < 80;
unsigned * pData, * pData2;
int pCands[MFS_FANIN_MAX];
- int RetValue, iVar, iVar2, i, w, nCands, clk, nWords, fBreak;
+ int RetValue, iVar, iVar2, i, w, nCands, nWords, fBreak;
+ clock_t clk;
Abc_Obj_t * pFanin;
Hop_Obj_t * pFunc;
assert( iFanin >= 0 );