From e49b76d4bf590a9497ffb4a858c0842ce980c6f0 Mon Sep 17 00:00:00 2001
From: Florent Pruvost <florent.pruvost@inria.fr>
Date: Tue, 29 Sep 2015 13:01:03 +0000
Subject: [PATCH] use warmup option by default for timings

---
 timing/CTestLists.cmake | 6 +++---
 timing/timing.c         | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/timing/CTestLists.cmake b/timing/CTestLists.cmake
index 5f39d14de..dc2093c52 100644
--- a/timing/CTestLists.cmake
+++ b/timing/CTestLists.cmake
@@ -39,7 +39,7 @@ foreach(cat ${TEST_CATEGORIES})
 
         if (CHAMELEON_PREC_${PREC})
             foreach(test ${TESTLIST})
-                add_test(time_${cat}_${prec}${test} ${MPI_CMD_${cat}} ./time_${prec}${test}_tile ${TEST_CMD_${cat}} --check --nowarmup)
+                add_test(time_${cat}_${prec}${test} ${MPI_CMD_${cat}} ./time_${prec}${test}_tile ${TEST_CMD_${cat}} --check --warmup)
             endforeach()
         endif()
     endforeach()
@@ -48,7 +48,7 @@ foreach(cat ${TEST_CATEGORIES})
 
         if (CHAMELEON_PREC_${PREC})
             foreach(test ${TESTLIST_ZC})
-                add_test(time_${cat}_${prec}${test} ${MPI_CMD_${cat}} ./time_${prec}${test}_tile ${TEST_CMD_${cat}} --check --nowarmup)
+                add_test(time_${cat}_${prec}${test} ${MPI_CMD_${cat}} ./time_${prec}${test}_tile ${TEST_CMD_${cat}} --check --warmup)
             endforeach()
         endif()
     endforeach()
@@ -71,7 +71,7 @@ if (CHAMELEON_USE_MPI AND MPI_C_FOUND)
 
             if (CHAMELEON_PREC_${PREC})
                 foreach(test ${TESTLIST_MPI})
-                    add_test(time_${cat}_${prec}${test} ${MPI_CMD_${cat}} ./time_${prec}${test}_tile ${TEST_CMD_${cat}} --check --nowarmup)
+                    add_test(time_${cat}_${prec}${test} ${MPI_CMD_${cat}} ./time_${prec}${test}_tile ${TEST_CMD_${cat}} --check --warmup)
                 endforeach()
             endif()
         endforeach()
diff --git a/timing/timing.c b/timing/timing.c
index 7e7ed6f8a..3cd1ddb29 100644
--- a/timing/timing.c
+++ b/timing/timing.c
@@ -346,7 +346,7 @@ show_help(char *prog_name) {
             "  --[a]sync        Enable/Disable synchronous calls in wrapper function such as POTRI. (default: async)\n"
             "  --[no]check      Check result (default: nocheck)\n"
             "  --[no]inv        Check on inverse (default: noinv)\n"
-            "  --[no]warmup     Perform a warmup run to pre-load libraries (default: nowarmup)\n"
+            "  --[no]warmup     Perform a warmup run to pre-load libraries (default: warmup)\n"
             "  --[no]trace      Enable/Disable trace generation (default: notrace)\n"
             "  --[no]dag        Enable/Disable DAG generation (default: nodag)\n"
             "                   Generates a dot_dag_file.dot.\n"
@@ -461,7 +461,7 @@ main(int argc, char *argv[]) {
     iparam[IPARAM_NB            ] = 128;
     iparam[IPARAM_IB            ] = 32;
     iparam[IPARAM_NITER         ] = 1;
-    iparam[IPARAM_WARMUP        ] = 0;
+    iparam[IPARAM_WARMUP        ] = 1;
     iparam[IPARAM_CHECK         ] = 0;
     iparam[IPARAM_VERBOSE       ] = 0;
     iparam[IPARAM_AUTOTUNING    ] = 0;
-- 
GitLab