From f76a183550b2eb9ceb87d947ef7418a57b1b349f Mon Sep 17 00:00:00 2001
From: David Monniaux <david.monniaux@univ-grenoble-alpes.fr>
Date: Sun, 10 Mar 2019 22:04:28 +0100
Subject: complex numbers attempt

---
 test/monniaux/complex/complex.c | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 test/monniaux/complex/complex.c

(limited to 'test/monniaux/complex')

diff --git a/test/monniaux/complex/complex.c b/test/monniaux/complex/complex.c
new file mode 100644
index 00000000..77fa13da
--- /dev/null
+++ b/test/monniaux/complex/complex.c
@@ -0,0 +1,22 @@
+#include <stdio.h>
+
+typedef struct {
+  double re, im;
+} complex_double;
+
+static inline void add_complex_double(complex_double *r,
+				      const complex_double *x,
+				      const complex_double *y) {
+  double re = x->re + y->re;
+  double im = x->im + y->im;
+  r->re = re;
+  r->im = im;
+}
+
+int main() {
+  complex_double a = { 1, 2 };
+  complex_double b = { 7, 4 };
+  complex_double r;
+  add_complex_double(&r, &a, &b);
+  printf("%g %g\n", r.re, r.im);
+}
-- 
cgit 


From b0812f6f17e6943dee4743245befb20a3dc719f6 Mon Sep 17 00:00:00 2001
From: David Monniaux <david.monniaux@univ-grenoble-alpes.fr>
Date: Mon, 11 Mar 2019 22:04:50 +0100
Subject: some more about complex numbers

---
 test/monniaux/complex/complex.c | 57 +++++++++++++++++++++++++++++++++++------
 1 file changed, 49 insertions(+), 8 deletions(-)

(limited to 'test/monniaux/complex')

diff --git a/test/monniaux/complex/complex.c b/test/monniaux/complex/complex.c
index 77fa13da..536c321b 100644
--- a/test/monniaux/complex/complex.c
+++ b/test/monniaux/complex/complex.c
@@ -2,21 +2,62 @@
 
 typedef struct {
   double re, im;
-} complex_double;
+} COMPLEX;
 
