This is an archive of the discontinued LLVM Phabricator instance.

Differential D94042

[OpenMP] Use c_int/c_size_t in Fortran target memory routine interface
ClosedPublic

Authored by hbae on Jan 4 2021, 3:45 PM.

Details

Reviewers
kkwli0
AndreyChurbanov
jdoerfert
Commits
rGfb1c52852690: [OpenMP] Use c_int/c_size_t in Fortran target memory routine interface
Summary

The Fortran interface is now in line with 5.1 specification.

Diff Detail

Event Timeline

hbae created this revision.Jan 4 2021, 3:45 PM
Herald added subscribers: guansong, yaxunl. · View Herald TranscriptJan 4 2021, 3:45 PM
hbae requested review of this revision.Jan 4 2021, 3:45 PM
Herald added a reviewer: jdoerfert. · View Herald TranscriptJan 4 2021, 3:45 PM
Herald added a subscriber: sstefan1. · View Herald Transcript
Harbormaster completed remote builds in B83953: Diff 314464.Jan 4 2021, 4:41 PM
kkwli0 added a comment.Jan 5 2021, 3:44 PM

It looks fine. Thanks.

AndreyChurbanov accepted this revision.Jan 6 2021, 2:09 PM

LGTM

This revision is now accepted and ready to land.Jan 6 2021, 2:09 PM
Closed by commit rGfb1c52852690: [OpenMP] Use c_int/c_size_t in Fortran target memory routine interface (authored by hbae). · Explain WhyJan 6 2021, 2:29 PM
This revision was automatically updated to reflect the committed changes.
hbae added a commit: rGfb1c52852690: [OpenMP] Use c_int/c_size_t in Fortran target memory routine interface.

Revision Contents

PathSize
openmp/
runtime/
src/
include/
97 lines
68 lines

Diff 314989

openmp/runtime/src/include/omp_lib.h.var

