From b4a08d0815342b6238d307864f0823d0f07bb691 Mon Sep 17 00:00:00 2001
From: David Monniaux <david.monniaux@univ-grenoble-alpes.fr>
Date: Tue, 26 May 2020 22:04:20 +0200
Subject: k1c -> kvx changes

---
 test/mppa/mmult/.gitignore |  4 ++--
 test/mppa/mmult/Makefile   | 30 +++++++++++++++---------------
 test/mppa/mmult/README.md  |  4 ++--
 3 files changed, 19 insertions(+), 19 deletions(-)

(limited to 'test/mppa/mmult')

diff --git a/test/mppa/mmult/.gitignore b/test/mppa/mmult/.gitignore
index c9cd4c65..b43ccc5f 100644
--- a/test/mppa/mmult/.gitignore
+++ b/test/mppa/mmult/.gitignore
@@ -1,4 +1,4 @@
-mmult-test-ccomp-k1c
-mmult-test-gcc-k1c
+mmult-test-ccomp-kvx
+mmult-test-gcc-kvx
 mmult-test-gcc-x86
 .zero
diff --git a/test/mppa/mmult/Makefile b/test/mppa/mmult/Makefile
index 667faef8..e7cd890e 100644
--- a/test/mppa/mmult/Makefile
+++ b/test/mppa/mmult/Makefile
@@ -1,20 +1,20 @@
-K1CC ?= k1-cos-gcc
+KVXC ?= k1-cos-gcc
 CC ?= gcc
 CCOMP ?= ccomp
 CFLAGS ?= -O2
 SIMU ?= k1-mppa
 TIMEOUT ?= 10s
 
-K1CCPATH=$(shell which $(K1CC))
+KVXCPATH=$(shell which $(KVXC))
 CCPATH=$(shell which $(CC))
 CCOMPPATH=$(shell which $(CCOMP))
 SIMUPATH=$(shell which $(SIMU))
 
 PRNG=../prng/prng.c
 
-ALL= mmult-test-gcc-x86 mmult-test-gcc-k1c mmult-test-ccomp-k1c
-CCOMP_OUT= mmult-test-ccomp-k1c.out
-GCC_OUT= mmult-test-gcc-k1c.out
+ALL= mmult-test-gcc-x86 mmult-test-gcc-kvx mmult-test-ccomp-kvx
+CCOMP_OUT= mmult-test-ccomp-kvx.out
+GCC_OUT= mmult-test-gcc-kvx.out
 X86_GCC_OUT= mmult-test-gcc-x86.out
 STUB_OUT=.zero
 
@@ -23,14 +23,14 @@ all: $(ALL)
 mmult-test-gcc-x86: mmult.c $(PRNG) $(CCPATH)
 	$(CC) $(CFLAGS) $(filter-out $(CCPATH),$^) -o $@
 
-mmult-test-gcc-k1c: mmult.c $(PRNG) $(K1CCPATH)
-	$(K1CC) $(CFLAGS) $(filter-out $(K1CCPATH),$^) -o $@
+mmult-test-gcc-kvx: mmult.c $(PRNG) $(KVXCPATH)
+	$(KVXC) $(CFLAGS) $(filter-out $(KVXCPATH),$^) -o $@
 
-mmult-test-ccomp-k1c: mmult.c $(PRNG) $(CCOMPPATH)
+mmult-test-ccomp-kvx: mmult.c $(PRNG) $(CCOMPPATH)
 	$(CCOMP) $(CFLAGS) $(filter-out $(CCOMPPATH),$^) -o $@
 
 .SECONDARY:
-%k1c.out: %k1c $(SIMUPATH)
+%kvx.out: %kvx $(SIMUPATH)
 	ret=0; timeout $(TIMEOUT) $(SIMU) -- $< > $@ || { ret=$$?; }; echo $$ret >> $@
 
 %x86.out: %x86
@@ -40,7 +40,7 @@ mmult-test-ccomp-k1c: mmult.c $(PRNG) $(CCOMPPATH)
 	@echo "0" > $@
 
 .PHONY:
-test: test-x86 test-k1c
+test: test-x86 test-kvx
 
 .PHONY:
 test-x86: $(X86_GCC_OUT) $(STUB_OUT)
@@ -51,17 +51,17 @@ test-x86: $(X86_GCC_OUT) $(STUB_OUT)
 	fi
 
 .PHONY:
-test-k1c: $(GCC_OUT) $(STUB_OUT)
+test-kvx: $(GCC_OUT) $(STUB_OUT)
 	@if ! diff $< $(STUB_OUT); then\
-		>&2 echo "ERROR k1c: $< failed";\
+		>&2 echo "ERROR kvx: $< failed";\
 	else\
-		echo "GOOD k1c: $< succeeded";\
+		echo "GOOD kvx: $< succeeded";\
 	fi
 
 .PHONY:
 check: $(CCOMP_OUT) $(STUB_OUT)
 	@if ! diff $< $(STUB_OUT); then\
-		>&2 echo "ERROR k1c: $< failed";\
+		>&2 echo "ERROR kvx: $< failed";\
 	else\
-		echo "GOOD k1c: $< succeeded";\
+		echo "GOOD kvx: $< succeeded";\
 	fi
diff --git a/test/mppa/mmult/README.md b/test/mppa/mmult/README.md
index ef2bff7e..780603f6 100644
--- a/test/mppa/mmult/README.md
+++ b/test/mppa/mmult/README.md
@@ -11,7 +11,7 @@ The following commands can be run inside the folder:
 
 - `make`: produces the unitary test binaries
   - `mmult-test-gcc-x86` : binary from gcc on x86
-  - `mmult-test-k1c-x86` : binary from gcc on k1c
-  - `mmult-test-ccomp-x86` : binary from ccomp on k1c
+  - `mmult-test-kvx-x86` : binary from gcc on kvx
+  - `mmult-test-ccomp-x86` : binary from ccomp on kvx
 - `make test`: tests the return value of the binaries produced by gcc.
 - `make check`: tests the return value of the binary produced by CompCert.
-- 
cgit