Commit 4760983a by Alan Mishchenko

Fixing time primtouts throughout the code.

parent 3aab7245
...@@ -175,7 +175,8 @@ void Aig_RManTableResize( Aig_RMan_t * p ) ...@@ -175,7 +175,8 @@ void Aig_RManTableResize( Aig_RMan_t * p )
{ {
Aig_Tru_t * pEntry, * pNext; Aig_Tru_t * pEntry, * pNext;
Aig_Tru_t ** pBinsOld, ** ppPlace; Aig_Tru_t ** pBinsOld, ** ppPlace;
int nBinsOld, Counter, i, clk; int nBinsOld, Counter, i;
clock_t clk;
assert( p->pBins != NULL ); assert( p->pBins != NULL );
clk = clock(); clk = clock();
// save the old Bins // save the old Bins
......
...@@ -54,7 +54,7 @@ void Aig_ManInterFast( Aig_Man_t * pManOn, Aig_Man_t * pManOff, int fVerbose ) ...@@ -54,7 +54,7 @@ void Aig_ManInterFast( Aig_Man_t * pManOn, Aig_Man_t * pManOff, int fVerbose )
Cnf_Dat_t * pCnfOn, * pCnfOff; Cnf_Dat_t * pCnfOn, * pCnfOff;
Aig_Obj_t * pObj, * pObj2; Aig_Obj_t * pObj, * pObj2;
int Lits[3], status, i; int Lits[3], status, i;
// int clk = clock(); // clock_t clk = clock();
assert( Aig_ManCiNum(pManOn) == Aig_ManCiNum(pManOff) ); assert( Aig_ManCiNum(pManOn) == Aig_ManCiNum(pManOff) );
assert( Aig_ManCoNum(pManOn) == Aig_ManCoNum(pManOff) ); assert( Aig_ManCoNum(pManOn) == Aig_ManCoNum(pManOff) );
......
...@@ -1791,7 +1791,8 @@ void Emb_ManDumpGnuplot( Emb_Man_t * p, char * pName, int fDumpLarge, int fShowI ...@@ -1791,7 +1791,8 @@ void Emb_ManDumpGnuplot( Emb_Man_t * p, char * pName, int fDumpLarge, int fShowI
void Gia_ManSolveProblem( Gia_Man_t * pGia, Emb_Par_t * pPars ) void Gia_ManSolveProblem( Gia_Man_t * pGia, Emb_Par_t * pPars )
{ {
Emb_Man_t * p; Emb_Man_t * p;
int i, clkSetup; int i;
clock_t clkSetup;
clock_t clk; clock_t clk;
// Gia_ManTestDistance( pGia ); // Gia_ManTestDistance( pGia );
......
...@@ -714,7 +714,7 @@ Vec_Int_t * Frc_ManCollectCos( Frc_Man_t * p ) ...@@ -714,7 +714,7 @@ Vec_Int_t * Frc_ManCollectCos( Frc_Man_t * p )
void Frc_ManCrossCutTest( Frc_Man_t * p, Vec_Int_t * vOrderInit ) void Frc_ManCrossCutTest( Frc_Man_t * p, Vec_Int_t * vOrderInit )
{ {
Vec_Int_t * vOrder; Vec_Int_t * vOrder;
// int clk = clock(); // clock_t clk = clock();
vOrder = vOrderInit? vOrderInit : Frc_ManCollectCos( p ); vOrder = vOrderInit? vOrderInit : Frc_ManCollectCos( p );
printf( "CrossCut = %6d\n", Frc_ManCrossCut( p, vOrder, 0 ) ); printf( "CrossCut = %6d\n", Frc_ManCrossCut( p, vOrder, 0 ) );
printf( "CrossCut = %6d\n", Frc_ManCrossCut( p, vOrder, 1 ) ); printf( "CrossCut = %6d\n", Frc_ManCrossCut( p, vOrder, 1 ) );
......
...@@ -354,7 +354,8 @@ void Gia_ManSatExperiment( Gia_Man_t * p ) ...@@ -354,7 +354,8 @@ void Gia_ManSatExperiment( Gia_Man_t * p )
Gia_Obj_t * pObj; Gia_Obj_t * pObj;
int i, nLevels, nLeaves, nNodes, nCount[2*GIA_LIMIT+2] = {0}, nCountAll = 0; int i, nLevels, nLeaves, nNodes, nCount[2*GIA_LIMIT+2] = {0}, nCountAll = 0;
int Num0 = 0, Num1 = 0; int Num0 = 0, Num1 = 0;
int clk = clock(), nWords = 0, nWords2 = 0; clock_t clk = clock();
int nWords = 0, nWords2 = 0;
pMan = Gia_ManSatStart(); pMan = Gia_ManSatStart();
// mark the nodes to become roots of leaf-DAGs // mark the nodes to become roots of leaf-DAGs
Gia_ManSetRefs( p ); Gia_ManSetRefs( p );
......
...@@ -787,7 +787,7 @@ Vec_Int_t * Saig_ManCbaFilterInputs( Aig_Man_t * pAig, int iFirstFlopPi, Abc_Cex ...@@ -787,7 +787,7 @@ Vec_Int_t * Saig_ManCbaFilterInputs( Aig_Man_t * pAig, int iFirstFlopPi, Abc_Cex
{ {
Saig_ManCba_t * p; Saig_ManCba_t * p;
Vec_Int_t * vRes, * vReasons; Vec_Int_t * vRes, * vReasons;
int clk; clock_t clk;
if ( Saig_ManPiNum(pAig) != pCex->nPis ) if ( Saig_ManPiNum(pAig) != pCex->nPis )
{ {
printf( "Saig_ManCbaFilterInputs(): The PI count of AIG (%d) does not match that of cex (%d).\n", printf( "Saig_ManCbaFilterInputs(): The PI count of AIG (%d) does not match that of cex (%d).\n",
......
...@@ -198,7 +198,7 @@ int Aig_ManMapHaigNodes( Aig_Man_t * pHaig ) ...@@ -198,7 +198,7 @@ int Aig_ManMapHaigNodes( Aig_Man_t * pHaig )
SeeAlso [] SeeAlso []
***********************************************************************/ ***********************************************************************/
int Aig_ManHaigVerify( Aig_Man_t * p, Aig_Man_t * pAig, Aig_Man_t * pHaig, int nFrames, int clkSynth ) int Aig_ManHaigVerify( Aig_Man_t * p, Aig_Man_t * pAig, Aig_Man_t * pHaig, int nFrames, clock_t clkSynth )
{ {
int nBTLimit = 0; int nBTLimit = 0;
Aig_Man_t * pFrames, * pTemp; Aig_Man_t * pFrames, * pTemp;
......
...@@ -428,7 +428,7 @@ Aig_Man_t * Iso_ManFilterPos( Aig_Man_t * pAig, Vec_Ptr_t ** pvPosEquivs, int fV ...@@ -428,7 +428,7 @@ Aig_Man_t * Iso_ManFilterPos( Aig_Man_t * pAig, Vec_Ptr_t ** pvPosEquivs, int fV
Vec_Str_t * vStr, * vPrev; Vec_Str_t * vStr, * vPrev;
int i, nPos; int i, nPos;
clock_t clk = clock(); clock_t clk = clock();
int clkDup = 0, clkAig = 0, clkIso = 0, clk2; clock_t clkDup = 0, clkAig = 0, clkIso = 0, clk2;
*pvPosEquivs = NULL; *pvPosEquivs = NULL;
// derive AIG for each PO // derive AIG for each PO
......
...@@ -181,7 +181,7 @@ Vec_Int_t * Iso_StoCollectInfo( Iso_Sto_t * p, Aig_Obj_t * pPo ) ...@@ -181,7 +181,7 @@ Vec_Int_t * Iso_StoCollectInfo( Iso_Sto_t * p, Aig_Obj_t * pPo )
Aig_Man_t * pAig = p->pAig; Aig_Man_t * pAig = p->pAig;
Aig_Obj_t * pObj; Aig_Obj_t * pObj;
int i, Value, Entry, * pPerm; int i, Value, Entry, * pPerm;
// int clk = clock(); // clock_t clk = clock();
assert( Aig_ObjIsCo(pPo) ); assert( Aig_ObjIsCo(pPo) );
......
...@@ -291,7 +291,7 @@ Cut_Man_t * Abc_NtkSeqCuts( Abc_Ntk_t * pNtk, Cut_Params_t * pParams ) ...@@ -291,7 +291,7 @@ Cut_Man_t * Abc_NtkSeqCuts( Abc_Ntk_t * pNtk, Cut_Params_t * pParams )
Abc_Obj_t * pObj, * pNode; Abc_Obj_t * pObj, * pNode;
int i, nIters, fStatus; int i, nIters, fStatus;
Vec_Int_t * vChoices; Vec_Int_t * vChoices;
int clk = clock(); clock_t clk = clock();
assert( Abc_NtkIsSeq(pNtk) ); assert( Abc_NtkIsSeq(pNtk) );
assert( pParams->fSeq ); assert( pParams->fSeq );
......
...@@ -698,7 +698,7 @@ Abc_Ntk_t * Abc_NtkFraigRestore() ...@@ -698,7 +698,7 @@ Abc_Ntk_t * Abc_NtkFraigRestore()
Vec_Ptr_t * vStore; Vec_Ptr_t * vStore;
Abc_Ntk_t * pNtk, * pFraig; Abc_Ntk_t * pNtk, * pFraig;
int nWords1, nWords2, nWordsMin; int nWords1, nWords2, nWordsMin;
// int clk = clock(); // clock_t clk = clock();
// get the stored network // get the stored network
vStore = Abc_FrameReadStore(); vStore = Abc_FrameReadStore();
......
...@@ -543,7 +543,7 @@ int Abc_NtkIvyProve( Abc_Ntk_t ** ppNtk, void * pPars ) ...@@ -543,7 +543,7 @@ int Abc_NtkIvyProve( Abc_Ntk_t ** ppNtk, void * pPars )
// apply AIG rewriting // apply AIG rewriting
if ( pParams->fUseRewriting && Abc_NtkNodeNum(pNtk) > 500 ) if ( pParams->fUseRewriting && Abc_NtkNodeNum(pNtk) > 500 )
{ {
// int clk = clock(); // clock_t clk = clock();
//printf( "Before rwsat = %d. ", Abc_NtkNodeNum(pNtk) ); //printf( "Before rwsat = %d. ", Abc_NtkNodeNum(pNtk) );
pParams->fUseRewriting = 0; pParams->fUseRewriting = 0;
pNtk = Abc_NtkBalance( pNtkTemp = pNtk, 0, 0, 0 ); pNtk = Abc_NtkBalance( pNtkTemp = pNtk, 0, 0, 0 );
......
...@@ -35,7 +35,7 @@ extern int Abc_NtkRefactor( Abc_Ntk_t * pNtk, int nNodeSizeMax, int nConeSizeMa ...@@ -35,7 +35,7 @@ extern int Abc_NtkRefactor( Abc_Ntk_t * pNtk, int nNodeSizeMax, int nConeSizeMa
extern Abc_Ntk_t * Abc_NtkFromFraig( Fraig_Man_t * pMan, Abc_Ntk_t * pNtk ); extern Abc_Ntk_t * Abc_NtkFromFraig( Fraig_Man_t * pMan, Abc_Ntk_t * pNtk );
static Abc_Ntk_t * Abc_NtkMiterFraig( Abc_Ntk_t * pNtk, int nBTLimit, ABC_INT64_T nInspLimit, int * pRetValue, int * pNumFails, ABC_INT64_T * pNumConfs, ABC_INT64_T * pNumInspects ); static Abc_Ntk_t * Abc_NtkMiterFraig( Abc_Ntk_t * pNtk, int nBTLimit, ABC_INT64_T nInspLimit, int * pRetValue, int * pNumFails, ABC_INT64_T * pNumConfs, ABC_INT64_T * pNumInspects );
static void Abc_NtkMiterPrint( Abc_Ntk_t * pNtk, char * pString, int clk, int fVerbose ); static void Abc_NtkMiterPrint( Abc_Ntk_t * pNtk, char * pString, clock_t clk, int fVerbose );
//////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////
...@@ -308,7 +308,7 @@ Abc_Ntk_t * Abc_NtkMiterFraig( Abc_Ntk_t * pNtk, int nBTLimit, ABC_INT64_T nInsp ...@@ -308,7 +308,7 @@ Abc_Ntk_t * Abc_NtkMiterFraig( Abc_Ntk_t * pNtk, int nBTLimit, ABC_INT64_T nInsp
SeeAlso [] SeeAlso []
***********************************************************************/ ***********************************************************************/
void Abc_NtkMiterPrint( Abc_Ntk_t * pNtk, char * pString, int clk, int fVerbose ) void Abc_NtkMiterPrint( Abc_Ntk_t * pNtk, char * pString, clock_t clk, int fVerbose )
{ {
if ( !fVerbose ) if ( !fVerbose )
return; return;
......
...@@ -2201,7 +2201,7 @@ int Abc_NtkRecAddCut( If_Man_t * pIfMan, If_Obj_t * pRoot, If_Cut_t * pCut ) ...@@ -2201,7 +2201,7 @@ int Abc_NtkRecAddCut( If_Man_t * pIfMan, If_Obj_t * pRoot, If_Cut_t * pCut )
unsigned * pTruth; unsigned * pTruth;
int i, RetValue, nNodes, nNodesBeg, nInputs = s_pMan->nVars, nLeaves = If_CutLeaveNum(pCut); int i, RetValue, nNodes, nNodesBeg, nInputs = s_pMan->nVars, nLeaves = If_CutLeaveNum(pCut);
unsigned uCanonPhase; unsigned uCanonPhase;
int clk, timeInsert, timeBuild; clock_t clk, timeInsert, timeBuild;
//int begin = clock(); //int begin = clock();
assert( nInputs <= 16 ); assert( nInputs <= 16 );
assert( nInputs == (int)pCut->nLimit ); assert( nInputs == (int)pCut->nLimit );
......
...@@ -196,7 +196,8 @@ Dec_Graph_t * Abc_NodeRefactor( Abc_ManRef_t * p, Abc_Obj_t * pNode, Vec_Ptr_t * ...@@ -196,7 +196,8 @@ Dec_Graph_t * Abc_NodeRefactor( Abc_ManRef_t * p, Abc_Obj_t * pNode, Vec_Ptr_t *
Abc_Obj_t * pFanin; Abc_Obj_t * pFanin;
Dec_Graph_t * pFForm; Dec_Graph_t * pFForm;
DdNode * bNodeFunc; DdNode * bNodeFunc;
int nNodesSaved, nNodesAdded, i, clk; int nNodesSaved, nNodesAdded, i;
clock_t clk;
char * pSop; char * pSop;
int Required; int Required;
......
...@@ -169,7 +169,7 @@ Rwr_ManAddTimeTotal( pManRwr, clock() - clkStart ); ...@@ -169,7 +169,7 @@ Rwr_ManAddTimeTotal( pManRwr, clock() - clkStart );
// put the nodes into the DFS order and reassign their IDs // put the nodes into the DFS order and reassign their IDs
{ {
// int clk = clock(); // clock_t clk = clock();
Abc_NtkReassignIds( pNtk ); Abc_NtkReassignIds( pNtk );
// ABC_PRT( "time", clock() - clk ); // ABC_PRT( "time", clock() - clk );
} }
......
...@@ -285,7 +285,8 @@ Vec_Int_t * Abc_NtkLutMerge( Abc_Ntk_t * pNtk, Nwk_LMPars_t * pPars ) ...@@ -285,7 +285,8 @@ Vec_Int_t * Abc_NtkLutMerge( Abc_Ntk_t * pNtk, Nwk_LMPars_t * pPars )
Vec_Int_t * vResult; Vec_Int_t * vResult;
Vec_Ptr_t * vStart, * vNext, * vCands1, * vCands2; Vec_Ptr_t * vStart, * vNext, * vCands1, * vCands2;
Abc_Obj_t * pLut, * pCand; Abc_Obj_t * pLut, * pCand;
int i, k, nVertsMax, nCands, clk = clock(); int i, k, nVertsMax, nCands;
clock_t clk = clock();
// count the number of vertices // count the number of vertices
nVertsMax = 0; nVertsMax = 0;
Abc_NtkForEachNode( pNtk, pLut, i ) Abc_NtkForEachNode( pNtk, pLut, i )
......
...@@ -65,7 +65,7 @@ int main( int argc, char * argv[] ) ...@@ -65,7 +65,7 @@ int main( int argc, char * argv[] )
int fRewrite = 0; int fRewrite = 0;
int fNewAlgo = 1; int fNewAlgo = 1;
int fVerbose = 0; int fVerbose = 0;
int clkTotal = clock(); clock_t clkTotal = clock();
if ( argc != 2 ) if ( argc != 2 )
{ {
......
...@@ -182,7 +182,7 @@ int Extra_bddReorderTest( DdManager * dd, DdNode * bF ) ...@@ -182,7 +182,7 @@ int Extra_bddReorderTest( DdManager * dd, DdNode * bF )
static DdManager * s_ddmin; static DdManager * s_ddmin;
DdNode * bFmin; DdNode * bFmin;
int nNodes; int nNodes;
// int clk1; // clock_t clk1;
if ( s_ddmin == NULL ) if ( s_ddmin == NULL )
s_ddmin = Cudd_Init( dd->size, 0, CUDD_UNIQUE_SLOTS, CUDD_CACHE_SLOTS, 0); s_ddmin = Cudd_Init( dd->size, 0, CUDD_UNIQUE_SLOTS, CUDD_CACHE_SLOTS, 0);
......
...@@ -45,7 +45,7 @@ ABC_NAMESPACE_IMPL_START ...@@ -45,7 +45,7 @@ ABC_NAMESPACE_IMPL_START
Dec_Man_t * Dec_ManStart() Dec_Man_t * Dec_ManStart()
{ {
Dec_Man_t * p; Dec_Man_t * p;
// int clk = clock(); // clock_t clk = clock();
p = ABC_ALLOC( Dec_Man_t, 1 ); p = ABC_ALLOC( Dec_Man_t, 1 );
p->pMvcMem = Mvc_ManagerStart(); p->pMvcMem = Mvc_ManagerStart();
p->vCubes = Vec_IntAlloc( 8 ); p->vCubes = Vec_IntAlloc( 8 );
......
...@@ -66,7 +66,7 @@ int main( int argc, char * argv[] ) ...@@ -66,7 +66,7 @@ int main( int argc, char * argv[] )
void * pAbc; void * pAbc;
char * pFileName; char * pFileName;
char Command[1000]; char Command[1000];
int clkRead, clkResyn, clkVer, clk; clock_t clkRead, clkResyn, clkVer, clk;
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
// get the input file name // get the input file name
......
...@@ -338,7 +338,7 @@ void Amap_LibCreateRules( Amap_Lib_t * pLib, int fVeryVerbose ) ...@@ -338,7 +338,7 @@ void Amap_LibCreateRules( Amap_Lib_t * pLib, int fVeryVerbose )
{ {
Amap_Gat_t * pGate; Amap_Gat_t * pGate;
int i, nGates = 0; int i, nGates = 0;
// int clk = clock(); // clock_t clk = clock();
pLib->fVerbose = fVeryVerbose; pLib->fVerbose = fVeryVerbose;
pLib->vRules = Vec_PtrAlloc( 100 ); pLib->vRules = Vec_PtrAlloc( 100 );
pLib->vRulesX = Vec_PtrAlloc( 100 ); pLib->vRulesX = Vec_PtrAlloc( 100 );
......
...@@ -667,7 +667,8 @@ Fpga_Cut_t * Fpga_MappingAreaWithoutNode( Fpga_Man_t * p, Fpga_Node_t * pNode, F ...@@ -667,7 +667,8 @@ Fpga_Cut_t * Fpga_MappingAreaWithoutNode( Fpga_Man_t * p, Fpga_Node_t * pNode, F
{ {
Fpga_Cut_t * pCut, * pCutBestOld, * pCutRes; Fpga_Cut_t * pCut, * pCutBestOld, * pCutRes;
float aAreaCutBest; float aAreaCutBest;
int i, clk; int i;
clock_t clk;
// make sure that at least one cut other than the trivial is present // make sure that at least one cut other than the trivial is present
if ( pNode->pCuts->pNext == NULL ) if ( pNode->pCuts->pNext == NULL )
{ {
......
...@@ -1407,7 +1407,7 @@ int If_CutCountTotalFanins( If_Man_t * p ) ...@@ -1407,7 +1407,7 @@ int If_CutCountTotalFanins( If_Man_t * p )
If_Obj_t * pObj; If_Obj_t * pObj;
Vec_Int_t * vLeaves; Vec_Int_t * vLeaves;
int i, nFaninsTotal = 0, Counter = 0; int i, nFaninsTotal = 0, Counter = 0;
int clk = clock(); clock_t clk = clock();
vLeaves = Vec_IntAlloc( 100 ); vLeaves = Vec_IntAlloc( 100 );
If_ManForEachObj( p, pObj, i ) If_ManForEachObj( p, pObj, i )
{ {
......
...@@ -203,7 +203,7 @@ void If_ObjPerformMappingAnd( If_Man_t * p, If_Obj_t * pObj, int Mode, int fPrep ...@@ -203,7 +203,7 @@ void If_ObjPerformMappingAnd( If_Man_t * p, If_Obj_t * pObj, int Mode, int fPrep
pCut->fCompl = 0; pCut->fCompl = 0;
if ( p->pPars->fTruth ) if ( p->pPars->fTruth )
{ {
// int clk = clock(); // clock_t clk = clock();
int RetValue = If_CutComputeTruth( p, pCut, pCut0, pCut1, pObj->fCompl0, pObj->fCompl1 ); int RetValue = If_CutComputeTruth( p, pCut, pCut0, pCut1, pObj->fCompl0, pObj->fCompl1 );
// p->timeTruth += clock() - clk; // p->timeTruth += clock() - clk;
pCut->fUseless = 0; pCut->fUseless = 0;
......
...@@ -915,7 +915,7 @@ Map_Cut_t * Map_CutTableConsider( Map_Man_t * pMan, Map_CutTable_t * p, Map_Node ...@@ -915,7 +915,7 @@ Map_Cut_t * Map_CutTableConsider( Map_Man_t * pMan, Map_CutTable_t * p, Map_Node
{ {
Map_Cut_t * pCut; Map_Cut_t * pCut;
int Place, i; int Place, i;
// int clk; // clock_t clk;
// check the cut // check the cut
Place = Map_CutTableLookup( p, ppNodes, nNodes ); Place = Map_CutTableLookup( p, ppNodes, nNodes );
if ( Place == -1 ) if ( Place == -1 )
...@@ -996,7 +996,7 @@ Map_Cut_t * Map_CutSortCuts( Map_Man_t * pMan, Map_CutTable_t * p, Map_Cut_t * p ...@@ -996,7 +996,7 @@ Map_Cut_t * Map_CutSortCuts( Map_Man_t * pMan, Map_CutTable_t * p, Map_Cut_t * p
{ {
Map_Cut_t * pListNew; Map_Cut_t * pListNew;
int nCuts, i; int nCuts, i;
// int clk; // clock_t clk;
// move the cuts from the list into the array // move the cuts from the list into the array
nCuts = Map_CutList2Array( p->pCuts1, pList ); nCuts = Map_CutList2Array( p->pCuts1, pList );
assert( nCuts <= MAP_CUTS_MAX_COMPUTE ); assert( nCuts <= MAP_CUTS_MAX_COMPUTE );
......
...@@ -77,7 +77,7 @@ Cut_Man_t * Abc_NtkCuts( Abc_Ntk_t * pNtk, Cut_Params_t * pParams ) ...@@ -77,7 +77,7 @@ Cut_Man_t * Abc_NtkCuts( Abc_Ntk_t * pNtk, Cut_Params_t * pParams )
Vec_Ptr_t * vNodes; Vec_Ptr_t * vNodes;
Vec_Int_t * vChoices; Vec_Int_t * vChoices;
int i; int i;
int clk = clock(); clock_t clk = clock();
extern void Abc_NtkBalanceAttach( Abc_Ntk_t * pNtk ); extern void Abc_NtkBalanceAttach( Abc_Ntk_t * pNtk );
extern void Abc_NtkBalanceDetach( Abc_Ntk_t * pNtk ); extern void Abc_NtkBalanceDetach( Abc_Ntk_t * pNtk );
...@@ -163,7 +163,8 @@ void Abc_NtkCutsOracle( Abc_Ntk_t * pNtk, Cut_Oracle_t * p ) ...@@ -163,7 +163,8 @@ void Abc_NtkCutsOracle( Abc_Ntk_t * pNtk, Cut_Oracle_t * p )
{ {
Abc_Obj_t * pObj; Abc_Obj_t * pObj;
Vec_Ptr_t * vNodes; Vec_Ptr_t * vNodes;
int i, clk = clock(); int i;
clock_t clk = clock();
int fDrop = Cut_OracleReadDrop(p); int fDrop = Cut_OracleReadDrop(p);
assert( Abc_NtkIsStrash(pNtk) ); assert( Abc_NtkIsStrash(pNtk) );
...@@ -225,7 +226,7 @@ Cut_Man_t * Abc_NtkSeqCuts( Abc_Ntk_t * pNtk, Cut_Params_t * pParams ) ...@@ -225,7 +226,7 @@ Cut_Man_t * Abc_NtkSeqCuts( Abc_Ntk_t * pNtk, Cut_Params_t * pParams )
Abc_Obj_t * pObj, * pNode; Abc_Obj_t * pObj, * pNode;
int i, nIters, fStatus; int i, nIters, fStatus;
Vec_Int_t * vChoices; Vec_Int_t * vChoices;
int clk = clock(); clock_t clk = clock();
assert( Abc_NtkIsSeq(pNtk) ); assert( Abc_NtkIsSeq(pNtk) );
assert( pParams->fSeq ); assert( pParams->fSeq );
......
...@@ -592,7 +592,7 @@ Dar_Lib_t * Dar_LibRead() ...@@ -592,7 +592,7 @@ Dar_Lib_t * Dar_LibRead()
***********************************************************************/ ***********************************************************************/
void Dar_LibStart() void Dar_LibStart()
{ {
// int clk = clock(); // clock_t clk = clock();
assert( s_DarLib == NULL ); assert( s_DarLib == NULL );
s_DarLib = Dar_LibRead(); s_DarLib = Dar_LibRead();
// printf( "The 4-input library started with %d nodes and %d subgraphs. ", s_DarLib->nObjs - 4, s_DarLib->nSubgrTotal ); // printf( "The 4-input library started with %d nodes and %d subgraphs. ", s_DarLib->nObjs - 4, s_DarLib->nSubgrTotal );
...@@ -1189,7 +1189,7 @@ int Dar2_LibEval( Gia_Man_t * p, Vec_Int_t * vCutLits, unsigned uTruth, int fKee ...@@ -1189,7 +1189,7 @@ int Dar2_LibEval( Gia_Man_t * p, Vec_Int_t * vCutLits, unsigned uTruth, int fKee
// int fTraining = 0; // int fTraining = 0;
Dar_LibObj_t * pObj; Dar_LibObj_t * pObj;
int Out, k, Class, nNodesSaved, nNodesAdded, nNodesGained; int Out, k, Class, nNodesSaved, nNodesAdded, nNodesGained;
clock_t clk = clock(); // clock_t clk = clock();
assert( Vec_IntSize(vCutLits) == 4 ); assert( Vec_IntSize(vCutLits) == 4 );
assert( (uTruth >> 16) == 0 ); assert( (uTruth >> 16) == 0 );
// check if the cut exits and assigns leaves and their levels // check if the cut exits and assigns leaves and their levels
......
...@@ -721,7 +721,8 @@ Aig_Man_t * Dar_ManChoiceNew( Aig_Man_t * pAig, Dch_Pars_t * pPars ) ...@@ -721,7 +721,8 @@ Aig_Man_t * Dar_ManChoiceNew( Aig_Man_t * pAig, Dch_Pars_t * pPars )
int fConstruct = 0; int fConstruct = 0;
Aig_Man_t * pMan, * pTemp; Aig_Man_t * pMan, * pTemp;
Vec_Ptr_t * vAigs; Vec_Ptr_t * vAigs;
int i, clk; int i;
clock_t clk;
clk = clock(); clk = clock();
// vAigs = Dar_ManChoiceSynthesisExt(); // vAigs = Dar_ManChoiceSynthesisExt();
......
...@@ -384,7 +384,8 @@ static inline void Fsim_ManSimulateRound( Fsim_Man_t * p ) ...@@ -384,7 +384,8 @@ static inline void Fsim_ManSimulateRound( Fsim_Man_t * p )
void Fsim_ManSimulateRoundTest( Fsim_Man_t * p ) void Fsim_ManSimulateRoundTest( Fsim_Man_t * p )
{ {
Fsim_Obj_t * pObj; Fsim_Obj_t * pObj;
int i, clk = clock(); int i;
clock_t clk = clock();
Fsim_ManForEachObj( p, pObj, i ) Fsim_ManForEachObj( p, pObj, i )
{ {
} }
...@@ -471,7 +472,8 @@ int Fsim_ManSimulate( Aig_Man_t * pAig, Fsim_ParSim_t * pPars ) ...@@ -471,7 +472,8 @@ int Fsim_ManSimulate( Aig_Man_t * pAig, Fsim_ParSim_t * pPars )
{ {
Fsim_Man_t * p; Fsim_Man_t * p;
Sec_MtrStatus_t Status; Sec_MtrStatus_t Status;
int i, iOut, iPat, clk, clkTotal = clock(), clk2, clk2Total = 0; int i, iOut, iPat;
clock_t clk, clkTotal = clock(), clk2, clk2Total = 0;
assert( Aig_ManRegNum(pAig) > 0 ); assert( Aig_ManRegNum(pAig) > 0 );
if ( pPars->fCheckMiter ) if ( pPars->fCheckMiter )
{ {
......
...@@ -341,7 +341,8 @@ Vec_Ptr_t * Fsim_ManTerSimulate( Aig_Man_t * pAig, int fVerbose ) ...@@ -341,7 +341,8 @@ Vec_Ptr_t * Fsim_ManTerSimulate( Aig_Man_t * pAig, int fVerbose )
Fsim_Man_t * p; Fsim_Man_t * p;
Vec_Ptr_t * vStates; Vec_Ptr_t * vStates;
unsigned ** pBins, * pState; unsigned ** pBins, * pState;
int i, nWords, nBins, clk, clkTotal = clock(); int i, nWords, nBins;
clock_t clk, clkTotal = clock();
assert( Aig_ManRegNum(pAig) > 0 ); assert( Aig_ManRegNum(pAig) > 0 );
// create manager // create manager
clk = clock(); clk = clock();
......
...@@ -60,7 +60,7 @@ int Fxu_PreprocessCubePairs( Fxu_Matrix * p, Vec_Ptr_t * vCovers, int nPairsTota ...@@ -60,7 +60,7 @@ int Fxu_PreprocessCubePairs( Fxu_Matrix * p, Vec_Ptr_t * vCovers, int nPairsTota
int nCubes, nBitsMax, nSum; int nCubes, nBitsMax, nSum;
int CutOffNum = -1, CutOffQuant = -1; // Suppress "might be used uninitialized" int CutOffNum = -1, CutOffQuant = -1; // Suppress "might be used uninitialized"
int iPair, iQuant, k, c; int iPair, iQuant, k, c;
// int clk = clock(); // clock_t clk = clock();
char * pSopCover; char * pSopCover;
int nFanins; int nFanins;
......
...@@ -86,7 +86,7 @@ int Abc_NtkMfsEdgePower( Mfs_Man_t * p, Abc_Obj_t * pNode ) ...@@ -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 Abc_WinNode(Mfs_Man_t * p, Abc_Obj_t *pNode)
{ {
// int clk; // clock_t clk;
// Abc_Obj_t * pFanin; // Abc_Obj_t * pFanin;
// int i; // int i;
...@@ -119,7 +119,7 @@ int Abc_WinNode(Mfs_Man_t * p, Abc_Obj_t *pNode) ...@@ -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 Abc_NtkMfsPowerResubNode( Mfs_Man_t * p, Abc_Obj_t * pNode )
{ {
int clk; clock_t clk;
Abc_Obj_t * pFanin; Abc_Obj_t * pFanin;
int i; int i;
......
...@@ -74,7 +74,7 @@ void Abc_NtkMfsParsDefault( Mfs_Par_t * pPars ) ...@@ -74,7 +74,7 @@ void Abc_NtkMfsParsDefault( Mfs_Par_t * pPars )
***********************************************************************/ ***********************************************************************/
int Abc_NtkMfsResub( Mfs_Man_t * p, Abc_Obj_t * pNode ) int Abc_NtkMfsResub( Mfs_Man_t * p, Abc_Obj_t * pNode )
{ {
int clk; clock_t clk;
p->nNodesTried++; p->nNodesTried++;
// prepare data structure for this node // prepare data structure for this node
Mfs_ManClean( p ); Mfs_ManClean( p );
...@@ -140,7 +140,8 @@ int Abc_NtkMfsNode( Mfs_Man_t * p, Abc_Obj_t * pNode ) ...@@ -140,7 +140,8 @@ int Abc_NtkMfsNode( Mfs_Man_t * p, Abc_Obj_t * pNode )
float dProb; 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 ); 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++; p->nNodesTried++;
// prepare data structure for this node // prepare data structure for this node
Mfs_ManClean( p ); Mfs_ManClean( p );
...@@ -213,7 +214,8 @@ int Abc_NtkMfs( Abc_Ntk_t * pNtk, Mfs_Par_t * pPars ) ...@@ -213,7 +214,8 @@ int Abc_NtkMfs( Abc_Ntk_t * pNtk, Mfs_Par_t * pPars )
Abc_Obj_t * pObj; Abc_Obj_t * pObj;
Vec_Vec_t * vLevels; Vec_Vec_t * vLevels;
Vec_Ptr_t * vNodes; 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 nTotalNodesBeg = Abc_NtkNodeNum(pNtk);
int nTotalEdgesBeg = Abc_NtkGetTotalFanins(pNtk); int nTotalEdgesBeg = Abc_NtkGetTotalFanins(pNtk);
......
...@@ -205,7 +205,8 @@ int Abc_NtkMfsTryResubOnceGia( Mfs_Man_t * p, int * pCands, int nCands ) ...@@ -205,7 +205,8 @@ int Abc_NtkMfsTryResubOnceGia( Mfs_Man_t * p, int * pCands, int nCands )
int fVeryVerbose = 0; int fVeryVerbose = 0;
int fUseGia = 1; int fUseGia = 1;
unsigned * pData; unsigned * pData;
int i, iVar, status, iOut, clk = clock(); int i, iVar, status, iOut;
clock_t clk = clock();
p->nSatCalls++; p->nSatCalls++;
// return -1; // return -1;
assert( p->pGia != NULL ); assert( p->pGia != NULL );
......
...@@ -337,7 +337,7 @@ Hop_Obj_t * Abc_NtkMfsInterplate( Mfs_Man_t * p, int * pCands, int nCands ) ...@@ -337,7 +337,7 @@ Hop_Obj_t * Abc_NtkMfsInterplate( Mfs_Man_t * p, int * pCands, int nCands )
Hop_Obj_t * pFunc; Hop_Obj_t * pFunc;
int nFanins, status; int nFanins, status;
int c, i, * pGloVars; int c, i, * pGloVars;
// int clk = clock(); // clock_t clk = clock();
// p->nDcMints += Abc_NtkMfsInterplateEval( p, pCands, nCands ); // p->nDcMints += Abc_NtkMfsInterplateEval( p, pCands, nCands );
......
...@@ -143,7 +143,8 @@ int Abc_NtkMfsSolveSatResub( Mfs_Man_t * p, Abc_Obj_t * pNode, int iFanin, int f ...@@ -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; int fVeryVerbose = p->pPars->fVeryVerbose && Vec_PtrSize(p->vDivs) < 80;
unsigned * pData; unsigned * pData;
int pCands[MFS_FANIN_MAX]; 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; Abc_Obj_t * pFanin;
Hop_Obj_t * pFunc; Hop_Obj_t * pFunc;
assert( iFanin >= 0 ); assert( iFanin >= 0 );
...@@ -292,7 +293,8 @@ int Abc_NtkMfsSolveSatResub2( Mfs_Man_t * p, Abc_Obj_t * pNode, int iFanin, int ...@@ -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; int fVeryVerbose = p->pPars->fVeryVerbose && Vec_PtrSize(p->vDivs) < 80;
unsigned * pData, * pData2; unsigned * pData, * pData2;
int pCands[MFS_FANIN_MAX]; 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; Abc_Obj_t * pFanin;
Hop_Obj_t * pFunc; Hop_Obj_t * pFunc;
assert( iFanin >= 0 ); assert( iFanin >= 0 );
......
...@@ -465,7 +465,7 @@ Vec_Ptr_t * Nwk_ManRetimeCutForward( Nwk_Man_t * pMan, int nLatches, int fVerbos ...@@ -465,7 +465,7 @@ Vec_Ptr_t * Nwk_ManRetimeCutForward( Nwk_Man_t * pMan, int nLatches, int fVerbos
Vec_Ptr_t * vNodes; Vec_Ptr_t * vNodes;
Nwk_Obj_t * pObj; Nwk_Obj_t * pObj;
int i, RetValue, Counter = 0, Counter2 = 0; int i, RetValue, Counter = 0, Counter2 = 0;
int clk = clock(); clock_t clk = clock();
// set the sequential parameters // set the sequential parameters
pMan->nLatches = nLatches; pMan->nLatches = nLatches;
pMan->nTruePis = Nwk_ManCiNum(pMan) - nLatches; pMan->nTruePis = Nwk_ManCiNum(pMan) - nLatches;
...@@ -550,7 +550,7 @@ Vec_Ptr_t * Nwk_ManRetimeCutBackward( Nwk_Man_t * pMan, int nLatches, int fVerbo ...@@ -550,7 +550,7 @@ Vec_Ptr_t * Nwk_ManRetimeCutBackward( Nwk_Man_t * pMan, int nLatches, int fVerbo
Vec_Ptr_t * vNodes; Vec_Ptr_t * vNodes;
Nwk_Obj_t * pObj; Nwk_Obj_t * pObj;
int i, RetValue, Counter = 0, Counter2 = 0; int i, RetValue, Counter = 0, Counter2 = 0;
int clk = clock(); clock_t clk = clock();
// set the sequential parameters // set the sequential parameters
pMan->nLatches = nLatches; pMan->nLatches = nLatches;
pMan->nTruePis = Nwk_ManCiNum(pMan) - nLatches; pMan->nTruePis = Nwk_ManCiNum(pMan) - nLatches;
......
...@@ -830,9 +830,10 @@ int Cec_ManLSCorrespondenceClasses( Gia_Man_t * pAig, Cec_ParCor_t * pPars ) ...@@ -830,9 +830,10 @@ int Cec_ManLSCorrespondenceClasses( Gia_Man_t * pAig, Cec_ParCor_t * pPars )
Cec_ManSim_t * pSim; Cec_ManSim_t * pSim;
Gia_Man_t * pSrm; Gia_Man_t * pSrm;
unsigned * pInitState = NULL; unsigned * pInitState = NULL;
int r, RetValue, clkTotal = clock(); int r, RetValue;
int clkSat = 0, clkSim = 0, clkSrm = 0; clock_t clkTotal = clock();
int clk2, clk = clock(); clock_t clkSat = 0, clkSim = 0, clkSrm = 0;
clock_t clk2, clk = clock();
ABC_FREE( pAig->pReprs ); ABC_FREE( pAig->pReprs );
ABC_FREE( pAig->pNexts ); ABC_FREE( pAig->pNexts );
if ( Gia_ManRegNum(pAig) == 0 ) if ( Gia_ManRegNum(pAig) == 0 )
...@@ -917,7 +918,7 @@ int Cec_ManLSCorrespondenceClasses( Gia_Man_t * pAig, Cec_ParCor_t * pPars ) ...@@ -917,7 +918,7 @@ int Cec_ManLSCorrespondenceClasses( Gia_Man_t * pAig, Cec_ParCor_t * pPars )
int fChanges = 1; int fChanges = 1;
while ( fChanges ) while ( fChanges )
{ {
int clkBmc = clock(); clock_t clkBmc = clock();
fChanges = 0; fChanges = 0;
pSrm = Gia_ManCorrSpecReduceInit( pAig, pPars->nFrames, pPars->nPrefix, !pPars->fLatchCorr, &vOutputs, pPars->fUseRings ); pSrm = Gia_ManCorrSpecReduceInit( pAig, pPars->nFrames, pPars->nPrefix, !pPars->fLatchCorr, &vOutputs, pPars->fUseRings );
if ( Gia_ManPoNum(pSrm) == 0 ) if ( Gia_ManPoNum(pSrm) == 0 )
......
...@@ -590,7 +590,8 @@ clk2 = clock(); ...@@ -590,7 +590,8 @@ clk2 = clock();
// verify implications using simulation // verify implications using simulation
if ( p->pCla->vImps && Vec_IntSize(p->pCla->vImps) ) if ( p->pCla->vImps && Vec_IntSize(p->pCla->vImps) )
{ {
int Temp, clk = clock(); int Temp;
clock_t clk = clock();
if ( Temp = Fra_ImpVerifyUsingSimulation( p ) ) if ( Temp = Fra_ImpVerifyUsingSimulation( p ) )
printf( "Implications failing the simulation test = %d (out of %d). ", Temp, Vec_IntSize(p->pCla->vImps) ); printf( "Implications failing the simulation test = %d (out of %d). ", Temp, Vec_IntSize(p->pCla->vImps) );
else else
......
...@@ -394,7 +394,8 @@ int Inter_ManPerformOneStepM114p( Inter_Man_t * p, int fUsePudlak, int fUseOther ...@@ -394,7 +394,8 @@ int Inter_ManPerformOneStepM114p( Inter_Man_t * p, int fUsePudlak, int fUseOther
{ {
M114p_Solver_t pSat; M114p_Solver_t pSat;
Vec_Int_t * vMapRoots, * vMapVars; Vec_Int_t * vMapRoots, * vMapVars;
int clk, status, RetValue; clock_t clk;
int status, RetValue;
assert( p->pInterNew == NULL ); assert( p->pInterNew == NULL );
// derive the SAT solver // derive the SAT solver
pSat = Inter_ManDeriveSatSolverM114p( p->pInter, p->pCnfInter, pSat = Inter_ManDeriveSatSolverM114p( p->pInter, p->pCnfInter,
......
...@@ -317,7 +317,8 @@ static inline void act_var_rescale(sat_solver* s) { ...@@ -317,7 +317,8 @@ static inline void act_var_rescale(sat_solver* s) {
static inline void act_clause_rescale(sat_solver* s) { static inline void act_clause_rescale(sat_solver* s) {
static int Total = 0; static int Total = 0;
clause** cs = (clause**)vecp_begin(&s->learnts); clause** cs = (clause**)vecp_begin(&s->learnts);
int i, clk = clock(); int i;
clock_t clk = clock();
for (i = 0; i < vecp_size(&s->learnts); i++){ for (i = 0; i < vecp_size(&s->learnts); i++){
unsigned a = clause_activity2(cs[i]); unsigned a = clause_activity2(cs[i]);
clause_setactivity2(cs[i], a >> 14); clause_setactivity2(cs[i], a >> 14);
......
...@@ -294,7 +294,8 @@ static inline void act_var_rescale(sat_solver2* s) { ...@@ -294,7 +294,8 @@ static inline void act_var_rescale(sat_solver2* s) {
static inline void act_clause_rescale(sat_solver2* s) { static inline void act_clause_rescale(sat_solver2* s) {
static int Total = 0; static int Total = 0;
float * claActs = (float *)veci_begin(&s->claActs); float * claActs = (float *)veci_begin(&s->claActs);
int i, clk = clock(); int i;
clock_t clk = clock();
for (i = 0; i < veci_size(&s->claActs); i++) for (i = 0; i < veci_size(&s->claActs); i++)
claActs[i] *= (float)1e-20; claActs[i] *= (float)1e-20;
s->cla_inc *= (float)1e-20; s->cla_inc *= (float)1e-20;
......
...@@ -264,7 +264,7 @@ int Msat_OrderVarSelect( Msat_Order_t * p ) ...@@ -264,7 +264,7 @@ int Msat_OrderVarSelect( Msat_Order_t * p )
Msat_OrderVar_t * pVar, * pNext, * pVarBest; Msat_OrderVar_t * pVar, * pNext, * pVarBest;
double * pdActs = p->pSat->pdActivity; double * pdActs = p->pSat->pdActivity;
double dfActBest; double dfActBest;
// int clk = clock(); // clock_t clk = clock();
pVarBest = NULL; pVarBest = NULL;
dfActBest = -1.0; dfActBest = -1.0;
......
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