Show First 20 Lines • Show All 580 Lines • ▼ Show 20 Lines!DIR$ ENDIF
end function omp_capture_affinity end function omp_capture_affinity
subroutine omp_display_env(verbose) bind(c) subroutine omp_display_env(verbose) bind(c)
import import
logical (kind=omp_logical_kind), value :: verbose logical (kind=omp_logical_kind), value :: verbose
end subroutine omp_display_env end subroutine omp_display_env
function omp_target_alloc(size, device_num) bind(c) function omp_target_alloc(size, device_num) bind(c)
use, intrinsic :: iso_c_binding, only : c_ptr use, intrinsic :: iso_c_binding, only : c_ptr, c_size_t, c_int
import
type(c_ptr) omp_target_alloc type(c_ptr) omp_target_alloc
integer (kind=kmp_size_t_kind), value :: size integer(c_size_t), value :: size
integer (kind=omp_integer_kind), value :: device_num integer(c_int), value :: device_num
end function omp_target_alloc end function omp_target_alloc
subroutine omp_target_free(device_ptr, device_num) bind(c) subroutine omp_target_free(device_ptr, device_num) bind(c)
use, intrinsic :: iso_c_binding, only : c_ptr use, intrinsic :: iso_c_binding, only : c_ptr, c_int
import
type(c_ptr), value :: device_ptr type(c_ptr), value :: device_ptr
integer (kind=omp_integer_kind), value :: device_num integer(c_int), value :: device_num
end subroutine omp_target_free end subroutine omp_target_free
function omp_target_is_present(ptr, device_num) bind(c) function omp_target_is_present(ptr, device_num) bind(c)
use, intrinsic :: iso_c_binding, only : c_ptr use, intrinsic :: iso_c_binding, only : c_ptr, c_int
import integer(c_int) omp_target_is_present
integer (kind=omp_integer_kind) omp_target_is_present
type(c_ptr), value :: ptr type(c_ptr), value :: ptr
integer (kind=omp_integer_kind), value :: device_num integer(c_int), value :: device_num
end function omp_target_is_present end function omp_target_is_present
function omp_target_memcpy(dst, src, length, dst_offset, & function omp_target_memcpy(dst, src, length, dst_offset, &
& src_offset, dst_device_num, src_device_num) bind(c) & src_offset, dst_device_num, src_device_num) bind(c)
use, intrinsic :: iso_c_binding, only : c_ptr use, intrinsic :: iso_c_binding, only : c_ptr, c_int, c_size_t
import integer(c_int) omp_target_memcpy
integer (kind=omp_integer_kind) omp_target_memcpy
type(c_ptr), value :: dst, src type(c_ptr), value :: dst, src
integer (kind=kmp_size_t_kind), value :: length, dst_offset, & integer(c_size_t), value :: length, dst_offset, src_offset
& src_offset integer(c_int), value :: dst_device_num, src_device_num
integer (kind=omp_integer_kind), value :: dst_device_num, &
& src_device_num
end function omp_target_memcpy end function omp_target_memcpy
function omp_target_memcpy_rect(dst, src, element_size, & function omp_target_memcpy_rect(dst, src, element_size, &
& num_dims, volume, dst_offsets, src_offsets, dst_dimensions, & & num_dims, volume, dst_offsets, src_offsets, dst_dimensions, &
& src_dimensions, dst_device_num, src_device_num) bind(c) & src_dimensions, dst_device_num, src_device_num) bind(c)
use, intrinsic :: iso_c_binding, only : c_ptr use, intrinsic :: iso_c_binding, only : c_ptr, c_int, c_size_t
import integer(c_int) omp_target_memcpy_rect
integer (kind=omp_integer_kind) omp_target_memcpy_rect
type(c_ptr), value :: dst, src type(c_ptr), value :: dst, src
integer (kind=kmp_size_t_kind), value :: element_size integer(c_size_t), value :: element_size
integer (kind=omp_integer_kind), value :: num_dims, & integer(c_int), value :: num_dims, dst_device_num, &
& dst_device_num, src_device_num & src_device_num
integer (kind=kmp_size_t_kind), intent(in) :: volume(*), & integer(c_size_t), intent(in) :: volume(*), dst_offsets(*), &
& dst_offsets(*), src_offsets(*), dst_dimensions(*), & & src_offsets(*), dst_dimensions(*), src_dimensions(*)
& src_dimensions(*)
end function omp_target_memcpy_rect end function omp_target_memcpy_rect
function omp_target_memcpy_async(dst, src, length, dst_offset, & function omp_target_memcpy_async(dst, src, length, dst_offset, &
& src_offset, dst_device_num, src_device_num, depobj_count, & & src_offset, dst_device_num, src_device_num, depobj_count, &
& depobj_list) bind(c) & depobj_list) bind(c)
use, intrinsic :: iso_c_binding, only : c_ptr use, intrinsic :: iso_c_binding, only : c_ptr, c_int, c_size_t
import import
integer (kind=omp_integer_kind) omp_target_memcpy_async integer(c_int) omp_target_memcpy_async
type(c_ptr), value :: dst, src type(c_ptr), value :: dst, src
integer (kind=kmp_size_t_kind), value :: length, dst_offset, & integer(c_size_t), value :: length, dst_offset, src_offset
& src_offset integer(c_int), value :: dst_device_num, src_device_num, &
integer (kind=omp_integer_kind), value :: dst_device_num, & & depobj_count
& src_device_num, depobj_count integer(omp_depend_kind), optional :: depobj_list(*)
integer (kind=omp_depend_kind), optional :: depobj_list(*)
end function omp_target_memcpy_async end function omp_target_memcpy_async
function omp_target_memcpy_rect_async(dst, src, element_size, & function omp_target_memcpy_rect_async(dst, src, element_size, &
& num_dims, volume, dst_offsets, src_offsets, dst_dimensions, & & num_dims, volume, dst_offsets, src_offsets, dst_dimensions, &
& src_dimensions, dst_device_num, src_device_num, & & src_dimensions, dst_device_num, src_device_num, &
& depobj_count, depobj_list) bind(c) & depobj_count, depobj_list) bind(c)
use, intrinsic :: iso_c_binding, only : c_ptr use, intrinsic :: iso_c_binding, only : c_ptr, c_int, c_size_t
import import
integer (kind=omp_integer_kind) omp_target_memcpy_rect_async integer(c_int) omp_target_memcpy_rect_async
type(c_ptr), value :: dst, src type(c_ptr), value :: dst, src
integer (kind=kmp_size_t_kind), value :: element_size integer(c_size_t), value :: element_size
integer (kind=omp_integer_kind), value :: num_dims, & integer(c_int), value :: num_dims, dst_device_num, &
& dst_device_num, src_device_num, depobj_count & src_device_num, depobj_count
integer (kind=kmp_size_t_kind), intent(in) :: volume(*), & integer(c_size_t), intent(in) :: volume(*), dst_offsets(*), &
& dst_offsets(*), src_offsets(*), dst_dimensions(*), & & src_offsets(*), dst_dimensions(*), src_dimensions(*)
& src_dimensions(*) integer(omp_depend_kind), optional :: depobj_list(*)
integer (kind=omp_depend_kind), optional :: depobj_list(*)
end function omp_target_memcpy_rect_async end function omp_target_memcpy_rect_async
function omp_target_associate_ptr(host_ptr, device_ptr, size, & function omp_target_associate_ptr(host_ptr, device_ptr, size, &
& device_offset, device_num) bind(c) & device_offset, device_num) bind(c)
use, intrinsic :: iso_c_binding, only : c_ptr use, intrinsic :: iso_c_binding, only : c_ptr, c_size_t, c_int
import integer(c_int) omp_target_associate_ptr
integer (kind=omp_integer_kind) omp_target_associate_ptr
type(c_ptr), value :: host_ptr, device_ptr type(c_ptr), value :: host_ptr, device_ptr
integer (kind=kmp_size_t_kind), value :: size, device_offset integer(c_size_t), value :: size, device_offset
integer (kind=omp_integer_kind), value :: device_num integer(c_int), value :: device_num
end function omp_target_associate_ptr end function omp_target_associate_ptr
function omp_get_mapped_ptr(ptr, device_num) bind(c) function omp_get_mapped_ptr(ptr, device_num) bind(c)
use, intrinsic :: iso_c_binding, only : c_ptr use, intrinsic :: iso_c_binding, only : c_ptr, c_int
import
type(c_ptr) omp_get_mapped_ptr type(c_ptr) omp_get_mapped_ptr
type(c_ptr), value :: ptr type(c_ptr), value :: ptr
integer (kind=omp_integer_kind), value :: device_num integer(c_int), value :: device_num
end function omp_get_mapped_ptr end function omp_get_mapped_ptr
function omp_target_disassociate_ptr(ptr, device_num) bind(c) function omp_target_disassociate_ptr(ptr, device_num) bind(c)
use, intrinsic :: iso_c_binding, only : c_ptr use, intrinsic :: iso_c_binding, only : c_ptr, c_int
import integer(c_int) omp_target_disassociate_ptr
integer (kind=omp_integer_kind) omp_target_disassociate_ptr
type(c_ptr), value :: ptr type(c_ptr), value :: ptr
integer (kind=omp_integer_kind), value :: device_num integer(c_int), value :: device_num
end function omp_target_disassociate_ptr end function omp_target_disassociate_ptr
! *** ! ***
! *** kmp_* entry points ! *** kmp_* entry points
! *** ! ***
subroutine kmp_set_stacksize(size) bind(c) subroutine kmp_set_stacksize(size) bind(c)
import import
▲ Show 20 Lines • Show All 332 Lines • Show Last 20 Lines