-static inline void add_complex_double(complex_double *r,
-				      const complex_double *x,
-				      const complex_double *y) {
+static inline void COMPLEX_zero(COMPLEX *r) {
+  r->re = r->im = 0.0;
+}
+
+static inline void COMPLEX_add(COMPLEX *r,
+				      const COMPLEX *x,
+				      const COMPLEX *y) {
   double re = x->re + y->re;
   double im = x->im + y->im;
   r->re = re;
   r->im = im;
 }
 
+static inline void COMPLEX_mul(COMPLEX *r,
+				      const COMPLEX *x,
+				      const COMPLEX *y) {
+  double re = x->re * y->re - x->im * y->im;
+  double im = x->im * y->re + x->re * y->im;
+  r->re = re;
+  r->im = im;
+}
+
+static inline void COMPLEX_mul_add(COMPLEX *r,
+				      const COMPLEX *x,
+				      const COMPLEX *y) {
+  double re = r->re + x->re * y->re - x->im * y->im;
+  double im = r->im + x->im * y->re + x->re * y->im;
+  r->re = re;
+  r->im = im;
+}
+
+
+void COMPLEX_mat_mul1(unsigned m, unsigned n, unsigned p,
+		     COMPLEX * restrict c, unsigned stride_c,
+		     const COMPLEX *a, unsigned stride_a,
+		     const COMPLEX *b, unsigned stride_b) {
+  for(unsigned i=0; i<m; i++) {
+    for(unsigned k=0; k<p; k++) {
+      COMPLEX_zero(c+i*stride_c+k);
+    }
+  }
+  for(unsigned i=0; i<m; i++) {
+    for(unsigned k=0; k<p; k++) {
+      for(unsigned j=0; j<n; j++) {
+	COMPLEX_mul_add(c+i*stride_c+k, a+i*stride_a+j, b+j*stride_b+k); 
+      }
+    }
+  }
+}
+
 int main() {
-  complex_double a = { 1, 2 };
-  complex_double b = { 7, 4 };
-  complex_double r;
-  add_complex_double(&r, &a, &b);
+  COMPLEX a = { 1, 2 };
+  COMPLEX b = { 7, 4 };
+  COMPLEX r;
+  COMPLEX_mul(&r, &a, &b);
   printf("%g %g\n", r.re, r.im);
 }
-- 
cgit 


From 549e1f93c95e06d796bdd15ca0cf24c0a0128e70 Mon Sep 17 00:00:00 2001
From: David Monniaux <david.monniaux@univ-grenoble-alpes.fr>
Date: Tue, 12 Mar 2019 06:24:50 +0100
Subject: some more work on complex matrices

---
 test/monniaux/complex/complex.c | 203 ++++++++++++++++++++++++++++++++++++++--
 1 file changed, 195 insertions(+), 8 deletions(-)

(limited to 'test/monniaux/complex')

diff --git a/test/monniaux/complex/complex.c b/test/monniaux/complex/complex.c
index 536c321b..0b806b24 100644
--- a/test/monniaux/complex/complex.c
+++ b/test/monniaux/complex/complex.c
@@ -1,7 +1,13 @@
 #include <stdio.h>
+#include <stdbool.h>
+#include <stdlib.h>
+#include <inttypes.h>
+#include "../clock.h"
+
+typedef double REAL;
 
 typedef struct {
-  double re, im;
+  REAL re, im;
 } COMPLEX;
 
 static inline void COMPLEX_zero(COMPLEX *r) {
@@ -26,7 +32,7 @@ static inline void COMPLEX_mul(COMPLEX *r,
   r->im = im;
 }
 
-static inline void COMPLEX_mul_add(COMPLEX *r,
+static inline void COMPLEX_mul_addto(COMPLEX *r,
 				      const COMPLEX *x,
 				      const COMPLEX *y) {
   double re = r->re + x->re * y->re - x->im * y->im;
@@ -35,6 +41,17 @@ static inline void COMPLEX_mul_add(COMPLEX *r,
   r->im = im;
 }
 
+#define MACRO_COMPLEX_mul_addto(r, x, y) \
+  { \
+    double rre=(r).re, rim=(r).im, \
+           xre = (x).re, xim=(x).im, \
+           yre = (y).re, yim = (y).im; \
+    double re = rre + xre * yre - xim * yim; \
+    double im = rim + xim * yre + xre * yim; \
+    r.re = re; \
+    r.im = im; \
+  }
+
 
 void COMPLEX_mat_mul1(unsigned m, unsigned n, unsigned p,
 		     COMPLEX * restrict c, unsigned stride_c,
@@ -48,16 +65,186 @@ void COMPLEX_mat_mul1(unsigned m, unsigned n, unsigned p,
   for(unsigned i=0; i<m; i++) {
     for(unsigned k=0; k<p; k++) {
       for(unsigned j=0; j<n; j++) {
-	COMPLEX_mul_add(c+i*stride_c+k, a+i*stride_a+j, b+j*stride_b+k); 
+	COMPLEX_mul_addto(c+i*stride_c+k, a+i*stride_a+j, b+j*stride_b+k); 
+      }
+    }
+  }
+}
+
+#define UNROLL 4
+
+#undef CHUNK
+#define CHUNK \
+  COMPLEX_mul_addto(&total, pa_i_j, pb_j_k);				\
+  pa_i_j ++;								\
+  pb_j_k = (COMPLEX*) ((char*) pb_j_k + stride_b_scaled);
+
+void COMPLEX_mat_mul8(unsigned m, unsigned n, unsigned p,
+		     COMPLEX * c, unsigned stride_c,
+		     const COMPLEX *a, unsigned stride_a,
+		     const COMPLEX *b, unsigned stride_b) {
+  const COMPLEX *pa_i = a;
+  COMPLEX * pc_i = c;
+  size_t stride_b_scaled = sizeof(COMPLEX) * stride_b;
+  for(unsigned i=0; i<m; i++) {
+    for(unsigned k=0; k<p; k++) {
+      const COMPLEX *pb_j_k = b+k, *pa_i_j = pa_i;
+      COMPLEX total;
+      COMPLEX_zero(&total);
+      {
+	unsigned j4=0, n4=n/UNROLL;
+	if (n4 > 0) {
+	  do {
+            CHUNK
+	    CHUNK
+	    CHUNK
+	    CHUNK
+	    j4++;
+	  } while (j4 < n4);
+	}
+      }
+      {
+	unsigned j4=0, n4=n%UNROLL;
+	if (n4 > 0) {
+	  do {
+	    CHUNK
+	    j4++;
+	  } while (j4 < n4);
+	}
+      }
+      pc_i[k] = total;
+    }
+    pa_i += stride_a;
+    pc_i += stride_c;
+  }
+}
+
+#undef CHUNK
+#define CHUNK \
+  MACRO_COMPLEX_mul_addto(total, *pa_i_j, *pb_j_k)	       		\
+  pa_i_j ++;								\
+  pb_j_k = (COMPLEX*) ((char*) pb_j_k + stride_b_scaled);
+
+void COMPLEX_mat_mul9(unsigned m, unsigned n, unsigned p,
+		     COMPLEX * c, unsigned stride_c,
+		     const COMPLEX *a, unsigned stride_a,
+		     const COMPLEX *b, unsigned stride_b) {
+  const COMPLEX *pa_i = a;
+  COMPLEX * pc_i = c;
+  size_t stride_b_scaled = sizeof(COMPLEX) * stride_b;
+  for(unsigned i=0; i<m; i++) {
+    for(unsigned k=0; k<p; k++) {
+      const COMPLEX *pb_j_k = b+k, *pa_i_j = pa_i;
+      COMPLEX total;
+      COMPLEX_zero(&total);
+      {
+	unsigned j4=0, n4=n/UNROLL;
+	if (n4 > 0) {
+	  do {
+            CHUNK
+	    CHUNK
+	    CHUNK
+	    CHUNK
+	    j4++;
+	  } while (j4 < n4);
+	}
+      }
+      {
+	unsigned j4=0, n4=n%UNROLL;
+	if (n4 > 0) {
+	  do {
+	    CHUNK
+	    j4++;
+	  } while (j4 < n4);
+	}
       }
+      pc_i[k] = total;
     }
+    pa_i += stride_a;
+    pc_i += stride_c;
   }
 }
 
+bool COMPLEX_equal(const COMPLEX *a,
+		   const COMPLEX *b) {
+  return a->re==b->re && a->im==b->im;
+}
+
+bool COMPLEX_mat_equal(unsigned m,
+		      unsigned n,
+		      const COMPLEX *a, unsigned stride_a,
+		      const COMPLEX *b, unsigned stride_b) {
+  for(unsigned i=0; i<m; i++) {
+    for(unsigned j=0; j<n; j++) {
+      if (! COMPLEX_equal(a+i*stride_a + j, b+i*stride_b + j)) {
+	printf("at %u,%u: (%g,%g) vs (%g,%g)\n", i, j,
+	       a[i*stride_a + j].re, a[i*stride_a + j].im,
+	       b[i*stride_b + j].re, b[i*stride_b + j].im);
+	return false;
+      }
+    }
+  }
+  return true;
+}
+
+REAL REAL_random(void) {
+  static uint64_t next = 1325997111;
+  next = next * 1103515249 + 12345;
+  return next % 1000;
+}
+
+void COMPLEX_mat_random(unsigned m,
+		       unsigned n,
+		       COMPLEX *a, unsigned stride_a) {
+  for(unsigned i=0; i<m; i++) {
+    for(unsigned j=0; j<n; j++) {
+      a[i*stride_a + j].re = REAL_random();
+      a[i*stride_a + j].im = REAL_random();
+    }
+  }
+}
+
+
 int main() {
-  COMPLEX a = { 1, 2 };
-  COMPLEX b = { 7, 4 };
-  COMPLEX r;
-  COMPLEX_mul(&r, &a, &b);
-  printf("%g %g\n", r.re, r.im);
+    const unsigned m = 60, n = 31, p = 50;
+  clock_prepare();
+  COMPLEX *a = malloc(sizeof(COMPLEX) * m * n);
+  COMPLEX_mat_random(m, n, a, n);
+  COMPLEX *b = malloc(sizeof(COMPLEX) * n * p);
+  COMPLEX_mat_random(n, p, b, p);
+  
+  COMPLEX *c1 = malloc(sizeof(COMPLEX) * m * p);
+  cycle_t c1_time = get_current_cycle();
+  COMPLEX_mat_mul1(m, n, p, c1, p, a, n, b, p);
+  c1_time = get_current_cycle()-c1_time;
+    
+  COMPLEX *c8 = malloc(sizeof(COMPLEX) * m * p);
+  cycle_t c8_time = get_current_cycle();
+  COMPLEX_mat_mul8(m, n, p, c8, p, a, n, b, p);
+  c8_time = get_current_cycle()-c8_time;
+    
+  COMPLEX *c9 = malloc(sizeof(COMPLEX) * m * p);
+  cycle_t c9_time = get_current_cycle();
+  COMPLEX_mat_mul9(m, n, p, c9, p, a, n, b, p);
+  c9_time = get_current_cycle()-c9_time;
+  
+  printf("c1==c8: %s\n"
+	 "c1==c9: %s\n"
+	 "c1_time = %" PRIu64 "\n"
+	 "c8_time = %" PRIu64 "\n"
+	 "c9_time = %" PRIu64 "\n",
+	
+	 COMPLEX_mat_equal(m, n, c1, p, c8, p)?"true":"false",
+	 COMPLEX_mat_equal(m, n, c1, p, c9, p)?"true":"false",
+	 
+	 c1_time,
+	 c8_time,
+	 c9_time);
+  
+  free(a);
+  free(b);
+  free(c1);
+  free(c8);
+  free(c9);
+  return 0;
 }
-- 
cgit 


From ef0f2126756c5a019254431a68e4efedeccf4f3e Mon Sep 17 00:00:00 2001
From: David Monniaux <david.monniaux@univ-grenoble-alpes.fr>
Date: Tue, 12 Mar 2019 06:38:11 +0100
Subject: some more optimized complex matrix

---
 test/monniaux/complex/complex.c | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

(limited to 'test/monniaux/complex')

diff --git a/test/monniaux/complex/complex.c b/test/monniaux/complex/complex.c
index 0b806b24..6c7dae1d 100644
--- a/test/monniaux/complex/complex.c
+++ b/test/monniaux/complex/complex.c
@@ -41,15 +41,12 @@ static inline void COMPLEX_mul_addto(COMPLEX *r,
   r->im = im;
 }
 
-#define MACRO_COMPLEX_mul_addto(r, x, y) \
+#define MACRO_COMPLEX_mul_addto(rre, rim, x, y)	\
   { \
-    double rre=(r).re, rim=(r).im, \
-           xre = (x).re, xim=(x).im, \
-           yre = (y).re, yim = (y).im; \
-    double re = rre + xre * yre - xim * yim; \
-    double im = rim + xim * yre + xre * yim; \
-    r.re = re; \
-    r.im = im; \
+    double xre = (x).re, xim=(x).im, \
+           yre = (y).re, yim=(y).im; \
+    (rre) += xre * yre - xim * yim; \
+    (rim) += xim * yre + xre * yim; \
   }
 
 
@@ -121,7 +118,7 @@ void COMPLEX_mat_mul8(unsigned m, unsigned n, unsigned p,
 
 #undef CHUNK
 #define CHUNK \
-  MACRO_COMPLEX_mul_addto(total, *pa_i_j, *pb_j_k)	       		\
+  MACRO_COMPLEX_mul_addto(totalre, totalim, *pa_i_j, *pb_j_k)	      	\
   pa_i_j ++;								\
   pb_j_k = (COMPLEX*) ((char*) pb_j_k + stride_b_scaled);
 
@@ -135,8 +132,7 @@ void COMPLEX_mat_mul9(unsigned m, unsigned n, unsigned p,
   for(unsigned i=0; i<m; i++) {
     for(unsigned k=0; k<p; k++) {
       const COMPLEX *pb_j_k = b+k, *pa_i_j = pa_i;
-      COMPLEX total;
-      COMPLEX_zero(&total);
+      REAL totalre=0.0, totalim=0.0;
       {
 	unsigned j4=0, n4=n/UNROLL;
 	if (n4 > 0) {
@@ -158,7 +154,8 @@ void COMPLEX_mat_mul9(unsigned m, unsigned n, unsigned p,
 	  } while (j4 < n4);
 	}
       }
-      pc_i[k] = total;
+      pc_i[k].re = totalre;
+      pc_i[k].im = totalim;
     }
     pa_i += stride_a;
     pc_i += stride_c;
-- 
cgit 


From a64e80432cf2222a84503f4202c04cfdbf705d27 Mon Sep 17 00:00:00 2001
From: David Monniaux <david.monniaux@univ-grenoble-alpes.fr>
Date: Tue, 12 Mar 2019 09:45:02 +0100
Subject: et hop un Makefile pour les matrices complexes

---
 test/monniaux/complex/Makefile      |  12 ++
 test/monniaux/complex/complex.c     | 247 ------------------------------------
 test/monniaux/complex/complex_mat.c | 247 ++++++++++++++++++++++++++++++++++++
 3 files changed, 259 insertions(+), 247 deletions(-)
 create mode 100644 test/monniaux/complex/Makefile
 delete mode 100644 test/monniaux/complex/complex.c
 create mode 100644 test/monniaux/complex/complex_mat.c

(limited to 'test/monniaux/complex')

diff --git a/test/monniaux/complex/Makefile b/test/monniaux/complex/Makefile
new file mode 100644
index 00000000..1c701783
--- /dev/null
+++ b/test/monniaux/complex/Makefile
@@ -0,0 +1,12 @@
+include ../rules.mk
+
+PRODUCTS=complex_mat.gcc.host.out complex_mat.ccomp.host.out \
+	complex_mat.gcc.k1c.out complex_mat.ccomp.k1c.out \
+	complex_mat.gcc.k1c.s complex_mat.ccomp.k1c.s
+
+all:	$(PRODUCTS)
+
+complex_mat.gcc.host.s complex_mat.ccomp.host.s complex_mat.gcc.k1c.s complex_mat.ccomp.k1c.s : ../clock.h
+
+complex_mat.gcc.host complex_mat.ccomp.host : ../clock.gcc.host.o
+complex_mat.gcc.k1c complex_mat.ccomp.k1c : ../clock.gcc.k1c.o
diff --git a/test/monniaux/complex/complex.c b/test/monniaux/complex/complex.c
deleted file mode 100644
index 6c7dae1d..00000000
--- a/test/monniaux/complex/complex.c
+++ /dev/null
@@ -1,247 +0,0 @@
-#include <stdio.h>
-#include <stdbool.h>
-#include <stdlib.h>
-#include <inttypes.h>
-#include "../clock.h"
-
-typedef double REAL;
-
-typedef struct {
-  REAL re, im;
-} COMPLEX;
-
-static inline void COMPLEX_zero(COMPLEX *r) {
-  r->re = r->im = 0.0;
-}
-
-static inline void COMPLEX_add(COMPLEX *r,
-				      const COMPLEX *x,
-				      const COMPLEX *y) {
-  double re = x->re + y->re;
-  double im = x->im + y->im;
-  r->re = re;
-  r->im = im;
-}
-
-static inline void COMPLEX_mul(COMPLEX *r,
-				      const COMPLEX *x,
-				      const COMPLEX *y) {
-  double re = x->re * y->re - x->im * y->im;
-  double im = x->im * y->re + x->re * y->im;
-  r->re = re;
-  r->im = im;
-}
-
-static inline void COMPLEX_mul_addto(COMPLEX *r,
-				      const COMPLEX *x,
-				      const COMPLEX *y) {
-  double re = r->re + x->re * y->re - x->im * y->im;
-  double im = r->im + x->im * y->re + x->re * y->im;
-  r->re = re;
-  r->im = im;
-}
-
-#define MACRO_COMPLEX_mul_addto(rre, rim, x, y)	\
-  { \
-    double xre = (x).re, xim=(x).im, \
-           yre = (y).re, yim=(y).im; \
-    (rre) += xre * yre - xim * yim; \
-    (rim) += xim * yre + xre * yim; \
-  }
-
-
-void COMPLEX_mat_mul1(unsigned m, unsigned n, unsigned p,
-		     COMPLEX * restrict c, unsigned stride_c,
-		     const COMPLEX *a, unsigned stride_a,
-		     const COMPLEX *b, unsigned stride_b) {
-  for(unsigned i=0; i<m; i++) {
-    for(unsigned k=0; k<p; k++) {
-      COMPLEX_zero(c+i*stride_c+k);
-    }
-  }
-  for(unsigned i=0; i<m; i++) {
-    for(unsigned k=0; k<p; k++) {
-      for(unsigned j=0; j<n; j++) {
-	COMPLEX_mul_addto(c+i*stride_c+k, a+i*stride_a+j, b+j*stride_b+k); 
-      }
-    }
-  }
-}
-
-#define UNROLL 4
-
-#undef CHUNK
-#define CHUNK \
-  COMPLEX_mul_addto(&total, pa_i_j, pb_j_k);				\
-  pa_i_j ++;								\
-  pb_j_k = (COMPLEX*) ((char*) pb_j_k + stride_b_scaled);
-
-void COMPLEX_mat_mul8(unsigned m, unsigned n, unsigned p,
-		     COMPLEX * c, unsigned stride_c,
-		     const COMPLEX *a, unsigned stride_a,
-		     const COMPLEX *b, unsigned stride_b) {
-  const COMPLEX *pa_i = a;
-  COMPLEX * pc_i = c;
-  size_t stride_b_scaled = sizeof(COMPLEX) * stride_b;
-  for(unsigned i=0; i<m; i++) {
-    for(unsigned k=0; k<p; k++) {
-      const COMPLEX *pb_j_k = b+k, *pa_i_j = pa_i;
-      COMPLEX total;
-      COMPLEX_zero(&total);
-      {
-	unsigned j4=0, n4=n/UNROLL;
-	if (n4 > 0) {
-	  do {
-            CHUNK
-	    CHUNK
-	    CHUNK
-	    CHUNK
-	    j4++;
-	  } while (j4 < n4);
-	}
-      }
-      {
-	unsigned j4=0, n4=n%UNROLL;
-	if (n4 > 0) {
-	  do {
-	    CHUNK
-	    j4++;
-	  } while (j4 < n4);
-	}
-      }
-      pc_i[k] = total;
-    }
-    pa_i += stride_a;
-    pc_i += stride_c;
-  }
-}
-
-#undef CHUNK
-#define CHUNK \
-  MACRO_COMPLEX_mul_addto(totalre, totalim, *pa_i_j, *pb_j_k)	      	\
-  pa_i_j ++;								\
-  pb_j_k = (COMPLEX*) ((char*) pb_j_k + stride_b_scaled);
-
-void COMPLEX_mat_mul9(unsigned m, unsigned n, unsigned p,
-		     COMPLEX * c, unsigned stride_c,
-		     const COMPLEX *a, unsigned stride_a,
-		     const COMPLEX *b, unsigned stride_b) {
-  const COMPLEX *pa_i = a;
-  COMPLEX * pc_i = c;
-  size_t stride_b_scaled = sizeof(COMPLEX) * stride_b;
-  for(unsigned i=0; i<m; i++) {
-    for(unsigned k=0; k<p; k++) {
-      const COMPLEX *pb_j_k = b+k, *pa_i_j = pa_i;
-      REAL totalre=0.0, totalim=0.0;
-      {
-	unsigned j4=0, n4=n/UNROLL;
-	if (n4 > 0) {
-	  do {
-            CHUNK
-	    CHUNK
-	    CHUNK
-	    CHUNK
-	    j4++;
-	  } while (j4 < n4);
-	}
-      }
-      {
-	unsigned j4=0, n4=n%UNROLL;
-	if (n4 > 0) {
-	  do {
-	    CHUNK
-	    j4++;
-	  } while (j4 < n4);
-	}
-      }
-      pc_i[k].re = totalre;
-      pc_i[k].im = totalim;
-    }
-    pa_i += stride_a;
-    pc_i += stride_c;
-  }
-}
-
-bool COMPLEX_equal(const COMPLEX *a,
-		   const COMPLEX *b) {
-  return a->re==b->re && a->im==b->im;
-}
-
-bool COMPLEX_mat_equal(unsigned m,
-		      unsigned n,
-		      const COMPLEX *a, unsigned stride_a,
-		      const COMPLEX *b, unsigned stride_b) {
-  for(unsigned i=0; i<m; i++) {
-    for(unsigned j=0; j<n; j++) {
-      if (! COMPLEX_equal(a+i*stride_a + j, b+i*stride_b + j)) {
-	printf("at %u,%u: (%g,%g) vs (%g,%g)\n", i, j,
-	       a[i*stride_a + j].re, a[i*stride_a + j].im,
-	       b[i*stride_b + j].re, b[i*stride_b + j].im);
-	return false;
-      }
-    }
-  }
-  return true;
-}
-
-REAL REAL_random(void) {
-  static uint64_t next = 1325997111;
-  next = next * 1103515249 + 12345;
-  return next % 1000;
-}
-
-void COMPLEX_mat_random(unsigned m,
-		       unsigned n,
-		       COMPLEX *a, unsigned stride_a) {
-  for(unsigned i=0; i<m; i++) {
-    for(unsigned j=0; j<n; j++) {
-      a[i*stride_a + j].re = REAL_random();
-      a[i*stride_a + j].im = REAL_random();
-    }
-  }
-}
-
-
-int main() {
-    const unsigned m = 60, n = 31, p = 50;
-  clock_prepare();
-  COMPLEX *a = malloc(sizeof(COMPLEX) * m * n);
-  COMPLEX_mat_random(m, n, a, n);
-  COMPLEX *b = malloc(sizeof(COMPLEX) * n * p);
-  COMPLEX_mat_random(n, p, b, p);
-  
-  COMPLEX *c1 = malloc(sizeof(COMPLEX) * m * p);
-  cycle_t c1_time = get_current_cycle();
-  COMPLEX_mat_mul1(m, n, p, c1, p, a, n, b, p);
-  c1_time = get_current_cycle()-c1_time;
-    
-  COMPLEX *c8 = malloc(sizeof(COMPLEX) * m * p);
-  cycle_t c8_time = get_current_cycle();
-  COMPLEX_mat_mul8(m, n, p, c8, p, a, n, b, p);
-  c8_time = get_current_cycle()-c8_time;
-    
-  COMPLEX *c9 = malloc(sizeof(COMPLEX) * m * p);
-  cycle_t c9_time = get_current_cycle();
-  COMPLEX_mat_mul9(m, n, p, c9, p, a, n, b, p);
-  c9_time = get_current_cycle()-c9_time;
-  
-  printf("c1==c8: %s\n"
-	 "c1==c9: %s\n"
-	 "c1_time = %" PRIu64 "\n"
-	 "c8_time = %" PRIu64 "\n"
-	 "c9_time = %" PRIu64 "\n",
-	
-	 COMPLEX_mat_equal(m, n, c1, p, c8, p)?"true":"false",
-	 COMPLEX_mat_equal(m, n, c1, p, c9, p)?"true":"false",
-	 
-	 c1_time,
-	 c8_time,
-	 c9_time);
-  
-  free(a);
-  free(b);
-  free(c1);
-  free(c8);
-  free(c9);
-  return 0;
-}
diff --git a/test/monniaux/complex/complex_mat.c b/test/monniaux/complex/complex_mat.c
new file mode 100644
index 00000000..6c7dae1d
--- /dev/null
+++ b/test/monniaux/complex/complex_mat.c
@@ -0,0 +1,247 @@
+#include <stdio.h>
+#include <stdbool.h>
+#include <stdlib.h>
+#include <inttypes.h>
+#include "../clock.h"
+
+typedef double REAL;
+
+typedef struct {
+  REAL re, im;
+} COMPLEX;
+
+static inline void COMPLEX_zero(COMPLEX *r) {
+  r->re = r->im = 0.0;
+}
+
+static inline void COMPLEX_add(COMPLEX *r,
+				      const COMPLEX *x,
+				      const COMPLEX *y) {
+  double re = x->re + y->re;
+  double im = x->im + y->im;
+  r->re = re;
+  r->im = im;
+}
+
+static inline void COMPLEX_mul(COMPLEX *r,
+				      const COMPLEX *x,
+				      const COMPLEX *y) {
+  double re = x->re * y->re - x->im * y->im;
+  double im = x->im * y->re + x->re * y->im;
+  r->re = re;
+  r->im = im;
+}
+
+static inline void COMPLEX_mul_addto(COMPLEX *r,
+				      const COMPLEX *x,
+				      const COMPLEX *y) {
+  double re = r->re + x->re * y->re - x->im * y->im;
+  double im = r->im + x->im * y->re + x->re * y->im;
+  r->re = re;
+  r->im = im;
+}
+
+#define MACRO_COMPLEX_mul_addto(rre, rim, x, y)	\
+  { \
+    double xre = (x).re, xim=(x).im, \
+           yre = (y).re, yim=(y).im; \
+    (rre) += xre * yre - xim * yim; \
+    (rim) += xim * yre + xre * yim; \
+  }
+
+
+void COMPLEX_mat_mul1(unsigned m, unsigned n, unsigned p,
+		     COMPLEX * restrict c, unsigned stride_c,
+		     const COMPLEX *a, unsigned stride_a,
+		     const COMPLEX *b, unsigned stride_b) {
+  for(unsigned i=0; i<m; i++) {
+    for(unsigned k=0; k<p; k++) {
+      COMPLEX_zero(c+i*stride_c+k);
+    }
+  }
+  for(unsigned i=0; i<m; i++) {
+    for(unsigned k=0; k<p; k++) {
+      for(unsigned j=0; j<n; j++) {
+	COMPLEX_mul_addto(c+i*stride_c+k, a+i*stride_a+j, b+j*stride_b+k); 
+      }
+    }
+  }
+}
+
+#define UNROLL 4
+
+#undef CHUNK
+#define CHUNK \
+  COMPLEX_mul_addto(&total, pa_i_j, pb_j_k);				\
+  pa_i_j ++;								\
+  pb_j_k = (COMPLEX*) ((char*) pb_j_k + stride_b_scaled);
+
+void COMPLEX_mat_mul8(unsigned m, unsigned n, unsigned p,
+		     COMPLEX * c, unsigned stride_c,
+		     const COMPLEX *a, unsigned stride_a,
+		     const COMPLEX *b, unsigned stride_b) {
+  const COMPLEX *pa_i = a;
+  COMPLEX * pc_i = c;
+  size_t stride_b_scaled = sizeof(COMPLEX) * stride_b;
+  for(unsigned i=0; i<m; i++) {
+    for(unsigned k=0; k<p; k++) {
+      const COMPLEX *pb_j_k = b+k, *pa_i_j = pa_i;
+      COMPLEX total;
+      COMPLEX_zero(&total);
+      {
+	unsigned j4=0, n4=n/UNROLL;
+	if (n4 > 0) {
+	  do {
+            CHUNK
+	    CHUNK
+	    CHUNK
+	    CHUNK
+	    j4++;
+	  } while (j4 < n4);
+	}
+      }
+      {
+	unsigned j4=0, n4=n%UNROLL;
+	if (n4 > 0) {
+	  do {
+	    CHUNK
+	    j4++;
+	  } while (j4 < n4);
+	}
+      }
+      pc_i[k] = total;
+    }
+    pa_i += stride_a;
+    pc_i += stride_c;
+  }
+}
+
+#undef CHUNK
+#define CHUNK \
+  MACRO_COMPLEX_mul_addto(totalre, totalim, *pa_i_j, *pb_j_k)	      	\
+  pa_i_j ++;								\
+  pb_j_k = (COMPLEX*) ((char*) pb_j_k + stride_b_scaled);
+
+void COMPLEX_mat_mul9(unsigned m, unsigned n, unsigned p,
+		     COMPLEX * c, unsigned stride_c,
+		     const COMPLEX *a, unsigned stride_a,
+		     const COMPLEX *b, unsigned stride_b) {
+  const COMPLEX *pa_i = a;
+  COMPLEX * pc_i = c;
+  size_t stride_b_scaled = sizeof(COMPLEX) * stride_b;
+  for(unsigned i=0; i<m; i++) {
+    for(unsigned k=0; k<p; k++) {
+      const COMPLEX *pb_j_k = b+k, *pa_i_j = pa_i;
+      REAL totalre=0.0, totalim=0.0;
+      {
+	unsigned j4=0, n4=n/UNROLL;
+	if (n4 > 0) {
+	  do {
+            CHUNK
+	    CHUNK
+	    CHUNK
+	    CHUNK
+	    j4++;
+	  } while (j4 < n4);
+	}
+      }
+      {
+	unsigned j4=0, n4=n%UNROLL;
+	if (n4 > 0) {
+	  do {
+	    CHUNK
+	    j4++;
+	  } while (j4 < n4);
+	}
+      }
+      pc_i[k].re = totalre;
+      pc_i[k].im = totalim;
+    }
+    pa_i += stride_a;
+    pc_i += stride_c;
+  }
+}
+
+bool COMPLEX_equal(const COMPLEX *a,
+		   const COMPLEX *b) {
+  return a->re==b->re && a->im==b->im;
+}
+
+bool COMPLEX_mat_equal(unsigned m,
+		      unsigned n,
+		      const COMPLEX *a, unsigned stride_a,
+		      const COMPLEX *b, unsigned stride_b) {
+  for(unsigned i=0; i<m; i++) {
+    for(unsigned j=0; j<n; j++) {
+      if (! COMPLEX_equal(a+i*stride_a + j, b+i*stride_b + j)) {
+	printf("at %u,%u: (%g,%g) vs (%g,%g)\n", i, j,
+	       a[i*stride_a + j].re, a[i*stride_a + j].im,
+	       b[i*stride_b + j].re, b[i*stride_b + j].im);
+	return false;
+      }
+    }
+  }
+  return true;
+}
+
+REAL REAL_random(void) {
+  static uint64_t next = 1325997111;
+  next = next * 1103515249 + 12345;
+  return next % 1000;
+}
+
+void COMPLEX_mat_random(unsigned m,
+		       unsigned n,
+		       COMPLEX *a, unsigned stride_a) {
+  for(unsigned i=0; i<m; i++) {
+    for(unsigned j=0; j<n; j++) {
+      a[i*stride_a + j].re = REAL_random();
+      a[i*stride_a + j].im = REAL_random();
+    }
+  }
+}
+
+
+int main() {
+    const unsigned m = 60, n = 31, p = 50;
+  clock_prepare();
+  COMPLEX *a = malloc(sizeof(COMPLEX) * m * n);
+  COMPLEX_mat_random(m, n, a, n);
+  COMPLEX *b = malloc(sizeof(COMPLEX) * n * p);
+  COMPLEX_mat_random(n, p, b, p);
+  
+  COMPLEX *c1 = malloc(sizeof(COMPLEX) * m * p);
+  cycle_t c1_time = get_current_cycle();
+  COMPLEX_mat_mul1(m, n, p, c1, p, a, n, b, p);
+  c1_time = get_current_cycle()-c1_time;
+    
+  COMPLEX *c8 = malloc(sizeof(COMPLEX) * m * p);
+  cycle_t c8_time = get_current_cycle();
+  COMPLEX_mat_mul8(m, n, p, c8, p, a, n, b, p);
+  c8_time = get_current_cycle()-c8_time;
+    
+  COMPLEX *c9 = malloc(sizeof(COMPLEX) * m * p);
+  cycle_t c9_time = get_current_cycle();
+  COMPLEX_mat_mul9(m, n, p, c9, p, a, n, b, p);
+  c9_time = get_current_cycle()-c9_time;
+  
+  printf("c1==c8: %s\n"
+	 "c1==c9: %s\n"
+	 "c1_time = %" PRIu64 "\n"
+	 "c8_time = %" PRIu64 "\n"
+	 "c9_time = %" PRIu64 "\n",
+	
+	 COMPLEX_mat_equal(m, n, c1, p, c8, p)?"true":"false",
+	 COMPLEX_mat_equal(m, n, c1, p, c9, p)?"true":"false",
+	 
+	 c1_time,
+	 c8_time,
+	 c9_time);
+  
+  free(a);
+  free(b);
+  free(c1);
+  free(c8);
+  free(c9);
+  return 0;
+}
-- 
cgit 


From 0e6e9bd0f68c5f628510603221463ed6b9fa2d54 Mon Sep 17 00:00:00 2001
From: David Monniaux <david.monniaux@univ-grenoble-alpes.fr>
Date: Tue, 12 Mar 2019 13:41:33 +0100
Subject: better tracing for ILP + make clean

---
 test/monniaux/complex/Makefile | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'test/monniaux/complex')

diff --git a/test/monniaux/complex/Makefile b/test/monniaux/complex/Makefile
index 1c701783..c92f5211 100644
--- a/test/monniaux/complex/Makefile
+++ b/test/monniaux/complex/Makefile
@@ -10,3 +10,8 @@ complex_mat.gcc.host.s complex_mat.ccomp.host.s complex_mat.gcc.k1c.s complex_ma
 
 complex_mat.gcc.host complex_mat.ccomp.host : ../clock.gcc.host.o
 complex_mat.gcc.k1c complex_mat.ccomp.k1c : ../clock.gcc.k1c.o
+
+clean:
+	-rm -f *.o *.s *.k1c
+
+.PHONY: clean
-- 
cgit 


From 03f2891a533dccbd8e4b5ba58a734fee79f1dd06 Mon Sep 17 00:00:00 2001
From: David Monniaux <david.monniaux@univ-grenoble-alpes.fr>
Date: Thu, 14 Mar 2019 15:07:32 +0100
Subject: le Makefile passe

---
 test/monniaux/complex/Makefile | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'test/monniaux/complex')

diff --git a/test/monniaux/complex/Makefile b/test/monniaux/complex/Makefile
index c92f5211..b0dca135 100644
--- a/test/monniaux/complex/Makefile
+++ b/test/monniaux/complex/Makefile
@@ -8,8 +8,17 @@ all:	$(PRODUCTS)
 
 complex_mat.gcc.host.s complex_mat.ccomp.host.s complex_mat.gcc.k1c.s complex_mat.ccomp.k1c.s : ../clock.h
 
-complex_mat.gcc.host complex_mat.ccomp.host : ../clock.gcc.host.o
-complex_mat.gcc.k1c complex_mat.ccomp.k1c : ../clock.gcc.k1c.o
+complex_mat.ccomp.host: complex_mat.ccomp.host.o ../clock.gcc.host.o
+	$(CCOMP) $(CCOMPFLAGS) $+ -o $@
+
+complex_mat.gcc.host: complex_mat.gcc.host.o ../clock.gcc.host.o
+	$(CC) $(CFLAGS) $+ -o $@
+
+complex_mat.gcc.k1c: complex_mat.gcc.k1c.o ../clock.gcc.k1c.o
+	$(K1C_CC) $(K1C_CFLAGS) $+ -o $@
+
+complex_mat.ccomp.k1c: complex_mat.ccomp.k1c.o ../clock.gcc.k1c.o
+	$(K1C_CCOMP) $(K1C_CCOMPFLAGS) $+ -o $@
 
 clean:
 	-rm -f *.o *.s *.k1c
-- 
cgit 


From 24e97bd87918f2c487416744ba12a78aba35a9e5 Mon Sep 17 00:00:00 2001
From: Cyril SIX <cyril.six@kalray.eu>
Date: Fri, 26 Apr 2019 16:35:30 +0200
Subject: Changes to include a -O1 -fschedule-insns2 gcc run as well

---
 test/monniaux/complex/Makefile | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'test/monniaux/complex')

diff --git a/test/monniaux/complex/Makefile b/test/monniaux/complex/Makefile
index b0dca135..ca3d441b 100644
--- a/test/monniaux/complex/Makefile
+++ b/test/monniaux/complex/Makefile
@@ -1,7 +1,7 @@
 include ../rules.mk
 
 PRODUCTS=complex_mat.gcc.host.out complex_mat.ccomp.host.out \
-	complex_mat.gcc.k1c.out complex_mat.ccomp.k1c.out \
+	complex_mat.gcc.k1c.out complex_mat.gcc.o1.k1c.out complex_mat.ccomp.k1c.out \
 	complex_mat.gcc.k1c.s complex_mat.ccomp.k1c.s
 
 all:	$(PRODUCTS)
@@ -17,6 +17,9 @@ complex_mat.gcc.host: complex_mat.gcc.host.o ../clock.gcc.host.o
 complex_mat.gcc.k1c: complex_mat.gcc.k1c.o ../clock.gcc.k1c.o
 	$(K1C_CC) $(K1C_CFLAGS) $+ -o $@
 
+complex_mat.gcc.o1.k1c: complex_mat.gcc.o1.k1c.o ../clock.gcc.k1c.o
+	$(K1C_CC) $(K1C_CFLAGS_O1) $+ -o $@
+
 complex_mat.ccomp.k1c: complex_mat.ccomp.k1c.o ../clock.gcc.k1c.o
 	$(K1C_CCOMP) $(K1C_CCOMPFLAGS) $+ -o $@
 
-- 
cgit 


From 76abb605749d1b8ddcc842cecb258fa755d63ccf Mon Sep 17 00:00:00 2001
From: Cyril SIX <cyril.six@kalray.eu>
Date: Tue, 14 May 2019 18:01:28 +0200
Subject: Avancement sur la génération de Makefile des benchmarks
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 test/monniaux/complex/Makefile   | 29 -----------------------------
 test/monniaux/complex/make.proto |  1 +
 2 files changed, 1 insertion(+), 29 deletions(-)
 delete mode 100644 test/monniaux/complex/Makefile
 create mode 100644 test/monniaux/complex/make.proto

(limited to 'test/monniaux/complex')

diff --git a/test/monniaux/complex/Makefile b/test/monniaux/complex/Makefile
deleted file mode 100644
index ca3d441b..00000000
--- a/test/monniaux/complex/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-include ../rules.mk
-
-PRODUCTS=complex_mat.gcc.host.out complex_mat.ccomp.host.out \
-	complex_mat.gcc.k1c.out complex_mat.gcc.o1.k1c.out complex_mat.ccomp.k1c.out \
-	complex_mat.gcc.k1c.s complex_mat.ccomp.k1c.s
-
-all:	$(PRODUCTS)
-
-complex_mat.gcc.host.s complex_mat.ccomp.host.s complex_mat.gcc.k1c.s complex_mat.ccomp.k1c.s : ../clock.h
-
-complex_mat.ccomp.host: complex_mat.ccomp.host.o ../clock.gcc.host.o
-	$(CCOMP) $(CCOMPFLAGS) $+ -o $@
-
-complex_mat.gcc.host: complex_mat.gcc.host.o ../clock.gcc.host.o
-	$(CC) $(CFLAGS) $+ -o $@
-
-complex_mat.gcc.k1c: complex_mat.gcc.k1c.o ../clock.gcc.k1c.o
-	$(K1C_CC) $(K1C_CFLAGS) $+ -o $@
-
-complex_mat.gcc.o1.k1c: complex_mat.gcc.o1.k1c.o ../clock.gcc.k1c.o
-	$(K1C_CC) $(K1C_CFLAGS_O1) $+ -o $@
-
-complex_mat.ccomp.k1c: complex_mat.ccomp.k1c.o ../clock.gcc.k1c.o
-	$(K1C_CCOMP) $(K1C_CCOMPFLAGS) $+ -o $@
-
-clean:
-	-rm -f *.o *.s *.k1c
-
-.PHONY: clean
diff --git a/test/monniaux/complex/make.proto b/test/monniaux/complex/make.proto
new file mode 100644
index 00000000..b4d1222f
--- /dev/null
+++ b/test/monniaux/complex/make.proto
@@ -0,0 +1 @@
+target: complex_mat
-- 
cgit 


From c1e6f2db8e9e3589e6bdc463256cbc9c59906ae7 Mon Sep 17 00:00:00 2001
From: Cyril SIX <cyril.six@kalray.eu>
Date: Wed, 15 May 2019 16:11:26 +0200
Subject: Measures for bitslices-aes, bitsliced-tea and complex_mat

---
 test/monniaux/complex/complex_mat.c | 6 +++---
 test/monniaux/complex/make.proto    | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'test/monniaux/complex')

diff --git a/test/monniaux/complex/complex_mat.c b/test/monniaux/complex/complex_mat.c
index 6c7dae1d..b7103f60 100644
--- a/test/monniaux/complex/complex_mat.c
+++ b/test/monniaux/complex/complex_mat.c
@@ -227,9 +227,9 @@ int main() {
   
   printf("c1==c8: %s\n"
 	 "c1==c9: %s\n"
-	 "c1_time = %" PRIu64 "\n"
-	 "c8_time = %" PRIu64 "\n"
-	 "c9_time = %" PRIu64 "\n",
+	 "c1_time : %" PRIu64 "\n"
+	 "c8_time : %" PRIu64 "\n"
+	 "c9_time : %" PRIu64 "\n",
 	
 	 COMPLEX_mat_equal(m, n, c1, p, c8, p)?"true":"false",
 	 COMPLEX_mat_equal(m, n, c1, p, c9, p)?"true":"false",
diff --git a/test/monniaux/complex/make.proto b/test/monniaux/complex/make.proto
index b4d1222f..b959c611 100644
--- a/test/monniaux/complex/make.proto
+++ b/test/monniaux/complex/make.proto
@@ -1 +1,2 @@
 target: complex_mat
+measures: ["c1_time"]
-- 
cgit 


From 4f3b7c0d75fd90ac064419d19d7af2e340d516aa Mon Sep 17 00:00:00 2001
From: Cyril SIX <cyril.six@kalray.eu>
Date: Fri, 17 May 2019 12:03:18 +0200
Subject: Adding more measures

---
 test/monniaux/complex/make.proto | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'test/monniaux/complex')

diff --git a/test/monniaux/complex/make.proto b/test/monniaux/complex/make.proto
index b959c611..7041c6d8 100644
--- a/test/monniaux/complex/make.proto
+++ b/test/monniaux/complex/make.proto
@@ -1,2 +1,2 @@
 target: complex_mat
-measures: ["c1_time"]
+measures: [c1_time, c1]
-- 
cgit 


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 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'test/monniaux/complex')

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]]
-- 
cgit 


From 1aa0d92ddba4e017f1b8f9aebc1757a8ad77c0eb Mon Sep 17 00:00:00 2001
From: David Monniaux <david.monniaux@univ-grenoble-alpes.fr>
Date: Wed, 29 May 2019 23:24:45 +0200
Subject: take other measurements

---
 test/monniaux/complex/make.proto | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'test/monniaux/complex')

diff --git a/test/monniaux/complex/make.proto b/test/monniaux/complex/make.proto
index 8870f311..4c3eb019 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],[c9_time, c9]]
-- 
cgit 


