From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1729) id 9AACC3853560; Wed, 29 Jun 2022 14:47:57 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 9AACC3853560 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Kwok Yeung To: gcc-cvs@gcc.gnu.org Subject: [gcc/devel/omp/gcc-12] libgomp: Remove unused '--with-hsa-runtime', '--with-hsa-runtime-include', '--with-hsa-runtime-lib' X-Act-Checkin: gcc X-Git-Author: Thomas Schwinge X-Git-Refname: refs/heads/devel/omp/gcc-12 X-Git-Oldrev: a309e5a14574a74e1641706dc58573792a1d2096 X-Git-Newrev: 55890b268ea44fc7dd30bb45933563bf0ee11c56 Message-Id: <20220629144757.9AACC3853560@sourceware.org> Date: Wed, 29 Jun 2022 14:47:57 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 29 Jun 2022 14:47:57 -0000 https://gcc.gnu.org/g:55890b268ea44fc7dd30bb45933563bf0ee11c56 commit 55890b268ea44fc7dd30bb45933563bf0ee11c56 Author: Thomas Schwinge Date: Wed Apr 6 12:26:13 2022 +0200 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. (cherry picked from commit 876ac21b7e796f9efb859dfb46ae2a4126b0b782) Diff: --- gcc/ChangeLog.omp | 8 +++++++ gcc/doc/install.texi | 12 ---------- libgomp/ChangeLog.omp | 11 +++++++++ libgomp/Makefile.in | 2 -- libgomp/configure | 55 ++----------------------------------------- libgomp/plugin/configfrag.ac | 29 ----------------------- libgomp/testsuite/Makefile.in | 2 -- 7 files changed, 21 insertions(+), 98 deletions(-) diff --git a/gcc/ChangeLog.omp b/gcc/ChangeLog.omp index 59ad9943ae0..de95d4136cd 100644 --- a/gcc/ChangeLog.omp +++ b/gcc/ChangeLog.omp @@ -1,3 +1,11 @@ +2022-04-06 Thomas Schwinge + + Backport from mainline: + 2022-04-06 Thomas Schwinge + + * doc/install.texi: Don't document '--with-hsa-runtime', + '--with-hsa-runtime-include', '--with-hsa-runtime-lib'. + 2022-05-06 Marcel Vollweiler Backport from mainline: diff --git a/gcc/doc/install.texi b/gcc/doc/install.texi index 10bfceffceb..45ef39da04e 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/ChangeLog.omp b/libgomp/ChangeLog.omp index 6082a762cee..05be22348e2 100644 --- a/libgomp/ChangeLog.omp +++ b/libgomp/ChangeLog.omp @@ -1,3 +1,14 @@ +2022-04-06 Thomas Schwinge + + Backport from mainline: + 2022-04-06 Thomas Schwinge + + * 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. + 2022-04-06 Thomas Schwinge Backport from mainline: diff --git a/libgomp/Makefile.in b/libgomp/Makefile.in index 9f65163f3c8..3eab45ad6cd 100644 --- a/libgomp/Makefile.in +++ b/libgomp/Makefile.in @@ -386,8 +386,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 f5a5438769f..4f8b68d712b 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@