openmp/runtime/src/include/omp_lib.f90.var

Show First 20 Lines • Show All 506 Lines • ▼ Show 20 Lines!DIR$ ENDIF
use omp_lib_kinds use omp_lib_kinds
logical (kind=omp_logical_kind), value :: verbose logical (kind=omp_logical_kind), value :: verbose
end subroutine omp_display_env end subroutine omp_display_env
function omp_target_alloc(size, device_num) bind(c) function omp_target_alloc(size, device_num) bind(c)
use omp_lib_kinds use omp_lib_kinds
type(c_ptr) omp_target_alloc type(c_ptr) omp_target_alloc
integer (kind=kmp_size_t_kind), value :: size integer(c_size_t), value :: size
integer (kind=omp_integer_kind), value :: device_num integer(c_int), value :: device_num
end function omp_target_alloc end function omp_target_alloc
subroutine omp_target_free(device_ptr, device_num) bind(c) subroutine omp_target_free(device_ptr, device_num) bind(c)
use omp_lib_kinds use omp_lib_kinds
type(c_ptr), value :: device_ptr type(c_ptr), value :: device_ptr
integer (kind=omp_integer_kind), value :: device_num integer(c_int), value :: device_num
end subroutine omp_target_free end subroutine omp_target_free
function omp_target_is_present(ptr, device_num) bind(c) function omp_target_is_present(ptr, device_num) bind(c)
use omp_lib_kinds use omp_lib_kinds
integer (kind=omp_integer_kind) omp_target_is_present integer(c_int) omp_target_is_present
type(c_ptr), value :: ptr type(c_ptr), value :: ptr
integer (kind=omp_integer_kind), value :: device_num integer(c_int), value :: device_num
end function omp_target_is_present end function omp_target_is_present
function omp_target_memcpy(dst, src, length, dst_offset, src_offset, & function omp_target_memcpy(dst, src, length, dst_offset, src_offset, &
dst_device_num, src_device_num) bind(c) dst_device_num, src_device_num) bind(c)
use omp_lib_kinds use omp_lib_kinds
integer (kind=omp_integer_kind) omp_target_memcpy integer(c_int) omp_target_memcpy
type(c_ptr), value :: dst, src type(c_ptr), value :: dst, src
integer (kind=kmp_size_t_kind), value :: length, dst_offset, & integer(c_size_t), value :: length, dst_offset, src_offset
src_offset integer(c_int), value :: dst_device_num, src_device_num
integer (kind=omp_integer_kind), value :: dst_device_num, &
src_device_num
end function omp_target_memcpy end function omp_target_memcpy
function omp_target_memcpy_rect(dst, src, element_size, num_dims, & function omp_target_memcpy_rect(dst, src, element_size, num_dims, &
volume, dst_offsets, src_offsets, dst_dimensions, & volume, dst_offsets, src_offsets, dst_dimensions, &
src_dimensions, dst_device_num, src_device_num) bind(c) src_dimensions, dst_device_num, src_device_num) bind(c)
use omp_lib_kinds use omp_lib_kinds
integer (kind=omp_integer_kind) omp_target_memcpy_rect integer(c_int) omp_target_memcpy_rect
type(c_ptr), value :: dst, src type(c_ptr), value :: dst, src
integer (kind=kmp_size_t_kind), value :: element_size integer(c_size_t), value :: element_size
integer (kind=omp_integer_kind), value :: num_dims, & integer(c_int), value :: num_dims, dst_device_num, src_device_num
dst_device_num, src_device_num integer(c_size_t), intent(in) :: volume(*), dst_offsets(*), &
integer (kind=kmp_size_t_kind), intent(in) :: volume(*), & src_offsets(*), dst_dimensions(*), src_dimensions(*)
dst_offsets(*), src_offsets(*), dst_dimensions(*), &
src_dimensions(*)
end function omp_target_memcpy_rect end function omp_target_memcpy_rect
function omp_target_memcpy_async(dst, src, length, dst_offset, & function omp_target_memcpy_async(dst, src, length, dst_offset, &
src_offset, dst_device_num, src_device_num, depobj_count, & src_offset, dst_device_num, src_device_num, depobj_count, &
depobj_list) bind(c) depobj_list) bind(c)
use omp_lib_kinds use omp_lib_kinds
integer (kind=omp_integer_kind) omp_target_memcpy_async integer(c_int) omp_target_memcpy_async
type(c_ptr), value :: dst, src type(c_ptr), value :: dst, src
integer (kind=kmp_size_t_kind), value :: length, dst_offset, & integer(c_size_t), value :: length, dst_offset, src_offset
src_offset integer(c_int), value :: dst_device_num, src_device_num, &
integer (kind=omp_integer_kind), value :: dst_device_num, & depobj_count
src_device_num, depobj_count integer(omp_depend_kind), optional :: depobj_list(*)
integer (kind=omp_depend_kind), optional :: depobj_list(*)
end function omp_target_memcpy_async end function omp_target_memcpy_async
function omp_target_memcpy_rect_async(dst, src, element_size, & function omp_target_memcpy_rect_async(dst, src, element_size, &
num_dims, volume, dst_offsets, src_offsets, dst_dimensions, & num_dims, volume, dst_offsets, src_offsets, dst_dimensions, &
src_dimensions, dst_device_num, src_device_num, depobj_count, & src_dimensions, dst_device_num, src_device_num, depobj_count, &
depobj_list) bind(c) depobj_list) bind(c)
use omp_lib_kinds use omp_lib_kinds
integer (kind=omp_integer_kind) omp_target_memcpy_rect_async integer(c_int) omp_target_memcpy_rect_async
type(c_ptr), value :: dst, src type(c_ptr), value :: dst, src
integer (kind=kmp_size_t_kind), value :: element_size integer(c_size_t), value :: element_size
integer (kind=omp_integer_kind), value :: num_dims, & integer(c_int), value :: num_dims, dst_device_num, src_device_num, &
dst_device_num, src_device_num, depobj_count depobj_count
integer (kind=kmp_size_t_kind), intent(in) :: volume(*), & integer(c_size_t), intent(in) :: volume(*), dst_offsets(*), &
dst_offsets(*), src_offsets(*), dst_dimensions(*), & src_offsets(*), dst_dimensions(*), src_dimensions(*)
src_dimensions(*) integer (omp_depend_kind), optional :: depobj_list(*)
integer (kind=omp_depend_kind), optional :: depobj_list(*)
end function omp_target_memcpy_rect_async end function omp_target_memcpy_rect_async
function omp_target_associate_ptr(host_ptr, device_ptr, size, & function omp_target_associate_ptr(host_ptr, device_ptr, size, &
device_offset, device_num) bind(c) device_offset, device_num) bind(c)
use omp_lib_kinds use omp_lib_kinds
integer (kind=omp_integer_kind) omp_target_associate_ptr integer(c_int) omp_target_associate_ptr
type(c_ptr), value :: host_ptr, device_ptr type(c_ptr), value :: host_ptr, device_ptr
integer (kind=kmp_size_t_kind), value :: size, device_offset integer(c_size_t), value :: size, device_offset
integer (kind=omp_integer_kind), value :: device_num integer(c_int), value :: device_num
end function omp_target_associate_ptr end function omp_target_associate_ptr
function omp_get_mapped_ptr(ptr, device_num) bind(c) function omp_get_mapped_ptr(ptr, device_num) bind(c)
use omp_lib_kinds use omp_lib_kinds
type(c_ptr) omp_get_mapped_ptr type(c_ptr) omp_get_mapped_ptr
type(c_ptr), value :: ptr type(c_ptr), value :: ptr
integer (kind=omp_integer_kind), value :: device_num integer(c_int), value :: device_num
end function omp_get_mapped_ptr end function omp_get_mapped_ptr
function omp_target_disassociate_ptr(ptr, device_num) bind(c) function omp_target_disassociate_ptr(ptr, device_num) bind(c)
use omp_lib_kinds use omp_lib_kinds
integer (kind=omp_integer_kind) omp_target_disassociate_ptr integer(c_int) omp_target_disassociate_ptr
type(c_ptr), value :: ptr type(c_ptr), value :: ptr
integer (kind=omp_integer_kind), value :: device_num integer(c_int), value :: device_num
end function omp_target_disassociate_ptr end function omp_target_disassociate_ptr
! *** ! ***
! *** kmp_* entry points ! *** kmp_* entry points
! *** ! ***
subroutine kmp_set_stacksize(size) bind(c) subroutine kmp_set_stacksize(size) bind(c)
use omp_lib_kinds use omp_lib_kinds
▲ Show 20 Lines • Show All 172 Lines • Show Last 20 Lines