From 9bc337d05eed466e2bfc9b18aa35fac34d3954a9 Mon Sep 17 00:00:00 2001 From: Cyril SIX Date: Thu, 18 Jul 2019 17:53:35 +0200 Subject: Fixing the generation of verifier_times.txt and oracle_times.txt --- test/monniaux/Makefile | 10 +++++----- test/monniaux/PostpassSchedulingOracle.patch | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/test/monniaux/Makefile b/test/monniaux/Makefile index 12f2bfe2..a6b19891 100644 --- a/test/monniaux/Makefile +++ b/test/monniaux/Makefile @@ -2,20 +2,20 @@ CCOMP?=ccomp -#all: compile_times.pdf measure_times.k1c.pdf +#all: verifier_times.txt oracle_times.txt measures.csv all: measures.csv verifier_times.txt: Asmblockdeps.patch - (cd ../../ && make -j20) + (cd ../../ && make -j20 && make install) patch $(realpath ../../extraction/Asmblockdeps.ml) < $< - (cd ../../ && make -j20); patch -R $(realpath ../../extraction/Asmblockdeps.ml) < $< + (cd ../../ && make -j20 && make install); patch -R $(realpath ../../extraction/Asmblockdeps.ml) < $< bash clean_benches.sh bash build_benches.sh $@ oracle_times.txt: PostpassSchedulingOracle.patch - (cd ../../ && make -j20) + (cd ../../ && make -j20 && make install) patch $(realpath ../../mppa_k1c/PostpassSchedulingOracle.ml) < $< - (cd ../../ && make -j20); patch -R $(realpath ../../mppa_k1c/PostpassSchedulingOracle.ml) < $< + (cd ../../ && make -j20 && make install); patch -R $(realpath ../../mppa_k1c/PostpassSchedulingOracle.ml) < $< bash clean_benches.sh bash build_benches.sh $@ diff --git a/test/monniaux/PostpassSchedulingOracle.patch b/test/monniaux/PostpassSchedulingOracle.patch index 747dfa69..31afdbc8 100644 --- a/test/monniaux/PostpassSchedulingOracle.patch +++ b/test/monniaux/PostpassSchedulingOracle.patch @@ -2,7 +2,7 @@ diff --git a/mppa_k1c/PostpassSchedulingOracle.ml b/mppa_k1c/PostpassSchedulingO index 2fc561e..d3748e8 100644 --- a/mppa_k1c/PostpassSchedulingOracle.ml +++ b/mppa_k1c/PostpassSchedulingOracle.ml -@@ -829,7 +829,7 @@ let print_bb oc bb = +@@ -808,7 +808,7 @@ let print_bb oc bb = let asm_instructions = Asm.unfold_bblock bb in List.iter (print_inst oc) asm_instructions @@ -11,7 +11,7 @@ index 2fc561e..d3748e8 100644 let problem = build_problem bb in let solution = (if !Clflags.option_fpostpass_sched = "ilp" then validated_scheduler cascaded_scheduler -@@ -850,6 +850,19 @@ let do_schedule bb = +@@ -831,6 +831,19 @@ let do_schedule bb = end; bundles) -- cgit