diff options
| -rw-r--r-- | test/monniaux/bitsliced-aes/Makefile.ccomp | 2 | ||||
| -rw-r--r-- | test/monniaux/clock.c | 5 | ||||
| -rw-r--r-- | test/monniaux/clock.h | 3 | ||||
| -rw-r--r-- | test/monniaux/crypto-algorithms/Makefile | 2 | ||||
| -rwxr-xr-x | test/monniaux/jpeg-6b/ccomp.sh | 2 | ||||
| -rw-r--r-- | test/monniaux/micro-bunzip/Makefile | 2 | ||||
| -rw-r--r-- | test/monniaux/mod_int_mat/int_mat.c | 2 | ||||
| -rwxr-xr-x | test/monniaux/picosat-965/dm_configure_ccomp.sh | 2 | ||||
| -rwxr-xr-x | test/monniaux/uzlib/compile.sh | 2 |
9 files changed, 14 insertions, 8 deletions
diff --git a/test/monniaux/bitsliced-aes/Makefile.ccomp b/test/monniaux/bitsliced-aes/Makefile.ccomp index 20e9428c..4a64c8bf 100644 --- a/test/monniaux/bitsliced-aes/Makefile.ccomp +++ b/test/monniaux/bitsliced-aes/Makefile.ccomp @@ -4,7 +4,7 @@ obj = $(src:.c=.o) LDFLAGS = -Wl,--gc-sections CFLAGS = -O3 -DUNROLL_TRANSPOSE -D_DEFAULT_SOURCE # CC=ccomp -CC=../../../ccomp -U __SIZEOF_INT128__ -U __SIZE_TYPE__ -D __SIZE_TYPE__='unsigned long long' +CC=../../../ccomp -U __SIZEOF_INT128__ name = bitslice $(name): _testbench $(obj) diff --git a/test/monniaux/clock.c b/test/monniaux/clock.c index 506dadc3..300cdc7f 100644 --- a/test/monniaux/clock.c +++ b/test/monniaux/clock.c @@ -1,4 +1,5 @@ #include "cycles.h" +#include <stdio.h> static cycle_t total_clock, last_start; @@ -13,3 +14,7 @@ void clock_stop(void) { cycle_t get_total_clock(void) { return total_clock; } + +void print_total_clock(void) { + printf("cycles: %llu\n", total_clock); +} diff --git a/test/monniaux/clock.h b/test/monniaux/clock.h index 768985b4..b5ee65a4 100644 --- a/test/monniaux/clock.h +++ b/test/monniaux/clock.h @@ -1,5 +1,6 @@ -typedef unsigned long long cycle_t; +typedef unsigned long cycle_t; void clock_stop(void); void clock_start(void); cycle_t get_total_clock(void); +void print_total_clock(void); diff --git a/test/monniaux/crypto-algorithms/Makefile b/test/monniaux/crypto-algorithms/Makefile index 348afe10..493ad22b 100644 --- a/test/monniaux/crypto-algorithms/Makefile +++ b/test/monniaux/crypto-algorithms/Makefile @@ -2,7 +2,7 @@ CFLAGS=-Wall -O3 K1C_CC=k1-mbr-gcc K1C_CFLAGS=-Wall -O3 K1C_CCOMP=../../../ccomp -K1C_CCOMPFLAGS=-Wall -O3 -D__thread= -D__int128=int -U __SIZE_TYPE__ -D __SIZE_TYPE__='unsigned long long' +K1C_CCOMPFLAGS=-Wall -O3 -D__thread= -D__int128=int all: md2.all md5.all sha1.all sha256.all blowfish.all des.all diff --git a/test/monniaux/jpeg-6b/ccomp.sh b/test/monniaux/jpeg-6b/ccomp.sh index cd587dcc..3e1ed6b2 100755 --- a/test/monniaux/jpeg-6b/ccomp.sh +++ b/test/monniaux/jpeg-6b/ccomp.sh @@ -1 +1 @@ -exec /home/monniaux/work/Kalray/CompCert/ccomp -U __SIZEOF_INT128__ -U __SIZE_TYPE__ -D __SIZE_TYPE__='unsigned long long' "$@" +exec /home/monniaux/work/Kalray/CompCert/ccomp -U __SIZEOF_INT128__ "$@" diff --git a/test/monniaux/micro-bunzip/Makefile b/test/monniaux/micro-bunzip/Makefile index bd317980..ccd21360 100644 --- a/test/monniaux/micro-bunzip/Makefile +++ b/test/monniaux/micro-bunzip/Makefile @@ -9,7 +9,7 @@ micro-bunzip.host: micro-bunzip.c ../clock.c $(CC) $+ -o $@ micro-bunzip.ccomp.k1c: micro-bunzip.c ../clock.gcc.k1c.o - ../../../ccomp -Wall -O3 $+ -U __SIZEOF_INT128__ -D __SIZE_TYPE__='unsigned long long' -o $@ + ../../../ccomp -Wall -O3 $+ -U __SIZEOF_INT128__ -o $@ # TODO: -O3 buggy?? micro-bunzip.gcc.k1c: micro-bunzip.c ../clock.gcc.k1c.o diff --git a/test/monniaux/mod_int_mat/int_mat.c b/test/monniaux/mod_int_mat/int_mat.c index fc763811..167c91fd 100644 --- a/test/monniaux/mod_int_mat/int_mat.c +++ b/test/monniaux/mod_int_mat/int_mat.c @@ -190,7 +190,7 @@ void modint_mat_mul7(unsigned m, unsigned n, unsigned p, } modint modint_random(void) { - static uint64_t next = 1325997111; + static uint32_t next = 1325997111; next = next * 1103515249 + 12345; return next % MODULUS; } diff --git a/test/monniaux/picosat-965/dm_configure_ccomp.sh b/test/monniaux/picosat-965/dm_configure_ccomp.sh index ffa6d884..65498834 100755 --- a/test/monniaux/picosat-965/dm_configure_ccomp.sh +++ b/test/monniaux/picosat-965/dm_configure_ccomp.sh @@ -1,2 +1,2 @@ # BUG -CC=../../../ccomp CFLAGS="-fall -Wall -O3 -U __SIZEOF_INT128__ -U __SIZE_TYPE__ -D __SIZE_TYPE__='unsigned long long' -DNALARM -DNZIP -DNGETRUSAGE" ./configure.sh +CC=../../../ccomp CFLAGS="-fall -Wall -O3 -U __SIZEOF_INT128__ -DNALARM -DNZIP -DNGETRUSAGE" ./configure.sh diff --git a/test/monniaux/uzlib/compile.sh b/test/monniaux/uzlib/compile.sh index 2a27b963..4c2ffe82 100755 --- a/test/monniaux/uzlib/compile.sh +++ b/test/monniaux/uzlib/compile.sh @@ -1 +1 @@ -make CC=/home/monniaux/work/Kalray/CompCert/ccomp COPT="-Wall -O3 -U__SIZEOF_INT128__ -U __SIZE_TYPE__ -D __SIZE_TYPE__='unsigned long long'" +make CC=/home/monniaux/work/Kalray/CompCert/ccomp COPT="-Wall -O3 -U__SIZEOF_INT128__" |