From: Thomas Schwinge <thomas@codesourcery.com>
To: Ilya Verbin <iverbin@gmail.com>
Cc: GCC Patches <gcc-patches@gcc.gnu.org>,
Bernd Schmidt <bernds@codesourcery.com>
Subject: Re: nvptx offloading patches [4/n]
Date: Wed, 11 Feb 2015 14:20:00 -0000 [thread overview]
Message-ID: <87siech6q8.fsf@schwinge.name> (raw)
In-Reply-To: <20150128175945.GD12176@msticlxl57.ims.intel.com>
[-- Attachment #1: Type: text/plain, Size: 2714 bytes --]
Hi!
On Wed, 28 Jan 2015 20:59:45 +0300, Ilya Verbin <iverbin@gmail.com> wrote:
> On 28 Jan 18:05, Thomas Schwinge wrote:
> > + fprintf (out, "#define PTX_ID 1\n");
> > + fprintf (out, "static __attribute__((constructor)) void init (void)\n{\n");
> > + fprintf (out, " GOMP_offload_register (__OPENMP_TARGET__, PTX_ID,\n");
>
> The file include/gomp-constants.h already contains:
> #define GOMP_DEVICE_NVIDIA_PTX 5
>
> I guess it would be better to include gomp-constants.h into mkoffload and to use
> this define.
Thanks! You're right indeed -- I mistakenly committed an older version
of this file. Committed to trunk in r220619:
commit ab0e6fbc36cacaa619dfacec41e17a681a28562a
Author: tschwinge <tschwinge@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Wed Feb 11 14:15:28 2015 +0000
nvptx mkoffload: Don't hard-code GOMP_DEVICE_NVIDIA_PTX.
gcc/
* config/nvptx/mkoffload.c: Include "gomp-constants.h".
(process): Use its GOMP_DEVICE_NVIDIA_PTX instead of (wrongly)
hard-coding PTX_ID.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@220619 138bc75d-0d04-0410-961f-82ee72b054a4
---
gcc/ChangeLog | 6 ++++++
gcc/config/nvptx/mkoffload.c | 5 +++--
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git gcc/ChangeLog gcc/ChangeLog
index 2fa7ff2..1479dcb 100644
--- gcc/ChangeLog
+++ gcc/ChangeLog
@@ -1,3 +1,9 @@
+2015-02-11 Thomas Schwinge <thomas@codesourcery.com>
+
+ * config/nvptx/mkoffload.c: Include "gomp-constants.h".
+ (process): Use its GOMP_DEVICE_NVIDIA_PTX instead of (wrongly)
+ hard-coding PTX_ID.
+
2015-02-11 H.J. Lu <hongjiu.lu@intel.com>
* doc/sourcebuild.texi (pie_enabled): Document.
diff --git gcc/config/nvptx/mkoffload.c gcc/config/nvptx/mkoffload.c
index 38ccdba..8f359cf 100644
--- gcc/config/nvptx/mkoffload.c
+++ gcc/config/nvptx/mkoffload.c
@@ -35,6 +35,7 @@
#include "obstack.h"
#include "diagnostic-core.h"
#include "collect-utils.h"
+#include "gomp-constants.h"
const char tool_name[] = "nvptx mkoffload";
@@ -791,9 +792,9 @@ process (FILE *in, FILE *out)
fprintf (out, "extern void GOMP_offload_register (const void *, int, void *);\n");
fprintf (out, "extern void *__OPENMP_TARGET__[];\n\n");
- fprintf (out, "#define PTX_ID 1\n");
fprintf (out, "static __attribute__((constructor)) void init (void)\n{\n");
- fprintf (out, " GOMP_offload_register (__OPENMP_TARGET__, PTX_ID,\n");
+ fprintf (out, " GOMP_offload_register (__OPENMP_TARGET__, %d,\n",
+ GOMP_DEVICE_NVIDIA_PTX);
fprintf (out, " &target_data);\n");
fprintf (out, "};\n");
}
Grüße,
Thomas
[-- Attachment #2: Type: application/pgp-signature, Size: 472 bytes --]
next prev parent reply other threads:[~2015-02-11 14:20 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-01 12:11 Bernd Schmidt
2015-01-28 18:03 ` Thomas Schwinge
2015-01-28 18:16 ` Ilya Verbin
2015-02-11 14:20 ` Thomas Schwinge [this message]
2015-02-11 14:19 ` Thomas Schwinge
2015-02-11 14:20 ` Thomas Schwinge
2015-02-11 14:44 ` Thomas Schwinge
2015-02-11 14:50 ` [nvptx] -freorder-blocks-and-partition, -freorder-functions (was: nvptx offloading patches [4/n]) Thomas Schwinge
2015-02-25 10:54 ` Option overriding in the offloading code path (was: [nvptx] -freorder-blocks-and-partition, -freorder-functions) Thomas Schwinge
2015-02-25 13:23 ` Option overriding in the offloading code path Bernd Schmidt
2015-02-25 17:15 ` Option overriding in the offloading code path (was: [nvptx] -freorder-blocks-and-partition, -freorder-functions) Jakub Jelinek
2015-02-26 10:42 ` var-tracking vs. pseudo registers (was: Option overriding in the offloading code path) Thomas Schwinge
2015-02-26 10:53 ` Jakub Jelinek
2015-03-26 11:00 ` [PATCH] Don't run var-tracking for targetm.no_register_allocation targets Jakub Jelinek
2015-03-26 11:20 ` Richard Biener
2015-04-27 16:44 ` var-tracking vs. pseudo registers (was: Option overriding in the offloading code path) Thomas Schwinge
2015-03-13 9:07 ` Option overriding in the offloading code path Thomas Schwinge
2015-02-11 15:21 ` nvptx offloading patches [4/n] Bernd Schmidt
2015-02-17 18:14 ` Thomas Schwinge
2015-02-18 8:26 ` nvptx mkoffload: For non-installed testing, look in all COMPILER_PATHs for GCC_INSTALL_NAME (was: nvptx offloading patches [4/n]) Thomas Schwinge
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87siech6q8.fsf@schwinge.name \
--to=thomas@codesourcery.com \
--cc=bernds@codesourcery.com \
--cc=gcc-patches@gcc.gnu.org \
--cc=iverbin@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).