On Tue, Apr 19, 2016 at 04:01:06PM +0200, Thomas Schwinge wrote:
> Two other solutions have been proposed in the past months: Chung-Lin's
> patches with subject: "Adjust offload plugin interface for avoiding
> deadlock on exit", later: "Resolve libgomp plugin deadlock on exit",
> later: "Resolve deadlock on plugin exit" (still pending review/approval),
> and 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>.
> (Both of which I have not reviewed in detail.) Assuming that Chung-Lin's
> patches are considered too invasive for gcc-6-branch, can we at least get
> Alexander's patch committed to gcc-6-branch as well as on trunk, please?
Yeah, Alex' patch is IMHO fine, even for gcc-6-branch.
> --- libgomp/ChangeLog.gomp-nvptx
> +++ libgomp/ChangeLog.gomp-nvptx
> @@ -1,3 +1,7 @@
> +2016-03-11 Alexander Monakov <amona...@ispras.ru>
> +
> + * plugin/plugin-nvptx.c (map_fini): Make cuMemFreeHost error non-fatal.
> +
> 2016-03-04 Alexander Monakov <amona...@ispras.ru>
>
> * config/nvptx/bar.c: Remove wrong invocation of
> diff --git libgomp/plugin/plugin-nvptx.c libgomp/plugin/plugin-nvptx.c
> index adf57b1..4e44242 100644
> --- libgomp/plugin/plugin-nvptx.c
> +++ libgomp/plugin/plugin-nvptx.c
> @@ -135,7 +135,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
Jakub
