libgomp: Use HSA_RUNTIME_LIB, HSA_KMT_LIB in the testsuite
libgomp/ * plugin/configfrag.ac (HSA_KMT_LIB, HSA_KMT_LDFLAGS): New variables. * testsuite/libgomp-test-support.exp.in (hsa_runtime_lib) (hsa_kmt_lib): Set variables. * testsuite/lib/libgomp.exp (libgomp_init): Use them to amend always_ld_library_path. * Makefile.in: Regenerate. * configure: Likewise. * testsuite/Makefile.in: Likewise. From-SVN: r233072
This commit is contained in:
Thomas Schwinge
Thomas Schwinge
parent
4a88d9b77a
commit
033ff3d130
@ -1,5 +1,15 @@
|
||||
2016-02-02 Thomas Schwinge <thomas@codesourcery.com>
|
||||
|
||||
* plugin/configfrag.ac (HSA_KMT_LIB, HSA_KMT_LDFLAGS): New
|
||||
variables.
|
||||
* testsuite/libgomp-test-support.exp.in (hsa_runtime_lib)
|
||||
(hsa_kmt_lib): Set variables.
|
||||
* testsuite/lib/libgomp.exp (libgomp_init): Use them to amend
|
||||
always_ld_library_path.
|
||||
* Makefile.in: Regenerate.
|
||||
* configure: Likewise.
|
||||
* testsuite/Makefile.in: Likewise.
|
||||
|
||||
* plugin/configfrag.ac (offload_additional_options)
|
||||
(offload_additional_lib_paths): Don't amend for hsa offloading.
|
||||
* configure: Regenerate.
|
||||
|
||||
@ -268,6 +268,7 @@ FC = @FC@
|
||||
FCFLAGS = @FCFLAGS@
|
||||
FGREP = @FGREP@
|
||||
GREP = @GREP@
|
||||
HSA_KMT_LIB = @HSA_KMT_LIB@
|
||||
HSA_RUNTIME_INCLUDE = @HSA_RUNTIME_INCLUDE@
|
||||
HSA_RUNTIME_LIB = @HSA_RUNTIME_LIB@
|
||||
INSTALL = @INSTALL@
|
||||
|
||||
16
libgomp/configure
vendored
16
libgomp/configure
vendored
@ -637,6 +637,7 @@ PLUGIN_HSA_LIBS
|
||||
PLUGIN_HSA_LDFLAGS
|
||||
PLUGIN_HSA_CPPFLAGS
|
||||
PLUGIN_HSA
|
||||
HSA_KMT_LIB
|
||||
HSA_RUNTIME_LIB
|
||||
HSA_RUNTIME_INCLUDE
|
||||
PLUGIN_NVPTX_LIBS
|
||||
@ -11144,7 +11145,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<_LT_EOF
|
||||
#line 11147 "configure"
|
||||
#line 11148 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -11250,7 +11251,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<_LT_EOF
|
||||
#line 11253 "configure"
|
||||
#line 11254 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -15292,6 +15293,9 @@ if test "x$HSA_RUNTIME_LIB" != x; then
|
||||
HSA_RUNTIME_LDFLAGS=-L$HSA_RUNTIME_LIB
|
||||
fi
|
||||
|
||||
HSA_KMT_LIB=
|
||||
|
||||
HSA_KMT_LDFLAGS=
|
||||
|
||||
# Check whether --with-hsa-kmt-lib was given.
|
||||
if test "${with_hsa_kmt_lib+set}" = set; then :
|
||||
@ -15299,8 +15303,10 @@ if test "${with_hsa_kmt_lib+set}" = set; then :
|
||||
fi
|
||||
|
||||
if test "x$with_hsa_kmt_lib" != x; then
|
||||
HSA_RUNTIME_LDFLAGS="$HSA_RUNTIME_LDFLAGS -L$with_hsa_kmt_lib"
|
||||
HSA_RUNTIME_LIB=
|
||||
HSA_KMT_LIB=$with_hsa_kmt_lib
|
||||
fi
|
||||
if test "x$HSA_KMT_LIB" != x; then
|
||||
HSA_KMT_LDFLAGS=-L$HSA_KMT_LIB
|
||||
fi
|
||||
|
||||
PLUGIN_HSA=0
|
||||
@ -15378,7 +15384,7 @@ rm -f core conftest.err conftest.$ac_objext \
|
||||
tgt_name=hsa
|
||||
PLUGIN_HSA=$tgt
|
||||
PLUGIN_HSA_CPPFLAGS=$HSA_RUNTIME_CPPFLAGS
|
||||
PLUGIN_HSA_LDFLAGS=$HSA_RUNTIME_LDFLAGS
|
||||
PLUGIN_HSA_LDFLAGS="$HSA_RUNTIME_LDFLAGS $HSA_KMT_LDFLAGS"
|
||||
PLUGIN_HSA_LIBS="-lhsa-runtime64 -lhsakmt"
|
||||
|
||||
PLUGIN_HSA_save_CPPFLAGS=$CPPFLAGS
|
||||
|
||||
@ -118,12 +118,17 @@ if test "x$HSA_RUNTIME_LIB" != x; then
|
||||
HSA_RUNTIME_LDFLAGS=-L$HSA_RUNTIME_LIB
|
||||
fi
|
||||
|
||||
HSA_KMT_LIB=
|
||||
AC_SUBST(HSA_KMT_LIB)
|
||||
HSA_KMT_LDFLAGS=
|
||||
AC_ARG_WITH(hsa-kmt-lib,
|
||||
[AS_HELP_STRING([--with-hsa-kmt-lib=PATH],
|
||||
[specify directory for installed HSA KMT library.])])
|
||||
if test "x$with_hsa_kmt_lib" != x; then
|
||||
HSA_RUNTIME_LDFLAGS="$HSA_RUNTIME_LDFLAGS -L$with_hsa_kmt_lib"
|
||||
HSA_RUNTIME_LIB=
|
||||
HSA_KMT_LIB=$with_hsa_kmt_lib
|
||||
fi
|
||||
if test "x$HSA_KMT_LIB" != x; then
|
||||
HSA_KMT_LDFLAGS=-L$HSA_KMT_LIB
|
||||
fi
|
||||
|
||||
PLUGIN_HSA=0
|
||||
@ -190,7 +195,7 @@ 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
|
||||
PLUGIN_HSA_LDFLAGS="$HSA_RUNTIME_LDFLAGS $HSA_KMT_LDFLAGS"
|
||||
PLUGIN_HSA_LIBS="-lhsa-runtime64 -lhsakmt"
|
||||
|
||||
PLUGIN_HSA_save_CPPFLAGS=$CPPFLAGS
|
||||
|
||||
@ -111,6 +111,7 @@ FC = @FC@
|
||||
FCFLAGS = @FCFLAGS@
|
||||
FGREP = @FGREP@
|
||||
GREP = @GREP@
|
||||
HSA_KMT_LIB = @HSA_KMT_LIB@
|
||||
HSA_RUNTIME_INCLUDE = @HSA_RUNTIME_INCLUDE@
|
||||
HSA_RUNTIME_LIB = @HSA_RUNTIME_LIB@
|
||||
INSTALL = @INSTALL@
|
||||
|
||||
@ -184,7 +184,7 @@ proc libgomp_init { args } {
|
||||
}
|
||||
lappend ALWAYS_CFLAGS "additional_flags=-I${srcdir}/.."
|
||||
|
||||
# For build-tree testing, also consider the CUDA paths used for builing.
|
||||
# For build-tree testing, also consider the library paths used for builing.
|
||||
# For installed testing, we assume all that to be provided in the sysroot.
|
||||
if { $blddir != "" } {
|
||||
global cuda_driver_include
|
||||
@ -200,6 +200,14 @@ proc libgomp_init { args } {
|
||||
lappend ALWAYS_CFLAGS "additional_flags=-L$cuda_driver_lib"
|
||||
append always_ld_library_path ":$cuda_driver_lib"
|
||||
}
|
||||
global hsa_runtime_lib
|
||||
global hsa_kmt_lib
|
||||
if { $hsa_runtime_lib != "" } {
|
||||
append always_ld_library_path ":$hsa_runtime_lib"
|
||||
}
|
||||
if { $hsa_kmt_lib != "" } {
|
||||
append always_ld_library_path ":$hsa_kmt_lib"
|
||||
}
|
||||
}
|
||||
|
||||
# We use atomic operations in the testcases to validate results.
|
||||
|
||||
@ -1,4 +1,6 @@
|
||||
set cuda_driver_include "@CUDA_DRIVER_INCLUDE@"
|
||||
set cuda_driver_lib "@CUDA_DRIVER_LIB@"
|
||||
set hsa_runtime_lib "@HSA_RUNTIME_LIB@"
|
||||
set hsa_kmt_lib "@HSA_KMT_LIB@"
|
||||
|
||||
set offload_targets "@offload_targets@"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user