From: Thomas Schwinge <thomas@codesourcery.com>
To: <gcc-patches@gcc.gnu.org>, Andrew Stubbs <ams@codesourcery.com>,
"Julian Brown" <julian@codesourcery.com>
Cc: Jakub Jelinek <jakub@redhat.com>
Subject: libgomp GCN plugin: Clean up always-empty 'PLUGIN_GCN_CPPFLAGS', 'PLUGIN_GCN_LDFLAGS' (was: libgomp GCN plugin: Clean up unused references to system-provided HSA Runtime library)
Date: Wed, 11 May 2022 14:38:39 +0200 [thread overview]
Message-ID: <87zgjoqm5s.fsf@euler.schwinge.homeip.net> (raw)
In-Reply-To: <878rsittr3.fsf@dem-tschwing-1.ger.mentorg.com>
[-- Attachment #1: Type: text/plain, Size: 1950 bytes --]
Hi!
On 2022-04-06T12:02:08+0200, I wrote:
> On 2021-01-14T15:50:23+0100, I wrote:
>> I'm raising here an issue with HSA libgomp plugin code changes from a
>> while ago. While HSA is now no longer relevant for GCC master branch,
>> the same code has also been copied into the GCN libgomp plugin.
>
> Here is another small clean-up patch (to enable further clean-up):
>
>> This is commit b8d89b03db5f212919e4571671ebb4f5f8b1e19d (r242749) "Remove
>> build dependence on HSA run-time":
>>
>> On 2016-11-22T14:27:44+0100, Martin Jambor <mjambor@suse.cz> wrote:
>>> --- a/libgomp/plugin/configfrag.ac
>>> +++ b/libgomp/plugin/configfrag.ac
>>
>>> @@ -195,8 +183,8 @@ if test x"$enable_offload_targets" != x; then
>>> tgt_name=hsa
>>> PLUGIN_HSA=$tgt
>>> PLUGIN_HSA_CPPFLAGS=$HSA_RUNTIME_CPPFLAGS
>>> - PLUGIN_HSA_LDFLAGS="$HSA_RUNTIME_LDFLAGS $HSA_KMT_LDFLAGS"
>>> - PLUGIN_HSA_LIBS="-lhsa-runtime64 -lhsakmt"
>>> + PLUGIN_HSA_LDFLAGS="$HSA_RUNTIME_LDFLAGS"
>>> + PLUGIN_HSA_LIBS="-ldl"
>>
>> So this switched from directly linking against 'libhsa-runtime64.so' to a
>> 'libdl'-based runtime linking variant.
>
> (Not intending to change anything regarding that.)
>
> Given the 'PLUGIN_HSA_LIBS' change cited above, OK to push the attached
> "libgomp GCN plugin: Clean up unused references to system-provided HSA
> Runtime library"?
With that done, I've then pushed to master branch
commit 91a6dcd14915181b4bce51cd44b56a3e9f9d35d8 "libgomp GCN plugin:
Clean up always-empty 'PLUGIN_GCN_CPPFLAGS', 'PLUGIN_GCN_LDFLAGS'", see
attached.
Grüße
Thomas
-----------------
Siemens Electronic Design Automation GmbH; Anschrift: Arnulfstraße 201, 80634 München; Gesellschaft mit beschränkter Haftung; Geschäftsführer: Thomas Heurung, Frank Thürauf; Sitz der Gesellschaft: München; Registergericht München, HRB 106955
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-libgomp-GCN-plugin-Clean-up-always-empty-PLUGIN_GCN_.patch --]
[-- Type: text/x-diff, Size: 5506 bytes --]
From 91a6dcd14915181b4bce51cd44b56a3e9f9d35d8 Mon Sep 17 00:00:00 2001
From: Thomas Schwinge <thomas@codesourcery.com>
Date: Wed, 6 Apr 2022 12:15:28 +0200
Subject: [PATCH] libgomp GCN plugin: Clean up always-empty
'PLUGIN_GCN_CPPFLAGS', 'PLUGIN_GCN_LDFLAGS'
After recent commit d6adba307508c75f1ccb2121eb1a43c9ab1d4056
"libgomp GCN plugin: Clean up unused references to system-provided HSA Runtime
library", these aren't set anymore.
libgomp/
* plugin/Makefrag.am (libgomp_plugin_gcn_la_CPPFLAGS): Don't
consider 'PLUGIN_GCN_CPPFLAGS'.
(libgomp_plugin_gcn_la_LDFLAGS): Don't consider
'PLUGIN_GCN_LDFLAGS'.
* plugin/configfrag.ac (PLUGIN_GCN_CPPFLAGS, PLUGIN_GCN_LDFLAGS):
Remove.
* Makefile.in: Regenerate.
* configure: Likewise.
* testsuite/Makefile.in: Likewise.
---
libgomp/Makefile.in | 10 ++++------
libgomp/configure | 10 ++--------
libgomp/plugin/Makefrag.am | 3 +--
libgomp/plugin/configfrag.ac | 4 ----
libgomp/testsuite/Makefile.in | 2 --
5 files changed, 7 insertions(+), 22 deletions(-)
diff --git a/libgomp/Makefile.in b/libgomp/Makefile.in
index 22cb2136a08..1c2ac5695ab 100644
--- a/libgomp/Makefile.in
+++ b/libgomp/Makefile.in
@@ -434,8 +434,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
PLUGIN_GCN = @PLUGIN_GCN@
-PLUGIN_GCN_CPPFLAGS = @PLUGIN_GCN_CPPFLAGS@
-PLUGIN_GCN_LDFLAGS = @PLUGIN_GCN_LDFLAGS@
PLUGIN_GCN_LIBS = @PLUGIN_GCN_LIBS@
PLUGIN_NVPTX = @PLUGIN_NVPTX@
PLUGIN_NVPTX_CPPFLAGS = @PLUGIN_NVPTX_CPPFLAGS@
@@ -574,12 +572,12 @@ libgomp_la_SOURCES = alloc.c atomic.c barrier.c critical.c env.c \
# AMD GCN plugin
@PLUGIN_GCN_TRUE@libgomp_plugin_gcn_version_info = -version-info $(libtool_VERSION)
@PLUGIN_GCN_TRUE@libgomp_plugin_gcn_la_SOURCES = plugin/plugin-gcn.c
-@PLUGIN_GCN_TRUE@libgomp_plugin_gcn_la_CPPFLAGS = $(AM_CPPFLAGS) $(PLUGIN_GCN_CPPFLAGS) \
+@PLUGIN_GCN_TRUE@libgomp_plugin_gcn_la_CPPFLAGS = $(AM_CPPFLAGS) \
@PLUGIN_GCN_TRUE@ -D_GNU_SOURCE
-@PLUGIN_GCN_TRUE@libgomp_plugin_gcn_la_LDFLAGS = \
-@PLUGIN_GCN_TRUE@ $(libgomp_plugin_gcn_version_info) \
-@PLUGIN_GCN_TRUE@ $(lt_host_flags) $(PLUGIN_GCN_LDFLAGS)
+@PLUGIN_GCN_TRUE@libgomp_plugin_gcn_la_LDFLAGS = $(libgomp_plugin_gcn_version_info) \
+@PLUGIN_GCN_TRUE@ $(lt_host_flags)
+
@PLUGIN_GCN_TRUE@libgomp_plugin_gcn_la_LIBADD = libgomp.la $(PLUGIN_GCN_LIBS)
@PLUGIN_GCN_TRUE@libgomp_plugin_gcn_la_LIBTOOLFLAGS = --tag=disable-static
nodist_noinst_HEADERS = libgomp_f.h
diff --git a/libgomp/configure b/libgomp/configure
index cf1d1fbe195..e735e4c5f2a 100755
--- a/libgomp/configure
+++ b/libgomp/configure
@@ -674,8 +674,6 @@ offload_additional_options
offload_targets
offload_plugins
PLUGIN_GCN_LIBS
-PLUGIN_GCN_LDFLAGS
-PLUGIN_GCN_CPPFLAGS
PLUGIN_GCN
HSA_RUNTIME_LIB
HSA_RUNTIME_INCLUDE
@@ -11431,7 +11429,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11434 "configure"
+#line 11432 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11537,7 +11535,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11540 "configure"
+#line 11538 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -15275,14 +15273,10 @@ if test "x$with_hsa_runtime_lib" != x; then
fi
PLUGIN_GCN=0
-PLUGIN_GCN_CPPFLAGS=
-PLUGIN_GCN_LDFLAGS=
PLUGIN_GCN_LIBS=
-
-
# Parse '--enable-offload-targets', figure out the corresponding libgomp
# plugins, and configure to find the corresponding offload compilers.
# 'offload_plugins' and 'offload_targets' will be populated in the same order.
diff --git a/libgomp/plugin/Makefrag.am b/libgomp/plugin/Makefrag.am
index 3fe50b61cfd..11929d4ff29 100644
--- a/libgomp/plugin/Makefrag.am
+++ b/libgomp/plugin/Makefrag.am
@@ -44,11 +44,10 @@ if PLUGIN_GCN
libgomp_plugin_gcn_version_info = -version-info $(libtool_VERSION)
toolexeclib_LTLIBRARIES += libgomp-plugin-gcn.la
libgomp_plugin_gcn_la_SOURCES = plugin/plugin-gcn.c
-libgomp_plugin_gcn_la_CPPFLAGS = $(AM_CPPFLAGS) $(PLUGIN_GCN_CPPFLAGS) \
+libgomp_plugin_gcn_la_CPPFLAGS = $(AM_CPPFLAGS) \
-D_GNU_SOURCE
libgomp_plugin_gcn_la_LDFLAGS = $(libgomp_plugin_gcn_version_info) \
$(lt_host_flags)
-libgomp_plugin_gcn_la_LDFLAGS += $(PLUGIN_GCN_LDFLAGS)
libgomp_plugin_gcn_la_LIBADD = libgomp.la $(PLUGIN_GCN_LIBS)
libgomp_plugin_gcn_la_LIBTOOLFLAGS = --tag=disable-static
endif
diff --git a/libgomp/plugin/configfrag.ac b/libgomp/plugin/configfrag.ac
index 52c3da09b43..94d357f9a26 100644
--- a/libgomp/plugin/configfrag.ac
+++ b/libgomp/plugin/configfrag.ac
@@ -121,12 +121,8 @@ if test "x$with_hsa_runtime_lib" != x; then
fi
PLUGIN_GCN=0
-PLUGIN_GCN_CPPFLAGS=
-PLUGIN_GCN_LDFLAGS=
PLUGIN_GCN_LIBS=
AC_SUBST(PLUGIN_GCN)
-AC_SUBST(PLUGIN_GCN_CPPFLAGS)
-AC_SUBST(PLUGIN_GCN_LDFLAGS)
AC_SUBST(PLUGIN_GCN_LIBS)
# Parse '--enable-offload-targets', figure out the corresponding libgomp
diff --git a/libgomp/testsuite/Makefile.in b/libgomp/testsuite/Makefile.in
index e48c3f2f9b0..f0c7da68601 100644
--- a/libgomp/testsuite/Makefile.in
+++ b/libgomp/testsuite/Makefile.in
@@ -212,8 +212,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
PLUGIN_GCN = @PLUGIN_GCN@
-PLUGIN_GCN_CPPFLAGS = @PLUGIN_GCN_CPPFLAGS@
-PLUGIN_GCN_LDFLAGS = @PLUGIN_GCN_LDFLAGS@
PLUGIN_GCN_LIBS = @PLUGIN_GCN_LIBS@
PLUGIN_NVPTX = @PLUGIN_NVPTX@
PLUGIN_NVPTX_CPPFLAGS = @PLUGIN_NVPTX_CPPFLAGS@
--
2.35.1
next prev parent reply other threads:[~2022-05-11 12:38 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-13 23:20 [PATCH 0/4] Merge from HSA branch to trunk Martin Jambor
2016-11-13 23:20 ` [PATCH 1/4] Remove build dependence on HSA run-time Martin Jambor
2016-11-18 10:23 ` Jakub Jelinek
2016-11-22 13:27 ` Martin Jambor
2016-11-22 14:13 ` Jakub Jelinek
2021-01-14 14:50 ` Thomas Schwinge
2021-01-19 11:37 ` Martin Jambor
2021-01-19 12:49 ` Martin Liška
2021-03-25 13:40 ` Thomas Schwinge
2022-04-06 9:20 ` libgomp testsuite: Don't amend 'LD_LIBRARY_PATH' for system-provided HSA Runtime library (was: [PATCH 1/4] Remove build dependence on HSA run-time) Thomas Schwinge
2022-04-06 9:24 ` Jakub Jelinek
2022-04-06 9:54 ` libgomp testsuite: Don't amend 'LD_LIBRARY_PATH' for system-provided HSA Runtime library Thomas Schwinge
2022-04-28 13:48 ` [PING] libgomp testsuite: Don't amend 'LD_LIBRARY_PATH' for system-provided HSA Runtime library (was: [PATCH 1/4] Remove build dependence on HSA run-time) Thomas Schwinge
2022-05-05 19:20 ` [PING^2] " Thomas Schwinge
2022-04-06 10:02 ` libgomp GCN plugin: Clean up unused references to " Thomas Schwinge
2022-04-28 13:50 ` [PING] " Thomas Schwinge
2022-04-28 14:18 ` Andrew Stubbs
2022-05-11 12:38 ` Thomas Schwinge [this message]
2022-05-11 12:40 ` libgomp: Remove unused '--with-hsa-runtime', '--with-hsa-runtime-include', '--with-hsa-runtime-lib' (was: libgomp GCN plugin: Clean up unused references to system-provided HSA Runtime library) Thomas Schwinge
2016-11-13 23:20 ` [PATCH 4/4] Back-end and IPA bits of hsa branch merge Martin Jambor
[not found] ` <yxfpftb48jra.fsf@hertz.schwinge.homeip.net>
2020-06-17 21:57 ` [HSA] Avoid ICE when "HSA does not implement indirect calls" (was: [PATCH 4/4] Back-end and IPA bits of hsa branch merge) Thomas Schwinge
2016-11-13 23:20 ` [PATCH 3/4] OpenMP lowering changes from the hsa branch Martin Jambor
2016-11-18 10:39 ` Jakub Jelinek
2016-03-16 14:13 ` [omp] Create openmp -fopt-info optimization group Martin Jambor
2017-02-21 8:09 ` [gomp4] add -finform-parallelism Cesar Philippidis
2017-02-22 8:28 ` Thomas Schwinge
2017-02-23 15:06 ` Cesar Philippidis
2016-11-22 13:43 ` [PATCH 3/4] OpenMP lowering changes from the hsa branch Martin Jambor
2017-02-22 7:58 ` Rename the "openmp" group of optimizations to "omp" (was: [PATCH 3/4] OpenMP lowering changes from the hsa branch) Thomas Schwinge
2017-02-22 8:17 ` Miscellaneous optimization group fixes (was: Rename the "openmp" group of optimizations to "omp") Thomas Schwinge
2017-02-22 9:53 ` Martin Jambor
2017-02-28 8:52 ` Rename the "openmp" group of optimizations to "omp" (was: Miscellaneous optimization group fixes) Thomas Schwinge
2017-02-28 9:04 ` Miscellaneous optimization group fixes Thomas Schwinge
2016-11-13 23:20 ` [PATCH 2/4] HSA specific built-ins Martin Jambor
2016-11-18 10:27 ` Jakub Jelinek
2016-11-22 13:30 ` Martin Jambor
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=87zgjoqm5s.fsf@euler.schwinge.homeip.net \
--to=thomas@codesourcery.com \
--cc=ams@codesourcery.com \
--cc=gcc-patches@gcc.gnu.org \
--cc=jakub@redhat.com \
--cc=julian@codesourcery.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).