Hi!
On Thu, 21 Apr 2016 16:43:22 +0300, Alexander Monakov <[email protected]>
wrote:
> On Tue, 19 Apr 2016, Jakub Jelinek wrote:
> > On Tue, Apr 19, 2016 at 04:01:06PM +0200, Thomas Schwinge wrote:
> > > [...] Alexander's much smaller patch with subject: "libgomp plugin: make
> > > cuMemFreeHost error non-fatal",
> > > <http://news.gmane.org/find-root.php?message_id=%3C1458323327-9908-4-git-send-email-amonakov%40ispras.ru%3E>.
> > Yeah, Alex' patch is IMHO fine, even for gcc-6-branch.
>
> Applied to both.
Thanks!
Backported to gomp-4_0-branch in r235345:
commit 7e774a1bb94e2c5f17765342a59c6cb25e76c943
Author: tschwinge <tschwinge@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Thu Apr 21 15:35:57 2016 +0000
libgomp nvptx plugin: make cuMemFreeHost error non-fatal
Backport trunk r235339:
libgomp/
2016-04-21 Alexander Monakov <[email protected]>
* plugin/plugin-nvptx.c (map_fini): Make cuMemFreeHost error
non-fatal.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gomp-4_0-branch@235345
138bc75d-0d04-0410-961f-82ee72b054a4
---
libgomp/ChangeLog.gomp | 8 ++++++++
libgomp/plugin/plugin-nvptx.c | 2 +-
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git libgomp/ChangeLog.gomp libgomp/ChangeLog.gomp
index 1c99026..23a8eef 100644
--- libgomp/ChangeLog.gomp
+++ libgomp/ChangeLog.gomp
@@ -1,3 +1,11 @@
+2016-04-21 Thomas Schwinge <[email protected]>
+
+ Backport trunk r235339:
+ 2016-04-21 Alexander Monakov <[email protected]>
+
+ * plugin/plugin-nvptx.c (map_fini): Make cuMemFreeHost error
+ non-fatal.
+
2016-04-08 Thomas Schwinge <[email protected]>
PR testsuite/70579
diff --git libgomp/plugin/plugin-nvptx.c libgomp/plugin/plugin-nvptx.c
index eea74d4..6b674c0 100644
--- libgomp/plugin/plugin-nvptx.c
+++ libgomp/plugin/plugin-nvptx.c
@@ -128,7 +128,7 @@ map_fini (struct ptx_stream *s)
r = cuMemFreeHost (s->h);
if (r != CUDA_SUCCESS)
- GOMP_PLUGIN_fatal ("cuMemFreeHost error: %s", cuda_error (r));
+ GOMP_PLUGIN_error ("cuMemFreeHost error: %s", cuda_error (r));
}
static void
Grüße
Thomas
