diff options
| author | Alan Mishchenko <alanmi@berkeley.edu> | 2012-07-07 17:46:54 -0700 |
|---|---|---|
| committer | Alan Mishchenko <alanmi@berkeley.edu> | 2012-07-07 17:46:54 -0700 |
| commit | 3aab7245738a69f1dd4d898493d5dabf6596ea61 (patch) | |
| tree | 16a23107ca27a250e82c492dcdd1a2bea640cff6 /src/sat/cnf | |
| parent | 16d96fcf533fb77ff4a45992991e38ac7ea74bb3 (diff) | |
| download | abc-3aab7245738a69f1dd4d898493d5dabf6596ea61.tar.gz abc-3aab7245738a69f1dd4d898493d5dabf6596ea61.tar.bz2 abc-3aab7245738a69f1dd4d898493d5dabf6596ea61.zip | |
Fixing time primtouts throughout the code.
Diffstat (limited to 'src/sat/cnf')
| -rw-r--r-- | src/sat/cnf/cnf.h | 7 | ||||
| -rw-r--r-- | src/sat/cnf/cnfCore.c | 6 | ||||
| -rw-r--r-- | src/sat/cnf/cnfFast.c | 2 |
3 files changed, 7 insertions, 8 deletions
diff --git a/src/sat/cnf/cnf.h b/src/sat/cnf/cnf.h index 478755d6..16aaa21f 100644 --- a/src/sat/cnf/cnf.h +++ b/src/sat/cnf/cnf.h @@ -30,7 +30,6 @@ #include <stdlib.h> #include <string.h> #include <assert.h> -#include <time.h> #include "src/misc/vec/vec.h" #include "src/aig/aig/aig.h" @@ -88,9 +87,9 @@ struct Cnf_Man_t_ int nMergeLimit; // the limit on the size of merged cut unsigned * pTruths[4]; // temporary truth tables Vec_Int_t * vMemory; // memory for intermediate ISOP representation - int timeCuts; - int timeMap; - int timeSave; + clock_t timeCuts; + clock_t timeMap; + clock_t timeSave; }; diff --git a/src/sat/cnf/cnfCore.c b/src/sat/cnf/cnfCore.c index 65d7ef60..f08ea6d1 100644 --- a/src/sat/cnf/cnfCore.c +++ b/src/sat/cnf/cnfCore.c @@ -50,7 +50,7 @@ Vec_Int_t * Cnf_DeriveMappingArray( Aig_Man_t * pAig ) Cnf_Man_t * p; Vec_Ptr_t * vMapped; Aig_MmFixed_t * pMemCuts; - int clk; + clock_t clk; // allocate the CNF manager if ( s_pManCnf == NULL ) s_pManCnf = Cnf_ManStart(); @@ -103,7 +103,7 @@ Cnf_Dat_t * Cnf_Derive( Aig_Man_t * pAig, int nOutputs ) Cnf_Dat_t * pCnf; Vec_Ptr_t * vMapped; Aig_MmFixed_t * pMemCuts; - int clk; + clock_t clk; // allocate the CNF manager if ( s_pManCnf == NULL ) s_pManCnf = Cnf_ManStart(); @@ -156,7 +156,7 @@ Cnf_Dat_t * Cnf_DeriveOther( Aig_Man_t * pAig, int fSkipTtMin ) Cnf_Dat_t * pCnf; Vec_Ptr_t * vMapped; Aig_MmFixed_t * pMemCuts; - int clk; + clock_t clk; // allocate the CNF manager if ( s_pManCnf == NULL ) s_pManCnf = Cnf_ManStart(); diff --git a/src/sat/cnf/cnfFast.c b/src/sat/cnf/cnfFast.c index 492ddb61..93b3072b 100644 --- a/src/sat/cnf/cnfFast.c +++ b/src/sat/cnf/cnfFast.c @@ -666,7 +666,7 @@ Cnf_Dat_t * Cnf_DeriveFastClauses( Aig_Man_t * p, int nOutputs ) Cnf_Dat_t * Cnf_DeriveFast( Aig_Man_t * p, int nOutputs ) { Cnf_Dat_t * pCnf = NULL; - int clk;//, clkTotal = clock(); + clock_t clk;//, clkTotal = clock(); // printf( "\n" ); Aig_ManCleanMarkAB( p ); // create initial marking |