diff mbox series

[v3,24/33] tests/tcg: Remove run-test-mmap-*

Message ID 20240102015808.132373-25-richard.henderson@linaro.org
State Superseded
Headers show
Series linux-user: Improve host and guest page size handling | expand

Commit Message

Richard Henderson Jan. 2, 2024, 1:57 a.m. UTC 
These tests are confused, because -p does not change
the guest page size, but the host page size.

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
 tests/tcg/alpha/Makefile.target     |  3 ---
 tests/tcg/arm/Makefile.target       |  3 ---
 tests/tcg/hppa/Makefile.target      |  3 ---
 tests/tcg/i386/Makefile.target      |  3 ---
 tests/tcg/m68k/Makefile.target      |  3 ---
 tests/tcg/multiarch/Makefile.target |  9 ---------
 tests/tcg/ppc/Makefile.target       | 12 ------------
 tests/tcg/sh4/Makefile.target       |  3 ---
 tests/tcg/sparc64/Makefile.target   |  6 ------
 9 files changed, 45 deletions(-)
 delete mode 100644 tests/tcg/ppc/Makefile.target
 delete mode 100644 tests/tcg/sparc64/Makefile.target

Comments

Pierrick Bouvier Jan. 8, 2024, 11:07 a.m. UTC | #1 
On 1/2/24 05:57, Richard Henderson wrote:
> These tests are confused, because -p does not change
> the guest page size, but the host page size.
> 
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
>   tests/tcg/alpha/Makefile.target     |  3 ---
>   tests/tcg/arm/Makefile.target       |  3 ---
>   tests/tcg/hppa/Makefile.target      |  3 ---
>   tests/tcg/i386/Makefile.target      |  3 ---
>   tests/tcg/m68k/Makefile.target      |  3 ---
>   tests/tcg/multiarch/Makefile.target |  9 ---------
>   tests/tcg/ppc/Makefile.target       | 12 ------------
>   tests/tcg/sh4/Makefile.target       |  3 ---
>   tests/tcg/sparc64/Makefile.target   |  6 ------
>   9 files changed, 45 deletions(-)
>   delete mode 100644 tests/tcg/ppc/Makefile.target
>   delete mode 100644 tests/tcg/sparc64/Makefile.target
> 
> diff --git a/tests/tcg/alpha/Makefile.target b/tests/tcg/alpha/Makefile.target
> index b94500a7d9..fdd7ddf64e 100644
> --- a/tests/tcg/alpha/Makefile.target
> +++ b/tests/tcg/alpha/Makefile.target
> @@ -13,6 +13,3 @@ test-cmov: test-cond.c
>   	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $< -o $@ $(LDFLAGS)
>   
>   run-test-cmov: test-cmov
> -
> -# On Alpha Linux only supports 8k pages
> -EXTRA_RUNS+=run-test-mmap-8192
> diff --git a/tests/tcg/arm/Makefile.target b/tests/tcg/arm/Makefile.target
> index 3473f4619e..0a1965fce7 100644
> --- a/tests/tcg/arm/Makefile.target
> +++ b/tests/tcg/arm/Makefile.target
> @@ -79,6 +79,3 @@ sha512-vector: sha512.c
>   ARM_TESTS += sha512-vector
>   
>   TESTS += $(ARM_TESTS)
> -
> -# On ARM Linux only supports 4k pages
> -EXTRA_RUNS+=run-test-mmap-4096
> diff --git a/tests/tcg/hppa/Makefile.target b/tests/tcg/hppa/Makefile.target
> index cdd0d572a7..ea5ae2186d 100644
> --- a/tests/tcg/hppa/Makefile.target
> +++ b/tests/tcg/hppa/Makefile.target
> @@ -2,9 +2,6 @@
>   #
>   # HPPA specific tweaks - specifically masking out broken tests
>   
> -# On parisc Linux supports 4K/16K/64K (but currently only 4k works)
> -EXTRA_RUNS+=run-test-mmap-4096 # run-test-mmap-16384 run-test-mmap-65536
> -
>   # This triggers failures for hppa-linux about 1% of the time
>   # HPPA is the odd target that can't use the sigtramp page;
>   # it requires the full vdso with dwarf2 unwind info.
> diff --git a/tests/tcg/i386/Makefile.target b/tests/tcg/i386/Makefile.target
> index 3dec7c6c42..53540ac96a 100644
> --- a/tests/tcg/i386/Makefile.target
> +++ b/tests/tcg/i386/Makefile.target
> @@ -71,9 +71,6 @@ endif
>   I386_TESTS:=$(filter-out $(SKIP_I386_TESTS), $(ALL_X86_TESTS))
>   TESTS=$(MULTIARCH_TESTS) $(I386_TESTS)
>   
> -# On i386 and x86_64 Linux only supports 4k pages (large pages are a different hack)
> -EXTRA_RUNS+=run-test-mmap-4096
> -
>   sha512-sse: CFLAGS=-msse4.1 -O3
>   sha512-sse: sha512.c
>   	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $< -o $@ $(LDFLAGS)
> diff --git a/tests/tcg/m68k/Makefile.target b/tests/tcg/m68k/Makefile.target
> index 6ff214e60a..33f7b1b127 100644
> --- a/tests/tcg/m68k/Makefile.target
> +++ b/tests/tcg/m68k/Makefile.target
> @@ -5,6 +5,3 @@
>   
>   VPATH += $(SRC_PATH)/tests/tcg/m68k
>   TESTS += trap denormal
> -
> -# On m68k Linux supports 4k and 8k pages (but 8k is currently broken)
> -EXTRA_RUNS+=run-test-mmap-4096 # run-test-mmap-8192
> diff --git a/tests/tcg/multiarch/Makefile.target b/tests/tcg/multiarch/Makefile.target
> index d31ba8d6ae..313f7417ba 100644
> --- a/tests/tcg/multiarch/Makefile.target
> +++ b/tests/tcg/multiarch/Makefile.target
> @@ -51,18 +51,9 @@ run-plugin-vma-pthread-with-%: vma-pthread
>   	$(call skip-test, $<, "flaky on CI?")
>   endif
>   
> -# We define the runner for test-mmap after the individual
> -# architectures have defined their supported pages sizes. If no
> -# additional page sizes are defined we only run the default test.
> -
> -# default case (host page size)
>   run-test-mmap: test-mmap
>   	$(call run-test, test-mmap, $(QEMU) $<, $< (default))
>   
> -# additional page sizes (defined by each architecture adding to EXTRA_RUNS)
> -run-test-mmap-%: test-mmap
> -	$(call run-test, test-mmap-$*, $(QEMU) -p $* $<, $< ($* byte pages))
> -
>   ifneq ($(GDB),)
>   GDB_SCRIPT=$(SRC_PATH)/tests/guest-debug/run-test.py
>   
> diff --git a/tests/tcg/ppc/Makefile.target b/tests/tcg/ppc/Makefile.target
> deleted file mode 100644
> index f5e08c7376..0000000000
> --- a/tests/tcg/ppc/Makefile.target
> +++ /dev/null
> @@ -1,12 +0,0 @@
> -# -*- Mode: makefile -*-
> -#
> -# PPC - included from tests/tcg/Makefile
> -#
> -
> -ifneq (,$(findstring 64,$(TARGET_NAME)))
> -# On PPC64 Linux can be configured with 4k (default) or 64k pages (currently broken)
> -EXTRA_RUNS+=run-test-mmap-4096 #run-test-mmap-65536
> -else
> -# On PPC32 Linux supports 4K/16K/64K/256K (but currently only 4k works)
> -EXTRA_RUNS+=run-test-mmap-4096 #run-test-mmap-16384 run-test-mmap-65536 run-test-mmap-262144
> -endif
> diff --git a/tests/tcg/sh4/Makefile.target b/tests/tcg/sh4/Makefile.target
> index 47c39a44b6..16eaa850a8 100644
> --- a/tests/tcg/sh4/Makefile.target
> +++ b/tests/tcg/sh4/Makefile.target
> @@ -3,9 +3,6 @@
>   # SuperH specific tweaks
>   #
>   
> -# On sh Linux supports 4k, 8k, 16k and 64k pages (but only 4k currently works)
> -EXTRA_RUNS+=run-test-mmap-4096 # run-test-mmap-8192 run-test-mmap-16384 run-test-mmap-65536
> -
>   # This triggers failures for sh4-linux about 10% of the time.
>   # Random SIGSEGV at unpredictable guest address, cause unknown.
>   run-signals: signals
> diff --git a/tests/tcg/sparc64/Makefile.target b/tests/tcg/sparc64/Makefile.target
> deleted file mode 100644
> index 408dace783..0000000000
> --- a/tests/tcg/sparc64/Makefile.target
> +++ /dev/null
> @@ -1,6 +0,0 @@
> -# -*- Mode: makefile -*-
> -#
> -# sparc specific tweaks
> -
> -# On Sparc64 Linux support 8k pages
> -EXTRA_RUNS+=run-test-mmap-8192

Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Ilya Leoshkevich Jan. 30, 2024, 10:46 a.m. UTC | #2 
On Tue, Jan 02, 2024 at 12:57:59PM +1100, Richard Henderson wrote:
> These tests are confused, because -p does not change
> the guest page size, but the host page size.
> 
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
>  tests/tcg/alpha/Makefile.target     |  3 ---
>  tests/tcg/arm/Makefile.target       |  3 ---
>  tests/tcg/hppa/Makefile.target      |  3 ---
>  tests/tcg/i386/Makefile.target      |  3 ---
>  tests/tcg/m68k/Makefile.target      |  3 ---
>  tests/tcg/multiarch/Makefile.target |  9 ---------
>  tests/tcg/ppc/Makefile.target       | 12 ------------
>  tests/tcg/sh4/Makefile.target       |  3 ---
>  tests/tcg/sparc64/Makefile.target   |  6 ------
>  9 files changed, 45 deletions(-)
>  delete mode 100644 tests/tcg/ppc/Makefile.target
>  delete mode 100644 tests/tcg/sparc64/Makefile.target

