From 57c86f6181634bbae6fcf039d3564635b3112524 Mon Sep 17 00:00:00 2001
From: maranget <Luc.Maranget@inria.fr>
Date: Tue, 3 Dec 2024 12:48:11 +0100
Subject: [PATCH] [litmus,test] Fix a few glitches

  + Reference to non-existing directories in some of catalogue index files.
  + Change Makefile variable for `make litmus-aarch64-test RUN_TESTS=true` to function.
---
 Makefile.aarch64                              | 16 ++++++-------
 catalogue/aarch64-VMSA/tests/newlob/@all      |  1 -
 .../aarch64-VMSA/tests/order-via-faults/@all  |  1 -
 litmus/libdir/kvm-armv8.4.cfg                 | 24 +++++++++++++++++++
 4 files changed, 32 insertions(+), 10 deletions(-)
 create mode 100644 litmus/libdir/kvm-armv8.4.cfg

diff --git a/Makefile.aarch64 b/Makefile.aarch64
index 96be521013..0342d55cc6 100644
--- a/Makefile.aarch64
+++ b/Makefile.aarch64
@@ -56,10 +56,10 @@ KUT_CONFIG_PARAMS=--arch=arm64 --page-size=4k --cross-prefix=$(KUT_AARCH64_PREFF
 KUT_DIR_AARCH64:=$(shell mktemp -d)
 
 litmus-aarch64-dep:
-	cd $(KUT_DIR_AARCH64);							\
-	git clone -q https://gitlab.com/kvm-unit-tests/kvm-unit-tests.git;	\
-	cd kvm-unit-tests;							\
-	./configure $(KUT_CONFIG_PARAMS); 					\
+	cd $(KUT_DIR_AARCH64);                                             \
+	git clone -q https://gitlab.com/kvm-unit-tests/kvm-unit-tests.git; \
+	cd kvm-unit-tests;                                                 \
+	./configure $(KUT_CONFIG_PARAMS);                                  \
 	make $(SILENTOPT)
 
 litmus-aarch64-test:: litmus-cata-aarch64-test-kvm
@@ -71,7 +71,7 @@ litmus-cata-aarch64-test-kvm: litmus-aarch64-dep
 		-mach kvm-armv8.1 -a 4			\
 		catalogue/aarch64/tests/@all
 	cd $(KUT_DIR_AARCH64)/kvm-unit-tests/t; make $(SILENTOPT) -j $(J)
-	if $(RUN_TESTS); then ( cd $(KUT_DIR)/kvm-unit-tests && sh t/run.sh ); fi
+	if $(RUN_TESTS); then ( cd $(KUT_DIR_AARCH64)/kvm-unit-tests && sh t/run.sh ); fi
 	$(RM) -r $(KUT_DIR_AARCH64)/kvm-unit-tests/t
 	@ echo "litmus7 in -mode kvm catalogue aarch64 tests: OK"
 
@@ -81,10 +81,10 @@ litmus-cata-aarch64-VMSA-test-kvm: litmus-aarch64-dep
 	$(LITMUS)					\
 		-set-libdir $(LITMUS_LIB_DIR)	        \
 		-o $(KUT_DIR_AARCH64)/kvm-unit-tests/t	\
-		-mach kvm-armv8.1 -a 4			\
+		-mach kvm-armv8.4 -a 4			\
 		catalogue/aarch64-VMSA/tests/@all
 	cd $(KUT_DIR_AARCH64)/kvm-unit-tests/t; make $(SILENTOPT) -j $(J)
-	if $(RUN_TESTS); then ( cd $(KUT_DIR)/kvm-unit-tests && sh t/run.sh ); fi
+	if $(RUN_TESTS); then ( cd $(KUT_DIR_AARCH64)/kvm-unit-tests && sh t/run.sh ); fi
 	$(RM) -r $(KUT_DIR_AARCH64)/kvm-unit-tests/t
 	@ echo "litmus7 in -mode kvm catalogue aarch64-VMSA tests: OK"
 
@@ -97,7 +97,7 @@ litmus-cata-aarch64-ifetch-test-kvm: litmus-aarch64-dep
 		-mach kvm-armv8.1 -variant self -a 4	\
 		catalogue/aarch64-ifetch/tests/@all
 	cd $(KUT_DIR_AARCH64)/kvm-unit-tests/t; make $(SILENTOPT) -j $(J)
-	if $(RUN_TESTS); then ( cd $(KUT_DIR)/kvm-unit-tests && sh t/run.sh ); fi
+	if $(RUN_TESTS); then ( cd $(KUT_DIR_AARCH64)/kvm-unit-tests && sh t/run.sh ); fi
 	$(RM) -r $(KUT_DIR_AARCH64)/kvm-unit-tests/t
 	@ echo "litmus7 in -mode kvm catalogue aarch64-ifetch tests: OK"
 
diff --git a/catalogue/aarch64-VMSA/tests/newlob/@all b/catalogue/aarch64-VMSA/tests/newlob/@all
index 35fbc1951f..c0aa3ae43a 100644
--- a/catalogue/aarch64-VMSA/tests/newlob/@all
+++ b/catalogue/aarch64-VMSA/tests/newlob/@all
@@ -1,4 +1,3 @@
-mmufault/@all
 LB+dmb.sy+acq-HU.litmus
 LB+dmb.sy+dmb.sy-HU.litmus
 LB+dmb.sy+dsb.sy-HU.litmus
diff --git a/catalogue/aarch64-VMSA/tests/order-via-faults/@all b/catalogue/aarch64-VMSA/tests/order-via-faults/@all
index e52552afc3..98ace94667 100644
--- a/catalogue/aarch64-VMSA/tests/order-via-faults/@all
+++ b/catalogue/aarch64-VMSA/tests/order-via-faults/@all
@@ -1,4 +1,3 @@
-aob/@all
 bob/@all
 cse-ob/@all
 dob/@all
diff --git a/litmus/libdir/kvm-armv8.4.cfg b/litmus/libdir/kvm-armv8.4.cfg
new file mode 100644
index 0000000000..81ba469f89
--- /dev/null
+++ b/litmus/libdir/kvm-armv8.4.cfg
@@ -0,0 +1,24 @@
+#ODROID-C2 compile as armv8.1
+size_of_test = 5k
+number_of_run = 200
+avail = 4
+limit = true
+memory = direct
+stride = 1
+carch = AArch64
+barrier = userfence
+smt = 1
+smt_mode = seq
+ascall = true
+mode = kvm
+delay = 32
+makevar = AUXFLAGS=0x0
+makevar = SRCDIR=$(PWD)/..
+makevar = -include $(SRCDIR)/config.mak
+makevar = libcflat = $(SRCDIR)/lib/libcflat.a
+makevar = libeabi = $(SRCDIR)/lib/arm/libeabi.a
+makevar = LIBFDT_archive = $(SRCDIR)/lib/libfdt/libfdt.a
+makevar = cstart.o = $(SRCDIR)/arm/cstart64.o
+makevar = FLATLIBS = $(libcflat) $(LIBFDT_archive) $(libeabi)
+makevar = optional-ccopt = $(shell if $(CC) -Werror $(1) -S -o /dev/null -xc /dev/null > /dev/null 2>&1; then echo "$(1)"; fi)
+ccopts = -std=gnu99 -ffreestanding -I $(SRCDIR)/lib -I $(SRCDIR)/libfdt -Wall -Werror  -fomit-frame-pointer -Wno-frame-address   -fno-pic  -no-pie -Wmissing-parameter-type -Wold-style-declaration -Woverride-init -O2 $(call optional-ccopt, -mno-outline-atomics) -march=armv8.4-a