Re: [PATCH 5/6] selftests/nolibc: rename riscv to riscv64

From: Charlie Jenkins <charlie@rivosinc.com>
To: "Thomas Weißschuh" <linux@weissschuh.net>
Cc: Willy Tarreau <w@1wt.eu>, Shuah Khan <shuah@kernel.org>,
	Paul Walmsley <paul.walmsley@sifive.com>,
	Palmer Dabbelt <palmer@dabbelt.com>,
	Albert Ou <aou@eecs.berkeley.edu>,
	linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org,
	linux-riscv@lists.infradead.org, Zhangjin Wu <falcon@tinylab.org>
Subject: Re: [PATCH 5/6] selftests/nolibc: rename riscv to riscv64
Date: Fri, 17 Jan 2025 11:13:24 -0800	[thread overview]
Message-ID: <Z4qr1KMVbjGbYcFV@ghost> (raw)
In-Reply-To: <20241221-nolibc-rv32-v1-5-d9ef6dab7c63@weissschuh.net>

On Sat, Dec 21, 2024 at 03:44:32PM +0100, Thomas Weißschuh wrote:
> riscv32 support is about the be added. To keep the naming clear and
> consistent with other architectures rename riscv to riscv64, as that is
> what it actually represents.

Seems like a reasonable change.

Reviewed-by: Charlie Jenkins <charlie@rivosinc.com>
Tested-by: Charlie Jenkins <charlie@rivosinc.com>

> 
> Signed-off-by: Thomas Weißschuh <linux@weissschuh.net>
> ---
>  tools/testing/selftests/nolibc/Makefile     | 6 ++++++
>  tools/testing/selftests/nolibc/run-tests.sh | 2 +-
>  2 files changed, 7 insertions(+), 1 deletion(-)
> 
> diff --git a/tools/testing/selftests/nolibc/Makefile b/tools/testing/selftests/nolibc/Makefile
> index e92e0b88586111072a0e043cb15f3b59cf42c3a6..78f47e85b389ac229ac13f3e7c8299fb3ec92197 100644
> --- a/tools/testing/selftests/nolibc/Makefile
> +++ b/tools/testing/selftests/nolibc/Makefile
> @@ -43,6 +43,7 @@ cc-option = $(call __cc-option, $(CC),$(CLANG_CROSS_FLAGS),$(1),$(2))
>  # configure default variants for target kernel supported architectures
>  XARCH_powerpc    = ppc
>  XARCH_mips       = mips32le
> +XARCH_riscv      = riscv64
>  XARCH            = $(or $(XARCH_$(ARCH)),$(ARCH))
>  
>  # map from user input variants to their kernel supported architectures
> @@ -51,6 +52,7 @@ ARCH_ppc64       = powerpc
>  ARCH_ppc64le     = powerpc
>  ARCH_mips32le    = mips
>  ARCH_mips32be    = mips
> +ARCH_riscv64     = riscv
>  ARCH            := $(or $(ARCH_$(XARCH)),$(XARCH))
>  
>  # kernel image names by architecture
> @@ -65,6 +67,7 @@ IMAGE_ppc        = vmlinux
>  IMAGE_ppc64      = vmlinux
>  IMAGE_ppc64le    = arch/powerpc/boot/zImage
>  IMAGE_riscv      = arch/riscv/boot/Image
> +IMAGE_riscv64    = arch/riscv/boot/Image
>  IMAGE_s390       = arch/s390/boot/bzImage
>  IMAGE_loongarch  = arch/loongarch/boot/vmlinuz.efi
>  IMAGE            = $(objtree)/$(IMAGE_$(XARCH))
> @@ -82,6 +85,7 @@ DEFCONFIG_ppc        = pmac32_defconfig
>  DEFCONFIG_ppc64      = powernv_be_defconfig
>  DEFCONFIG_ppc64le    = powernv_defconfig
>  DEFCONFIG_riscv      = defconfig
> +DEFCONFIG_riscv64    = defconfig
>  DEFCONFIG_s390       = defconfig
>  DEFCONFIG_loongarch  = defconfig
>  DEFCONFIG            = $(DEFCONFIG_$(XARCH))
> @@ -104,6 +108,7 @@ QEMU_ARCH_ppc        = ppc
>  QEMU_ARCH_ppc64      = ppc64
>  QEMU_ARCH_ppc64le    = ppc64
>  QEMU_ARCH_riscv      = riscv64
> +QEMU_ARCH_riscv64    = riscv64
>  QEMU_ARCH_s390       = s390x
>  QEMU_ARCH_loongarch  = loongarch64
>  QEMU_ARCH            = $(QEMU_ARCH_$(XARCH))
> @@ -130,6 +135,7 @@ QEMU_ARGS_ppc        = -M g3beige -append "console=ttyS0 panic=-1 $(TEST:%=NOLIB
>  QEMU_ARGS_ppc64      = -M powernv -append "console=hvc0 panic=-1 $(TEST:%=NOLIBC_TEST=%)"
>  QEMU_ARGS_ppc64le    = -M powernv -append "console=hvc0 panic=-1 $(TEST:%=NOLIBC_TEST=%)"
>  QEMU_ARGS_riscv      = -M virt -append "console=ttyS0 panic=-1 $(TEST:%=NOLIBC_TEST=%)"
> +QEMU_ARGS_riscv64    = -M virt -append "console=ttyS0 panic=-1 $(TEST:%=NOLIBC_TEST=%)"
>  QEMU_ARGS_s390       = -M s390-ccw-virtio -append "console=ttyS0 panic=-1 $(TEST:%=NOLIBC_TEST=%)"
>  QEMU_ARGS_loongarch  = -M virt -append "console=ttyS0,115200 panic=-1 $(TEST:%=NOLIBC_TEST=%)"
>  QEMU_ARGS            = -m 1G $(QEMU_ARGS_$(XARCH)) $(QEMU_ARGS_BIOS) $(QEMU_ARGS_EXTRA)
> diff --git a/tools/testing/selftests/nolibc/run-tests.sh b/tools/testing/selftests/nolibc/run-tests.sh
> index e7ecda4ae796fbf0d389f20144511e66ce4f0b30..caa1ae40fe9a2faf8931c299aacd19716227e2b8 100755
> --- a/tools/testing/selftests/nolibc/run-tests.sh
> +++ b/tools/testing/selftests/nolibc/run-tests.sh
> @@ -17,7 +17,7 @@ perform_download=0
>  test_mode=system
>  werror=1
>  llvm=
> -archs="i386 x86_64 arm64 arm mips32le mips32be ppc ppc64 ppc64le riscv s390 loongarch"
> +archs="i386 x86_64 arm64 arm mips32le mips32be ppc ppc64 ppc64le riscv64 s390 loongarch"
>  
>  TEMP=$(getopt -o 'j:d:c:b:a:m:pelh' -n "$0" -- "$@")
>  
> 
> -- 
> 2.47.1
> 
> 
> _______________________________________________
> linux-riscv mailing list
> linux-riscv@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-riscv