diff options
-rwxr-xr-x | configure | 2 | ||||
-rw-r--r-- | test/c/Makefile | 20 | ||||
-rw-r--r-- | test/c/fib.c | 4 |
3 files changed, 16 insertions, 10 deletions
@@ -822,6 +822,8 @@ fi if [ "$arch" = "mppa_k1c" ]; then cat >> Makefile.config <<EOF ARCHDIRS=$arch $arch/lib $arch/abstractbb $arch/abstractbb/Impure +EXECUTE=k1-cluster --syscall=libstd_scalls.so -- +CFLAGS= -D __K1C_COS__ BACKENDLIB=Machblock.v Machblockgen.v Machblockgenproof.v\\ Asmblock.v Asmblockgen.v Asmblockgenproof0.v Asmblockgenproof1.v Asmblockgenproof.v Asmvliw.v\\ ForwardSimulationBlock.v PostpassScheduling.v PostpassSchedulingproof.v\\ diff --git a/test/c/Makefile b/test/c/Makefile index 46670ec6..14c856ff 100644 --- a/test/c/Makefile +++ b/test/c/Makefile @@ -3,14 +3,14 @@ include ../../Makefile.config CCOMP=../../ccomp CCOMPFLAGS=$(CCOMPOPTS) -stdlib ../../runtime -dc -dclight -dasm -CFLAGS=-O1 -Wall +CFLAGS+=-O1 -Wall LIBS=$(LIBMATH) -TIME=xtime -o /dev/null -mintime 2.0 # Xavier's hack -#TIME=time >/dev/null # Otherwise +#TIME=xtime -o /dev/null -mintime 2.0 # Xavier's hack +TIME=time >/dev/null # Otherwise -PROGS=fib qsort fftw sha1 sha3 aes \ +PROGS?=fib qsort fftw sha1 sha3 aes \ lists binarytrees fannkuch \ nsieve nsievebits vmach \ chomp perlin siphash24\ @@ -31,28 +31,28 @@ all_gcc: $(PROGS:%=%.gcc) %.gcc: %.c $(CC) $(CFLAGS) -o $*.gcc $*.c $(LIBS) -test: +test: all @for i in $(PROGS); do \ - if $(SIMU) ./$$i.compcert | cmp -s - Results/$$i; \ + if $(EXECUTE) ./$$i.compcert | cmp -s - Results/$$i; \ then echo "$$i: passed"; \ else echo "$$i: FAILED"; exit 2; \ fi; \ done -test_gcc: +test_gcc: all_gcc @for i in $(PROGS); do \ - if ./$$i.gcc | cmp -s - Results/$$i; \ + if $(EXECUTE) ./$$i.gcc | cmp -s - Results/$$i; \ then echo "$$i: passed"; \ else echo "$$i: FAILED"; \ fi; \ done -bench_gcc: +bench_gcc: all_gcc @for i in $(PROGS); do \ echo -n "$$i: "; $(TIME) ./$$i.gcc; \ done -bench: +bench: all @for i in $(PROGS); do \ echo -n "$$i: "; $(TIME) ./$$i.compcert; \ done diff --git a/test/c/fib.c b/test/c/fib.c index e4c7d095..19548415 100644 --- a/test/c/fib.c +++ b/test/c/fib.c @@ -12,7 +12,11 @@ int fib(int n) int main(int argc, char ** argv) { int n, r; +#ifdef __K1C_COS__ + if (argc >= 2) n = atoi(argv[1]); else n = 26; +#else if (argc >= 2) n = atoi(argv[1]); else n = 35; +#endif r = fib(n); printf("fib(%d) = %d\n", n, r); return 0; |