Thomas Schwinge
4b9af57eae
With nvptx offloading configured, and supported, and CUDA available:
$ make check-target-libgomp RUNTESTFLAGS="--all c.exp=context-1.c c++.exp=context-1.c"
[...]
Running [...]/libgomp.oacc-c/c.exp ...
PASS: libgomp.oacc-c/../libgomp.oacc-c-c++-common/context-1.c -DACC_DEVICE_TYPE_nvidia=1 -DACC_MEM_SHARED=0 -foffload=nvptx-none -O0 (test for excess errors)
PASS: libgomp.oacc-c/../libgomp.oacc-c-c++-common/context-1.c -DACC_DEVICE_TYPE_nvidia=1 -DACC_MEM_SHARED=0 -foffload=nvptx-none -O0 execution test
PASS: libgomp.oacc-c/../libgomp.oacc-c-c++-common/context-1.c -DACC_DEVICE_TYPE_nvidia=1 -DACC_MEM_SHARED=0 -foffload=nvptx-none -O2 (test for excess errors)
PASS: libgomp.oacc-c/../libgomp.oacc-c-c++-common/context-1.c -DACC_DEVICE_TYPE_nvidia=1 -DACC_MEM_SHARED=0 -foffload=nvptx-none -O2 execution test
UNSUPPORTED: libgomp.oacc-c/../libgomp.oacc-c-c++-common/context-1.c -DACC_DEVICE_TYPE_host=1 -DACC_MEM_SHARED=1 -foffload=disable -O2
Running [...]/libgomp.oacc-c++/c++.exp ...
PASS: libgomp.oacc-c++/../libgomp.oacc-c-c++-common/context-1.c -DACC_DEVICE_TYPE_nvidia=1 -DACC_MEM_SHARED=0 -foffload=nvptx-none -O0 (test for excess errors)
PASS: libgomp.oacc-c++/../libgomp.oacc-c-c++-common/context-1.c -DACC_DEVICE_TYPE_nvidia=1 -DACC_MEM_SHARED=0 -foffload=nvptx-none -O0 execution test
PASS: libgomp.oacc-c++/../libgomp.oacc-c-c++-common/context-1.c -DACC_DEVICE_TYPE_nvidia=1 -DACC_MEM_SHARED=0 -foffload=nvptx-none -O2 (test for excess errors)
PASS: libgomp.oacc-c++/../libgomp.oacc-c-c++-common/context-1.c -DACC_DEVICE_TYPE_nvidia=1 -DACC_MEM_SHARED=0 -foffload=nvptx-none -O2 execution test
UNSUPPORTED: libgomp.oacc-c++/../libgomp.oacc-c-c++-common/context-1.c -DACC_DEVICE_TYPE_host=1 -DACC_MEM_SHARED=1 -foffload=disable -O2
[...]
..., but for 'c++.exp=context-1.c' alone, we currently get all-UNSUPPORTED:
$ make check-target-libgomp RUNTESTFLAGS_="--all c++.exp=context-1.c"
[...]
Running [...]/libgomp.oacc-c++/c++.exp ...
UNSUPPORTED: libgomp.oacc-c++/../libgomp.oacc-c-c++-common/context-1.c -DACC_DEVICE_TYPE_nvidia=1 -DACC_MEM_SHARED=0 -foffload=nvptx-none -O0
UNSUPPORTED: libgomp.oacc-c++/../libgomp.oacc-c-c++-common/context-1.c -DACC_DEVICE_TYPE_nvidia=1 -DACC_MEM_SHARED=0 -foffload=nvptx-none -O2
UNSUPPORTED: libgomp.oacc-c++/../libgomp.oacc-c-c++-common/context-1.c -DACC_DEVICE_TYPE_host=1 -DACC_MEM_SHARED=1 -foffload=disable -O2
[...]
That is, if 'c.exp' executes first, it does successfully evaluate
'dg-require-effective-target openacc_cublas' -- and does cache this result (so
it isn't reevaluated for 'c++.exp'). However, for 'c++.exp' alone (that is,
without the 'c.exp' result cached), we run into:
spawn -ignore SIGHUP [xgcc] [...] -x c++ openacc_cublas2311907.c [...]
In file included from /usr/include/cuda_fp16.h:3673,
from /usr/include/cublas_api.h:75,
from /usr/include/cublas_v2.h:65,
from openacc_cublas2311907.c:3:
/usr/include/cuda_fp16.hpp:67:10: fatal error: utility: No such file or directory
We're missing include paths to C++/libstdc++ build-tree headers.
Fix this by using the mechanism introduced for Fortran in
r212268 (commit f707da16f7) re
"libgomp.fortran/fortran.exp - add -fintrinsic-modules-path ${blddir}".
libgomp/
* testsuite/libgomp.c++/c++.exp: Use 'lang_include_flags' instead
of 'libstdcxx_includes'.
* testsuite/libgomp.oacc-c++/c++.exp: Likewise.
(cherry picked from commit 1b93b9191d073bf9e867ab8bfc8e4b59ba5af1f3)
82 lines
2.3 KiB
Plaintext
82 lines
2.3 KiB
Plaintext
load_lib libgomp-dg.exp
|
|
load_gcc_lib gcc-dg.exp
|
|
|
|
global shlib_ext
|
|
|
|
set shlib_ext [get_shlib_extension]
|
|
set lang_link_flags "-lstdc++"
|
|
set lang_test_file_found 0
|
|
set lang_library_path "../libstdc++-v3/src/.libs"
|
|
if [info exists lang_include_flags] then {
|
|
unset lang_include_flags
|
|
}
|
|
|
|
# If a testcase doesn't have special options, use these.
|
|
if ![info exists DEFAULT_CFLAGS] then {
|
|
set DEFAULT_CFLAGS "-O2"
|
|
}
|
|
|
|
# Initialize dg.
|
|
dg-init
|
|
|
|
# Turn on OpenMP.
|
|
lappend ALWAYS_CFLAGS "additional_flags=-fopenmp"
|
|
|
|
# Switch into C++ mode. Otherwise, the libgomp.c-c++-common/*.c
|
|
# files would be compiled as C files.
|
|
set SAVE_GCC_UNDER_TEST "$GCC_UNDER_TEST"
|
|
set GCC_UNDER_TEST "$GCC_UNDER_TEST -x c++"
|
|
|
|
set blddir [lookfor_file [get_multilibs] libgomp]
|
|
|
|
|
|
if { $blddir != "" } {
|
|
# Look for a static libstdc++ first.
|
|
if [file exists "${blddir}/${lang_library_path}/libstdc++.a"] {
|
|
set lang_test_file "${lang_library_path}/libstdc++.a"
|
|
set lang_test_file_found 1
|
|
# We may have a shared only build, so look for a shared libstdc++.
|
|
} elseif [file exists "${blddir}/${lang_library_path}/libstdc++.${shlib_ext}"] {
|
|
set lang_test_file "${lang_library_path}/libstdc++.${shlib_ext}"
|
|
set lang_test_file_found 1
|
|
} else {
|
|
puts "No libstdc++ library found, will not execute c++ tests"
|
|
}
|
|
} elseif { [info exists GXX_UNDER_TEST] } {
|
|
set lang_test_file_found 1
|
|
# Needs to exist for libgomp.exp.
|
|
set lang_test_file ""
|
|
} else {
|
|
puts "GXX_UNDER_TEST not defined, will not execute c++ tests"
|
|
}
|
|
|
|
if { $lang_test_file_found } {
|
|
# Gather a list of all tests.
|
|
set tests [lsort [concat \
|
|
[find $srcdir/$subdir *.C] \
|
|
[find $srcdir/$subdir/../libgomp.c-c++-common *.c]]]
|
|
|
|
if { $blddir != "" } {
|
|
set ld_library_path "$always_ld_library_path:${blddir}/${lang_library_path}"
|
|
} else {
|
|
set ld_library_path "$always_ld_library_path"
|
|
}
|
|
append ld_library_path [gcc-set-multilib-library-path $GCC_UNDER_TEST]
|
|
set_ld_library_path_env_vars
|
|
|
|
set flags_file "${blddir}/../libstdc++-v3/scripts/testsuite_flags"
|
|
if { [file exists $flags_file] } {
|
|
set lang_source_re {^.*\.[cC]$}
|
|
set lang_include_flags [exec sh $flags_file --build-includes]
|
|
}
|
|
|
|
# Main loop.
|
|
dg-runtest $tests "" $DEFAULT_CFLAGS
|
|
}
|
|
|
|
# See above.
|
|
set GCC_UNDER_TEST "$SAVE_GCC_UNDER_TEST"
|
|
|
|
# All done.
|
|
dg-finish
|