From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 28430 invoked by alias); 14 Jul 2015 20:06:11 -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 28421 invoked by uid 89); 14 Jul 2015 20:06:11 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.9 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; Tue, 14 Jul 2015 20:06:09 +0000 Received: from svr-orw-fem-06.mgc.mentorg.com ([147.34.97.120]) by relay1.mentorg.com with esmtp id 1ZF6Ss-0002xC-CL from Thomas_Schwinge@mentor.com ; Tue, 14 Jul 2015 13:06:06 -0700 Received: from tftp-cs (147.34.91.1) by SVR-ORW-FEM-06.mgc.mentorg.com (147.34.97.120) with Microsoft SMTP Server id 14.3.224.2; Tue, 14 Jul 2015 13:06:06 -0700 Received: by tftp-cs (Postfix, from userid 49978) id 8D230C23CF; Tue, 14 Jul 2015 13:06:05 -0700 (PDT) From: Thomas Schwinge To: Richard Biener CC: Subject: Re: [nvptx offloading] Only 64-bit configurations are currently supported In-Reply-To: <87zj364rq1.fsf@kepler.schwinge.homeip.net> References: <54451994.9070209@codesourcery.com> <54451D57.5050803@codesourcery.com> <5447F0E1.7080906@redhat.com> <544FAE8B.5010906@codesourcery.com> <545179C6.4030406@redhat.com> <5460E5AD.6060502@codesourcery.com> <87vbl2w69s.fsf@kepler.schwinge.homeip.net> <87egq8mir1.fsf@schwinge.name> <20150204094314.GH1746@tucnak.redhat.com> <8761azfvso.fsf@kepler.schwinge.homeip.net> <87zj364rq1.fsf@kepler.schwinge.homeip.net> User-Agent: Notmuch/0.9-101-g81dad07 (http://notmuchmail.org) Emacs/24.4.1 (i586-pc-linux-gnu) Date: Tue, 14 Jul 2015 20:10:00 -0000 Message-ID: <87615mzeqn.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/msg01198.txt.bz2 --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Content-length: 8390 Hi! OK for gcc-5-branch? On Wed, 8 Jul 2015 17:03:02 +0200, I wrote: > On Wed, 18 Feb 2015 09:50:15 +0100, I wrote: > > So far, we have concentrated only on the 64-bit x86_64 configuration; > > 32-bit has several known issues to be resolved. > > filed. >=20 > I have committed the following patch in r225560. This gets us rid of the > lots of "expected FAILs" in the 32-bit part of > RUNTESTFLAGS=3D'--target_board=3Dunix\{-m64,-m32\}' testing, for example. >=20 > commit fe265ad3c9624da88f43be349137696449148f4f > Author: tschwinge > Date: Wed Jul 8 14:59:59 2015 +0000 >=20 > [nvptx offloading] Only 64-bit configurations are currently supported >=20=20=20=20=20 > PR libgomp/65099 > gcc/ > * config/nvptx/mkoffload.c (main): Create an offload image only in > 64-bit configurations. > libgomp/ > * plugin/plugin-nvptx.c (nvptx_get_num_devices): Return 0 if not > in a 64-bit configuration. > * testsuite/libgomp.oacc-c++/c++.exp: Don't attempt nvidia > offloading testing if no such device is available. > * testsuite/libgomp.oacc-c/c.exp: Likewise. > * testsuite/libgomp.oacc-fortran/fortran.exp: Likewise. >=20=20=20=20=20 > git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@225560 138bc75d-0d04-= 0410-961f-82ee72b054a4 > --- > gcc/ChangeLog | 6 +++ > gcc/config/nvptx/mkoffload.c | 56 +++++++++++---= ------ > libgomp/ChangeLog | 10 ++++ > libgomp/plugin/plugin-nvptx.c | 5 ++ > libgomp/testsuite/libgomp.oacc-c++/c++.exp | 6 +++ > libgomp/testsuite/libgomp.oacc-c/c.exp | 6 +++ > libgomp/testsuite/libgomp.oacc-fortran/fortran.exp | 6 +++ > 7 files changed, 70 insertions(+), 25 deletions(-) >=20 > diff --git gcc/ChangeLog gcc/ChangeLog > index 33a2fa0..4c83723 100644 > --- gcc/ChangeLog > +++ gcc/ChangeLog > @@ -1,3 +1,9 @@ > +2015-07-08 Thomas Schwinge > + > + PR libgomp/65099 > + * config/nvptx/mkoffload.c (main): Create an offload image only in > + 64-bit configurations. > + > 2015-07-08 Martin Liska >=20=20 > PR bootstrap/66744 > diff --git gcc/config/nvptx/mkoffload.c gcc/config/nvptx/mkoffload.c > index 8687154..8bc08bf 100644 > --- gcc/config/nvptx/mkoffload.c > +++ gcc/config/nvptx/mkoffload.c > @@ -993,37 +993,43 @@ main (int argc, char **argv) > obstack_ptr_grow (&argv_obstack, argv[ix]); > } >=20=20 > - ptx_name =3D make_temp_file (".mkoffload"); > - obstack_ptr_grow (&argv_obstack, "-o"); > - obstack_ptr_grow (&argv_obstack, ptx_name); > - obstack_ptr_grow (&argv_obstack, NULL); > - const char **new_argv =3D XOBFINISH (&argv_obstack, const char **); > - > - char *execpath =3D getenv ("GCC_EXEC_PREFIX"); > - char *cpath =3D getenv ("COMPILER_PATH"); > - char *lpath =3D getenv ("LIBRARY_PATH"); > - unsetenv ("GCC_EXEC_PREFIX"); > - unsetenv ("COMPILER_PATH"); > - unsetenv ("LIBRARY_PATH"); > - > - fork_execute (new_argv[0], CONST_CAST (char **, new_argv), true); > - obstack_free (&argv_obstack, NULL); > - > - xputenv (concat ("GCC_EXEC_PREFIX=3D", execpath, NULL)); > - xputenv (concat ("COMPILER_PATH=3D", cpath, NULL)); > - xputenv (concat ("LIBRARY_PATH=3D", lpath, NULL)); > - > - in =3D fopen (ptx_name, "r"); > - if (!in) > - fatal_error (input_location, "cannot open intermediate ptx file"); > - > ptx_cfile_name =3D make_temp_file (".c"); >=20=20 > out =3D fopen (ptx_cfile_name, "w"); > if (!out) > fatal_error (input_location, "cannot open '%s'", ptx_cfile_name); >=20=20 > - process (in, out); > + /* PR libgomp/65099: Currently, we only support offloading in 64-bit > + configurations. */ > + if (!target_ilp32) > + { > + ptx_name =3D make_temp_file (".mkoffload"); > + obstack_ptr_grow (&argv_obstack, "-o"); > + obstack_ptr_grow (&argv_obstack, ptx_name); > + obstack_ptr_grow (&argv_obstack, NULL); > + const char **new_argv =3D XOBFINISH (&argv_obstack, const char **); > + > + char *execpath =3D getenv ("GCC_EXEC_PREFIX"); > + char *cpath =3D getenv ("COMPILER_PATH"); > + char *lpath =3D getenv ("LIBRARY_PATH"); > + unsetenv ("GCC_EXEC_PREFIX"); > + unsetenv ("COMPILER_PATH"); > + unsetenv ("LIBRARY_PATH"); > + > + fork_execute (new_argv[0], CONST_CAST (char **, new_argv), true); > + obstack_free (&argv_obstack, NULL); > + > + xputenv (concat ("GCC_EXEC_PREFIX=3D", execpath, NULL)); > + xputenv (concat ("COMPILER_PATH=3D", cpath, NULL)); > + xputenv (concat ("LIBRARY_PATH=3D", lpath, NULL)); > + > + in =3D fopen (ptx_name, "r"); > + if (!in) > + fatal_error (input_location, "cannot open intermediate ptx file"); > + > + process (in, out); > + } > + > fclose (out); >=20=20 > compile_native (ptx_cfile_name, outname, collect_gcc); > diff --git libgomp/ChangeLog libgomp/ChangeLog > index 8839397..34f3a1c 100644 > --- libgomp/ChangeLog > +++ libgomp/ChangeLog > @@ -1,3 +1,13 @@ > +2015-07-08 Thomas Schwinge > + > + PR libgomp/65099 > + * plugin/plugin-nvptx.c (nvptx_get_num_devices): Return 0 if not > + in a 64-bit configuration. > + * testsuite/libgomp.oacc-c++/c++.exp: Don't attempt nvidia > + offloading testing if no such device is available. > + * testsuite/libgomp.oacc-c/c.exp: Likewise. > + * testsuite/libgomp.oacc-fortran/fortran.exp: Likewise. > + > 2015-07-08 Tom de Vries >=20=20 > * testsuite/libgomp.c/parloops-exit-first-loop-alt-3.c (main): Fix > diff --git libgomp/plugin/plugin-nvptx.c libgomp/plugin/plugin-nvptx.c > index ee3a0ae..b67d301 100644 > --- libgomp/plugin/plugin-nvptx.c > +++ libgomp/plugin/plugin-nvptx.c > @@ -777,6 +777,11 @@ nvptx_get_num_devices (void) > int n; > CUresult r; >=20=20 > + /* PR libgomp/65099: Currently, we only support offloading in 64-bit > + configurations. */ > + if (sizeof (void *) !=3D 8) > + return 0; > + > /* This function will be called before the plugin has been initialized= in > order to enumerate available devices, but CUDA API routines can't b= e used > until cuInit has been called. Just call it now (but don't yet do a= ny > diff --git libgomp/testsuite/libgomp.oacc-c++/c++.exp libgomp/testsuite/l= ibgomp.oacc-c++/c++.exp > index 80d1359..3b97024 100644 > --- libgomp/testsuite/libgomp.oacc-c++/c++.exp > +++ libgomp/testsuite/libgomp.oacc-c++/c++.exp > @@ -85,6 +85,12 @@ if { $lang_test_file_found } { > set acc_mem_shared 0 > } > nvidia { > + if { ![check_effective_target_openacc_nvidia_accel_present] } { > + # Don't bother; execution testing is going to FAIL. > + untested "$subdir $offload_target_openacc offloading" > + continue > + } > + > # Copy ptx file (TEMPORARY) > remote_download host $srcdir/libgomp.oacc-c-c++-common/subr.ptx >=20=20 > diff --git libgomp/testsuite/libgomp.oacc-c/c.exp libgomp/testsuite/libgo= mp.oacc-c/c.exp > index c0c70bb..326b988 100644 > --- libgomp/testsuite/libgomp.oacc-c/c.exp > +++ libgomp/testsuite/libgomp.oacc-c/c.exp > @@ -48,6 +48,12 @@ foreach offload_target_openacc $offload_targets_s_open= acc { > set acc_mem_shared 0 > } > nvidia { > + if { ![check_effective_target_openacc_nvidia_accel_present] } { > + # Don't bother; execution testing is going to FAIL. > + untested "$subdir $offload_target_openacc offloading" > + continue > + } > + > # Copy ptx file (TEMPORARY) > remote_download host $srcdir/libgomp.oacc-c-c++-common/subr.ptx >=20=20 > diff --git libgomp/testsuite/libgomp.oacc-fortran/fortran.exp libgomp/tes= tsuite/libgomp.oacc-fortran/fortran.exp > index a8f62e8..a8aaff0 100644 > --- libgomp/testsuite/libgomp.oacc-fortran/fortran.exp > +++ libgomp/testsuite/libgomp.oacc-fortran/fortran.exp > @@ -77,6 +77,12 @@ if { $lang_test_file_found } { > set acc_mem_shared 0 > } > nvidia { > + if { ![check_effective_target_openacc_nvidia_accel_present] } { > + # Don't bother; execution testing is going to FAIL. > + untested "$subdir $offload_target_openacc offloading" > + continue > + } > + > set acc_mem_shared 0 > } > default { Gr=C3=BC=C3=9Fe, Thomas --=-=-= Content-Type: application/pgp-signature; name="signature.asc" Content-length: 472 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAEBAgAGBQJVpWugAAoJEK3/DN1sMFFtR9MH/iHrQhaaKUWt1Kw70ADDcAK4 B+miXtyV94jEb4nyszAUvMZs5EtgG2LysIUFuCFANhNCZDzADbN1Uo+xaGg5pUH/ SXPplqkGErZxR7KWTEwaoX8vmgwXYm2RaKns98apqsGQzg6aCU7Ht5l0nFjHkcgi HzHiwAu50VT0i3TXCpwmV9VupgZqlkDEY8XWL6/OKKBBwoZ098P9vk2DpD+6Pkbz 6d84vYBdpvQo4fFglmShPTzzFEmv9jJRAWEqQGjAdIRPk+fxlQkTu4PENhBw6PgE jZcPJbqzJx2Np54yWSm02yfc+1HjkMJGRDeqYg2ILqreumiPXUIjH8YiytHv2oU= =fJfh -----END PGP SIGNATURE----- --=-=-=--