From patchwork Thu Nov 30 14:57:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Schwinge X-Patchwork-Id: 81035 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 0197F385AC3B for ; Thu, 30 Nov 2023 14:57:55 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from esa1.mentor.iphmx.com (esa1.mentor.iphmx.com [68.232.129.153]) by sourceware.org (Postfix) with ESMTPS id 8D0CC3858D37 for ; Thu, 30 Nov 2023 14:57:37 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 8D0CC3858D37 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=codesourcery.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=mentor.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 8D0CC3858D37 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=68.232.129.153 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1701356259; cv=none; b=MxICEKQQ7fpnqZNojdlpHNhFDfLebPl+yv5Jyj97+ondsO32BFxPWpiSbLCcW/xMG7nsR45rLF3ozCHWo9BeJk0MPEFZNWKTdxBNaJ24exRITkoYlm8HGg/9NneYaNXRxbhhxwSwy0/2PwovjujHEuSpqNfWiIPxQ7mqxq0TzMw= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1701356259; c=relaxed/simple; bh=D8pqkV3Tj5woX83WKipm8BqA6Tjne/Sy1cOPgiNFQIM=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=QB29wspjRbhQC7zLIMSB6zz/PYC9XSurm7YWZFFZ8aegslSNJ+EhsJ7xSZfPQB2GGtci+1wssyJq8I9TSe9FvGrNTPACE4V8dKzBGti8OZfKrtiT42n5cK9hO9fgGgw6qQp47FFPNl4t41IuHKdcF/kI9PvKhEFVbvLSHUFfFa8= ARC-Authentication-Results: i=1; server2.sourceware.org X-CSE-ConnectionGUID: gRic5aBRTRyPmMRbaV4XSQ== X-CSE-MsgGUID: K/AcYI2aQVOQUYOCef3sDA== X-IronPort-AV: E=Sophos;i="6.04,239,1695715200"; d="scan'208,223";a="27270165" Received: from orw-gwy-02-in.mentorg.com ([192.94.38.167]) by esa1.mentor.iphmx.com with ESMTP; 30 Nov 2023 06:57:36 -0800 IronPort-SDR: 1OkNK5jZnBI9cuDbq+NmTr2AXEB38q2GewRGWrnWtGeZRunTxFmI4MBKBbkdLEj4uyguJDa0c0 mJzh6iytrZMqnAcWdiOUeNkOlLRe8DU8QPjG7yE9jh24eRczLUOKsalVGQvKxNzrhuHyzZDIRD CO5aAUQ88H8hKgcA6qOhiAXbOUXULXN/I2MB42h/9+9Hv7I/iCjKq/HPNuZ13Cd+bJRt4++IPq R72skQrWqj4vhy8QFmTO+QLprDmDJAkWTJpz0Oohoh+s3ou3Z5BPr+JGW3jDRCUKsP0P7UBJFJ BZo= From: Thomas Schwinge To: CC: Tom de Vries , Jakub Jelinek , Tobias Burnus Subject: In 'libgomp.c/declare-variant-{3,4}-*.c', restrict 'scan-offload-tree-dump's to 'only_for_offload_target [...]' (was: [PATCH][libgomp, testsuite, nvptx] Add libgomp.c/declare-variant-3-sm*.c) In-Reply-To: <0ce14ee6-a677-76a9-7e7a-d99d3927bd8a@suse.de> References: <6b0f4fe5-06d4-5ede-5bd1-a53ed82f6d36@suse.de> <221e5215-3b8b-fa9f-4e7b-2faa86b8b991@codesourcery.com> <71e9c008-7ad1-c24f-76eb-6a03180525c4@suse.de> <0ce14ee6-a677-76a9-7e7a-d99d3927bd8a@suse.de> User-Agent: Notmuch/0.29.3+94~g74c3f1b (https://notmuchmail.org) Emacs/28.2 (x86_64-pc-linux-gnu) Date: Thu, 30 Nov 2023 15:57:30 +0100 Message-ID: <87a5qv5lwl.fsf@euler.schwinge.homeip.net> MIME-Version: 1.0 X-Originating-IP: [137.202.0.90] X-ClientProxiedBy: svr-ies-mbx-14.mgc.mentorg.com (139.181.222.14) To svr-ies-mbx-10.mgc.mentorg.com (139.181.222.10) X-Spam-Status: No, score=-11.8 required=5.0 tests=BAYES_00, GIT_PATCH_0, HEADER_FROM_DIFFERENT_DOMAINS, KAM_DMARC_STATUS, SPF_HELO_PASS, 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.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Hi! On 2022-02-24T11:32:53+0100, Tom de Vries via Gcc-patches wrote: > --- /dev/null > +++ b/libgomp/testsuite/libgomp.c/declare-variant-3-sm30.c > @@ -0,0 +1,7 @@ > +/* { dg-do run { target { offload_target_nvptx } } } */ This means, the test case is active if nvptx offloading compilation is enabled. But, consider the case that GCN offloading compilation also is enabled: | +/* { dg-additional-options -foffload=nvptx-none } */ > +/* { dg-additional-options "-foffload=-misa=sm_30" } */ This means, the test cases is restricted to nvptx offloading compilation, but not GCN. > +/* { dg-additional-options "-foffload=-fdump-tree-optimized" } */ This will thus produce a dump file for nvptx, only. No dump file produced for GCN. > +[...] > +/* { dg-final { scan-offload-tree-dump "= f30 \\(\\);" "optimized" } } */ ..., and this will try to scan dump files for both GCN and nvptx. The former doesn't exist, resulting in UNRESOLVEDs for GCN. Etc. I've pushed to master branch commit 186e22c5de8eb49603bb1e74ac5d0eba6cc40480 "In 'libgomp.c/declare-variant-{3,4}-*.c', restrict 'scan-offload-tree-dump's to 'only_for_offload_target [...]'", see attached. Grüße Thomas ----------------- Siemens Electronic Design Automation GmbH; Anschrift: Arnulfstraße 201, 80634 München; Gesellschaft mit beschränkter Haftung; Geschäftsführer: Thomas Heurung, Frank Thürauf; Sitz der Gesellschaft: München; Registergericht München, HRB 106955 From 186e22c5de8eb49603bb1e74ac5d0eba6cc40480 Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Tue, 21 Nov 2023 17:31:37 +0100 Subject: [PATCH] In 'libgomp.c/declare-variant-{3,4}-*.c', restrict 'scan-offload-tree-dump's to 'only_for_offload_target [...]' ... to care for the case where not just one but both of GCN and nvptx offloading are enabled. In that case, we currently get: UNRESOLVED: libgomp.c/declare-variant-3-sm30.c scan-amdgcn-amdhsa-offload-tree-dump optimized "= f30 \\(\\);" ... in addition to: PASS: libgomp.c/declare-variant-3-sm30.c scan-nvptx-none-offload-tree-dump optimized "= f30 \\(\\);" Etc. Fix-up for commit 59b8ade88774b4dcf1691a8f650cdbb86cc30862 "[libgomp, testsuite, nvptx] Add libgomp.c/declare-variant-3-sm*.c", and commit 1fd508744eccda9ad9c6d6fcce5b2ea9c568818d "amdgcn: Support AMD-specific 'isa' traits in OpenMP context selectors". libgomp/ * testsuite/libgomp.c/declare-variant-3-sm30.c: Restrict 'scan-offload-tree-dump' to 'only_for_offload_target nvptx-none'. * testsuite/libgomp.c/declare-variant-3-sm35.c: Likewise. * testsuite/libgomp.c/declare-variant-3-sm53.c: Likewise. * testsuite/libgomp.c/declare-variant-3-sm70.c: Likewise. * testsuite/libgomp.c/declare-variant-3-sm75.c: Likewise. * testsuite/libgomp.c/declare-variant-3-sm80.c: Likewise. * testsuite/libgomp.c/declare-variant-4-fiji.c: Restrict 'scan-offload-tree-dump' to 'only_for_offload_target amdgcn-amdhsa'. * testsuite/libgomp.c/declare-variant-4-gfx803.c: Likewise. * testsuite/libgomp.c/declare-variant-4-gfx900.c: Likewise. * testsuite/libgomp.c/declare-variant-4-gfx906.c: Likewise. * testsuite/libgomp.c/declare-variant-4-gfx908.c: Likewise. * testsuite/libgomp.c/declare-variant-4-gfx90a.c: Likewise. --- libgomp/testsuite/libgomp.c/declare-variant-3-sm30.c | 2 +- libgomp/testsuite/libgomp.c/declare-variant-3-sm35.c | 2 +- libgomp/testsuite/libgomp.c/declare-variant-3-sm53.c | 2 +- libgomp/testsuite/libgomp.c/declare-variant-3-sm70.c | 2 +- libgomp/testsuite/libgomp.c/declare-variant-3-sm75.c | 2 +- libgomp/testsuite/libgomp.c/declare-variant-3-sm80.c | 2 +- libgomp/testsuite/libgomp.c/declare-variant-4-fiji.c | 2 +- libgomp/testsuite/libgomp.c/declare-variant-4-gfx803.c | 2 +- libgomp/testsuite/libgomp.c/declare-variant-4-gfx900.c | 2 +- libgomp/testsuite/libgomp.c/declare-variant-4-gfx906.c | 2 +- libgomp/testsuite/libgomp.c/declare-variant-4-gfx908.c | 2 +- libgomp/testsuite/libgomp.c/declare-variant-4-gfx90a.c | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/libgomp/testsuite/libgomp.c/declare-variant-3-sm30.c b/libgomp/testsuite/libgomp.c/declare-variant-3-sm30.c index be5edbaf0fd..a373647bb33 100644 --- a/libgomp/testsuite/libgomp.c/declare-variant-3-sm30.c +++ b/libgomp/testsuite/libgomp.c/declare-variant-3-sm30.c @@ -5,4 +5,4 @@ #include "declare-variant-3.h" -/* { dg-final { scan-offload-tree-dump "= f30 \\(\\);" "optimized" } } */ +/* { dg-final { only_for_offload_target nvptx-none scan-offload-tree-dump "= f30 \\(\\);" "optimized" } } */ diff --git a/libgomp/testsuite/libgomp.c/declare-variant-3-sm35.c b/libgomp/testsuite/libgomp.c/declare-variant-3-sm35.c index 79cd8fc940d..bf8dc3e2441 100644 --- a/libgomp/testsuite/libgomp.c/declare-variant-3-sm35.c +++ b/libgomp/testsuite/libgomp.c/declare-variant-3-sm35.c @@ -5,4 +5,4 @@ #include "declare-variant-3.h" -/* { dg-final { scan-offload-tree-dump "= f35 \\(\\);" "optimized" } } */ +/* { dg-final { only_for_offload_target nvptx-none scan-offload-tree-dump "= f35 \\(\\);" "optimized" } } */ diff --git a/libgomp/testsuite/libgomp.c/declare-variant-3-sm53.c b/libgomp/testsuite/libgomp.c/declare-variant-3-sm53.c index 8d05e9efc62..1864a7a9277 100644 --- a/libgomp/testsuite/libgomp.c/declare-variant-3-sm53.c +++ b/libgomp/testsuite/libgomp.c/declare-variant-3-sm53.c @@ -5,4 +5,4 @@ #include "declare-variant-3.h" -/* { dg-final { scan-offload-tree-dump "= f53 \\(\\);" "optimized" } } */ +/* { dg-final { only_for_offload_target nvptx-none scan-offload-tree-dump "= f53 \\(\\);" "optimized" } } */ diff --git a/libgomp/testsuite/libgomp.c/declare-variant-3-sm70.c b/libgomp/testsuite/libgomp.c/declare-variant-3-sm70.c index e102c11ab44..2249cd4c24d 100644 --- a/libgomp/testsuite/libgomp.c/declare-variant-3-sm70.c +++ b/libgomp/testsuite/libgomp.c/declare-variant-3-sm70.c @@ -5,4 +5,4 @@ #include "declare-variant-3.h" -/* { dg-final { scan-offload-tree-dump "= f70 \\(\\);" "optimized" } } */ +/* { dg-final { only_for_offload_target nvptx-none scan-offload-tree-dump "= f70 \\(\\);" "optimized" } } */ diff --git a/libgomp/testsuite/libgomp.c/declare-variant-3-sm75.c b/libgomp/testsuite/libgomp.c/declare-variant-3-sm75.c index 7122ccc22d1..18ede59c541 100644 --- a/libgomp/testsuite/libgomp.c/declare-variant-3-sm75.c +++ b/libgomp/testsuite/libgomp.c/declare-variant-3-sm75.c @@ -5,4 +5,4 @@ #include "declare-variant-3.h" -/* { dg-final { scan-offload-tree-dump "= f75 \\(\\);" "optimized" } } */ +/* { dg-final { only_for_offload_target nvptx-none scan-offload-tree-dump "= f75 \\(\\);" "optimized" } } */ diff --git a/libgomp/testsuite/libgomp.c/declare-variant-3-sm80.c b/libgomp/testsuite/libgomp.c/declare-variant-3-sm80.c index 5e13d876500..20048f1d702 100644 --- a/libgomp/testsuite/libgomp.c/declare-variant-3-sm80.c +++ b/libgomp/testsuite/libgomp.c/declare-variant-3-sm80.c @@ -5,4 +5,4 @@ #include "declare-variant-3.h" -/* { dg-final { scan-offload-tree-dump "= f80 \\(\\);" "optimized" } } */ +/* { dg-final { only_for_offload_target nvptx-none scan-offload-tree-dump "= f80 \\(\\);" "optimized" } } */ diff --git a/libgomp/testsuite/libgomp.c/declare-variant-4-fiji.c b/libgomp/testsuite/libgomp.c/declare-variant-4-fiji.c index ae2af1cc00c..8a4e0f4728c 100644 --- a/libgomp/testsuite/libgomp.c/declare-variant-4-fiji.c +++ b/libgomp/testsuite/libgomp.c/declare-variant-4-fiji.c @@ -5,4 +5,4 @@ #define USE_FIJI_FOR_GFX803 #include "declare-variant-4.h" -/* { dg-final { scan-offload-tree-dump "= gfx803 \\(\\);" "optimized" } } */ +/* { dg-final { only_for_offload_target amdgcn-amdhsa scan-offload-tree-dump "= gfx803 \\(\\);" "optimized" } } */ diff --git a/libgomp/testsuite/libgomp.c/declare-variant-4-gfx803.c b/libgomp/testsuite/libgomp.c/declare-variant-4-gfx803.c index e0437a04d65..050d7c9dd79 100644 --- a/libgomp/testsuite/libgomp.c/declare-variant-4-gfx803.c +++ b/libgomp/testsuite/libgomp.c/declare-variant-4-gfx803.c @@ -4,4 +4,4 @@ #include "declare-variant-4.h" -/* { dg-final { scan-offload-tree-dump "= gfx803 \\(\\);" "optimized" } } */ +/* { dg-final { only_for_offload_target amdgcn-amdhsa scan-offload-tree-dump "= gfx803 \\(\\);" "optimized" } } */ diff --git a/libgomp/testsuite/libgomp.c/declare-variant-4-gfx900.c b/libgomp/testsuite/libgomp.c/declare-variant-4-gfx900.c index 8de03725dec..2eeb4a248c1 100644 --- a/libgomp/testsuite/libgomp.c/declare-variant-4-gfx900.c +++ b/libgomp/testsuite/libgomp.c/declare-variant-4-gfx900.c @@ -4,4 +4,4 @@ #include "declare-variant-4.h" -/* { dg-final { scan-offload-tree-dump "= gfx900 \\(\\);" "optimized" } } */ +/* { dg-final { only_for_offload_target amdgcn-amdhsa scan-offload-tree-dump "= gfx900 \\(\\);" "optimized" } } */ diff --git a/libgomp/testsuite/libgomp.c/declare-variant-4-gfx906.c b/libgomp/testsuite/libgomp.c/declare-variant-4-gfx906.c index be6f193ed3a..73a670dcc2a 100644 --- a/libgomp/testsuite/libgomp.c/declare-variant-4-gfx906.c +++ b/libgomp/testsuite/libgomp.c/declare-variant-4-gfx906.c @@ -4,4 +4,4 @@ #include "declare-variant-4.h" -/* { dg-final { scan-offload-tree-dump "= gfx906 \\(\\);" "optimized" } } */ +/* { dg-final { only_for_offload_target amdgcn-amdhsa scan-offload-tree-dump "= gfx906 \\(\\);" "optimized" } } */ diff --git a/libgomp/testsuite/libgomp.c/declare-variant-4-gfx908.c b/libgomp/testsuite/libgomp.c/declare-variant-4-gfx908.c index 311fad9074d..ead330f9f2c 100644 --- a/libgomp/testsuite/libgomp.c/declare-variant-4-gfx908.c +++ b/libgomp/testsuite/libgomp.c/declare-variant-4-gfx908.c @@ -4,4 +4,4 @@ #include "declare-variant-4.h" -/* { dg-final { scan-offload-tree-dump "= gfx908 \\(\\);" "optimized" } } */ +/* { dg-final { only_for_offload_target amdgcn-amdhsa scan-offload-tree-dump "= gfx908 \\(\\);" "optimized" } } */ diff --git a/libgomp/testsuite/libgomp.c/declare-variant-4-gfx90a.c b/libgomp/testsuite/libgomp.c/declare-variant-4-gfx90a.c index 96cc14ca0a3..a9b2d62a49d 100644 --- a/libgomp/testsuite/libgomp.c/declare-variant-4-gfx90a.c +++ b/libgomp/testsuite/libgomp.c/declare-variant-4-gfx90a.c @@ -4,4 +4,4 @@ #include "declare-variant-4.h" -/* { dg-final { scan-offload-tree-dump "= gfx90a \\(\\);" "optimized" } } */ +/* { dg-final { only_for_offload_target amdgcn-amdhsa scan-offload-tree-dump "= gfx90a \\(\\);" "optimized" } } */ -- 2.34.1