diff options
| author | Cyril SIX <cyril.six@kalray.eu> | 2019-10-16 17:13:05 +0200 |
|---|---|---|
| committer | Cyril SIX <cyril.six@kalray.eu> | 2019-10-16 17:13:23 +0200 |
| commit | 9ee131bd329d1941eb37eb347f36a0c613a719a9 (patch) | |
| tree | 25760a2f9e796a0f3436463852bb819c288f0a50 /test/c | |
| parent | 72378d9371bc5da342266bcf14231ab568e0f919 (diff) | |
| parent | e1725209b2b4401adc63ce5238fa5db7c134609c (diff) | |
| download | compcert-kvx-9ee131bd329d1941eb37eb347f36a0c613a719a9.tar.gz compcert-kvx-9ee131bd329d1941eb37eb347f36a0c613a719a9.zip | |
[regression to check!] Merge tag 'v3.6' into mppa-work
Conflicts:
.gitignore
backend/Lineartyping.v
common/Values.v
configure
cparser/Machine.ml
cparser/Machine.mli
driver/Configuration.ml
driver/Frontend.ml
runtime/Makefile
test/c/Makefile
test/c/aes.c
test/compression/Makefile
test/regression/Makefile
test/regression/extasm.c
test/regression/floats-basics.c
test/regression/floats.c
Note : test/regression should be checked, didn't test it yet
Diffstat (limited to 'test/c')
| -rw-r--r-- | test/c/Makefile | 9 | ||||
| -rw-r--r-- | test/c/aes.c | 10 |
2 files changed, 6 insertions, 13 deletions
diff --git a/test/c/Makefile b/test/c/Makefile index 6bd05718..a2a80e06 100644 --- a/test/c/Makefile +++ b/test/c/Makefile @@ -8,8 +8,9 @@ EXECUTE:=timeout --signal=SIGTERM 20s $(EXECUTE) LIBS=$(LIBMATH) -#TIME=xtime -o /dev/null -mintime 2.0 # Xavier's hack -TIME=time >/dev/null # Otherwise +TIME=time >/dev/null +# FIXME - maybe this is better? From v3.6 +# TIME=ocaml unix.cma ../../tools/xtime.ml -o /dev/null -mintime 2.0 -minruns 4 PROGS?=fib integr qsort fft fftsp fftw sha1 sha3 aes almabench \ lists binarytrees fannkuch mandelbrot nbody \ @@ -56,12 +57,12 @@ test_gcc: all_gcc bench_gcc: all_gcc @for i in $(PROGS); do \ - echo -n "$$i: "; $(TIME) ./$$i.gcc; \ + $(TIME) -name $$i -- ./$$i.gcc; \ done bench: all @for i in $(PROGS); do \ - echo -n "$$i: "; $(TIME) ./$$i.compcert; \ + $(TIME) -name $$i -- ./$$i.compcert; \ done clean: diff --git a/test/c/aes.c b/test/c/aes.c index 28d51a78..16f02e47 100644 --- a/test/c/aes.c +++ b/test/c/aes.c @@ -27,6 +27,7 @@ #include <stdlib.h> #include <stdio.h> #include <string.h> +#include "../endian.h" #define MAXKC (256/32) #define MAXKB (256/8) @@ -36,15 +37,6 @@ typedef unsigned char u8; typedef unsigned short u16; typedef unsigned int u32; -#if defined(__ppc__) || defined(__PPC__) || defined(__ARMEB__) -#define ARCH_BIG_ENDIAN -#elif defined(__i386__) || defined(__x86_64__) || defined(__ARMEL__) \ - || defined(__riscv) || defined(__K1C__) -#undef ARCH_BIG_ENDIAN -#else -#error "unknown endianness" -#endif - #ifdef ARCH_BIG_ENDIAN #define GETU32(pt) (*(u32 *)(pt)) #define PUTU32(ct,st) (*(u32 *)(ct) = (st)) |