Add timing statements

diff --git a/src/Backend/constraint.cc b/src/Backend/constraint.cc
index b7cb320e2a9da41473d260e09a27940c1360f174..0fe3d4562a069550ad5a0ee321a0c6317c831553 100644 (file)
--- a/src/Backend/constraint.cc
+++ b/src/Backend/constraint.cc
@@ -352,6 +352,7 @@ int solveCNF(CNF *cnf) {
        long long finishTime = getTimeNano();
        cnf->encodeTime = startSolve - startTime;
        cnf->solveTime = finishTime - startSolve;
+       model_print("CNF Encode time: %f\n Solve time: %f\n", cnf->encodeTime/1000000000.0, cnf->solveTime/ 1000000000.0);
        return result;
 }
 

diff --git a/src/config.h b/src/config.h
index 2e48668479d21cfacd8bf42e014849ec5a83d2aa..e34b82810f12e85049baa60ecf112985fbecaa43 100644 (file)
--- a/src/config.h
+++ b/src/config.h
@@ -19,7 +19,7 @@
 //#define CONFIG_DEBUG
 #endif
 
-//#define SATCHECK_CONFIG
+#define SATCHECK_CONFIG
 
 #ifndef CONFIG_ASSERT
 #define CONFIG_ASSERT

diff --git a/src/csolver.cc b/src/csolver.cc
index fb29cffaaa3532148014f8c42ae22350c3b074de..160e6867f854c7abb42a646521782cd576a69d0f 100644 (file)
--- a/src/csolver.cc
+++ b/src/csolver.cc
@@ -100,10 +100,7 @@ CSolver* CSolver::deserialize(const char * file){
 void CSolver::serialize() {
        model_print("serializing ...\n");
        char buffer[255];
-       struct timespec t;
-       clock_gettime(CLOCK_REALTIME, &t);
-
-       unsigned long long nanotime=t.tv_sec*1000000000+t.tv_nsec;
+       long long nanotime=getTimeNano();
        int numchars=sprintf(buffer, "DUMP%llu", nanotime);
        Serializer serializer(buffer);
        SetIteratorBooleanEdge *it = getConstraints();
@@ -501,7 +498,9 @@ void CSolver::inferFixedOrders() {
        }
 }
 
+#define NANOSEC 1000000000.0
 int CSolver::solve() {
+       long long starttime = getTimeNano();    
        bool deleteTuner = false;
        if (tuner == NULL) {
                tuner = new DefaultTuner();
@@ -520,14 +519,19 @@ int CSolver::solve() {
                }
                delete orderit;
        }
-       
-       computePolarities(this);
 
+       computePolarities(this);
+       long long time2 = getTimeNano();
+       model_print("Polarity time: %f\n", (time2-starttime)/NANOSEC);
        Preprocess pp(this);
        pp.doTransform();
-
+       long long time3 = getTimeNano();
+       model_print("Preprocess time: %f\n", (time3-time2)/NANOSEC);
+       
        DecomposeOrderTransform dot(this);
        dot.doTransform();
+       long long time4 = getTimeNano();
+       model_print("Decompose Order: %f\n", (time4-time3)/NANOSEC);
 
        IntegerEncodingTransform iet(this);
        iet.doTransform();
@@ -537,14 +541,20 @@ int CSolver::solve() {
        eg.encode();
 
        naiveEncodingDecision(this);
-
+       long long time5 = getTimeNano();
+       model_print("Encoding Graph Time: %f\n", (time5-time4)/NANOSEC);
+       
        long long startTime = getTimeNano();
        satEncoder->encodeAllSATEncoder(this);
+       long long endTime = getTimeNano();
+
+       elapsedTime = endTime - startTime;
+       model_print("Elapse Encode time: %f\n", elapsedTime/NANOSEC);
+       
        model_print("Is problem UNSAT after encoding: %d\n", unsat);
        int result = unsat ? IS_UNSAT : satEncoder->solve();
        model_print("Result Computed in CSolver: %d\n", result);
-       long long finishTime = getTimeNano();
-       elapsedTime = finishTime - startTime;
+       
        if (deleteTuner) {
                delete tuner;
                tuner = NULL;

diff --git a/src/mymemory.h b/src/mymemory.h
index 0798860fa89a625aad4bfbee1c9cfffd88fd70bc..766e6f65675464a17840cbaf80bef665a349ead7 100644 (file)
--- a/src/mymemory.h
+++ b/src/mymemory.h
@@ -19,7 +19,7 @@
 
 #include "config.h"
 
-//#define SATCHECK_CONFIG
+#define SATCHECK_CONFIG
 
 /*
    void * ourmalloc(size_t size);