This is an archive of the discontinued LLVM Phabricator instance.

Differential D100222

[flang][OpenMP] Modify semantic check for nesting of `ordered` regions to include `close` nesting check.
ClosedPublic

Authored by arnamoy10 on Apr 9 2021, 11:51 AM.

Details

Reviewers
kiranchandramohan
bryanpkc
kiranktp
SouraVX
clementval
AMDChirag
jdoerfert
Commits
rG162b463d85d3: [flang][OpenMP] Modify semantic check for nesting of `ordered` regions to…

Diff Detail

Event Timeline

arnamoy10 created this revision.Apr 9 2021, 11:51 AM
Herald added subscribers: jdoerfert, guansong, yaxunl. · View Herald TranscriptApr 9 2021, 11:51 AM
arnamoy10 requested review of this revision.Apr 9 2021, 11:51 AM
Herald added a reviewer: jdoerfert. · View Herald TranscriptApr 9 2021, 11:51 AM
Herald added a project: Restricted Project. · View Herald Transcript
Herald added subscribers: llvm-commits, sstefan1. · View Herald Transcript
Harbormaster completed remote builds in B98047: Diff 336534.Apr 9 2021, 12:31 PM
kiranchandramohan accepted this revision.Apr 10 2021, 7:08 AM

LGTM.

This revision is now accepted and ready to land.Apr 10 2021, 7:08 AM
Closed by commit rG162b463d85d3: [flang][OpenMP] Modify semantic check for nesting of `ordered` regions to… (authored by arnamoy10). · Explain WhyApr 13 2021, 10:57 AM
This revision was automatically updated to reflect the committed changes.
arnamoy10 added a commit: rG162b463d85d3: [flang][OpenMP] Modify semantic check for nesting of `ordered` regions to….

Revision Contents

PathSize
flang/
lib/
Semantics/
3 lines
test/
Semantics/
50 lines

Diff 337208

flang/lib/Semantics/check-omp-structure.cpp

Show First 20 Lines • Show All 388 Lines • ▼ Show 20 Lines if (llvm::omp::doSet.test(GetContextParent().directive) &&
!FindClauseParent(llvm::omp::Clause::OMPC_ordered)) { !FindClauseParent(llvm::omp::Clause::OMPC_ordered)) {
context_.Say(blkDirective.source, context_.Say(blkDirective.source,
"The ORDERED clause must be present on the loop" "The ORDERED clause must be present on the loop"
" construct if any ORDERED region ever binds" " construct if any ORDERED region ever binds"
" to a loop region arising from the loop construct."_err_en_US); " to a loop region arising from the loop construct."_err_en_US);
} }
// Other disallowed nestings, these directives do not support // Other disallowed nestings, these directives do not support
// ordered clause in them, so no need to check // ordered clause in them, so no need to check
else if (llvm::omp::nestedOrderedErrSet.test( else if (IsCloselyNestedRegion(llvm::omp::nestedOrderedErrSet)) {
GetContextParent().directive)) {
context_.Say(blkDirective.source, context_.Say(blkDirective.source,
"`ORDERED` region may not be closely nested inside of " "`ORDERED` region may not be closely nested inside of "
"`CRITICAL`, `ORDERED`, explicit `TASK` or `TASKLOOP` region."_err_en_US); "`CRITICAL`, `ORDERED`, explicit `TASK` or `TASKLOOP` region."_err_en_US);
} }
} }
} }
void OmpStructureChecker::Leave(const parser::OpenMPBlockConstruct &) { void OmpStructureChecker::Leave(const parser::OpenMPBlockConstruct &) {
▲ Show 20 Lines • Show All 1,139 Lines • Show Last 20 Lines

flang/test/Semantics/omp-ordered-simd.f90

Show First 20 Lines • Show All 86 Lines • ▼ Show 20 Lines IF (I <= 10) THEN
!ERROR: `ORDERED` region may not be closely nested inside of `CRITICAL`, `ORDERED`, explicit `TASK` or `TASKLOOP` region. !ERROR: `ORDERED` region may not be closely nested inside of `CRITICAL`, `ORDERED`, explicit `TASK` or `TASKLOOP` region.
!$OMP ORDERED !$OMP ORDERED
CALL WORK(I) CALL WORK(I)
!$OMP END ORDERED !$OMP END ORDERED
ENDIF ENDIF
END DO END DO
!$OMP END TASKLOOP !$OMP END TASKLOOP
!$OMP CRITICAL
C = C - A * B
!$OMP MASTER
DO I = 1,N
!ERROR: `ORDERED` region may not be closely nested inside of `CRITICAL`, `ORDERED`, explicit `TASK` or `TASKLOOP` region.
!$OMP ORDERED
CALL WORK(I)
!$OMP END ORDERED
END DO
!$OMP END MASTER
!$OMP END CRITICAL
!$OMP ORDERED
C = C - A * B
!$OMP MASTER
DO I = 1,N
!ERROR: `ORDERED` region may not be closely nested inside of `CRITICAL`, `ORDERED`, explicit `TASK` or `TASKLOOP` region.
!$OMP ORDERED
CALL WORK(I)
!$OMP END ORDERED
END DO
!$OMP END MASTER
!$OMP END ORDERED
!$OMP TASK
C = C - A * B
!$OMP MASTER
DO I = 1,N
!ERROR: `ORDERED` region may not be closely nested inside of `CRITICAL`, `ORDERED`, explicit `TASK` or `TASKLOOP` region.
!$OMP ORDERED
CALL WORK(I)
!$OMP END ORDERED
END DO
!$OMP END MASTER
!$OMP END TASK
!$OMP TASKLOOP
DO J= 1,N
C = C - A * B
!$OMP MASTER
DO I = 1,N
!ERROR: `ORDERED` region may not be closely nested inside of `CRITICAL`, `ORDERED`, explicit `TASK` or `TASKLOOP` region.
!$OMP ORDERED
CALL WORK(I)
!$OMP END ORDERED
END DO
!$OMP END MASTER
END DO
!$OMP END TASKLOOP
END SUBROUTINE ORDERED_BAD END SUBROUTINE ORDERED_BAD