From 7811a12e452fb5ffb6953f7e1610aad1d473b396 Mon Sep 17 00:00:00 2001 From: Cyril SIX Date: Thu, 20 Jun 2019 14:57:45 +0200 Subject: Circumventing a bug from patch https://lists.gnu.org/archive/html/bug-patch/2017-01/msg00001.html --- test/monniaux/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'test') diff --git a/test/monniaux/Makefile b/test/monniaux/Makefile index b436c034..af4f039f 100644 --- a/test/monniaux/Makefile +++ b/test/monniaux/Makefile @@ -5,14 +5,14 @@ CCOMP?=ccomp all: compile_times.pdf measure_times.k1c.pdf verifier_times.txt: Asmblockdeps.patch - patch ../../extraction/Asmblockdeps.ml < $< - (cd ../../ && make -j20 && make install); patch -R ../../extraction/Asmblockdeps.ml < $< + patch $(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 - patch ../../mppa_k1c/PostpassSchedulingOracle.ml < $< - (cd ../../ && make -j20 && make install); patch -R ../../mppa_k1c/PostpassSchedulingOracle.ml < $< + patch $(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 $@ -- cgit From fa0271962d23a06ae2456d88291409cb27f3076a Mon Sep 17 00:00:00 2001 From: Cyril SIX Date: Thu, 20 Jun 2019 15:21:35 +0200 Subject: Using Python3.5 instead of Python3.6 (python3.6 not installed on carlit) --- test/monniaux/Makefile | 4 ++-- test/monniaux/gencompile.py | 2 +- test/monniaux/gengraphs.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'test') diff --git a/test/monniaux/Makefile b/test/monniaux/Makefile index af4f039f..e099ed51 100644 --- a/test/monniaux/Makefile +++ b/test/monniaux/Makefile @@ -22,10 +22,10 @@ measures.csv: bash run_benches.sh $@ compile_times.pdf: gencompile.py verifier_times.txt oracle_times.txt - python3.6 $^ $@ + python3.5 $^ $@ measure_times.k1c.pdf: gengraphs.py measures.csv - python3.6 $^ $(basename $(basename $@)) + python3.5 $^ $(basename $(basename $@)) .PHONY: clean: diff --git a/test/monniaux/gencompile.py b/test/monniaux/gencompile.py index 6167c522..739e535a 100755 --- a/test/monniaux/gencompile.py +++ b/test/monniaux/gencompile.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3.6 +#!/usr/bin/python3.5 import numpy as np # type: ignore import matplotlib.pyplot as plt # type: ignore diff --git a/test/monniaux/gengraphs.py b/test/monniaux/gengraphs.py index 97cb08dc..feb9f185 100755 --- a/test/monniaux/gengraphs.py +++ b/test/monniaux/gengraphs.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3.6 +#!/usr/bin/python3.5 import numpy as np # type: ignore import matplotlib.pyplot as plt # type: ignore -- cgit From 909fc0b55e396bb921901d3833f6941fd16b4bd1 Mon Sep 17 00:00:00 2001 From: Cyril SIX Date: Thu, 20 Jun 2019 17:13:02 +0200 Subject: Fixing invalid syntax error --- test/monniaux/gengraphs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'test') diff --git a/test/monniaux/gengraphs.py b/test/monniaux/gengraphs.py index feb9f185..e7403df6 100755 --- a/test/monniaux/gengraphs.py +++ b/test/monniaux/gengraphs.py @@ -33,7 +33,7 @@ def extract_compiler(env: str) -> str: return " ".join(words) def extract_compilers(envs: List[str]) -> List[str]: - compilers: List[str] = [] + compilers = [] for env in envs: compiler = extract_compiler(env) if compiler not in compilers: -- cgit From a52b50bf91bbb11ebb95757b818374d4507ea05d Mon Sep 17 00:00:00 2001 From: Cyril SIX Date: Thu, 20 Jun 2019 17:42:40 +0200 Subject: Enlevé les annotations en attendant que python3.6 soit réinstallé sur carlit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- test/monniaux/gengraphs.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'test') diff --git a/test/monniaux/gengraphs.py b/test/monniaux/gengraphs.py index e7403df6..afcb6cfd 100755 --- a/test/monniaux/gengraphs.py +++ b/test/monniaux/gengraphs.py @@ -48,15 +48,19 @@ def subdivide_interv(inf: Any, sup: float, n: int) -> List[float]: # envs is the list of environments to compare # The returned value will be a dictionnary associating the compiler (e.g. "gcc") to his relative comparison on the best result def make_relative_heights(data: Dict[str, List[float]], envs: List[str]) -> Dict[str, List[float]]: - n_benches: int = len(data["benches"]) - cols: Dict[str, List[float]] = {extract_compiler(env):data[env] for env in envs} + #n_benches: int = len(data["benches"]) + #cols: Dict[str, List[float]] = {extract_compiler(env):data[env] for env in envs} + n_benches = len(data["benches"]) + cols = {extract_compiler(env):data[env] for env in envs} - ret: Dict[str, List[float]] = {} + #ret: Dict[str, List[float]] = {} + ret = {} for compiler in cols: ret[compiler] = [] for i in range(n_benches): - maximum: float = max([cols[compiler][i] for compiler in cols]) + #maximum: float = max([cols[compiler][i] for compiler in cols]) + maximum = max([cols[compiler][i] for compiler in cols]) for compiler in cols: ret[compiler].append(cols[compiler][i] / float(maximum)) @@ -71,7 +75,8 @@ def generate_file(f: str, cols: List[str]) -> None: compilers = extract_compilers(cols) start_inds = subdivide_interv(ind, ind+2*width, len(compilers)) inverse_cycles = {key:[1./x if isinstance(x, int) else x for x in list(df[key])] for key in df.columns} - heights: Dict[str, List[float]] = make_relative_heights(inverse_cycles, cols) + #heights: Dict[str, List[float]] = make_relative_heights(inverse_cycles, cols) + heights = make_relative_heights(inverse_cycles, cols) fig, ax = plt.subplots() rects = [] -- cgit From 80295d3c7cc82c34903f7ed92a77a64870f1920f Mon Sep 17 00:00:00 2001 From: David Monniaux Date: Fri, 21 Jun 2019 22:07:28 +0200 Subject: -frevlist --- test/monniaux/rules.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'test') diff --git a/test/monniaux/rules.mk b/test/monniaux/rules.mk index 33a71a46..211feafd 100644 --- a/test/monniaux/rules.mk +++ b/test/monniaux/rules.mk @@ -9,7 +9,7 @@ K1C_CFLAGS = -D__K1C_COS__ -std=c99 -O3 -Wall -Wextra -Werror=implicit $(ALL_CF K1C_CFLAGS_O1 =-std=c99 -O1 -fschedule-insns2 -Wall -Wextra -Werror=implicit $(ALL_CFLAGS) K1C_CCOMP = ../../../ccomp -K1C_CCOMPFLAGS=-O3 -Wall $(ALL_CCOMPFLAGS) $(ALL_CFLAGS) # -fpostpass-ilp +K1C_CCOMPFLAGS=-O3 -Wall $(ALL_CCOMPFLAGS) $(ALL_CFLAGS) # -fpostpass= revlist EXECUTE=k1-cluster --syscall=libstd_scalls.so -- EXECUTE_CYCLES=k1-cluster --syscall=libstd_scalls.so --cycle-based -- -- cgit From 2cad56ee1f3d508d1671628a10da1852c5ee95a7 Mon Sep 17 00:00:00 2001 From: David Monniaux Date: Mon, 24 Jun 2019 11:49:37 +0200 Subject: pretty-printing for extra operations (unfinished) --- test/monniaux/rules.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'test') diff --git a/test/monniaux/rules.mk b/test/monniaux/rules.mk index 211feafd..53f88ebe 100644 --- a/test/monniaux/rules.mk +++ b/test/monniaux/rules.mk @@ -9,7 +9,7 @@ K1C_CFLAGS = -D__K1C_COS__ -std=c99 -O3 -Wall -Wextra -Werror=implicit $(ALL_CF K1C_CFLAGS_O1 =-std=c99 -O1 -fschedule-insns2 -Wall -Wextra -Werror=implicit $(ALL_CFLAGS) K1C_CCOMP = ../../../ccomp -K1C_CCOMPFLAGS=-O3 -Wall $(ALL_CCOMPFLAGS) $(ALL_CFLAGS) # -fpostpass= revlist +K1C_CCOMPFLAGS=-dall -O3 -Wall $(ALL_CCOMPFLAGS) $(ALL_CFLAGS) # -fpostpass= revlist EXECUTE=k1-cluster --syscall=libstd_scalls.so -- EXECUTE_CYCLES=k1-cluster --syscall=libstd_scalls.so --cycle-based -- -- cgit From c97bad7c55cef10fb1336c6851ff01125fc56a09 Mon Sep 17 00:00:00 2001 From: David Monniaux Date: Mon, 24 Jun 2019 12:18:15 +0200 Subject: rm -dall --- test/monniaux/rules.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'test') diff --git a/test/monniaux/rules.mk b/test/monniaux/rules.mk index 53f88ebe..211feafd 100644 --- a/test/monniaux/rules.mk +++ b/test/monniaux/rules.mk @@ -9,7 +9,7 @@ K1C_CFLAGS = -D__K1C_COS__ -std=c99 -O3 -Wall -Wextra -Werror=implicit $(ALL_CF K1C_CFLAGS_O1 =-std=c99 -O1 -fschedule-insns2 -Wall -Wextra -Werror=implicit $(ALL_CFLAGS) K1C_CCOMP = ../../../ccomp -K1C_CCOMPFLAGS=-dall -O3 -Wall $(ALL_CCOMPFLAGS) $(ALL_CFLAGS) # -fpostpass= revlist +K1C_CCOMPFLAGS=-O3 -Wall $(ALL_CCOMPFLAGS) $(ALL_CFLAGS) # -fpostpass= revlist EXECUTE=k1-cluster --syscall=libstd_scalls.so -- EXECUTE_CYCLES=k1-cluster --syscall=libstd_scalls.so --cycle-based -- -- cgit