Merge branch 'kvx-work' into mppa-RTLpathSE

Adapting the new mppa-RTLpathSE passes into the new Compiler.vexpand
framework

3 files changed, 25 insertions, 25 deletions

diff --git a/test/monniaux/bitsliced-aes/notes.org b/test/monniaux/bitsliced-aes/notes.org
index 6c2e27fa..c9a6fea2 100644
--- a/test/monniaux/bitsliced-aes/notes.org
+++ b/test/monniaux/bitsliced-aes/notes.org
@@ -3,52 +3,52 @@
 ==> test.ccomp.host.out <==
 cycles: 3080223
 
-==> test.ccomp.k1c.out <==
+==> test.ccomp.kvx.out <==
 cycles: 10145951
 
 ==> test.gcc.host.out <==
 cycles: 1485887
 
-==> test.gcc.k1c.out <==
+==> test.gcc.kvx.out <==
 cycles: 4078535
 
 ** neg and
 ==> test.ccomp.host.out <==
 cycles: 2905049
 
-==> test.ccomp.k1c.out <==
+==> test.ccomp.kvx.out <==
 cycles: 7995063
 
 ==> test.gcc.host.out <==
 cycles: 1858263
 
-==> test.gcc.k1c.out <==
+==> test.gcc.kvx.out <==
 cycles: 5255763
 
 ** cmove mais mauvais scheduling de registres
 ==> test.ccomp.host.out <==
 cycles: 4363682
 
-==> test.ccomp.k1c.out <==
+==> test.ccomp.kvx.out <==
 cycles: 7208629
 
 ==> test.gcc.host.out <==
 cycles: 2916854
 
-==> test.gcc.k1c.out <==
+==> test.gcc.kvx.out <==
 cycles: 5646730
 
 ** cmove via match du and
 ==> test.ccomp.host.out <==
 cycles: 2553732
 
-==> test.ccomp.k1c.out <==
+==> test.ccomp.kvx.out <==
 cycles: 7208629
 
 ==> test.gcc.host.out <==
 cycles: 1849125
 
-==> test.gcc.k1c.out <==
+==> test.gcc.kvx.out <==
 cycles: 5255763
 
 ** hand optimized loads
diff --git a/test/monniaux/bitsliced-aes/one_file/compare.sh b/test/monniaux/bitsliced-aes/one_file/compare.sh
index e069eef6..314c1718 100755
--- a/test/monniaux/bitsliced-aes/one_file/compare.sh
+++ b/test/monniaux/bitsliced-aes/one_file/compare.sh
@@ -1,12 +1,12 @@
 #!/bin/bash
 ROOT=/home/monniaux/work/Kalray/CompCert
 SRC=bitsliced-aes.c
-k1-cos-gcc -Werror=implicit -Werror=uninitialized -O3 $SRC $ROOT/test/monniaux/clock.gcc.k1c.o -o bitsliced-aes.gcc.k1c &&
-$ROOT/ccomp -O3 -fno-unprototyped -O3 $SRC $ROOT/test/monniaux/clock.gcc.k1c.o -o bitsliced-aes.ccomp.k1c &&
+k1-cos-gcc -Werror=implicit -Werror=uninitialized -O3 $SRC $ROOT/test/monniaux/clock.gcc.kvx.o -o bitsliced-aes.gcc.kvx &&
+$ROOT/ccomp -O3 -fno-unprototyped -O3 $SRC $ROOT/test/monniaux/clock.gcc.kvx.o -o bitsliced-aes.ccomp.kvx &&
 gcc -Werror=implicit -Werror=uninitialized -O3 $SRC  $ROOT/test/monniaux/clock.gcc.host.o -o bitsliced-aes.gcc.host &&
 valgrind ./bitsliced-aes.gcc.host &&
