diff options
Diffstat (limited to 'test/monniaux/xor_and_mat')
-rw-r--r-- | test/monniaux/xor_and_mat/Makefile | 23 | ||||
-rw-r--r-- | test/monniaux/xor_and_mat/int_mat_run.c | 46 |
2 files changed, 26 insertions, 43 deletions
diff --git a/test/monniaux/xor_and_mat/Makefile b/test/monniaux/xor_and_mat/Makefile index 005382de..e6c4db77 100644 --- a/test/monniaux/xor_and_mat/Makefile +++ b/test/monniaux/xor_and_mat/Makefile @@ -1,21 +1,4 @@ -include ../rules.mk - -PRODUCTS=int_mat.host int_mat.gcc.k1c.out int_mat.ccomp.k1c.out int_mat.ccomp.k1c.s int_mat.gcc.k1c.s int_mat.gcc.k1c int_mat.ccomp.k1c - -all: $(PRODUCTS) - -int_mat.host: int_mat.c int_mat_run.c xor_and.h - $(CC) $(CFLAGS) int_mat.c int_mat_run.c -o $@ - -int_mat.gcc.k1c.s int_mat.ccomp.k1c.s int_mat_run.gcc.k1c.s: xor_and.h +TARGET=xor_and_mat +MEASURES="c1 c2 c3 c4 c5 c6 c7" -int_mat.gcc.k1c: int_mat.gcc.k1c.o int_mat_run.gcc.k1c.o - $(K1C_CC) $(K1C_CFLAGS) $+ -o $@ - -int_mat.ccomp.k1c: int_mat.ccomp.k1c.o int_mat_run.gcc.k1c.o - $(K1C_CCOMP) $(K1C_CCOMPFLAGS) $+ -o $@ - -clean: - $(RM) -f $(PRODUCTS) int_mat.gcc.k1c.o int_mat.ccomp.k1c.o int_mat_run.gcc.k1c.o - -.PHONY: clean +include ../rules.mk diff --git a/test/monniaux/xor_and_mat/int_mat_run.c b/test/monniaux/xor_and_mat/int_mat_run.c index 53335de4..a6a821d9 100644 --- a/test/monniaux/xor_and_mat/int_mat_run.c +++ b/test/monniaux/xor_and_mat/int_mat_run.c @@ -3,50 +3,50 @@ #include <stdio.h> #include <inttypes.h> #include "xor_and.h" -#include "../cycles.h" +#include "../clock.h" int main() { const unsigned m = 60, n = 31, p = 50; - cycle_count_config(); + clock_prepare(); xor_and *a = malloc(sizeof(xor_and) * m * n); xor_and_mat_random(m, n, a, n); xor_and *b = malloc(sizeof(xor_and) * n * p); xor_and_mat_random(n, p, b, p); xor_and *c1 = malloc(sizeof(xor_and) * m * p); - cycle_t c1_time = get_cycle(); + cycle_t c1_time = get_current_cycle(); xor_and_mat_mul1(m, n, p, c1, p, a, n, b, p); - c1_time = get_cycle()-c1_time; + c1_time = get_current_cycle()-c1_time; xor_and *c2 = malloc(sizeof(xor_and) * m * p); - cycle_t c2_time = get_cycle(); + cycle_t c2_time = get_current_cycle(); xor_and_mat_mul2(m, n, p, c2, p, a, n, b, p); - c2_time = get_cycle()-c2_time; + c2_time = get_current_cycle()-c2_time; xor_and *c3 = malloc(sizeof(xor_and) * m * p); - cycle_t c3_time = get_cycle(); + cycle_t c3_time = get_current_cycle(); xor_and_mat_mul3(m, n, p, c3, p, a, n, b, p); - c3_time = get_cycle()-c3_time; + c3_time = get_current_cycle()-c3_time; xor_and *c4 = malloc(sizeof(xor_and) * m * p); - cycle_t c4_time = get_cycle(); + cycle_t c4_time = get_current_cycle(); xor_and_mat_mul4(m, n, p, c4, p, a, n, b, p); - c4_time = get_cycle()-c4_time; + c4_time = get_current_cycle()-c4_time; xor_and *c5 = malloc(sizeof(xor_and) * m * p); - cycle_t c5_time = get_cycle(); + cycle_t c5_time = get_current_cycle(); xor_and_mat_mul5(m, n, p, c5, p, a, n, b, p); - c5_time = get_cycle()-c5_time; + c5_time = get_current_cycle()-c5_time; xor_and *c6 = malloc(sizeof(xor_and) * m * p); - cycle_t c6_time = get_cycle(); + cycle_t c6_time = get_current_cycle(); xor_and_mat_mul6(m, n, p, c6, p, a, n, b, p); - c6_time = get_cycle()-c6_time; + c6_time = get_current_cycle()-c6_time; xor_and *c7 = malloc(sizeof(xor_and) * m * p); - cycle_t c7_time = get_cycle(); + cycle_t c7_time = get_current_cycle(); xor_and_mat_mul7(m, n, p, c7, p, a, n, b, p); - c7_time = get_cycle()-c7_time; + c7_time = get_current_cycle()-c7_time; printf("c1==c2: %s\n" "c1==c3: %s\n" @@ -54,13 +54,13 @@ int main() { "c1==c5: %s\n" "c1==c6: %s\n" "c1==c7: %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", + "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", xor_and_mat_equal(m, n, c1, p, c2, p)?"true":"false", xor_and_mat_equal(m, n, c1, p, c3, p)?"true":"false", |