6103184e81
* Makefile.am (libgomp_la_SOURCES): Add atomic.c, icv.c, icv-device.c.
* Makefile.in. Regenerate.
* configure.ac [nvptx*-*-*] (libgomp_use_pthreads): Set and use it...
(LIBGOMP_USE_PTHREADS): ...here; new define.
* configure: Regenerate.
* config.h.in: Likewise.
* config/posix/affinity.c: Move to...
* affinity.c: ...here (new file). Guard use of Pthreads-specific
interface by LIBGOMP_USE_PTHREADS.
* critical.c: Split out GOMP_atomic_{start,end} into...
* atomic.c: ...here (new file).
* env.c: Split out ICV definitions into...
* icv.c: ...here (new file) and...
* icv-device.c: ...here. New file.
* config/linux/lock.c (gomp_init_lock_30): Move to generic lock.c.
(gomp_destroy_lock_30): Ditto.
(gomp_set_lock_30): Ditto.
(gomp_unset_lock_30): Ditto.
(gomp_test_lock_30): Ditto.
(gomp_init_nest_lock_30): Ditto.
(gomp_destroy_nest_lock_30): Ditto.
(gomp_set_nest_lock_30): Ditto.
(gomp_unset_nest_lock_30): Ditto.
(gomp_test_nest_lock_30): Ditto.
* lock.c: New.
* config/nvptx/lock.c: New.
* config/nvptx/bar.c: New.
* config/nvptx/bar.h: New.
* config/nvptx/doacross.h: New.
* config/nvptx/error.c: New.
* config/nvptx/icv-device.c: New.
* config/nvptx/mutex.h: New.
* config/nvptx/pool.h: New.
* config/nvptx/proc.c: New.
* config/nvptx/ptrlock.h: New.
* config/nvptx/sem.h: New.
* config/nvptx/simple-bar.h: New.
* config/nvptx/target.c: New.
* config/nvptx/task.c: New.
* config/nvptx/team.c: New.
* config/nvptx/time.c: New.
* config/posix/simple-bar.h: New.
* libgomp.h: Guard pthread.h inclusion. Include simple-bar.h.
(gomp_num_teams_var): Declare.
(struct gomp_thread_pool): Change threads_dock member to
gomp_simple_barrier_t.
[__nvptx__] (gomp_thread): New implementation.
(gomp_thread_attr): Guard by LIBGOMP_USE_PTHREADS.
(gomp_thread_destructor): Ditto.
(gomp_init_thread_affinity): Ditto.
* team.c: Guard uses of Pthreads-specific interfaces by
LIBGOMP_USE_PTHREADS. Adjust all uses of threads_dock.
(gomp_free_thread) [__nvptx__]: Do not call 'free'.
* config/nvptx/alloc.c: Delete.
* config/nvptx/barrier.c: Ditto.
* config/nvptx/fortran.c: Ditto.
* config/nvptx/iter.c: Ditto.
* config/nvptx/iter_ull.c: Ditto.
* config/nvptx/loop.c: Ditto.
* config/nvptx/loop_ull.c: Ditto.
* config/nvptx/ordered.c: Ditto.
* config/nvptx/parallel.c: Ditto.
* config/nvptx/priority_queue.c: Ditto.
* config/nvptx/sections.c: Ditto.
* config/nvptx/single.c: Ditto.
* config/nvptx/splay-tree.c: Ditto.
* config/nvptx/work.c: Ditto.
* testsuite/libgomp.fortran/fortran.exp (lang_link_flags): Pass
-foffload=-lgfortran in addition to -lgfortran.
* testsuite/libgomp.oacc-fortran/fortran.exp (lang_link_flags): Ditto.
* plugin/plugin-nvptx.c: Include <limits.h>.
(struct targ_fn_descriptor): Add new fields.
(struct ptx_device): Ditto. Set them...
(nvptx_open_device): ...here.
(nvptx_adjust_launch_bounds): New.
(nvptx_host2dev): Allow NULL 'nvthd'.
(nvptx_dev2host): Ditto.
(GOMP_OFFLOAD_get_caps): Add GOMP_OFFLOAD_CAP_OPENMP_400.
(link_ptx): Adjust log sizes.
(nvptx_host2dev): Allow NULL 'nvthd'.
(nvptx_dev2host): Ditto.
(nvptx_set_clocktick): New. Use it...
(GOMP_OFFLOAD_load_image): ...here. Set new targ_fn_descriptor
fields.
(GOMP_OFFLOAD_dev2dev): New.
(nvptx_adjust_launch_bounds): New.
(nvptx_stacks_size): New.
(nvptx_stacks_alloc): New.
(nvptx_stacks_free): New.
(GOMP_OFFLOAD_run): New.
(GOMP_OFFLOAD_async_run): New (stub).
Co-Authored-By: Dmitry Melnik <dm@ispras.ru>
Co-Authored-By: Jakub Jelinek <jakub@redhat.com>
From-SVN: r242789
74 lines
2.5 KiB
Plaintext
74 lines
2.5 KiB
Plaintext
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 -foffload=-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 OpenMP.
|
|
lappend ALWAYS_CFLAGS "additional_flags=-fopenmp"
|
|
|
|
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
|
|
|
|
# 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 "" ""
|
|
}
|
|
|
|
# All done.
|
|
dg-finish
|