From 76c41fd907a3f7e7d574da4c075f30656e3ede9f Mon Sep 17 00:00:00 2001
From: Cyril SIX <cyril.six@kalray.eu>
Date: Fri, 17 May 2019 14:14:38 +0200
Subject: Measures to CSV done

---
 test/monniaux/complex/make.proto                    | 2 +-
 test/monniaux/number_theoretic_transform/make.proto | 1 +
 test/monniaux/quicksort/make.proto                  | 1 +
 test/monniaux/quicksort/quicksort_run.c             | 2 +-
 test/monniaux/sha-2/make.proto                      | 1 +
 test/monniaux/sha-2/sha-256_run.c                   | 2 +-
 test/monniaux/tacle-bench-lift/make.proto           | 1 +
 test/monniaux/tacle-bench-powerwindow/make.proto    | 1 +
 test/monniaux/ternary/make.proto                    | 1 +
 test/monniaux/ternary/ternary.c                     | 2 +-
 test/monniaux/too_slow/make.proto                   | 1 +
 11 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/test/monniaux/complex/make.proto b/test/monniaux/complex/make.proto
index 7041c6d8..8870f311 100644
--- a/test/monniaux/complex/make.proto
+++ b/test/monniaux/complex/make.proto
@@ -1,2 +1,2 @@
 target: complex_mat
-measures: [c1_time, c1]
+measures: [[c1_time, c1]]
diff --git a/test/monniaux/number_theoretic_transform/make.proto b/test/monniaux/number_theoretic_transform/make.proto
index 2d3c7144..e1844226 100644
--- a/test/monniaux/number_theoretic_transform/make.proto
+++ b/test/monniaux/number_theoretic_transform/make.proto
@@ -1 +1,2 @@
 target: ntt
+measures: [cycles]
diff --git a/test/monniaux/quicksort/make.proto b/test/monniaux/quicksort/make.proto
index 4af771e5..fe2f906b 100644
--- a/test/monniaux/quicksort/make.proto
+++ b/test/monniaux/quicksort/make.proto
@@ -1,2 +1,3 @@
 objdeps: [{name: quicksort_run, compiler: gcc}]
 target: quicksort
+measures: [quicksort_time]
diff --git a/test/monniaux/quicksort/quicksort_run.c b/test/monniaux/quicksort/quicksort_run.c
index f9e1b871..88747d17 100644
--- a/test/monniaux/quicksort/quicksort_run.c
+++ b/test/monniaux/quicksort/quicksort_run.c
@@ -13,7 +13,7 @@ int main (void) {
   quicksort(vec, len);
   quicksort_time = get_cycle() - quicksort_time;
   printf("sorted=%s\n"
-	 "quicksort_time=%" PRIu64 "\n",
+	 "quicksort_time:%" PRIu64 "\n",
 	 data_vec_is_sorted(vec, len)?"true":"false",
 	 quicksort_time);
   free(vec);
diff --git a/test/monniaux/sha-2/make.proto b/test/monniaux/sha-2/make.proto
index e96fee7d..f776565e 100644
--- a/test/monniaux/sha-2/make.proto
+++ b/test/monniaux/sha-2/make.proto
@@ -1,2 +1,3 @@
 objdeps: [{name: sha-256_run, compiler: gcc}]
 target: sha-256
+measures: ["total cycles"]
diff --git a/test/monniaux/sha-2/sha-256_run.c b/test/monniaux/sha-2/sha-256_run.c
index c3865991..05a69d6b 100644
--- a/test/monniaux/sha-2/sha-256_run.c
+++ b/test/monniaux/sha-2/sha-256_run.c
@@ -280,6 +280,6 @@ int main(void)
 		}
 	}
 	destruct_binary_messages();
-	printf("total cycles = %" PRIu64 "\n", cycle_total);
+	printf("total cycles : %" PRIu64 "\n", cycle_total);
 	return 0;
 }
diff --git a/test/monniaux/tacle-bench-lift/make.proto b/test/monniaux/tacle-bench-lift/make.proto
index 58dd5c39..c4849bab 100644
--- a/test/monniaux/tacle-bench-lift/make.proto
+++ b/test/monniaux/tacle-bench-lift/make.proto
@@ -1,3 +1,4 @@
 intro: "ALL_CFLAGS = -include kill_pragma.h"
 objdeps: [{name: liftlibcontrol, compiler: both}, {name: liftlibio, compiler: both}]
 target: lift
+measures: [cycles]
diff --git a/test/monniaux/tacle-bench-powerwindow/make.proto b/test/monniaux/tacle-bench-powerwindow/make.proto
index 3d1ad1e5..21e07941 100644
--- a/test/monniaux/tacle-bench-powerwindow/make.proto
+++ b/test/monniaux/tacle-bench-powerwindow/make.proto
@@ -5,3 +5,4 @@ objdeps: [{name: powerwindow_const_params, compiler: both}, {name: powerwindow_c
           {name: powerwindow_PW_Control_PSG_BackL, compiler: both}, {name: powerwindow_PW_Control_PSG_BackR, compiler: both},
           {name: powerwindow_PW_Control_PSG_Front, compiler: both}]
 target: powerwindow
+measures: [cycles]
diff --git a/test/monniaux/ternary/make.proto b/test/monniaux/ternary/make.proto
index c5219f1c..1568ed07 100644
--- a/test/monniaux/ternary/make.proto
+++ b/test/monniaux/ternary/make.proto
@@ -1 +1,2 @@
 target: ternary
+measures: [cycles]
diff --git a/test/monniaux/ternary/ternary.c b/test/monniaux/ternary/ternary.c
index ed7de156..e8813a5c 100644
--- a/test/monniaux/ternary/ternary.c
+++ b/test/monniaux/ternary/ternary.c
@@ -19,6 +19,6 @@ int main() {
   clock_start();
   data result = silly_computation();
   clock_stop();
-  printf("result=%" PRIu32 "\ncycles=%" PRIu64 "\n", result, get_total_clock());
+  printf("result=%" PRIu32 "\ncycles:%" PRIu64 "\n", result, get_total_clock());
   return 0;
 }
diff --git a/test/monniaux/too_slow/make.proto b/test/monniaux/too_slow/make.proto
index a7b0b37d..0635cdd9 100644
--- a/test/monniaux/too_slow/make.proto
+++ b/test/monniaux/too_slow/make.proto
@@ -1 +1,2 @@
 target: memset_from_bitsliced-aes
+measures: [cycles]
-- 
cgit