diff options
| -rw-r--r-- | test/monniaux/bitsliced-aes/Makefile | 2 | ||||
| -rw-r--r-- | test/monniaux/bitsliced-tea/Makefile | 2 | ||||
| -rw-r--r-- | test/monniaux/complex/complex_mat.c | 6 | ||||
| -rw-r--r-- | test/monniaux/float_mat/float_mat_run.c | 16 | ||||
| -rw-r--r-- | test/monniaux/rules.mk | 2 |
5 files changed, 14 insertions, 14 deletions
diff --git a/test/monniaux/bitsliced-aes/Makefile b/test/monniaux/bitsliced-aes/Makefile index 5365cce5..0fef17be 100644 --- a/test/monniaux/bitsliced-aes/Makefile +++ b/test/monniaux/bitsliced-aes/Makefile @@ -1,4 +1,4 @@ ALL_CFILES=$(wildcard *.c) tests/tests.c -TARGET=test +TARGET=bitsliced-aes include ../rules.mk diff --git a/test/monniaux/bitsliced-tea/Makefile b/test/monniaux/bitsliced-tea/Makefile index 8c28ac37..02b35381 100644 --- a/test/monniaux/bitsliced-tea/Makefile +++ b/test/monniaux/bitsliced-tea/Makefile @@ -1,3 +1,3 @@ -TARGET=bstea +TARGET=bitsliced-tea include ../rules.mk 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", diff --git a/test/monniaux/float_mat/float_mat_run.c b/test/monniaux/float_mat/float_mat_run.c index 329648c2..2f590f98 100644 --- a/test/monniaux/float_mat/float_mat_run.c +++ b/test/monniaux/float_mat/float_mat_run.c @@ -93,14 +93,14 @@ int main() { "c1==c6: %s\n" "c1==c7: %s\n" "c1==c8: %s\n" - "c1_time : %" PRIu64 "\n" - "c2_time : %" PRIu64 "\n" - "c3_time : %" PRIu64 "\n" - "c4_time : %" PRIu64 "\n" - "c5_time : %" PRIu64 "\n" - "c6_time : %" PRIu64 "\n" - "c7_time : %" PRIu64 "\n" - "c8_time : %" PRIu64 "\n", + "c1 cycles: %" PRIu64 "\n" + "c2 cycles: %" PRIu64 "\n" + "c3 cycles: %" PRIu64 "\n" + "c4 cycles: %" PRIu64 "\n" + "c5 cycles: %" PRIu64 "\n" + "c6 cycles: %" PRIu64 "\n" + "c7 cycles: %" PRIu64 "\n" + "c8 cycles: %" PRIu64 "\n", REAL_mat_equal(m, n, c1, p, c2, p)?"true":"false", REAL_mat_equal(m, n, c1, p, c3, p)?"true":"false", diff --git a/test/monniaux/rules.mk b/test/monniaux/rules.mk index f65dc414..66c5c165 100644 --- a/test/monniaux/rules.mk +++ b/test/monniaux/rules.mk @@ -72,7 +72,7 @@ asm/%$(3).s: %.c .SECONDARY: bin/$(TARGET)$(3).bin: $(addprefix obj/,$(ALL_CFILES:.c=$(3).o)) $(CLOCK).gcc.k1c.o @mkdir -p $$(@D) - $(K1C_CC) $$+ -lm -o $$@ + $(1) $$+ -lm -o $$@ BINFILES:=$(BINFILES) bin/$(TARGET)$(3).bin OUTFILES:=$(OUTFILES) out/$(TARGET)$(3).out |