From patchwork Wed May 31 16:25:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vineet Gupta X-Patchwork-Id: 101534 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp3004427vqr; Wed, 31 May 2023 09:27:00 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ435WweM0Zb6bCnUy2/6Fb2fb2hKcYo+TF78WRibhhhB3Vak5COPfIf7ZU3M+1BqaL9KnB8 X-Received: by 2002:a17:907:1c9f:b0:8b8:c06e:52d8 with SMTP id nb31-20020a1709071c9f00b008b8c06e52d8mr6648117ejc.36.1685550420312; Wed, 31 May 2023 09:27:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685550420; cv=none; d=google.com; s=arc-20160816; b=Nq2pyMtNXYyhYkUkFgRbNGCxaDdChpAogwILxgTvCaKAGXECQLJXf4Zho8edcLGrkQ XLLkfNrn7lM8XhBK4dKcJJAGetOt3TxBHksHDP3NuDhPrOYwCtRolRib4Fn/4dRUtqrP lw/wJ++Dc9QxS9wgai5uwKKXooYsAuiB8PN1GT3WSCkG2XuEC77mM5tT1tvv2DwGyhwX is5yOzDSIe8T/4XPS+OAUxkTVryBk4EgrkehX9RTWIFvwhaR09WPX5hY+69rU8lDN0Tr 7KHpFaeuv1BHiaH457vuXfBU8qMI0WrIErjaHMrX8o+eCjL1z0Fx/EZKW+5PxnHr6Mov 7XEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature:dmarc-filter:delivered-to; bh=ZhKjMevQO/wve3r9OhIhqIjNO5qPfkR3dR2fIs13tPI=; b=X9oNpcm9F+NFSmvNedfsXRjmXBC3iNy098MDiwP7YepS0R8jh1Zz9nFgQhLhDxENWN fDT9AY8z/M5rKJGcQRWrNUeMQzpk9wUkpYoMqkDM5YSbW4YYEdjwBQ8LFnZS0FhorqPK q/uLC1EBtjpzG1ercncaajqg9VNvYDe0/RY0u1yZKu0U4QdME2B0h60QMrD10KfKTyl1 7fK/NzjXw1LGTXYQyrczzkjr7Rm68QAJcWUv/CW/0hRxzkjVfARuFW8AFVl2WMloaJuv qUWtgY9DitvYgT0T8/rN63W0T3IAHjF0ZGyZzwUIz4RWG/7OJ33s3qZcsEp3/o89xoJg M6Ow== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@rivosinc-com.20221208.gappssmtp.com header.s=20221208 header.b=Jev4Xiae; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org" Received: from sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id h26-20020a1709062dda00b0096f68864fbasi11950315eji.637.2023.05.31.09.27.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 31 May 2023 09:27:00 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@rivosinc-com.20221208.gappssmtp.com header.s=20221208 header.b=Jev4Xiae; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org" Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 8E189385703A for ; Wed, 31 May 2023 16:26:48 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-pl1-x62e.google.com (mail-pl1-x62e.google.com [IPv6:2607:f8b0:4864:20::62e]) by sourceware.org (Postfix) with ESMTPS id 99A293858CDB for ; Wed, 31 May 2023 16:25:55 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 99A293858CDB Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=rivosinc.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=rivosinc.com Received: by mail-pl1-x62e.google.com with SMTP id d9443c01a7336-1b02fcde49aso26826655ad.0 for ; Wed, 31 May 2023 09:25:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20221208.gappssmtp.com; s=20221208; t=1685550354; x=1688142354; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ZhKjMevQO/wve3r9OhIhqIjNO5qPfkR3dR2fIs13tPI=; b=Jev4XiaecOE2HYaajfjHRMKwQkXaul3llK/lGFvykg9rwZWciVrQF+5Amqa0JyfVxz c6KyMF+3633PwMi4dwbC4nt93K4yc7pJJHE46HwKbD+pO+VgxxC4gJBS8iUn3mIFskyl 92uJ+rCLXKH6SGZggIqNms3jo6xKYiMfBX12YFe+GH7vOvZpi7QaanPuS37/FgVWZ3n0 54/U1j+HIHil0GnNQ95IVdyC54igu9uLgHUDe6ROJPSKADEa6ue6yDjFK4jBp8Y28VfC NFLfLgOZtyntA4iymqsGUOzwyGnK9njghfM93qlqiHEQNEXH2QI6/Nax6+lkBzBvuqP8 ZPRg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685550354; x=1688142354; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ZhKjMevQO/wve3r9OhIhqIjNO5qPfkR3dR2fIs13tPI=; b=S4tiukyiCxJX4Ptlr7vNk2njUafQTpbwJaEMYm2NorDB5pwnm6hXt+CjtETMBj6KhX C9gBR5y7+X9NLVhVIwXuVPYYcJbAVIeC3RZjYRiE8wJvxRdpOoTJm1KT6fcXgWXngxgh KghAGsMViXK70UWRbuniYGvonzAhSqe+WrbSYo3h5QS1W49TbETnkyXfzt7WLI5kN9QI vGT8MRHCVt+Bq6/7C+nqSrSF1RjlHKK1ytB/EJjaRCrMKuLuYDzQ0D4GXfuj/K62FkNj o2TNUtWjFkHassVqbnjV+uQP9OglavBpeEzconY01cwfO61IQfqCt0gLAQdI7vSAawdo DUtQ== X-Gm-Message-State: AC+VfDz/MLmFoENt6UrnP8aQUdfRoBrJrT0yaLq/EgT4j+NhnB1ZRbBd RtYYpu7vxaZTnubolrOF+E3Euek3w7BAzPIFz/g= X-Received: by 2002:a17:902:7045:b0:1af:cf34:a645 with SMTP id h5-20020a170902704500b001afcf34a645mr4466522plt.21.1685550354458; Wed, 31 May 2023 09:25:54 -0700 (PDT) Received: from vineet-framework.ba.rivosinc.com ([71.202.114.183]) by smtp.gmail.com with ESMTPSA id q9-20020a170902788900b001a6f7744a27sm1604443pll.87.2023.05.31.09.25.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 31 May 2023 09:25:54 -0700 (PDT) From: Vineet Gupta To: gcc-patches@gcc.gnu.org Cc: kito.cheng@gmail.com, Jeff Law , Palmer Dabbelt , Philipp Tomsich , Christoph Mullner , gnu-toolchain@rivosinc.com, Vineet Gupta Subject: [PATCH 1/3] testsuite: Unbork multilib testing on RISC-V (and any target really) Date: Wed, 31 May 2023 09:25:32 -0700 Message-Id: <20230531162534.119952-2-vineetg@rivosinc.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230531162534.119952-1-vineetg@rivosinc.com> References: <20230531162534.119952-1-vineetg@rivosinc.com> MIME-Version: 1.0 X-Spam-Status: No, score=-10.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1767427717301570233?= X-GMAIL-MSGID: =?utf-8?q?1767427717301570233?= 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 --- 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]] "" ""