From patchwork Thu Mar 21 11:20:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Schwinge X-Patchwork-Id: 1914378 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=baylibre-com.20230601.gappssmtp.com header.i=@baylibre-com.20230601.gappssmtp.com header.a=rsa-sha256 header.s=20230601 header.b=Gc8eScux; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4V0jhH66J3z1yWy for ; Thu, 21 Mar 2024 22:21:19 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id E24D03858410 for ; Thu, 21 Mar 2024 11:21:17 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wr1-x42d.google.com (mail-wr1-x42d.google.com [IPv6:2a00:1450:4864:20::42d]) by sourceware.org (Postfix) with ESMTPS id AD2473858CD1 for ; Thu, 21 Mar 2024 11:20:48 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org AD2473858CD1 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=baylibre.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org AD2473858CD1 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::42d ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1711020060; cv=none; b=JHpNB67dhoCnfYt6ACrJao4WaWyKACcrhEG6ZZ5tbV7wrVpdIVSxQiT3XEFMSd8pBdQc2PrbR99a59mi0BbVPYEpD+sbJAnhewpzEjD4r2VK2xTCFie5SRZZcqgliKCLQRu4vR4aVj2+RGj2ezALzPk8IB4ekS0qBBXtSXdNTiE= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1711020060; c=relaxed/simple; bh=6bI3IIuj2bsP1whxFj/C5hSQc8YXdSbd7V7QwZmLvxw=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=XrqSbWBuuijVwmSFWdYP/GaUOyqFKiCCxk8i89d5e32bntlSVajkC8srxfFOe8YRkp7lJzpiMyduSeh8lqyFClawezxWNzIbap0oTZbGWvlF4HtWaPkb+Flw+AHzZwFEpw+Y87aAvK2gQway0Y3LnZjwJt2pmUjWyivRo6c5EIw= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-wr1-x42d.google.com with SMTP id ffacd0b85a97d-33ed6078884so1101881f8f.1 for ; Thu, 21 Mar 2024 04:20:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20230601.gappssmtp.com; s=20230601; t=1711020047; x=1711624847; darn=gcc.gnu.org; h=mime-version:message-id:date:user-agent:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=rzQOs3unMmM1cPzNHSnwiAw4Qf2kdlG7YF6/9xBUjdY=; b=Gc8eScuxoFnP7fb6DLl5TlcqZpq2FMUzS5ZMx+yGKrRrxs7lixHMDKkn+iulM+sKHm ydIwhKCRLuKiE0wFpYyUtrV1qImjrt0NbNg9CpU/tLqnG4RpCWIKLiudtC6cuWEdNovD zBKmSLFyl3ILlEIJBgwsAVu9Hj1ZCrn1xenIy7z+BTCzQguFMURHzbSv16j+bbZUpVd9 SzArni4CmdZ/QqSCVYLeokwPThmOm/0RcMgxsBFnHfhlkBDyxikY9fvD30Z6M8B7MG68 6+VpSETANQHDYBSZNXYnPfQn2Nv0CrPMZQ48cc/hMZgi4bVoGf84qnkZzENHqPhu/bn3 UT4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711020047; x=1711624847; h=mime-version:message-id:date:user-agent:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=rzQOs3unMmM1cPzNHSnwiAw4Qf2kdlG7YF6/9xBUjdY=; b=Tyix5AE+9QA1Jbv7wrSN+KXuZivKGRjB/l1uQt6ejoqRXIz2fQG+JcKC+ognJ5w8Dv hzs+gFGDlzFM585dfU+mhxulzqF+6Ddu+4AsVPi9cYeijzO/PTvKCAhYMH5Ih2cCFhTF GzZOaYmf1aR111BOOYBxEJkuB6VassZmlM1CWBxccUtq/fCFXW0M2aN9YdlNwjMMPB/i LAWZhN0SoZI5VcuPaZj0/ArfYZ9mS4nPQBBwaaBtQ4I7fn6KuN7q2LHP7gLN5yl55N9a 9LmFm+37UwA1iBHCOj/uWUD+XKJbTMK5HVigoRYHm9Eply80Ecn4c04jZyRzhqcdXYeX D0tQ== X-Forwarded-Encrypted: i=1; AJvYcCVrErB2j/eZ/gj6Te7AplZs3swng8U80xbmhwdwd6S564HmUrNjTufY9OSDwfh6g6feO6kYqWoZo+65zIhEqwRNTxxHqgRiGg== X-Gm-Message-State: AOJu0YyUb3tx1DIs2yDgg9cr2KsbDM5nk3OGoUpZeemR353dOUOVqmzG 8UyQJj9X3ty5fTqj9DMT3Lj985mwoWRqH66GdLv4eTGnTeaOKf+/W3/l3RRyxfzmE3MwVBy9UkQ 0Ifg= X-Google-Smtp-Source: AGHT+IFZHaFDUcaC6RYTxsrGL4/vhl2utK05T+MklWZys8OJKPbNap3mmR4yugyuXN4GoTCGrH7JFA== X-Received: by 2002:a5d:526e:0:b0:33e:b7d4:892f with SMTP id l14-20020a5d526e000000b0033eb7d4892fmr2446177wrc.20.1711020047236; Thu, 21 Mar 2024 04:20:47 -0700 (PDT) Received: from euler.schwinge.homeip.net (p200300c8b70336000b0134869109dcb1.dip0.t-ipconnect.de. [2003:c8:b703:3600:b01:3486:9109:dcb1]) by smtp.gmail.com with ESMTPSA id j8-20020a05600c190800b004140c161e8dsm5313080wmq.43.2024.03.21.04.20.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Mar 2024 04:20:46 -0700 (PDT) From: Thomas Schwinge To: Mike Stump , Jakub Jelinek , gcc-patches@gcc.gnu.org Cc: Richard Biener , Rainer Orth Subject: New effective-target 'asm_goto_with_outputs' (was: [PATCH] testsuite: Fix up lra effective target) In-Reply-To: <2357E81F-095F-4D98-8FE9-767107359BF8@comcast.net> References: <2357E81F-095F-4D98-8FE9-767107359BF8@comcast.net> User-Agent: Notmuch/0.30+8~g47a4bad (https://notmuchmail.org) Emacs/29.2 (x86_64-pc-linux-gnu) Date: Thu, 21 Mar 2024 12:20:38 +0100 Message-ID: <87ttkzompl.fsf@euler.schwinge.ddns.net> MIME-Version: 1.0 X-Spam-Status: No, score=-11.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP 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.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Hi! On 2024-02-16T10:48:53-0800, Mike Stump wrote: > On Feb 16, 2024, at 2:16 AM, Jakub Jelinek wrote: >> >> There is one special case, NVPTX, which is a TARGET_NO_REGISTER_ALLOCATION >> target. I think claiming for it that it is a lra target is strange (even >> though it effectively returns true for targetm.lra_p ()), unsure if it >> supports asm goto with outputs or not, if it does and we want to test it, >> perhaps we should introduce asm_goto_outputs effective target and use >> lra || nvptx-*-* for that? > > Since the port people have to maintain that code in general, I usually leave it to them to try and select a cheap, maintainable way to manage it. > > If people want to pave the way, I'd tend to defer to them, having thought about more than I. Here I am. ;-) After commit e16f90be2dc8af6c371fe79044c3e668fa3dda62 "testsuite: Fix up lra effective target", we get for nvptx target: -PASS: gcc.c-torture/compile/asmgoto-2.c -O0 (test for excess errors) +ERROR: gcc.c-torture/compile/asmgoto-2.c -O0 : no files matched glob pattern "lra1020113.c.[0-9][0-9][0-9]r.reload" for " dg-do 2 compile { target lra } " Etc. That is, the current effective-target 'lra' is not suitable for nvptx -- which, I suppose, is OK, given that nvptx neither uses LRA nor doesn't use LRA. ;-) (Therefore, effective-target 'lra' shouldn't get used in test cases that are active for nvptx.) However, nvptx appears to support 'asm goto' with outputs, including the new execution test case: PASS: gcc.dg/pr107385.c execution test I'm attaching "[WIP] New effective-target 'asm_goto_with_outputs'", which does address the effective-target check for nvptx, and otherwise does 's%lra%asm_goto_with_outputs'. (I have not yet actually merged 'check_effective_target_lra' into 'check_effective_target_asm_goto_with_outputs'.) I have verified that all current effective-target 'lra' test cases actually use 'asm goto' with outputs, there is just one exception: 'gcc.dg/pr110079.c' (see "bb-reorder: Fix -freorder-blocks-and-partition ICEs on aarch64 with asm goto [PR110079]", "ICE with -freorder-blocks-and-partition and inline-asm goto"). That test case, 'gcc.dg/pr110079.c', currently uses 'target lra', and uses 'asm goto' -- but not with outputs, so is 'asm_goto_with_outputs' not really applicable? The test case does PASS for nvptx target (but I've not verified what it's actually doing/testing). How to handle that one? Grüße Thomas From d9f8faaa5026bb970b3246235eb22bf9b5e9fe3a Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Mon, 4 Mar 2024 16:04:11 +0100 Subject: [PATCH] [WIP] New effective-target 'asm_goto_with_outputs' After commit e16f90be2dc8af6c371fe79044c3e668fa3dda62 "testsuite: Fix up lra effective target", we get for nvptx target: -PASS: gcc.c-torture/compile/asmgoto-2.c -O0 (test for excess errors) +ERROR: gcc.c-torture/compile/asmgoto-2.c -O0 : no files matched glob pattern "lra1020113.c.[0-9][0-9][0-9]r.reload" for " dg-do 2 compile { target lra } " Etc. However, nvptx appears to support 'asm goto' with outputs, including the new execution test case: PASS: gcc.dg/pr107385.c execution test TODO gcc/testsuite/gcc.dg/pr110079.c doesn't using 'asm_goto' with outputs, but is PASS for nvptx, and would ERROR for 'target lra'. --- gcc/doc/sourcebuild.texi | 3 +++ gcc/testsuite/gcc.c-torture/compile/asmgoto-2.c | 2 +- gcc/testsuite/gcc.c-torture/compile/asmgoto-5.c | 2 +- gcc/testsuite/gcc.c-torture/compile/asmgoto-6.c | 3 +-- gcc/testsuite/gcc.c-torture/compile/pr98096.c | 2 +- gcc/testsuite/gcc.dg/pr100590.c | 2 +- gcc/testsuite/gcc.dg/pr107385.c | 2 +- gcc/testsuite/gcc.dg/pr108095.c | 2 +- gcc/testsuite/gcc.dg/pr110079.c | 2 +- gcc/testsuite/gcc.dg/pr97954.c | 2 +- gcc/testsuite/gcc.dg/torture/pr100329.c | 2 +- gcc/testsuite/gcc.dg/torture/pr100398.c | 2 +- gcc/testsuite/gcc.dg/torture/pr100519.c | 2 +- gcc/testsuite/gcc.dg/torture/pr110422.c | 2 +- gcc/testsuite/lib/target-supports.exp | 9 +++++++++ 15 files changed, 25 insertions(+), 14 deletions(-) diff --git a/gcc/doc/sourcebuild.texi b/gcc/doc/sourcebuild.texi index b56b9c39733..a176a3c864f 100644 --- a/gcc/doc/sourcebuild.texi +++ b/gcc/doc/sourcebuild.texi @@ -2863,6 +2863,9 @@ Target supports weak undefined symbols @item R_flag_in_section Target supports the 'R' flag in .section directive in assembly inputs. +@item asm_goto_with_outputs +Target supports 'asm goto' with outputs. + @item automatic_stack_alignment Target supports automatic stack alignment. diff --git a/gcc/testsuite/gcc.c-torture/compile/asmgoto-2.c b/gcc/testsuite/gcc.c-torture/compile/asmgoto-2.c index 43e597bc59f..234c90e5295 100644 --- a/gcc/testsuite/gcc.c-torture/compile/asmgoto-2.c +++ b/gcc/testsuite/gcc.c-torture/compile/asmgoto-2.c @@ -1,5 +1,5 @@ /* This test should be switched off for a new target with less than 4 allocatable registers */ -/* { dg-do compile { target lra } } */ +/* { dg-do compile { target asm_goto_with_outputs } } */ int foo (void) { diff --git a/gcc/testsuite/gcc.c-torture/compile/asmgoto-5.c b/gcc/testsuite/gcc.c-torture/compile/asmgoto-5.c index e1574a2903a..af1ba5a7001 100644 --- a/gcc/testsuite/gcc.c-torture/compile/asmgoto-5.c +++ b/gcc/testsuite/gcc.c-torture/compile/asmgoto-5.c @@ -1,5 +1,5 @@ /* Test to generate output reload in asm goto on x86_64. */ -/* { dg-do compile { target lra } } */ +/* { dg-do compile { target asm_goto_with_outputs } } */ /* { dg-skip-if "no O0" { { i?86-*-* x86_64-*-* } && { ! ia32 } } { "-O0" } { "" } } */ #if defined __x86_64__ diff --git a/gcc/testsuite/gcc.c-torture/compile/asmgoto-6.c b/gcc/testsuite/gcc.c-torture/compile/asmgoto-6.c index 6799b83c20a..cb3c7d711a6 100644 --- a/gcc/testsuite/gcc.c-torture/compile/asmgoto-6.c +++ b/gcc/testsuite/gcc.c-torture/compile/asmgoto-6.c @@ -1,5 +1,4 @@ - -/* { dg-do compile { target lra } } */ +/* { dg-do compile { target asm_goto_with_outputs } } */ /* PR middle-end/110420 */ /* PR middle-end/103979 */ /* PR middle-end/98619 */ diff --git a/gcc/testsuite/gcc.c-torture/compile/pr98096.c b/gcc/testsuite/gcc.c-torture/compile/pr98096.c index bba3fa5c619..3a1b6159c2e 100644 --- a/gcc/testsuite/gcc.c-torture/compile/pr98096.c +++ b/gcc/testsuite/gcc.c-torture/compile/pr98096.c @@ -1,6 +1,6 @@ /* Test for correct naming of label operands in asm goto in case of presence of input/output operands. */ -/* { dg-do compile { target lra } } */ +/* { dg-do compile { target asm_goto_with_outputs } } */ int i, j; int f(void) { asm goto ("# %0 %2" : "+r" (i) ::: jmp); diff --git a/gcc/testsuite/gcc.dg/pr100590.c b/gcc/testsuite/gcc.dg/pr100590.c index 8d1e1a0d306..64cb717ed0e 100644 --- a/gcc/testsuite/gcc.dg/pr100590.c +++ b/gcc/testsuite/gcc.dg/pr100590.c @@ -1,5 +1,5 @@ /* PR rtl-optimization/100590 */ -/* { dg-do compile { target lra } } */ +/* { dg-do compile { target asm_goto_with_outputs } } */ /* { dg-options "-O1 -fno-dce -w" } */ int diff --git a/gcc/testsuite/gcc.dg/pr107385.c b/gcc/testsuite/gcc.dg/pr107385.c index 0cc0655d848..690ad3c1b5e 100644 --- a/gcc/testsuite/gcc.dg/pr107385.c +++ b/gcc/testsuite/gcc.dg/pr107385.c @@ -1,5 +1,5 @@ /* PR middle-end/107385 */ -/* { dg-do run { target lra } } */ +/* { dg-do run { target asm_goto_with_outputs } } */ /* { dg-options "-O2" } */ __attribute__((noipa)) int diff --git a/gcc/testsuite/gcc.dg/pr108095.c b/gcc/testsuite/gcc.dg/pr108095.c index 0a487cf614a..115ea73e39b 100644 --- a/gcc/testsuite/gcc.dg/pr108095.c +++ b/gcc/testsuite/gcc.dg/pr108095.c @@ -1,5 +1,5 @@ /* PR tree-optimization/108095 */ -/* { dg-do compile { target lra } } */ +/* { dg-do compile { target asm_goto_with_outputs } } */ /* { dg-options "-Os -g" } */ int v; diff --git a/gcc/testsuite/gcc.dg/pr110079.c b/gcc/testsuite/gcc.dg/pr110079.c index 1682f9c2344..e8ec6666b23 100644 --- a/gcc/testsuite/gcc.dg/pr110079.c +++ b/gcc/testsuite/gcc.dg/pr110079.c @@ -1,5 +1,5 @@ /* PR rtl-optimization/110079 */ -/* { dg-do compile { target lra } } */ +/* { dg-do compile { target asm_goto_with_outputs } } */ /* { dg-options "-O2" } */ /* { dg-additional-options "-freorder-blocks-and-partition" { target freorder } } */ diff --git a/gcc/testsuite/gcc.dg/pr97954.c b/gcc/testsuite/gcc.dg/pr97954.c index 0be60f500b6..619bed3b40c 100644 --- a/gcc/testsuite/gcc.dg/pr97954.c +++ b/gcc/testsuite/gcc.dg/pr97954.c @@ -1,5 +1,5 @@ /* PR rtl-optimization/97954 */ -/* { dg-do compile { target lra } } */ +/* { dg-do compile { target asm_goto_with_outputs } } */ /* { dg-options "-O2" } */ int diff --git a/gcc/testsuite/gcc.dg/torture/pr100329.c b/gcc/testsuite/gcc.dg/torture/pr100329.c index 2a4331ba712..5759131a6ca 100644 --- a/gcc/testsuite/gcc.dg/torture/pr100329.c +++ b/gcc/testsuite/gcc.dg/torture/pr100329.c @@ -1,4 +1,4 @@ -/* { dg-do compile { target lra } } */ +/* { dg-do compile { target asm_goto_with_outputs } } */ /* { dg-additional-options "--param tree-reassoc-width=2" } */ unsigned int a0; diff --git a/gcc/testsuite/gcc.dg/torture/pr100398.c b/gcc/testsuite/gcc.dg/torture/pr100398.c index 4fc1168d22f..eeeaf98e15b 100644 --- a/gcc/testsuite/gcc.dg/torture/pr100398.c +++ b/gcc/testsuite/gcc.dg/torture/pr100398.c @@ -1,4 +1,4 @@ -/* { dg-do compile { target lra } } */ +/* { dg-do compile { target asm_goto_with_outputs } } */ int test5_limit (void) diff --git a/gcc/testsuite/gcc.dg/torture/pr100519.c b/gcc/testsuite/gcc.dg/torture/pr100519.c index 89dff668a97..b82ce46c529 100644 --- a/gcc/testsuite/gcc.dg/torture/pr100519.c +++ b/gcc/testsuite/gcc.dg/torture/pr100519.c @@ -1,4 +1,4 @@ -/* { dg-do compile { target lra } } */ +/* { dg-do compile { target asm_goto_with_outputs } } */ /* { dg-additional-options "--param tree-reassoc-width=2" } */ unsigned int foo_a1, foo_a2; diff --git a/gcc/testsuite/gcc.dg/torture/pr110422.c b/gcc/testsuite/gcc.dg/torture/pr110422.c index 2a653bdfce3..34de7a2980f 100644 --- a/gcc/testsuite/gcc.dg/torture/pr110422.c +++ b/gcc/testsuite/gcc.dg/torture/pr110422.c @@ -1,4 +1,4 @@ -/* { dg-do compile { target lra } } */ +/* { dg-do compile { target asm_goto_with_outputs } } */ struct T { int x; }; int foo(void) { diff --git a/gcc/testsuite/lib/target-supports.exp b/gcc/testsuite/lib/target-supports.exp index 5a1f0ed5a28..158dc51a71f 100644 --- a/gcc/testsuite/lib/target-supports.exp +++ b/gcc/testsuite/lib/target-supports.exp @@ -13211,6 +13211,15 @@ proc check_effective_target_lra { } { } {-O2 -fdump-rtl-reload-details}] ;# LRA notes requires a detailed dump. } +# Return 1 if 'asm goto' with outputs is supported, 0 otherwise. + +proc check_effective_target_asm_goto_with_outputs { } { + if { [istarget nvptx-*-*] } { + return 1 + } + return [check_effective_target_lra] +} + # Test whether optimizations are enabled ('__OPTIMIZE__') per the # 'current_compiler_flags' (thus don't cache). -- 2.34.1