From patchwork Mon Apr 22 09:56:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandre Oliva X-Patchwork-Id: 1926138 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; secure) header.d=adacore.com header.i=@adacore.com header.a=rsa-sha256 header.s=google header.b=IEK7rE8+; 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 4VNLJq3FSNz1yZS for ; Mon, 22 Apr 2024 19:57:31 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id AF2F53858401 for ; Mon, 22 Apr 2024 09:57:29 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-pf1-x436.google.com (mail-pf1-x436.google.com [IPv6:2607:f8b0:4864:20::436]) by sourceware.org (Postfix) with ESMTPS id DD1523858D35 for ; Mon, 22 Apr 2024 09:57:06 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org DD1523858D35 Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=adacore.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org DD1523858D35 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::436 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1713779829; cv=none; b=GrZTeZ1UjNlQPpSyHQGEv6a1oYjnuE6I9a5oYWuX0Yrp0KMF8gsXhCg485aTc13zixmZyHOupxQkVtNYzRC3gnX+NuNF26Da85BKCkiqpKq7t0AbrCZxlUEs13LqdS7brNjEctu/SxXpSsfWaQJ3gSlrz7MEnghug+aYfWv1r/s= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1713779829; c=relaxed/simple; bh=BtouHzXDvOi7NhFYe7pccM2K4Ppzk1njLANapuecC28=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=KQmXY/IeV6WsMUFwHtZING6znfoA0pUwrgfpmZwh2Q/1dk0evxHtDNqk44gcEDsNrwQyFDmnlh0WtrQRr22KmJTqwL+gYY4lk9xoAhJny4Ws6o0lolJOTbN2OeyIxqT3OoP7Z+RyEstucOPTshjyjdNg4jNmYn7Ion5dUMWYgwk= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-pf1-x436.google.com with SMTP id d2e1a72fcca58-6ed627829e6so4674653b3a.1 for ; Mon, 22 Apr 2024 02:57:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1713779826; x=1714384626; darn=gcc.gnu.org; h=mime-version:user-agent:message-id:in-reply-to:date:references :organization:subject:cc:to:from:from:to:cc:subject:date:message-id :reply-to; bh=vN9fDh073v6ihfDMsjVi5dMGmAtg/ZU20/QEzQUQU8o=; b=IEK7rE8+cA/FwB41dMNz5ZpFCRfaIxKV/xULeYbXv+5sas6OG+OnzcxX0/PS8nOBH5 Xvsoq5HjO++umaXVwEdo02JVHNsbuma1VJWaXh1K0eIHtD3/sCeQiA94DHJyamhpIGyp BNzvuEtYXpTXO6ba1GDZc5EXaT4ete0Jrw2+Ki/DpB+dj6UPuVf3/kxaW3ec5/5TtSBS hntIMaH03maZnOWHQ4T8Qe1A3R2A4vsx0qXAkvmlQXNPOOZnlWoUQNrUg4TicmjBBajc 3bNJs5l4I9LLE1VsLus84DciRAYkzDnh1u8aKHKuJSXTOjzOh7+hBZ3KWcZlmaj1Pa1j 8yCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713779826; x=1714384626; h=mime-version:user-agent:message-id:in-reply-to:date:references :organization:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=vN9fDh073v6ihfDMsjVi5dMGmAtg/ZU20/QEzQUQU8o=; b=Dl61yolqzDrFBCbx4upN9uo3BcMBO6E5OfeSK4kypkTjdR6+m8JKCKWhywbWjoPQkD rcIzpQVPkMuEm0WdL2TTKhS9S17UcY94MA3mcY5ceAZcH8BlBQhYyitTLrCTknUzCLRW 3duPIbVYVBEG93PB1djL87FgW3pNqnizi1Z0anyq6Efec2ZVuJski/xEcMiXlcYui4vi KyyPDyOc1Fsl4s+trsUvNUU6eBLXo2JCsoYReShquSvm2EeeSElJSO/aL0qEGTLMycom /LvVd8T5iGTlM2SjELWuhgYaO9DsU3ATAxo+AjJJRxCcYIOydopPS8OSyNcUPI4+wwDa p8sg== X-Gm-Message-State: AOJu0YxCVF8xqDMP2MK8e2L6qhr5L9RRie0ll46lJt1ljqNcgSbyP1xQ 0JENjnWFReN35/0IX9zHV42ltZmnOIbUVwCzI6Uz95AKPIsjpMIFEpuUAOMsCZFcHrnRZzcqtZ4 lww== X-Google-Smtp-Source: AGHT+IGxTlr1vcp/7eTFtponnDGLxwppLI83N2mn/tSP97pyo9D+zjzfl4YTWSpJhn2X9kA8oDEZTA== X-Received: by 2002:a05:6a21:6d98:b0:1aa:23cc:80ae with SMTP id wl24-20020a056a216d9800b001aa23cc80aemr13284464pzb.30.1713779825672; Mon, 22 Apr 2024 02:57:05 -0700 (PDT) Received: from free.home ([2804:7f1:218b:5e2:c43b:e0c4:71a:241b]) by smtp.gmail.com with ESMTPSA id fj24-20020a056a003a1800b006ea916eac02sm7470307pfb.42.2024.04.22.02.57.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Apr 2024 02:57:05 -0700 (PDT) Received: from livre (livre.home [172.31.160.2]) by free.home (8.15.2/8.15.2) with ESMTPS id 43M9uqfc020478 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Mon, 22 Apr 2024 06:56:52 -0300 From: Alexandre Oliva To: gcc-patches@gcc.gnu.org Cc: Rainer Orth , Mike Stump , David Edelsohn , Segher Boessenkool , Kewen Lin , Hans-Peter Nilsson Subject: [PATCH v2] [testsuite] require sqrt_insn effective target where needed Organization: Free thinker, does not speak for AdaCore References: Date: Mon, 22 Apr 2024 06:56:52 -0300 In-Reply-To: (Alexandre Oliva's message of "Wed, 10 Mar 2021 02:30:00 -0300") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 X-Spam-Status: No, score=-12.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, WEIRD_QUOTING 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 This patch takes feedback received for 3 earlier patches, and adopts a simpler approach to skip the still-failing tests, that I believe to be in line with ppc maintainers' expressed preferences. https://gcc.gnu.org/pipermail/gcc-patches/2021-February/565939.html https://gcc.gnu.org/pipermail/gcc-patches/2021-March/566617.html https://gcc.gnu.org/pipermail/gcc-patches/2021-March/566521.html Ping?-ish :-) Some tests fail on ppc and ppc64 when testing a compiler [with options for] for a CPU [emulator] that doesn't support the sqrt insn. The gcc.dg/cdce3.c is one in which the expected shrink-wrap optimization only takes place when the target CPU supports a sqrt insn. The gcc.target/powerpc/pr46728-1[0-4].c tests use -mpowerpc-gpopt and call sqrt(), which involves the sqrt insn that the target CPU under test may not support. Require a sqrt_insn effective target for all the affected tests. Regstrapped on x86_64-linux-gnu and ppc64el-linux-gnu. Also testing with gcc-13 on ppc64-vx7r2 and ppc-vx7r2. Ok to install? for gcc/testsuite/ChangeLog * gcc.dg/cdce3.c: Require sqrt_insn effective target. * gcc.target/powerpc/pr46728-10.c: Likewise. * gcc.target/powerpc/pr46728-11.c: Likewise. * gcc.target/powerpc/pr46728-13.c: Likewise. * gcc.target/powerpc/pr46728-14.c: Likewise. --- gcc/testsuite/gcc.dg/cdce3.c | 3 ++- gcc/testsuite/gcc.target/powerpc/pr46728-10.c | 1 + gcc/testsuite/gcc.target/powerpc/pr46728-11.c | 1 + gcc/testsuite/gcc.target/powerpc/pr46728-13.c | 1 + gcc/testsuite/gcc.target/powerpc/pr46728-14.c | 1 + 5 files changed, 6 insertions(+), 1 deletion(-) diff --git a/gcc/testsuite/gcc.dg/cdce3.c b/gcc/testsuite/gcc.dg/cdce3.c index 601ddf055fd71..f759a95972e8b 100644 --- a/gcc/testsuite/gcc.dg/cdce3.c +++ b/gcc/testsuite/gcc.dg/cdce3.c @@ -1,7 +1,8 @@ /* { dg-do compile } */ /* { dg-require-effective-target hard_float } */ +/* { dg-require-effective-target sqrt_insn } */ /* { dg-options "-O2 -fmath-errno -fdump-tree-cdce-details -fdump-tree-optimized" } */ -/* { dg-final { scan-tree-dump "cdce3.c:11: \[^\n\r]* function call is shrink-wrapped into error conditions\." "cdce" } } */ +/* { dg-final { scan-tree-dump "cdce3.c:12: \[^\n\r]* function call is shrink-wrapped into error conditions\." "cdce" } } */ /* { dg-final { scan-tree-dump "sqrtf \\(\[^\n\r]*\\); \\\[tail call\\\]" "optimized" } } */ /* { dg-skip-if "doesn't have a sqrtf insn" { mmix-*-* } } */ diff --git a/gcc/testsuite/gcc.target/powerpc/pr46728-10.c b/gcc/testsuite/gcc.target/powerpc/pr46728-10.c index 3be4728d333a4..7e9bb638106c2 100644 --- a/gcc/testsuite/gcc.target/powerpc/pr46728-10.c +++ b/gcc/testsuite/gcc.target/powerpc/pr46728-10.c @@ -1,6 +1,7 @@ /* { dg-do run } */ /* { dg-skip-if "-mpowerpc-gpopt not supported" { powerpc*-*-darwin* } } */ /* { dg-options "-O2 -ffast-math -fno-inline -fno-unroll-loops -lm -mpowerpc-gpopt" } */ +/* { dg-require-effective-target sqrt_insn } */ #include diff --git a/gcc/testsuite/gcc.target/powerpc/pr46728-11.c b/gcc/testsuite/gcc.target/powerpc/pr46728-11.c index 43b6728a4b812..5bfa25925675a 100644 --- a/gcc/testsuite/gcc.target/powerpc/pr46728-11.c +++ b/gcc/testsuite/gcc.target/powerpc/pr46728-11.c @@ -1,6 +1,7 @@ /* { dg-do run } */ /* { dg-skip-if "-mpowerpc-gpopt not supported" { powerpc*-*-darwin* } } */ /* { dg-options "-O2 -ffast-math -fno-inline -fno-unroll-loops -lm -mpowerpc-gpopt" } */ +/* { dg-require-effective-target sqrt_insn } */ #include diff --git a/gcc/testsuite/gcc.target/powerpc/pr46728-13.c b/gcc/testsuite/gcc.target/powerpc/pr46728-13.c index b9fd63973b728..b66d0209a5e54 100644 --- a/gcc/testsuite/gcc.target/powerpc/pr46728-13.c +++ b/gcc/testsuite/gcc.target/powerpc/pr46728-13.c @@ -1,6 +1,7 @@ /* { dg-do run } */ /* { dg-skip-if "-mpowerpc-gpopt not supported" { powerpc*-*-darwin* } } */ /* { dg-options "-O2 -ffast-math -fno-inline -fno-unroll-loops -lm -mpowerpc-gpopt" } */ +/* { dg-require-effective-target sqrt_insn } */ #include diff --git a/gcc/testsuite/gcc.target/powerpc/pr46728-14.c b/gcc/testsuite/gcc.target/powerpc/pr46728-14.c index 5affff13bdb6c..71a1a70c4e7a2 100644 --- a/gcc/testsuite/gcc.target/powerpc/pr46728-14.c +++ b/gcc/testsuite/gcc.target/powerpc/pr46728-14.c @@ -1,6 +1,7 @@ /* { dg-do run } */ /* { dg-skip-if "-mpowerpc-gpopt not supported" { powerpc*-*-darwin* } } */ /* { dg-options "-O2 -ffast-math -fno-inline -fno-unroll-loops -lm -mpowerpc-gpopt" } */ +/* { dg-require-effective-target sqrt_insn } */ #include