From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 130776 invoked by alias); 9 Jul 2015 15:52:34 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Received: (qmail 130764 invoked by uid 89); 9 Jul 2015 15:52:34 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.3 required=5.0 tests=AWL,BAYES_00,RCVD_IN_DNSWL_LOW,SPF_PASS autolearn=ham version=3.3.2 X-HELO: relay1.mentorg.com Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 09 Jul 2015 15:52:32 +0000 Received: from nat-ies.mentorg.com ([192.94.31.2] helo=SVR-IES-FEM-01.mgc.mentorg.com) by relay1.mentorg.com with esmtp id 1ZDE7g-0003tG-29 from Thomas_Schwinge@mentor.com ; Thu, 09 Jul 2015 08:52:28 -0700 Received: from feldtkeller.schwinge.homeip.net (137.202.0.76) by SVR-IES-FEM-01.mgc.mentorg.com (137.202.0.104) with Microsoft SMTP Server id 14.3.224.2; Thu, 9 Jul 2015 16:52:26 +0100 From: Thomas Schwinge To: Jakub Jelinek CC: Subject: Merge DEF_GOACC_BUILTIN into DEF_GOMP_BUILTIN? (was: OpenACC middle end changes) In-Reply-To: <20141113180949.GX5026@tucnak.redhat.com> References: <87fvdnnijk.fsf@schwinge.name> <20141113180949.GX5026@tucnak.redhat.com> User-Agent: Notmuch/0.9-101-g81dad07 (http://notmuchmail.org) Emacs/24.4.1 (i586-pc-linux-gnu) Date: Thu, 09 Jul 2015 15:52:00 -0000 Message-ID: <87io9t49cb.fsf@kepler.schwinge.homeip.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha1; protocol="application/pgp-signature" X-SW-Source: 2015-07/txt/msg00778.txt.bz2 --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Content-length: 2267 Hi! On Thu, 13 Nov 2014 19:09:49 +0100, Jakub Jelinek wrote: > On Thu, Nov 13, 2014 at 05:59:11PM +0100, Thomas Schwinge wrote: > > * should gcc/oacc-builtins.def just be merged into > > gcc/omp-builtins.def; >=20 > Why not. The reason why they aren't in gcc/builtins.def is that > the Fortran FE doesn't source those, but OpenACC supports the same > languages as OpenMP. (We've done that, .) Now, trying to merge trunk into gomp-4_0-branch, I've hit the "problem" that Tom applied in trunk r224745: --- gcc/builtins.def +++ gcc/builtins.def @@ -182,7 +182,9 @@ along with GCC; see the file COPYING3. If not see #define DEF_GOMP_BUILTIN(ENUM, NAME, TYPE, ATTRS) \ DEF_BUILTIN (ENUM, "__builtin_" NAME, BUILT_IN_NORMAL, TYPE, TYPE, \ false, true, true, ATTRS, false, \ - (flag_openmp || flag_tree_parallelize_loops \ + (flag_openmp \ + || flag_tree_parallelize_loops > 1 \ + || flag_cilkplus \ || flag_offload_abi !=3D OFFLOAD_ABI_UNSET)) =20 /* Builtin used by implementation of Cilk Plus. Most of these are decompo= sed Before this patch, all DEF_GOMP_BUILTINs (erroneously) had always been available, due to flag_tree_parallelize_loops's default value of 1. With gcc/omp-low.c:lower_reduction_clauses using a BUILT_IN_GOMP_ATOMIC_START/BUILT_IN_GOMP_ATOMIC_END sequence as a last resort, and that being chosen for some kind of OpenACC reduction clauses (which is present on gomp-4_0-branch only), we're then running into ICEs, as those two DEF_GOMP_BUILTINs are not available with plain -fopenacc. Now, it there actually a good reason to have separate DEF_GOACC_BUILTIN and DEF_GOMP_BUILTIN directives (which I basically just initially did to be "least intrusive", ), or should I just add flag_openacc to DEF_GOMP_BUILTIN, and change all DEF_GOACC_BUILTIN instantiations to DEF_GOMP_BUILTIN? Merging them definitely makes sense to me now, so OK to do the obvious? Gr=C3=BC=C3=9Fe, Thomas --=-=-= Content-Type: application/pgp-signature; name="signature.asc" Content-length: 472 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAEBAgAGBQJVnpi0AAoJEK3/DN1sMFFtNfkIAKRXNAxlTLrRnT2p0aKI5OKO fRsec3mwdIu19DSBaq07XP1EQPwBambK6HwRfiV/SYtopeiMgSSO7BVafx/TgHm4 KBXlwhezkPg/l0nU7W6Fk+y+aY/DYXrcdoyl8XvKfzkAZqiQvPgidU2NHsZJq9cd 5DHoilZ5hnGFlcNaFa3k+NurX6qwZjoP+1d/IJkAWNZfUzyVUqiLTlbMUHY4JVrQ 5xO/fNSns5KJD9XFc3z6ly/3Ow1qQ8EQvUEM68Q3K8lmFTYb9a3DaNdFa96CjZGX ZcWOJqt7JtN+yxraxzu+pJuGiJdNZYSAGe7a9IehWzZNkxWv4N90sXFq1V4zx6I= =Y8Qq -----END PGP SIGNATURE----- --=-=-=--