picosat now uses the same Makefile system as the rest

we are 27% slower than gcc

3 files changed, 49 insertions, 3 deletions

diff --git a/test/monniaux/picosat-965/Makefile b/test/monniaux/picosat-965/Makefile
new file mode 100644
index 00000000..d2f7689a
--- /dev/null
+++ b/test/monniaux/picosat-965/Makefile
@@ -0,0 +1,28 @@
+EXECUTE_ARGS=sudoku.sat
+
+include ../rules.mk
+
+EMBEDDED_CFLAGS = -DNALARM -DNZIP -DNGETRUSAGE
+K1C_CFLAGS += $(EMBEDDED_CFLAGS)
+K1C_CCOMPFLAGS += $(EMBEDDED_CFLAGS)
+CCOMPFLAGS += -fbitfields
+K1C_CCOMPFLAGS += -fbitfields
+
+all: picosat.ccomp.k1c.s version.ccomp.k1c.s app.ccomp.k1c.s main.ccomp.k1c.s picosat.gcc.k1c.s version.gcc.k1c.s app.gcc.k1c.s main.gcc.k1c.s picosat.ccomp.k1c.out picosat.gcc.k1c.out picosat.ccomp.host.out picosat.gcc.host.out
+
+picosat.ccomp.k1c : picosat.ccomp.k1c.s version.ccomp.k1c.s app.ccomp.k1c.s main.ccomp.k1c.s ../clock.gcc.k1c.o
+	$(K1C_CCOMP) $(K1C_CCOMPFLAGS) $+ -o $@
+
+picosat.gcc.k1c : picosat.gcc.k1c.s version.gcc.k1c.s app.gcc.k1c.s main.gcc.k1c.s ../clock.gcc.k1c.o
+	$(K1C_CC) $(K1C_CFLAGS) $+ -o $@
+
+picosat.ccomp.host : picosat.ccomp.host.s version.ccomp.host.s app.ccomp.host.s main.ccomp.host.s ../clock.gcc.host.o
+	$(CCOMP) $(CCOMPFLAGS) $+ -o $@
+
+picosat.gcc.host : picosat.gcc.host.s version.gcc.host.s app.gcc.host.s main.gcc.host.s ../clock.gcc.host.o
+	$(CC) $(FLAGS) $+ -o $@
+
+clean:
+	-rm -f *.s *.k1c *.out
+
+.PHONY: clean
diff --git a/test/monniaux/picosat-965/app.c b/test/monniaux/picosat-965/app.c
index d817cf21..64ebdbd0 100644
--- a/test/monniaux/picosat-965/app.c
+++ b/test/monniaux/picosat-965/app.c
@@ -12,7 +12,7 @@
 #define BUNZIP2 "bzcat %s"
 #define GZIP "gzip -c -f > %s"
 
-#if 0
+#ifndef NZIP
 FILE * popen (const char *, const char*);
 int pclose (FILE *);
 #endif
@@ -542,7 +542,7 @@ picosat_main (int argc, char **argv)
   unsigned seed;
   FILE *file;
   int trace;
-
+  
   start_time = picosat_time_stamp ();
 
   sargc = argc;
diff --git a/test/monniaux/picosat-965/main.c b/test/monniaux/picosat-965/main.c
index 03fad79f..13d7b0e5 100644
--- a/test/monniaux/picosat-965/main.c
+++ b/test/monniaux/picosat-965/main.c
@@ -1,7 +1,25 @@
+#define VERIMAG_MEASUREMENTS
+#ifdef VERIMAG_MEASUREMENTS
+#include "../clock.h"
+#endif
+
 int picosat_main (int, char **);
 
 int
 main (int argc, char **argv)
 {
-  return picosat_main (argc, argv);
+
+#ifdef VERIMAG_MEASUREMENTS
+  clock_prepare();
+  clock_start();
+#endif
+
+  int ret= picosat_main (argc, argv);
+
+#ifdef VERIMAG_MEASUREMENTS
+  clock_stop();
+  print_total_clock();
+#endif
+
+  return ret;
 }