From patchwork Wed May 11 12:40:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Schwinge X-Patchwork-Id: 53806 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 9FBC0384F022 for ; Wed, 11 May 2022 12:41:17 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from esa2.mentor.iphmx.com (esa2.mentor.iphmx.com [68.232.141.98]) by sourceware.org (Postfix) with ESMTPS id 21DFD3857425 for ; Wed, 11 May 2022 12:41:00 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 21DFD3857425 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=codesourcery.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=mentor.com X-IronPort-AV: E=Sophos;i="5.91,217,1647331200"; d="scan'208,223";a="75728436" Received: from orw-gwy-02-in.mentorg.com ([192.94.38.167]) by esa2.mentor.iphmx.com with ESMTP; 11 May 2022 04:40:59 -0800 IronPort-SDR: iMKARC2BEa11kPLTC2q1x2Ambfy+2bwflCLCbUiBIrPmr+fcdyny5688cN+fouuu+zieUNc46P 44uRpqdkPcACBGvfOu60V32eg4weYKp8vB9st3itts1wcNL/sl+3cFXS6H/QG1KDtN5sakV2NA rtZQIHKBftLTjxKiTt3eEMg1WSZ5WXAmFDWhBGccsphcCxeRzEH8asNFYoaW3naF3xAI87mf71 x89hRh7aetWmRZ0k7SanOGjDyvFV39NEQSeh2BTi2TzENWjwG7I/pKcFswOfFxFviY0KeTSsHK 4Yk= From: Thomas Schwinge To: , Andrew Stubbs , "Julian Brown" Subject: 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) In-Reply-To: <878rsittr3.fsf@dem-tschwing-1.ger.mentorg.com> References: <20161118102310.GP3541@tucnak.redhat.com> <20161122132744.lrxg63wvfa3qfvhf@virgil.suse.cz> <87o8hrindc.fsf@euler.schwinge.homeip.net> <878rsittr3.fsf@dem-tschwing-1.ger.mentorg.com> User-Agent: Notmuch/0.29.3+94~g74c3f1b (https://notmuchmail.org) Emacs/27.1 (x86_64-pc-linux-gnu) Date: Wed, 11 May 2022 14:40:50 +0200 Message-ID: <87wnesqm25.fsf@euler.schwinge.homeip.net> MIME-Version: 1.0 X-Originating-IP: [137.202.0.90] X-ClientProxiedBy: svr-ies-mbx-14.mgc.mentorg.com (139.181.222.14) To svr-ies-mbx-10.mgc.mentorg.com (139.181.222.10) X-Spam-Status: No, score=-11.8 required=5.0 tests=BAYES_00, GIT_PATCH_0, HEADER_FROM_DIFFERENT_DOMAINS, KAM_DMARC_STATUS, KAM_LOTSOFHASH, SPF_HELO_PASS, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jakub Jelinek Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" Hi! On 2022-04-06T12:02:08+0200, Thomas Schwinge 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 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 876ac21b7e796f9efb859dfb46ae2a4126b0b782 "libgomp: Remove unused '--with-hsa-runtime', '--with-hsa-runtime-include', '--with-hsa-runtime-lib'", 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 From 876ac21b7e796f9efb859dfb46ae2a4126b0b782 Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Wed, 6 Apr 2022 12:26:13 +0200 Subject: [PATCH] libgomp: Remove unused '--with-hsa-runtime', '--with-hsa-runtime-include', '--with-hsa-runtime-lib' With recent commit 2e309a4eff80e55b53d32d26926a2a94eabfea21 "libgomp testsuite: Don't amend 'LD_LIBRARY_PATH' for system-provided HSA Runtime library", and commit d6adba307508c75f1ccb2121eb1a43c9ab1d4056 "libgomp GCN plugin: Clean up unused references to system-provided HSA Runtime library", the last uses of '--with-hsa-runtime' etc. are gone. gcc/ * doc/install.texi: Don't document '--with-hsa-runtime', '--with-hsa-runtime-include', '--with-hsa-runtime-lib'. libgomp/ * plugin/configfrag.ac: Remove '--with-hsa-runtime', '--with-hsa-runtime-include', '--with-hsa-runtime-lib' processing. * Makefile.in: Regenerate. * configure: Likewise. * testsuite/Makefile.in: Likewise. --- gcc/doc/install.texi | 12 -------- libgomp/Makefile.in | 2 -- libgomp/configure | 55 ++--------------------------------- libgomp/plugin/configfrag.ac | 29 ------------------ libgomp/testsuite/Makefile.in | 2 -- 5 files changed, 2 insertions(+), 98 deletions(-) diff --git a/gcc/doc/install.texi b/gcc/doc/install.texi index 76392302653..042241e9fad 100644 --- a/gcc/doc/install.texi +++ b/gcc/doc/install.texi @@ -2329,18 +2329,6 @@ those are in separate optional packages and where the presence or absence of those optional packages should determine the actual supported offloading target set rather than the GCC configure-time selection. -@item --with-hsa-runtime=@var{pathname} -@itemx --with-hsa-runtime-include=@var{pathname} -@itemx --with-hsa-runtime-lib=@var{pathname} - -If you configure GCC with offloading which uses an HSA run-time such as -AMDGCN but do not have the HSA run-time library installed in a standard -location then you can explicitly specify the directory where they are -installed. The @option{--with-hsa-runtime=@/@var{hsainstalldir}} option -is a shorthand for -@option{--with-hsa-runtime-lib=@/@var{hsainstalldir}/lib} and -@option{--with-hsa-runtime-include=@/@var{hsainstalldir}/include}. - @item --enable-cet @itemx --disable-cet Enable building target run-time libraries with control-flow diff --git a/libgomp/Makefile.in b/libgomp/Makefile.in index 1c2ac5695ab..f2712aa5133 100644 --- a/libgomp/Makefile.in +++ b/libgomp/Makefile.in @@ -385,8 +385,6 @@ FC = @FC@ FCFLAGS = @FCFLAGS@ FGREP = @FGREP@ GREP = @GREP@ -HSA_RUNTIME_INCLUDE = @HSA_RUNTIME_INCLUDE@ -HSA_RUNTIME_LIB = @HSA_RUNTIME_LIB@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ diff --git a/libgomp/configure b/libgomp/configure index e735e4c5f2a..3de8eb2641f 100755 --- a/libgomp/configure +++ b/libgomp/configure @@ -675,8 +675,6 @@ offload_targets offload_plugins PLUGIN_GCN_LIBS PLUGIN_GCN -HSA_RUNTIME_LIB -HSA_RUNTIME_INCLUDE PLUGIN_NVPTX_LIBS PLUGIN_NVPTX_LDFLAGS PLUGIN_NVPTX_CPPFLAGS @@ -834,9 +832,6 @@ enable_maintainer_mode with_cuda_driver with_cuda_driver_include with_cuda_driver_lib -with_hsa_runtime -with_hsa_runtime_include -with_hsa_runtime_lib enable_linux_futex enable_tls enable_symvers @@ -1519,16 +1514,6 @@ Optional Packages: --with-cuda-driver-lib=PATH specify directory for the installed CUDA driver library - --with-hsa-runtime=PATH specify prefix directory for installed HSA run-time - package. Equivalent to - --with-hsa-runtime-include=PATH/include plus - --with-hsa-runtime-lib=PATH/lib - --with-hsa-runtime-include=PATH - specify directory for installed HSA run-time include - files - --with-hsa-runtime-lib=PATH - specify directory for the installed HSA run-time - library --with-gcc-major-version-only use only GCC major number in filesystem paths @@ -11429,7 +11414,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11432 "configure" +#line 11417 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11535,7 +11520,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11538 "configure" +#line 11523 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -15236,42 +15221,6 @@ PLUGIN_NVPTX_DYNAMIC=0 -# Look for HSA run-time, its includes and libraries - -HSA_RUNTIME_INCLUDE= -HSA_RUNTIME_LIB= - - - - -# Check whether --with-hsa-runtime was given. -if test "${with_hsa_runtime+set}" = set; then : - withval=$with_hsa_runtime; -fi - - -# Check whether --with-hsa-runtime-include was given. -if test "${with_hsa_runtime_include+set}" = set; then : - withval=$with_hsa_runtime_include; -fi - - -# Check whether --with-hsa-runtime-lib was given. -if test "${with_hsa_runtime_lib+set}" = set; then : - withval=$with_hsa_runtime_lib; -fi - -if test "x$with_hsa_runtime" != x; then - HSA_RUNTIME_INCLUDE=$with_hsa_runtime/include - HSA_RUNTIME_LIB=$with_hsa_runtime/lib -fi -if test "x$with_hsa_runtime_include" != x; then - HSA_RUNTIME_INCLUDE=$with_hsa_runtime_include -fi -if test "x$with_hsa_runtime_lib" != x; then - HSA_RUNTIME_LIB=$with_hsa_runtime_lib -fi - PLUGIN_GCN=0 PLUGIN_GCN_LIBS= diff --git a/libgomp/plugin/configfrag.ac b/libgomp/plugin/configfrag.ac index 94d357f9a26..9eeac4562e4 100644 --- a/libgomp/plugin/configfrag.ac +++ b/libgomp/plugin/configfrag.ac @@ -91,35 +91,6 @@ AC_SUBST(PLUGIN_NVPTX_CPPFLAGS) AC_SUBST(PLUGIN_NVPTX_LDFLAGS) AC_SUBST(PLUGIN_NVPTX_LIBS) -# Look for HSA run-time, its includes and libraries - -HSA_RUNTIME_INCLUDE= -HSA_RUNTIME_LIB= -AC_SUBST(HSA_RUNTIME_INCLUDE) -AC_SUBST(HSA_RUNTIME_LIB) - -AC_ARG_WITH(hsa-runtime, - [AS_HELP_STRING([--with-hsa-runtime=PATH], - [specify prefix directory for installed HSA run-time package. - Equivalent to --with-hsa-runtime-include=PATH/include - plus --with-hsa-runtime-lib=PATH/lib])]) -AC_ARG_WITH(hsa-runtime-include, - [AS_HELP_STRING([--with-hsa-runtime-include=PATH], - [specify directory for installed HSA run-time include files])]) -AC_ARG_WITH(hsa-runtime-lib, - [AS_HELP_STRING([--with-hsa-runtime-lib=PATH], - [specify directory for the installed HSA run-time library])]) -if test "x$with_hsa_runtime" != x; then - HSA_RUNTIME_INCLUDE=$with_hsa_runtime/include - HSA_RUNTIME_LIB=$with_hsa_runtime/lib -fi -if test "x$with_hsa_runtime_include" != x; then - HSA_RUNTIME_INCLUDE=$with_hsa_runtime_include -fi -if test "x$with_hsa_runtime_lib" != x; then - HSA_RUNTIME_LIB=$with_hsa_runtime_lib -fi - PLUGIN_GCN=0 PLUGIN_GCN_LIBS= AC_SUBST(PLUGIN_GCN) diff --git a/libgomp/testsuite/Makefile.in b/libgomp/testsuite/Makefile.in index f0c7da68601..32be337b8fc 100644 --- a/libgomp/testsuite/Makefile.in +++ b/libgomp/testsuite/Makefile.in @@ -163,8 +163,6 @@ FC = @FC@ FCFLAGS = @FCFLAGS@ FGREP = @FGREP@ GREP = @GREP@ -HSA_RUNTIME_INCLUDE = @HSA_RUNTIME_INCLUDE@ -HSA_RUNTIME_LIB = @HSA_RUNTIME_LIB@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ -- 2.35.1