Reviewed-by: Ilya Leoshkevich <iii@linux.ibm.com>
diff mbox series

Patch

diff --git a/tests/tcg/alpha/Makefile.target b/tests/tcg/alpha/Makefile.target
index b94500a7d9..fdd7ddf64e 100644
--- a/tests/tcg/alpha/Makefile.target
+++ b/tests/tcg/alpha/Makefile.target
@@ -13,6 +13,3 @@  test-cmov: test-cond.c
 	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $< -o $@ $(LDFLAGS)
 
 run-test-cmov: test-cmov
-
-# On Alpha Linux only supports 8k pages
-EXTRA_RUNS+=run-test-mmap-8192
diff --git a/tests/tcg/arm/Makefile.target b/tests/tcg/arm/Makefile.target
index 3473f4619e..0a1965fce7 100644
--- a/tests/tcg/arm/Makefile.target
+++ b/tests/tcg/arm/Makefile.target
@@ -79,6 +79,3 @@  sha512-vector: sha512.c
 ARM_TESTS += sha512-vector
 
 TESTS += $(ARM_TESTS)
-
-# On ARM Linux only supports 4k pages
-EXTRA_RUNS+=run-test-mmap-4096
diff --git a/tests/tcg/hppa/Makefile.target b/tests/tcg/hppa/Makefile.target
index cdd0d572a7..ea5ae2186d 100644
--- a/tests/tcg/hppa/Makefile.target
+++ b/tests/tcg/hppa/Makefile.target
@@ -2,9 +2,6 @@ 
 #
 # HPPA specific tweaks - specifically masking out broken tests
 
