b97e78b712
gcc/ * builtins.c (expand_builtin_acc_on_device) [ACCEL_COMPILER]: Emit open-coded sequence. * omp-low.c (oacc_process_reduction_data): Remove handline of GOMP_DEVICE_HOST_NONSHM. gcc/testsuite/ * c-c++-common/goacc/acc_on_device-2.c: Remove XFAIL for C. include/ * gomp-constants.c (GOMP_DEVICE_HOST_NONSHM): Remove. libgomp/ * libgomp-plugin.h (enum offload_target_type): Remove OFFLOAD_TARGET_TYPE_HOST_NONSHM. * openacc.f90 (openacc_kinds): Remove acc_device_host_nonshm. * openacc.h (enum acc_device_t): Likewise. * openacc_lib.h: Likewise. * oacc-init.c (name_of_acc_device_t): Don't handle it. (acc_on_device): Just use __builtin_acc_on_device. * testsuite/libgomp.oacc-c-c++-common/if-1.c: Don't forbid usage of acc_on_device builtin. * plugin/plugin-host.h: Remove file. * plugin/plugin-host.c: Likewise, but salvage some content into... * oacc-host.c: ... this file. * plugin/Makefrag.am: Don't build libgomp-plugin-host_nonshm.la. * plugin/configfrag.ac (offload_targets): Don't add host_nonshm. * Makefile.in: Regenerate. * configure: Likewise. * testsuite/lib/libgomp.exp (check_effective_target_openacc_host_nonshm_selected): Remove. * testsuite/libgomp.oacc-c++/c++.exp: Don't handle ACC_DEVICE_TYPE=host_nonshm. * testsuite/libgomp.oacc-c/c.exp: Likewise. * testsuite/libgomp.oacc-fortran/fortran.exp: Likewise. * testsuite/libgomp.oacc-c-c++-common/acc_on_device-1.c: Likewise. * testsuite/libgomp.oacc-fortran/acc_on_device-1-1.f90: Likewise. * testsuite/libgomp.oacc-fortran/acc_on_device-1-2.f: Likewise. * testsuite/libgomp.oacc-fortran/acc_on_device-1-3.f: Likewise. From-SVN: r226763
102 lines
3.2 KiB
Plaintext
102 lines
3.2 KiB
Plaintext
# This whole file adapted from libgomp.fortran/fortran.exp.
|
|
|
|
load_lib libgomp-dg.exp
|
|
load_gcc_lib gcc-dg.exp
|
|
load_gcc_lib gfortran-dg.exp
|
|
|
|
global shlib_ext
|
|
global ALWAYS_CFLAGS
|
|
|
|
set shlib_ext [get_shlib_extension]
|
|
set lang_library_path "../libgfortran/.libs"
|
|
set lang_link_flags "-lgfortran"
|
|
if [info exists lang_include_flags] then {
|
|
unset lang_include_flags
|
|
}
|
|
set lang_test_file_found 0
|
|
set quadmath_library_path "../libquadmath/.libs"
|
|
|
|
|
|
# Initialize dg.
|
|
dg-init
|
|
|
|
# Turn on OpenACC.
|
|
lappend ALWAYS_CFLAGS "additional_flags=-fopenacc"
|
|
|
|
if { $blddir != "" } {
|
|
set lang_source_re {^.*\.[fF](|90|95|03|08)$}
|
|
set lang_include_flags "-fintrinsic-modules-path=${blddir}"
|
|
# Look for a static libgfortran first.
|
|
if [file exists "${blddir}/${lang_library_path}/libgfortran.a"] {
|
|
set lang_test_file "${lang_library_path}/libgfortran.a"
|
|
set lang_test_file_found 1
|
|
# We may have a shared only build, so look for a shared libgfortran.
|
|
} elseif [file exists "${blddir}/${lang_library_path}/libgfortran.${shlib_ext}"] {
|
|
set lang_test_file "${lang_library_path}/libgfortran.${shlib_ext}"
|
|
set lang_test_file_found 1
|
|
} else {
|
|
puts "No libgfortran library found, will not execute fortran tests"
|
|
}
|
|
} elseif [info exists GFORTRAN_UNDER_TEST] {
|
|
set lang_test_file_found 1
|
|
# Needs to exist for libgomp.exp.
|
|
set lang_test_file ""
|
|
} else {
|
|
puts "GFORTRAN_UNDER_TEST not defined, will not execute fortran tests"
|
|
}
|
|
|
|
if { $lang_test_file_found } {
|
|
# Gather a list of all tests.
|
|
set tests [lsort [find $srcdir/$subdir *.\[fF\]{,90,95,03,08}]]
|
|
|
|
if { $blddir != "" } {
|
|
if { [file exists "${blddir}/${quadmath_library_path}/libquadmath.a"]
|
|
|| [file exists "${blddir}/${quadmath_library_path}/libquadmath.${shlib_ext}"] } {
|
|
lappend ALWAYS_CFLAGS "ldflags=-L${blddir}/${quadmath_library_path}/"
|
|
# Allow for spec subsitution.
|
|
lappend ALWAYS_CFLAGS "additional_flags=-B${blddir}/${quadmath_library_path}/"
|
|
set ld_library_path "$always_ld_library_path:${blddir}/${lang_library_path}:${blddir}/${quadmath_library_path}"
|
|
} else {
|
|
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
|
|
|
|
# Test OpenACC with available accelerators.
|
|
foreach offload_target_openacc $offload_targets_s_openacc {
|
|
set tagopt "-DACC_DEVICE_TYPE_$offload_target_openacc=1"
|
|
|
|
switch $offload_target_openacc {
|
|
host {
|
|
set acc_mem_shared 1
|
|
}
|
|
nvidia {
|
|
if { ![check_effective_target_openacc_nvidia_accel_present] } {
|
|
# Don't bother; execution testing is going to FAIL.
|
|
untested "$subdir $offload_target_openacc offloading"
|
|
continue
|
|
}
|
|
|
|
set acc_mem_shared 0
|
|
}
|
|
default {
|
|
set acc_mem_shared 0
|
|
}
|
|
}
|
|
set tagopt "$tagopt -DACC_MEM_SHARED=$acc_mem_shared"
|
|
|
|
setenv ACC_DEVICE_TYPE $offload_target_openacc
|
|
|
|
# For Fortran we're doing torture testing, as Fortran has far more tests
|
|
# with arrays etc. that testing just -O0 or -O2 is insufficient, that is
|
|
# typically not the case for C/C++.
|
|
gfortran-dg-runtest $tests "$tagopt" ""
|
|
}
|
|
}
|
|
|
|
# All done.
|
|
dg-finish
|