From c1330c1f6863d4029bfa965b4151e629d72a2217 Mon Sep 17 00:00:00 2001
From: Cyril SIX <cyril.six@kalray.eu>
Date: Wed, 17 Jul 2019 11:52:14 +0200
Subject: Up to ntt

---
 test/monniaux/complex/Makefile   | 4 ++++
 test/monniaux/complex/make.proto | 2 --
 2 files changed, 4 insertions(+), 2 deletions(-)
 create mode 100644 test/monniaux/complex/Makefile
 delete mode 100644 test/monniaux/complex/make.proto

(limited to 'test/monniaux/complex')

diff --git a/test/monniaux/complex/Makefile b/test/monniaux/complex/Makefile
new file mode 100644
index 00000000..38c10eab
--- /dev/null
+++ b/test/monniaux/complex/Makefile
@@ -0,0 +1,4 @@
+TARGET=complex_mat
+MEASURES="c1 c8 c9"
+
+include ../rules.mk
diff --git a/test/monniaux/complex/make.proto b/test/monniaux/complex/make.proto
deleted file mode 100644
index 4c3eb019..00000000
--- a/test/monniaux/complex/make.proto
+++ /dev/null
@@ -1,2 +0,0 @@
-target: complex_mat
-measures: [[c1_time, c1],[c9_time, c9]]
-- 
cgit 