-# On parisc Linux supports 4K/16K/64K (but currently only 4k works)
-EXTRA_RUNS+=run-test-mmap-4096 # run-test-mmap-16384 run-test-mmap-65536
-
 # This triggers failures for hppa-linux about 1% of the time
 # HPPA is the odd target that can't use the sigtramp page;
 # it requires the full vdso with dwarf2 unwind info.
diff --git a/tests/tcg/i386/Makefile.target b/tests/tcg/i386/Makefile.target
index 3dec7c6c42..53540ac96a 100644
--- a/tests/tcg/i386/Makefile.target
+++ b/tests/tcg/i386/Makefile.target
@@ -71,9 +71,6 @@  endif
 I386_TESTS:=$(filter-out $(SKIP_I386_TESTS), $(ALL_X86_TESTS))
 TESTS=$(MULTIARCH_TESTS) $(I386_TESTS)
 
-# On i386 and x86_64 Linux only supports 4k pages (large pages are a different hack)
-EXTRA_RUNS+=run-test-mmap-4096
-
 sha512-sse: CFLAGS=-msse4.1 -O3
 sha512-sse: sha512.c
 	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $< -o $@ $(LDFLAGS)
diff --git a/tests/tcg/m68k/Makefile.target b/tests/tcg/m68k/Makefile.target
index 6ff214e60a..33f7b1b127 100644
--- a/tests/tcg/m68k/Makefile.target
+++ b/tests/tcg/m68k/Makefile.target
@@ -5,6 +5,3 @@ 
 
 VPATH += $(SRC_PATH)/tests/tcg/m68k
 TESTS += trap denormal
