Skip to content

Commit

Permalink
[litmus,test] Fix a few glitches
Browse files Browse the repository at this point in the history
  + Reference to non-existing directories in some of catalogue index files.
  + Change Makefile variable for `make litmus-aarch64-test RUN_TESTS=true` to function.
  • Loading branch information
maranget committed Dec 3, 2024
1 parent cd9b4a5 commit 57c86f6
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 10 deletions.
16 changes: 8 additions & 8 deletions Makefile.aarch64
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"

Expand All @@ -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"

Expand All @@ -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"

Expand Down
1 change: 0 additions & 1 deletion catalogue/aarch64-VMSA/tests/newlob/@all
Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 0 additions & 1 deletion catalogue/aarch64-VMSA/tests/order-via-faults/@all
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
aob/@all
bob/@all
cse-ob/@all
dob/@all
Expand Down
24 changes: 24 additions & 0 deletions litmus/libdir/kvm-armv8.4.cfg
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 57c86f6

Please sign in to comment.