From b288b587378984c3c419d26a13dcf93686d1b779 Mon Sep 17 00:00:00 2001
From: Cyril SIX <cyril.six@kalray.eu>
Date: Wed, 17 Jul 2019 12:03:39 +0200
Subject: All working benches ported

---
 test/monniaux/complex/complex_mat.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'test/monniaux/complex')

diff --git a/test/monniaux/complex/complex_mat.c b/test/monniaux/complex/complex_mat.c
index b7103f60..9ce4fd23 100644
--- a/test/monniaux/complex/complex_mat.c
+++ b/test/monniaux/complex/complex_mat.c
@@ -227,9 +227,9 @@ int main() {
   
   printf("c1==c8: %s\n"
 	 "c1==c9: %s\n"
-	 "c1_time : %" PRIu64 "\n"
-	 "c8_time : %" PRIu64 "\n"
-	 "c9_time : %" PRIu64 "\n",
+	 "c1 : %" PRIu64 "\n"
+	 "c8 : %" PRIu64 "\n"
+	 "c9 : %" PRIu64 "\n",
 	
 	 COMPLEX_mat_equal(m, n, c1, p, c8, p)?"true":"false",
 	 COMPLEX_mat_equal(m, n, c1, p, c9, p)?"true":"false",
-- 
cgit 


From 1d7e934386fdb23f4e16f056e3d419be09ec0b02 Mon Sep 17 00:00:00 2001
From: Cyril SIX <cyril.six@kalray.eu>
Date: Wed, 17 Jul 2019 14:42:40 +0200
Subject: Portage réussi et complet
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 test/monniaux/complex/complex_mat.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'test/monniaux/complex')

diff --git a/test/monniaux/complex/complex_mat.c b/test/monniaux/complex/complex_mat.c
index 9ce4fd23..f39dccf0 100644
--- a/test/monniaux/complex/complex_mat.c
+++ b/test/monniaux/complex/complex_mat.c
@@ -227,9 +227,9 @@ int main() {
   
   printf("c1==c8: %s\n"
 	 "c1==c9: %s\n"
-	 "c1 : %" PRIu64 "\n"
-	 "c8 : %" PRIu64 "\n"
-	 "c9 : %" PRIu64 "\n",
+	 "c1 cycles: %" PRIu64 "\n"
+	 "c8 cycles: %" PRIu64 "\n"
+	 "c9 cycles: %" PRIu64 "\n",
 	
 	 COMPLEX_mat_equal(m, n, c1, p, c8, p)?"true":"false",
 	 COMPLEX_mat_equal(m, n, c1, p, c9, p)?"true":"false",
-- 
cgit