Skip to content

Commit

Permalink
[Flang][LLVM][OpenMP] Relax target data restrictions to be more inlin…
Browse files Browse the repository at this point in the history
…e with the specification (#82537)

Currently we emit errors whenever a map is not provided on a target data
directive, however, I believe that's incorrect behavior, the
specification states:

"At least one map, use_device_addr or use_device_ptr clause must appear
on the directive"

So provided one is present, the directive is legal in this case.
Slightly different to its siblings (enter/exit/update) which don't have
use_device_addr/use_device_ptr.
  • Loading branch information
agozillon committed Feb 22, 2024
1 parent 9dbedca commit cf8fc53
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 6 deletions.
12 changes: 11 additions & 1 deletion flang/test/Semantics/OpenMP/device-constructs.f90
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,11 @@
! Check OpenMP clause validity for the following directives:
! 2.10 Device constructs
program main
use iso_c_binding

real(8) :: arrayA(256), arrayB(256)
integer :: N
type(c_ptr) :: cptr

arrayA = 1.414
arrayB = 3.14
Expand Down Expand Up @@ -135,7 +137,15 @@ program main
enddo
!$omp end target data

!ERROR: At least one of MAP clause must appear on the TARGET DATA directive
!$omp target data device(0) use_device_addr(cptr)
cptr = c_null_ptr
!$omp end target data

!$omp target data device(0) use_device_addr(cptr)
cptr = c_null_ptr
!$omp end target data

!ERROR: At least one of MAP, USE_DEVICE_ADDR, USE_DEVICE_PTR clause must appear on the TARGET DATA directive
!$omp target data device(0)
do i = 1, N
a = 3.14
Expand Down
8 changes: 3 additions & 5 deletions llvm/include/llvm/Frontend/OpenMP/OMP.td
Original file line number Diff line number Diff line change
Expand Up @@ -710,16 +710,14 @@ def OMP_Requires : Directive<"requires"> {
}
def OMP_Nothing : Directive<"nothing"> {}
def OMP_TargetData : Directive<"target data"> {
let allowedClauses = [
VersionedClause<OMPC_UseDevicePtr>,
VersionedClause<OMPC_UseDeviceAddr, 50>
];
let allowedOnceClauses = [
VersionedClause<OMPC_Device>,
VersionedClause<OMPC_If>
];
let requiredClauses = [
VersionedClause<OMPC_Map>
VersionedClause<OMPC_Map>,
VersionedClause<OMPC_UseDevicePtr>,
VersionedClause<OMPC_UseDeviceAddr, 50>
];
}
def OMP_TargetEnterData : Directive<"target enter data"> {
Expand Down

0 comments on commit cf8fc53

Please sign in to comment.