-
-# On m68k Linux supports 4k and 8k pages (but 8k is currently broken)
-EXTRA_RUNS+=run-test-mmap-4096 # run-test-mmap-8192
diff --git a/tests/tcg/multiarch/Makefile.target b/tests/tcg/multiarch/Makefile.target
index d31ba8d6ae..313f7417ba 100644
--- a/tests/tcg/multiarch/Makefile.target
+++ b/tests/tcg/multiarch/Makefile.target
@@ -51,18 +51,9 @@  run-plugin-vma-pthread-with-%: vma-pthread
 	$(call skip-test, $<, "flaky on CI?")
 endif
 
-# We define the runner for test-mmap after the individual
-# architectures have defined their supported pages sizes. If no
-# additional page sizes are defined we only run the default test.
-
-# default case (host page size)
 run-test-mmap: test-mmap
 	$(call run-test, test-mmap, $(QEMU) $<, $< (default))
 
-# additional page sizes (defined by each architecture adding to EXTRA_RUNS)
-run-test-mmap-%: test-mmap
-	$(call run-test, test-mmap-$*, $(QEMU) -p $* $<, $< ($* byte pages))
-
 ifneq ($(GDB),)
 GDB_SCRIPT=$(SRC_PATH)/tests/guest-debug/run-test.py
 
diff --git a/tests/tcg/ppc/Makefile.target b/tests/tcg/ppc/Makefile.target
deleted file mode 100644
index f5e08c7376..0000000000
--- a/tests/tcg/ppc/Makefile.target
+++ /dev/null
@@ -1,12 +0,0 @@ 
-# -*- Mode: makefile -*-
-#
-# PPC - included from tests/tcg/Makefile
-#
-
-ifneq (,$(findstring 64,$(TARGET_NAME)))
-# On PPC64 Linux can be configured with 4k (default) or 64k pages (currently broken)
-EXTRA_RUNS+=run-test-mmap-4096 #run-test-mmap-65536
-else
-# On PPC32 Linux supports 4K/16K/64K/256K (but currently only 4k works)
-EXTRA_RUNS+=run-test-mmap-4096 #run-test-mmap-16384 run-test-mmap-65536 run-test-mmap-262144
-endif
diff --git a/tests/tcg/sh4/Makefile.target b/tests/tcg/sh4/Makefile.target
index 47c39a44b6..16eaa850a8 100644
--- a/tests/tcg/sh4/Makefile.target
+++ b/tests/tcg/sh4/Makefile.target
@@ -3,9 +3,6 @@ 
 # SuperH specific tweaks
 #
 
-# On sh Linux supports 4k, 8k, 16k and 64k pages (but only 4k currently works)
-EXTRA_RUNS+=run-test-mmap-4096 # run-test-mmap-8192 run-test-mmap-16384 run-test-mmap-65536
-
 # This triggers failures for sh4-linux about 10% of the time.
 # Random SIGSEGV at unpredictable guest address, cause unknown.
 run-signals: signals
diff --git a/tests/tcg/sparc64/Makefile.target b/tests/tcg/sparc64/Makefile.target
deleted file mode 100644
index 408dace783..0000000000
--- a/tests/tcg/sparc64/Makefile.target
+++ /dev/null
@@ -1,6 +0,0 @@ 
-# -*- Mode: makefile -*-
-#
-# sparc specific tweaks
-
-# On Sparc64 Linux support 8k pages
-EXTRA_RUNS+=run-test-mmap-8192