From: Vineet Gupta <vineetg@rivosinc.com>
To: gcc-patches@gcc.gnu.org
Cc: kito.cheng@gmail.com, Jeff Law <jeffreyalaw@gmail.com>,
Palmer Dabbelt <palmer@rivosinc.com>,
Philipp Tomsich <philipp.tomsich@vrull.eu>,
Christoph Mullner <christoph.muellner@vrull.eu>,
gnu-toolchain@rivosinc.com, Vineet Gupta <vineetg@rivosinc.com>
Subject: [PATCH 1/3] testsuite: Unbork multilib testing on RISC-V (and any target really)
Date: Wed, 31 May 2023 09:25:32 -0700 [thread overview]
Message-ID: <20230531162534.119952-2-vineetg@rivosinc.com> (raw)
In-Reply-To: <20230531162534.119952-1-vineetg@rivosinc.com>
Multilib testing on trunk is currently busted (and surprisingly this
affects any/all targets but it seems nobody cares). We currently get the
following splat:
| ERROR: tcl error code NONE
| ERROR: torture-init: torture_without_loops is not empty as expected
And this takes down pretty much all of testsuite.
| ========= Summary of gcc testsuite =========
| | # of unexpected case / # of unique unexpected case
| | gcc | g++ | gfortran |
| rv64imafdc/ lp64d/ medlow | 5421 / 4 | 1 / 1 | 72 / 12 |
| rv32imafdc/ ilp32d/ medlow | 5422 / 5 | 3 / 2 | 72 / 12 |
| rv32imac/ ilp32/ medlow | 391 / 5 | 3 / 2 | 109 / 19 |
| rv64imac/ lp64/ medlow | 5422 / 5 | 1 / 1 | 109 / 19 |
There have been recent improvements in test harness around pairing of
torture-{init,finish} and checking for leaking torture options. This
however triggers a latent bug introduced way back in 2009: commit 3dd1415dc88
"i386-prefetch.exp: Skip tests when multilib flags contain -march" which
missed a pairing torture-finish. It was benign so far but in the new
regime it causes extra state "torture-init-done" confusing the 2nd round of
tests (in multilib).
This fix moves the early exit outside of torture-{init,finish} bracket
and brings RISC-V testing back to sanity.
| rv64imafdc/ lp64d/ medlow | 3 / 2 | 1 / 1 | 72 / 12 |
| rv32imafdc/ ilp32d/ medlow | 4 / 3 | 3 / 2 | 72 / 12 |
| rv32imac/ ilp32/ medlow | 3 / 2 | 3 / 2 | 109 / 19 |
| rv64imac/ lp64/ medlow | 5 / 4 | 1 / 1 | 109 / 19 |
gcc/testsuite:
* gcc.misc-tests/i386-prefetch.exp: Move early return outside
the torture-{init,finish}
Signed-off-by: Vineet Gupta <vineetg@rivosinc.com>
---
gcc/testsuite/gcc.misc-tests/i386-prefetch.exp | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/gcc/testsuite/gcc.misc-tests/i386-prefetch.exp b/gcc/testsuite/gcc.misc-tests/i386-prefetch.exp
index ad9e56a54bcf..7101b1e30576 100644
--- a/gcc/testsuite/gcc.misc-tests/i386-prefetch.exp
+++ b/gcc/testsuite/gcc.misc-tests/i386-prefetch.exp
@@ -82,6 +82,13 @@ if $tracelevel then {
strace $tracelevel
}
+if { [board_info target exists multilib_flags]
+ && [string match "* -march=*" " [board_info target multilib_flags] "] } {
+ # Multilib flags come after the -march flags we pass and override
+ # them, so skip these tests when such flags are passed.
+ return
+}
+
# Load support procs.
load_lib gcc-dg.exp
load_lib torture-options.exp
@@ -90,13 +97,6 @@ load_lib torture-options.exp
dg-init
torture-init
-if { [board_info target exists multilib_flags]
- && [string match "* -march=*" " [board_info target multilib_flags] "] } {
- # Multilib flags come after the -march flags we pass and override
- # them, so skip these tests when such flags are passed.
- return
-}
-
set-torture-options $PREFETCH_NONE
gcc-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/i386-pf-none-*.c]] "" ""
--
2.34.1
next prev parent reply other threads:[~2023-05-31 16:25 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-31 16:25 [PATCH 0/3] Unbork testsuite for multlib setups Vineet Gupta
2023-05-31 16:25 ` Vineet Gupta [this message]
2023-05-31 17:57 ` [PATCH 1/3] testsuite: Unbork multilib testing on RISC-V (and any target really) Jeff Law
2023-05-31 18:13 ` Iain Sandoe
2023-05-31 18:22 ` Vineet Gupta
2023-06-01 7:24 ` Thomas Schwinge
2023-06-01 11:47 ` Thomas Schwinge
2023-06-01 14:48 ` Jeff Law
2023-06-01 19:38 ` [Committed] testsuite: Unbork multilib setups using -march flags (RISC-V) Vineet Gupta
2023-05-31 18:16 ` [PATCH 1/3] testsuite: Unbork multilib testing on RISC-V (and any target really) Vineet Gupta
2023-06-01 14:52 ` Jeff Law
2023-05-31 16:25 ` [PATCH 2/3] RISC-V: Add missing torture-init and torture-finish for rvv.exp Vineet Gupta
2023-06-01 11:53 ` Thomas Schwinge
2023-06-01 14:54 ` Jeff Law
2023-06-01 19:33 ` Vineet Gupta
2023-05-31 16:25 ` [PATCH 3/3] testsuite: print any leaking torture options for debugging Vineet Gupta
2023-06-01 14:51 ` Jeff Law
2023-06-01 19:39 ` [Committed] " Vineet Gupta
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230531162534.119952-2-vineetg@rivosinc.com \
--to=vineetg@rivosinc.com \
--cc=christoph.muellner@vrull.eu \
--cc=gcc-patches@gcc.gnu.org \
--cc=gnu-toolchain@rivosinc.com \
--cc=jeffreyalaw@gmail.com \
--cc=kito.cheng@gmail.com \
--cc=palmer@rivosinc.com \
--cc=philipp.tomsich@vrull.eu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).