From patchwork Wed Nov 25 19:08:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Schwinge X-Patchwork-Id: 1406233 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; helo=sourceware.org; envelope-from=gcc-patches-bounces@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=codesourcery.com Received: from 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 RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Ch9Ql4x89z9sRK for ; Thu, 26 Nov 2020 06:08:31 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id D0EA5396D811; Wed, 25 Nov 2020 19:08:29 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from esa2.mentor.iphmx.com (esa2.mentor.iphmx.com [68.232.141.98]) by sourceware.org (Postfix) with ESMTPS id 2C267388A031 for ; Wed, 25 Nov 2020 19:08:25 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 2C267388A031 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=codesourcery.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=Thomas_Schwinge@mentor.com IronPort-SDR: HC5M0IytJrbmuG52KMiay/dBmAgRfLZKGCe65/EYObVIu1lfBbbrdm0E9I/VS3ME2owjDL2/E0 ChKtB1sU4AlW2TG9Gg0SmS3fx10d06JqIYEGHFgJhbtq9o7je+nGEKyzybJ3/5bQ4xsSQAmokG MT0GYRlPZxSuAEhfJBgwduRqG69+Q7Js4Ove7td6D/I8cVJUWpd0fgx9X6BPPQUQsb+M0nyEOb +gkQnXDpCtArWZKkfJYHMhfYrsbROhln8XG6+avSwHkd352eFCX8J4P4/RPSgCrSRQBeU0X43I Ebg= X-IronPort-AV: E=Sophos;i="5.78,370,1599552000"; d="scan'208,223";a="55502027" Received: from orw-gwy-02-in.mentorg.com ([192.94.38.167]) by esa2.mentor.iphmx.com with ESMTP; 25 Nov 2020 11:08:24 -0800 IronPort-SDR: F8+Vi/PUZU6AJf1uvOkQEN1OP5ZuYndskkLIbR1A4SnFuppd8msxhW6mUeYEqrO+q7HKYHvoP3 /v1MeFlVSp+Wx6/G3tmUHm5kHTpNxa+KKBXn+Up9GAnn0BFQP8J82wTCOX8FbpE9szgRY9hN2h ooIjDQIEMQmm4i0flQquLi6M1sQw+bKprb9Nx6JLX5MW0K/QZusslBQLqiWQkFC6y4OmzSxti8 ujP74Aoa8Px7WaCUxsmUrDRwvHyzhtIEOiF4ltmKn4dNkFXUvnYMVudBpMcy5BYFcBqxVk6eZl nBw= From: Thomas Schwinge To: Subject: Fix templatized C++ OpenACC 'cache' directive ICEs User-Agent: Notmuch/0.29.1+93~g67ed7df (https://notmuchmail.org) Emacs/25.2.2 (x86_64-pc-linux-gnu) Date: Wed, 25 Nov 2020 20:08:17 +0100 Message-ID: <87k0u9l0f2.fsf@dem-tschwing-1.ger.mentorg.com> MIME-Version: 1.0 X-Originating-IP: [137.202.0.90] X-ClientProxiedBy: svr-ies-mbx-01.mgc.mentorg.com (139.181.222.1) To svr-ies-mbx-01.mgc.mentorg.com (139.181.222.1) X-Spam-Status: No, score=-12.7 required=5.0 tests=BAYES_00, GIT_PATCH_0, HEADER_FROM_DIFFERENT_DOMAINS, KAM_DMARC_STATUS, KAM_LOTSOFHASH, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) 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@gcc.gnu.org Sender: "Gcc-patches" Hi! I've pushed "Fix templatized C++ OpenACC 'cache' directive ICEs" to master branch in commit 0cab70604cfda30bc64351b39493ef884ff7ba10, and backported to releases/gcc-10 branch in commit 5bfcc9e103c06d85de43766fe05eb59f4f50c3db, to releases/gcc-9 branch in commit 1cb1c9e62f92ad674976b0da8cc46d7350d79a05, to releases/gcc-8 branch in commit b4a3e26c329f63c9953f4c4e3141c562bf91ce93, see attached. Grüße Thomas ----------------- Mentor Graphics (Deutschland) GmbH, Arnulfstraße 201, 80634 München / Germany Registergericht München HRB 106955, Geschäftsführer: Thomas Heurung, Alexander Walter From b4a3e26c329f63c9953f4c4e3141c562bf91ce93 Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Wed, 25 Nov 2020 13:03:52 +0100 Subject: [PATCH] Fix templatized C++ OpenACC 'cache' directive ICEs This has been broken forever, whoops... gcc/cp/ * pt.c (tsubst_omp_clauses): Handle 'OMP_CLAUSE__CACHE_'. (tsubst_expr): Handle 'OACC_CACHE'. gcc/testsuite/ * c-c++-common/goacc/cache-1.c: Update. * c-c++-common/goacc/cache-2.c: Likewise. * g++.dg/goacc/cache-1.C: New. * g++.dg/goacc/cache-2.C: Likewise. libgomp/ * testsuite/libgomp.oacc-c++/cache-1.C: New. * testsuite/libgomp.oacc-c-c++-common/cache-1.c: Update. (cherry picked from commit 0cab70604cfda30bc64351b39493ef884ff7ba10) --- gcc/cp/pt.c | 2 ++ gcc/testsuite/c-c++-common/goacc/cache-1.c | 18 +++++++++++------- gcc/testsuite/c-c++-common/goacc/cache-2.c | 10 +++++----- gcc/testsuite/g++.dg/goacc/cache-1.C | 15 +++++++++++++++ .../goacc/cache-2.c => g++.dg/goacc/cache-2.C} | 15 +++++++++++---- libgomp/testsuite/libgomp.oacc-c++/cache-1.C | 13 +++++++++++++ .../libgomp.oacc-c-c++-common/cache-1.c | 12 +++++++++++- 7 files changed, 68 insertions(+), 17 deletions(-) create mode 100644 gcc/testsuite/g++.dg/goacc/cache-1.C copy gcc/testsuite/{c-c++-common/goacc/cache-2.c => g++.dg/goacc/cache-2.C} (90%) create mode 100644 libgomp/testsuite/libgomp.oacc-c++/cache-1.C diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 2d38310f1fb..063b18c1f45 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -16130,6 +16130,7 @@ tsubst_omp_clauses (tree clauses, enum c_omp_region_type ort, case OMP_CLAUSE_FROM: case OMP_CLAUSE_TO: case OMP_CLAUSE_MAP: + case OMP_CLAUSE__CACHE_: case OMP_CLAUSE_USE_DEVICE_PTR: case OMP_CLAUSE_IS_DEVICE_PTR: OMP_CLAUSE_DECL (nc) @@ -17369,6 +17370,7 @@ tsubst_expr (tree t, tree args, tsubst_flags_t complain, tree in_decl, add_stmt (t); break; + case OACC_CACHE: case OACC_ENTER_DATA: case OACC_EXIT_DATA: case OACC_UPDATE: diff --git a/gcc/testsuite/c-c++-common/goacc/cache-1.c b/gcc/testsuite/c-c++-common/goacc/cache-1.c index 1d4759e738c..242f3c612fd 100644 --- a/gcc/testsuite/c-c++-common/goacc/cache-1.c +++ b/gcc/testsuite/c-c++-common/goacc/cache-1.c @@ -1,9 +1,15 @@ -/* OpenACC cache directive: valid usage. */ -/* For execution testing, this file is "#include"d from - libgomp/testsuite/libgomp.oacc-c-c++-common/cache-1.c. */ +/* OpenACC 'cache' directive: valid usage. */ -int -main (int argc, char **argv) +/* See also corresponding C++ variant: '../../g++.dg/goacc/cache-1.C'. */ + +/* For execution testing, this file is '#include'd from + '../../../../libgomp/testsuite/libgomp.oacc-c-c++-common/cache-1.c'. */ + +#ifdef TEMPLATIZE +template +#endif +static void +test () { #define N 2 int a[N], b[N]; @@ -61,6 +67,4 @@ main (int argc, char **argv) if (a[i] != b[i]) __builtin_abort (); } - - return 0; } diff --git a/gcc/testsuite/c-c++-common/goacc/cache-2.c b/gcc/testsuite/c-c++-common/goacc/cache-2.c index d1181d1b6e7..80b925e5112 100644 --- a/gcc/testsuite/c-c++-common/goacc/cache-2.c +++ b/gcc/testsuite/c-c++-common/goacc/cache-2.c @@ -1,7 +1,9 @@ -/* OpenACC cache directive: invalid usage. */ +/* OpenACC 'cache' directive: invalid usage. */ -int -main (int argc, char **argv) +/* See also corresponding C++ variant: '../../g++.dg/goacc/cache-2.C'. */ + +static void +test () { #define N 2 int a[N], b[N]; @@ -52,6 +54,4 @@ main (int argc, char **argv) if (a[i] != b[i]) __builtin_abort (); } - - return 0; } diff --git a/gcc/testsuite/g++.dg/goacc/cache-1.C b/gcc/testsuite/g++.dg/goacc/cache-1.C new file mode 100644 index 00000000000..a8d5ab32016 --- /dev/null +++ b/gcc/testsuite/g++.dg/goacc/cache-1.C @@ -0,0 +1,15 @@ +/* OpenACC 'cache' directive: valid usage. */ + +/* See also corresponding C/C++ variant '../../c-c++-common/goacc/cache-1.c'. */ + +/* For execution testing, this file is '#include'd from + '../../../../libgomp/testsuite/libgomp.oacc-c++/cache-1.C'. */ + +#define TEMPLATIZE +#include "../../c-c++-common/goacc/cache-1.c" + +static void +instantiate () +{ + &test<0>; +} diff --git a/gcc/testsuite/c-c++-common/goacc/cache-2.c b/gcc/testsuite/g++.dg/goacc/cache-2.C similarity index 90% copy from gcc/testsuite/c-c++-common/goacc/cache-2.c copy to gcc/testsuite/g++.dg/goacc/cache-2.C index d1181d1b6e7..ef0b8a9e76f 100644 --- a/gcc/testsuite/c-c++-common/goacc/cache-2.c +++ b/gcc/testsuite/g++.dg/goacc/cache-2.C @@ -1,7 +1,10 @@ -/* OpenACC cache directive: invalid usage. */ +/* OpenACC 'cache' directive: invalid usage. */ -int -main (int argc, char **argv) +/* See also corresponding C/C++ variant '../../c-c++-common/goacc/cache-2.c'. */ + +template +static void +test () { #define N 2 int a[N], b[N]; @@ -52,6 +55,10 @@ main (int argc, char **argv) if (a[i] != b[i]) __builtin_abort (); } +} - return 0; +static void +instantiate () +{ + &test<0>; } diff --git a/libgomp/testsuite/libgomp.oacc-c++/cache-1.C b/libgomp/testsuite/libgomp.oacc-c++/cache-1.C new file mode 100644 index 00000000000..fcb1f84eef9 --- /dev/null +++ b/libgomp/testsuite/libgomp.oacc-c++/cache-1.C @@ -0,0 +1,13 @@ +/* OpenACC 'cache' directive. */ + +/* See also corresponding C/C++ variant '../libgomp.oacc-c-c++-common/cache-1.c'. */ + +#include "../../../gcc/testsuite/g++.dg/goacc/cache-1.C" + +int +main (int argc, char *argv[]) +{ + test<0> (); + + return 0; +} diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/cache-1.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/cache-1.c index 16aaed5df70..c0dddb3c4f3 100644 --- a/libgomp/testsuite/libgomp.oacc-c-c++-common/cache-1.c +++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/cache-1.c @@ -1,3 +1,13 @@ -/* OpenACC cache directive. */ +/* OpenACC 'cache' directive. */ + +/* See also corresponding C++ variant '../libgomp.oacc-c++/cache-1.C'. */ #include "../../../gcc/testsuite/c-c++-common/goacc/cache-1.c" + +int +main (int argc, char *argv[]) +{ + test (); + + return 0; +} -- 2.17.1