[PATCH v4 16/16] KVM: selftests: Override ARCH for x86_64 instead of using ARCH_DIR

[Muhammad Usama Anjum]

On 11/28/24 5:55 AM, Sean Christopherson wrote:
> Now that KVM selftests uses the kernel's canonical arch paths, directly
> override ARCH to 'x86' when targeting x86_64 instead of defining ARCH_DIR
> to redirect to appropriate paths.  ARCH_DIR was originally added to deal
> with KVM selftests using the target triple ARCH for directories, e.g.
> s390x and aarch64; keeping it around just to deal with the one-off alias
> from x86_64=>x86 is unnecessary and confusing.
> 
> Note, even when selftests are built from the top-level Makefile, ARCH is
> scoped to KVM's makefiles, i.e. overriding ARCH won't trip up some other
> selftests that (somehow) expects x86_64 and can't work with x86.
> 
> Signed-off-by: Sean Christopherson <seanjc at google.com>
Reviewed-by: Muhammad Usama Anjum <usama.anjum at collabora.com>

> ---
>  tools/testing/selftests/kvm/Makefile     |  4 +---
>  tools/testing/selftests/kvm/Makefile.kvm | 20 ++++++++++----------
>  2 files changed, 11 insertions(+), 13 deletions(-)
> 
> diff --git a/tools/testing/selftests/kvm/Makefile b/tools/testing/selftests/kvm/Makefile
> index 9bc2eba1af1c..20af35a91d6f 100644
> --- a/tools/testing/selftests/kvm/Makefile
> +++ b/tools/testing/selftests/kvm/Makefile
> @@ -6,9 +6,7 @@ ARCH            ?= $(SUBARCH)
>  ifeq ($(ARCH),$(filter $(ARCH),arm64 s390 riscv x86 x86_64))
>  # Top-level selftests allows ARCH=x86_64 :-(
>  ifeq ($(ARCH),x86_64)
> -	ARCH_DIR := x86
> -else
> -	ARCH_DIR := $(ARCH)
> +	ARCH := x86
>  endif
>  include Makefile.kvm
>  else
> diff --git a/tools/testing/selftests/kvm/Makefile.kvm b/tools/testing/selftests/kvm/Makefile.kvm
> index 9888dd6bb483..4277b983cace 100644
> --- a/tools/testing/selftests/kvm/Makefile.kvm
> +++ b/tools/testing/selftests/kvm/Makefile.kvm
> @@ -207,10 +207,10 @@ TEST_GEN_PROGS_riscv += steal_time
>  SPLIT_TESTS += arch_timer
>  SPLIT_TESTS += get-reg-list
>  
> -TEST_PROGS += $(TEST_PROGS_$(ARCH_DIR))
> -TEST_GEN_PROGS += $(TEST_GEN_PROGS_$(ARCH_DIR))
> -TEST_GEN_PROGS_EXTENDED += $(TEST_GEN_PROGS_EXTENDED_$(ARCH_DIR))
> -LIBKVM += $(LIBKVM_$(ARCH_DIR))
> +TEST_PROGS += $(TEST_PROGS_$(ARCH))
> +TEST_GEN_PROGS += $(TEST_GEN_PROGS_$(ARCH))
> +TEST_GEN_PROGS_EXTENDED += $(TEST_GEN_PROGS_EXTENDED_$(ARCH))
> +LIBKVM += $(LIBKVM_$(ARCH))
>  
>  OVERRIDE_TARGETS = 1
>  
> @@ -222,14 +222,14 @@ include ../lib.mk
>  INSTALL_HDR_PATH = $(top_srcdir)/usr
>  LINUX_HDR_PATH = $(INSTALL_HDR_PATH)/include/
>  LINUX_TOOL_INCLUDE = $(top_srcdir)/tools/include
> -LINUX_TOOL_ARCH_INCLUDE = $(top_srcdir)/tools/arch/$(ARCH_DIR)/include
> +LINUX_TOOL_ARCH_INCLUDE = $(top_srcdir)/tools/arch/$(ARCH)/include
>  CFLAGS += -Wall -Wstrict-prototypes -Wuninitialized -O2 -g -std=gnu99 \
>  	-Wno-gnu-variable-sized-type-not-at-end -MD -MP -DCONFIG_64BIT \
>  	-fno-builtin-memcmp -fno-builtin-memcpy \
>  	-fno-builtin-memset -fno-builtin-strnlen \
>  	-fno-stack-protector -fno-PIE -fno-strict-aliasing \
>  	-I$(LINUX_TOOL_INCLUDE) -I$(LINUX_TOOL_ARCH_INCLUDE) \
> -	-I$(LINUX_HDR_PATH) -Iinclude -I$(<D) -Iinclude/$(ARCH_DIR) \
> +	-I$(LINUX_HDR_PATH) -Iinclude -I$(<D) -Iinclude/$(ARCH) \
>  	-I ../rseq -I.. $(EXTRA_CFLAGS) $(KHDR_INCLUDES)
>  ifeq ($(ARCH),s390)
>  	CFLAGS += -march=z10
> @@ -273,7 +273,7 @@ LIBKVM_S_OBJ := $(patsubst %.S, $(OUTPUT)/%.o, $(LIBKVM_S))
>  LIBKVM_STRING_OBJ := $(patsubst %.c, $(OUTPUT)/%.o, $(LIBKVM_STRING))
>  LIBKVM_OBJS = $(LIBKVM_C_OBJ) $(LIBKVM_S_OBJ) $(LIBKVM_STRING_OBJ)
>  SPLIT_TEST_GEN_PROGS := $(patsubst %, $(OUTPUT)/%, $(SPLIT_TESTS))
> -SPLIT_TEST_GEN_OBJ := $(patsubst %, $(OUTPUT)/$(ARCH_DIR)/%.o, $(SPLIT_TESTS))
> +SPLIT_TEST_GEN_OBJ := $(patsubst %, $(OUTPUT)/$(ARCH)/%.o, $(SPLIT_TESTS))
>  
>  TEST_GEN_OBJ = $(patsubst %, %.o, $(TEST_GEN_PROGS))
>  TEST_GEN_OBJ += $(patsubst %, %.o, $(TEST_GEN_PROGS_EXTENDED))
> @@ -282,7 +282,7 @@ TEST_DEP_FILES += $(patsubst %.o, %.d, $(LIBKVM_OBJS))
>  TEST_DEP_FILES += $(patsubst %.o, %.d, $(SPLIT_TEST_GEN_OBJ))
>  -include $(TEST_DEP_FILES)
>  
> -$(shell mkdir -p $(sort $(OUTPUT)/$(ARCH_DIR) $(dir $(LIBKVM_C_OBJ) $(LIBKVM_S_OBJ))))
> +$(shell mkdir -p $(sort $(OUTPUT)/$(ARCH) $(dir $(LIBKVM_C_OBJ) $(LIBKVM_S_OBJ))))
>  
>  $(filter-out $(SPLIT_TEST_GEN_PROGS), $(TEST_GEN_PROGS)) \
>  $(TEST_GEN_PROGS_EXTENDED): %: %.o
> @@ -290,9 +290,9 @@ $(TEST_GEN_PROGS_EXTENDED): %: %.o
>  $(TEST_GEN_OBJ): $(OUTPUT)/%.o: %.c
>  	$(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c $< -o $@
>  
> -$(SPLIT_TEST_GEN_PROGS): $(OUTPUT)/%: $(OUTPUT)/%.o $(OUTPUT)/$(ARCH_DIR)/%.o
> +$(SPLIT_TEST_GEN_PROGS): $(OUTPUT)/%: $(OUTPUT)/%.o $(OUTPUT)/$(ARCH)/%.o
>  	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(TARGET_ARCH) $^ $(LDLIBS) -o $@
> -$(SPLIT_TEST_GEN_OBJ): $(OUTPUT)/$(ARCH_DIR)/%.o: $(ARCH_DIR)/%.c
> +$(SPLIT_TEST_GEN_OBJ): $(OUTPUT)/$(ARCH)/%.o: $(ARCH)/%.c
>  	$(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c $< -o $@
>  
>  EXTRA_CLEAN += $(GEN_HDRS) \


-- 
BR,
Muhammad Usama Anjum