-k1-cluster -- ./bitsliced-aes.gcc.k1c > ./bitsliced-aes.gcc.k1c.out &&
-k1-cluster -- ./bitsliced-aes.ccomp.k1c > ./bitsliced-aes.ccomp.k1c.out &&
-grep cycles ./bitsliced-aes.gcc.k1c.out | sed -e 's/cycles: //' > ./bitsliced-aes.gcc.k1c.cycles &&
-grep cycles ./bitsliced-aes.ccomp.k1c.out | sed -e 's/cycles: //' > ./bitsliced-aes.ccomp.k1c.cycles &&
-test $(cat ./bitsliced-aes.ccomp.k1c.cycles) -gt $(expr 2 '*' $(cat ./bitsliced-aes.gcc.k1c.cycles))
+k1-cluster -- ./bitsliced-aes.gcc.kvx > ./bitsliced-aes.gcc.kvx.out &&
+k1-cluster -- ./bitsliced-aes.ccomp.kvx > ./bitsliced-aes.ccomp.kvx.out &&
+grep cycles ./bitsliced-aes.gcc.kvx.out | sed -e 's/cycles: //' > ./bitsliced-aes.gcc.kvx.cycles &&
+grep cycles ./bitsliced-aes.ccomp.kvx.out | sed -e 's/cycles: //' > ./bitsliced-aes.ccomp.kvx.cycles &&
+test $(cat ./bitsliced-aes.ccomp.kvx.cycles) -gt $(expr 2 '*' $(cat ./bitsliced-aes.gcc.kvx.cycles))
diff --git a/test/monniaux/bitsliced-aes/one_file/reduce/compare.sh b/test/monniaux/bitsliced-aes/one_file/reduce/compare.sh
index 97939771..0f61ad00 100755
--- a/test/monniaux/bitsliced-aes/one_file/reduce/compare.sh
+++ b/test/monniaux/bitsliced-aes/one_file/reduce/compare.sh
@@ -2,15 +2,15 @@
 ROOT=/home/monniaux/work/Kalray/CompCert
 SRC=bitsliced-aes_compute.c
 MAIN=/home/monniaux/work/Kalray/CompCert/test/monniaux/bitsliced-aes/one_file/reduce/bitsliced-aes_main
-k1-cos-gcc -Werror=implicit -Werror=uninitialized -O3 $SRC $ROOT/test/monniaux/clock.gcc.k1c.o $MAIN.gcc.k1c.o -o bitsliced-aes.gcc.k1c &&
-$ROOT/ccomp -O3 -fno-unprototyped -O3 $SRC $ROOT/test/monniaux/clock.gcc.k1c.o  $MAIN.gcc.k1c.o -o bitsliced-aes.ccomp.k1c &&
+k1-cos-gcc -Werror=implicit -Werror=uninitialized -O3 $SRC $ROOT/test/monniaux/clock.gcc.kvx.o $MAIN.gcc.kvx.o -o bitsliced-aes.gcc.kvx &&
+$ROOT/ccomp -O3 -fno-unprototyped -O3 $SRC $ROOT/test/monniaux/clock.gcc.kvx.o  $MAIN.gcc.kvx.o -o bitsliced-aes.ccomp.kvx &&
 gcc -Werror=implicit -Werror=uninitialized -O3 $SRC  $ROOT/test/monniaux/clock.gcc.host.o $MAIN.c -o bitsliced-aes.gcc.host &&
 valgrind ./bitsliced-aes.gcc.host &&
-k1-cluster --cycle-based -- ./bitsliced-aes.gcc.k1c > ./bitsliced-aes.gcc.k1c.out &&
-k1-cluster --cycle-based -- ./bitsliced-aes.ccomp.k1c > ./bitsliced-aes.ccomp.k1c.out &&
-grep cycles ./bitsliced-aes.gcc.k1c.out > ./bitsliced-aes.gcc.k1c.cycles &&
-grep cycles ./bitsliced-aes.ccomp.k1c.out > ./bitsliced-aes.ccomp.k1c.cycles &&
-sed -i -e 's/cycles: //' ./bitsliced-aes.gcc.k1c.cycles &&
-sed -i -e 's/cycles: //' ./bitsliced-aes.ccomp.k1c.cycles &&
-test $(cat ./bitsliced-aes.gcc.k1c.cycles) -gt 100000 &&
-test $(cat ./bitsliced-aes.ccomp.k1c.cycles) -gt $(expr 2 '*' $(cat ./bitsliced-aes.gcc.k1c.cycles))
+k1-cluster --cycle-based -- ./bitsliced-aes.gcc.kvx > ./bitsliced-aes.gcc.kvx.out &&
+k1-cluster --cycle-based -- ./bitsliced-aes.ccomp.kvx > ./bitsliced-aes.ccomp.kvx.out &&
+grep cycles ./bitsliced-aes.gcc.kvx.out > ./bitsliced-aes.gcc.kvx.cycles &&
+grep cycles ./bitsliced-aes.ccomp.kvx.out > ./bitsliced-aes.ccomp.kvx.cycles &&
+sed -i -e 's/cycles: //' ./bitsliced-aes.gcc.kvx.cycles &&
+sed -i -e 's/cycles: //' ./bitsliced-aes.ccomp.kvx.cycles &&
+test $(cat ./bitsliced-aes.gcc.kvx.cycles) -gt 100000 &&
+test $(cat ./bitsliced-aes.ccomp.kvx.cycles) -gt $(expr 2 '*' $(cat ./bitsliced-aes.gcc.kvx.cycles))