From b826d551fcd2eb0c4f13fd57471bd3142d26d3ba Mon Sep 17 00:00:00 2001 From: PeixinQiao Date: Sat, 11 Jun 2022 10:46:42 +0800 Subject: [PATCH] [NFC] Move flang OpenMP semantic tests under one single directory To be consistent with OpenACC and will find the tests in one single directory for OpenMP. Reviewed By: kiranchandramohan Differential Revision: https://reviews.llvm.org/D127529 --- .../{ => OpenMP}/omp-allocate-directive.f90 | 2 +- .../test/Semantics/{ => OpenMP}/omp-allocate01.f90 | 2 +- .../test/Semantics/{ => OpenMP}/omp-allocate02.f90 | 2 +- .../test/Semantics/{ => OpenMP}/omp-allocate03.f90 | 2 +- .../test/Semantics/{ => OpenMP}/omp-allocate04.f90 | 2 +- .../test/Semantics/{ => OpenMP}/omp-allocate05.f90 | 2 +- .../test/Semantics/{ => OpenMP}/omp-allocate06.f90 | 2 +- .../test/Semantics/{ => OpenMP}/omp-allocate07.f90 | 2 +- .../test/Semantics/{ => OpenMP}/omp-allocate08.f90 | 2 +- flang/test/Semantics/{ => OpenMP}/omp-atomic.f90 | 2 +- flang/test/Semantics/{ => OpenMP}/omp-atomic01.f90 | 2 +- flang/test/Semantics/{ => OpenMP}/omp-atomic02.f90 | 2 +- flang/test/Semantics/{ => OpenMP}/omp-atomic03.f90 | 2 +- flang/test/Semantics/{ => OpenMP}/omp-atomic04.f90 | 2 +- flang/test/Semantics/{ => OpenMP}/omp-atomic05.f90 | 2 +- .../{ => OpenMP}/omp-clause-validity01.f90 | 2 +- .../{ => OpenMP}/omp-combined-constructs.f90 | 2 +- flang/test/Semantics/{ => OpenMP}/omp-copyin01.f90 | 2 +- flang/test/Semantics/{ => OpenMP}/omp-copyin02.f90 | 2 +- flang/test/Semantics/{ => OpenMP}/omp-copyin03.f90 | 2 +- flang/test/Semantics/{ => OpenMP}/omp-copyin04.f90 | 2 +- flang/test/Semantics/{ => OpenMP}/omp-copyin05.f90 | 2 +- .../Semantics/{ => OpenMP}/omp-copyprivate01.f90 | 2 +- .../Semantics/{ => OpenMP}/omp-copyprivate02.f90 | 2 +- .../Semantics/{ => OpenMP}/omp-copyprivate03.f90 | 2 +- .../{ => OpenMP}/omp-declarative-directive.f90 | 2 +- .../{ => OpenMP}/omp-declare-target01.f90 | 2 +- .../{ => OpenMP}/omp-declare-target02.f90 | 2 +- .../{ => OpenMP}/omp-declare-target03.f90 | 2 +- .../{ => OpenMP}/omp-declare-target04.f90 | 2 +- .../{ => OpenMP}/omp-declare-target05.f90 | 2 +- flang/test/Semantics/{ => OpenMP}/omp-default.f90 | 2 +- .../test/Semantics/{ => OpenMP}/omp-default02.f90 | 2 +- flang/test/Semantics/{ => OpenMP}/omp-depend01.f90 | 2 +- flang/test/Semantics/{ => OpenMP}/omp-depend02.f90 | 2 +- flang/test/Semantics/{ => OpenMP}/omp-depend03.f90 | 2 +- .../{ => OpenMP}/omp-device-constructs.f90 | 2 +- .../{ => OpenMP}/omp-do-collapse-positivecases.f90 | 2 +- .../Semantics/{ => OpenMP}/omp-do-collapse.f90 | 2 +- flang/test/Semantics/{ => OpenMP}/omp-do-cycle.f90 | 2 +- .../{ => OpenMP}/omp-do-ordered-positivecases.f90 | 2 +- .../test/Semantics/{ => OpenMP}/omp-do-ordered.f90 | 2 +- .../Semantics/{ => OpenMP}/omp-do-schedule01.f90 | 2 +- .../Semantics/{ => OpenMP}/omp-do-schedule02.f90 | 2 +- .../Semantics/{ => OpenMP}/omp-do-schedule03.f90 | 2 +- .../Semantics/{ => OpenMP}/omp-do-schedule04.f90 | 2 +- .../{ => OpenMP}/omp-do01-positivecase.f90 | 2 +- flang/test/Semantics/{ => OpenMP}/omp-do01.f90 | 2 +- flang/test/Semantics/{ => OpenMP}/omp-do02.f90 | 0 flang/test/Semantics/{ => OpenMP}/omp-do03.f90 | 2 +- .../{ => OpenMP}/omp-do04-positivecase.f90 | 2 +- flang/test/Semantics/{ => OpenMP}/omp-do04.f90 | 2 +- .../{ => OpenMP}/omp-do05-positivecase.f90 | 2 +- flang/test/Semantics/{ => OpenMP}/omp-do05.f90 | 2 +- .../{ => OpenMP}/omp-do06-positivecases.f90 | 2 +- flang/test/Semantics/{ => OpenMP}/omp-do06.f90 | 2 +- flang/test/Semantics/{ => OpenMP}/omp-do07.f90 | 0 flang/test/Semantics/{ => OpenMP}/omp-do08.f90 | 2 +- flang/test/Semantics/{ => OpenMP}/omp-do09.f90 | 2 +- flang/test/Semantics/{ => OpenMP}/omp-do10.f90 | 2 +- flang/test/Semantics/{ => OpenMP}/omp-do11.f90 | 2 +- flang/test/Semantics/{ => OpenMP}/omp-do12.f90 | 2 +- flang/test/Semantics/{ => OpenMP}/omp-do13.f90 | 2 +- flang/test/Semantics/{ => OpenMP}/omp-do14.f90 | 2 +- flang/test/Semantics/{ => OpenMP}/omp-do15.f90 | 2 +- flang/test/Semantics/{ => OpenMP}/omp-do16.f90 | 2 +- flang/test/Semantics/{ => OpenMP}/omp-do17.f90 | 2 +- flang/test/Semantics/OpenMP/omp-do18.f90 | 40 +++++++++++++++ flang/test/Semantics/OpenMP/omp-do19.f90 | 25 ++++++++++ .../Semantics/{ => OpenMP}/omp-firstprivate01.f90 | 2 +- flang/test/Semantics/{ => OpenMP}/omp-flush01.f90 | 2 +- flang/test/Semantics/{ => OpenMP}/omp-flush02.f90 | 2 +- .../Semantics/{ => OpenMP}/omp-invalid-branch.f90 | 0 .../Semantics/{ => OpenMP}/omp-lastprivate01.f90 | 2 +- .../Semantics/{ => OpenMP}/omp-lastprivate02.f90 | 2 +- .../Semantics/{ => OpenMP}/omp-linear-iter.f90 | 2 +- .../{ => OpenMP}/omp-loop-association.f90 | 2 +- .../Semantics/{ => OpenMP}/omp-loop-simd01.f90 | 2 +- .../Semantics/OpenMP/omp-modfile-threadprivate.f90 | 35 +++++++++++++ .../Semantics/{ => OpenMP}/omp-nested-barrier.f90 | 2 +- .../Semantics/{ => OpenMP}/omp-nested-cancel.f90 | 2 +- .../{ => OpenMP}/omp-nested-cancellation-point.f90 | 2 +- .../{ => OpenMP}/omp-nested-distribute.f90 | 2 +- .../Semantics/{ => OpenMP}/omp-nested-master.f90 | 2 +- .../Semantics/{ => OpenMP}/omp-nested-simd.f90 | 2 +- .../Semantics/{ => OpenMP}/omp-nested-target.f90 | 2 +- .../Semantics/{ => OpenMP}/omp-nested-teams.f90 | 2 +- flang/test/Semantics/{ => OpenMP}/omp-nested01.f90 | 2 +- .../{ => OpenMP}/omp-no-dowhile-in-parallel.f90 | 2 +- .../Semantics/{ => OpenMP}/omp-nontemporal.f90 | 2 +- .../Semantics/{ => OpenMP}/omp-ordered-simd.f90 | 2 +- .../test/Semantics/{ => OpenMP}/omp-ordered01.f90 | 2 +- .../test/Semantics/{ => OpenMP}/omp-ordered02.f90 | 2 +- .../test/Semantics/{ => OpenMP}/omp-ordered03.f90 | 2 +- .../{ => OpenMP}/omp-parallel-private01.f90 | 2 +- .../{ => OpenMP}/omp-parallel-private02.f90 | 2 +- .../{ => OpenMP}/omp-parallel-private03.f90 | 2 +- .../{ => OpenMP}/omp-parallel-private04.f90 | 2 +- .../{ => OpenMP}/omp-parallel-sections01.f90 | 2 +- .../{ => OpenMP}/omp-parallel-shared01.f90 | 2 +- .../{ => OpenMP}/omp-parallel-shared02.f90 | 2 +- .../{ => OpenMP}/omp-parallel-shared03.f90 | 2 +- .../{ => OpenMP}/omp-parallel-shared04.f90 | 2 +- .../test/Semantics/{ => OpenMP}/omp-parallel01.f90 | 0 .../test/Semantics/{ => OpenMP}/omp-parallel02.f90 | 0 .../{ => OpenMP}/omp-private-is-pointer-check.f90 | 0 .../test/Semantics/{ => OpenMP}/omp-private01.f90 | 2 +- .../test/Semantics/{ => OpenMP}/omp-private02.f90 | 2 +- .../Semantics/{ => OpenMP}/omp-reduction01.f90 | 2 +- .../Semantics/{ => OpenMP}/omp-reduction02.f90 | 2 +- .../Semantics/{ => OpenMP}/omp-reduction03.f90 | 2 +- .../Semantics/{ => OpenMP}/omp-reduction04.f90 | 2 +- .../Semantics/{ => OpenMP}/omp-reduction05.f90 | 2 +- .../Semantics/{ => OpenMP}/omp-reduction06.f90 | 2 +- .../Semantics/{ => OpenMP}/omp-reduction07.f90 | 2 +- .../Semantics/{ => OpenMP}/omp-reduction08.f90 | 2 +- .../Semantics/{ => OpenMP}/omp-reduction09.f90 | 2 +- .../Semantics/{ => OpenMP}/omp-reduction10.f90 | 2 +- .../test/Semantics/{ => OpenMP}/omp-resolve01.f90 | 2 +- .../test/Semantics/{ => OpenMP}/omp-resolve02.f90 | 2 +- .../test/Semantics/{ => OpenMP}/omp-resolve03.f90 | 2 +- .../test/Semantics/{ => OpenMP}/omp-resolve04.f90 | 2 +- .../test/Semantics/{ => OpenMP}/omp-resolve05.f90 | 2 +- .../test/Semantics/{ => OpenMP}/omp-resolve06.f90 | 2 +- .../test/Semantics/{ => OpenMP}/omp-sections01.f90 | 2 +- .../test/Semantics/{ => OpenMP}/omp-sections02.f90 | 2 +- .../test/Semantics/{ => OpenMP}/omp-sections03.f90 | 2 +- .../Semantics/{ => OpenMP}/omp-simd-aligned.f90 | 2 +- .../{ => OpenMP}/omp-simd-nontemporal.f90 | 2 +- flang/test/Semantics/{ => OpenMP}/omp-simd01.f90 | 2 +- flang/test/Semantics/{ => OpenMP}/omp-simd02.f90 | 2 +- flang/test/Semantics/{ => OpenMP}/omp-simd03.f90 | 0 flang/test/Semantics/{ => OpenMP}/omp-single01.f90 | 2 +- flang/test/Semantics/{ => OpenMP}/omp-single02.f90 | 2 +- flang/test/Semantics/{ => OpenMP}/omp-symbol01.f90 | 2 +- flang/test/Semantics/{ => OpenMP}/omp-symbol02.f90 | 2 +- flang/test/Semantics/{ => OpenMP}/omp-symbol03.f90 | 2 +- flang/test/Semantics/{ => OpenMP}/omp-symbol04.f90 | 2 +- flang/test/Semantics/{ => OpenMP}/omp-symbol05.f90 | 2 +- flang/test/Semantics/{ => OpenMP}/omp-symbol06.f90 | 2 +- flang/test/Semantics/{ => OpenMP}/omp-symbol07.f90 | 2 +- flang/test/Semantics/{ => OpenMP}/omp-symbol08.f90 | 2 +- .../Semantics/{ => OpenMP}/omp-sync-critical01.f90 | 2 +- .../Semantics/{ => OpenMP}/omp-sync-critical02.f90 | 2 +- flang/test/Semantics/{ => OpenMP}/omp-task01.f90 | 0 .../Semantics/{ => OpenMP}/omp-taskgroup01.f90 | 2 +- .../Semantics/{ => OpenMP}/omp-taskloop-simd01.f90 | 2 +- .../test/Semantics/{ => OpenMP}/omp-taskloop01.f90 | 2 +- .../test/Semantics/{ => OpenMP}/omp-taskloop02.f90 | 0 .../test/Semantics/{ => OpenMP}/omp-taskloop03.f90 | 0 .../Semantics/{ => OpenMP}/omp-threadprivate01.f90 | 2 +- .../Semantics/{ => OpenMP}/omp-threadprivate02.f90 | 2 +- .../Semantics/{ => OpenMP}/omp-threadprivate03.f90 | 2 +- .../Semantics/{ => OpenMP}/omp-threadprivate04.f90 | 2 +- .../Semantics/{ => OpenMP}/omp-threadprivate05.f90 | 2 +- .../Semantics/{ => OpenMP}/omp-workshare01.f90 | 2 +- .../Semantics/{ => OpenMP}/omp-workshare02.f90 | 2 +- .../Semantics/{ => OpenMP}/omp-workshare03.f90 | 2 +- .../Semantics/{ => OpenMP}/omp-workshare04.f90 | 2 +- .../Semantics/{ => OpenMP}/omp-workshare05.f90 | 2 +- flang/test/Semantics/canondo05.f90 | 58 +++++++++------------- flang/test/Semantics/canondo06.f90 | 43 ++++++++-------- flang/test/Semantics/canondo18.f90 | 28 ----------- flang/test/Semantics/canondo19.f90 | 28 ----------- flang/test/Semantics/modfile47.f90 | 52 +++++++------------ flang/test/Semantics/modfile49.f90 | 19 ------- 166 files changed, 311 insertions(+), 311 deletions(-) rename flang/test/Semantics/{ => OpenMP}/omp-allocate-directive.f90 (91%) rename flang/test/Semantics/{ => OpenMP}/omp-allocate01.f90 (92%) rename flang/test/Semantics/{ => OpenMP}/omp-allocate02.f90 (92%) rename flang/test/Semantics/{ => OpenMP}/omp-allocate03.f90 (92%) rename flang/test/Semantics/{ => OpenMP}/omp-allocate04.f90 (85%) rename flang/test/Semantics/{ => OpenMP}/omp-allocate05.f90 (92%) rename flang/test/Semantics/{ => OpenMP}/omp-allocate06.f90 (91%) rename flang/test/Semantics/{ => OpenMP}/omp-allocate07.f90 (94%) rename flang/test/Semantics/{ => OpenMP}/omp-allocate08.f90 (96%) rename flang/test/Semantics/{ => OpenMP}/omp-atomic.f90 (94%) rename flang/test/Semantics/{ => OpenMP}/omp-atomic01.f90 (99%) rename flang/test/Semantics/{ => OpenMP}/omp-atomic02.f90 (98%) rename flang/test/Semantics/{ => OpenMP}/omp-atomic03.f90 (97%) rename flang/test/Semantics/{ => OpenMP}/omp-atomic04.f90 (98%) rename flang/test/Semantics/{ => OpenMP}/omp-atomic05.f90 (94%) rename flang/test/Semantics/{ => OpenMP}/omp-clause-validity01.f90 (99%) rename flang/test/Semantics/{ => OpenMP}/omp-combined-constructs.f90 (99%) rename flang/test/Semantics/{ => OpenMP}/omp-copyin01.f90 (91%) rename flang/test/Semantics/{ => OpenMP}/omp-copyin02.f90 (91%) rename flang/test/Semantics/{ => OpenMP}/omp-copyin03.f90 (91%) rename flang/test/Semantics/{ => OpenMP}/omp-copyin04.f90 (88%) rename flang/test/Semantics/{ => OpenMP}/omp-copyin05.f90 (90%) rename flang/test/Semantics/{ => OpenMP}/omp-copyprivate01.f90 (92%) rename flang/test/Semantics/{ => OpenMP}/omp-copyprivate02.f90 (90%) rename flang/test/Semantics/{ => OpenMP}/omp-copyprivate03.f90 (93%) rename flang/test/Semantics/{ => OpenMP}/omp-declarative-directive.f90 (97%) rename flang/test/Semantics/{ => OpenMP}/omp-declare-target01.f90 (98%) rename flang/test/Semantics/{ => OpenMP}/omp-declare-target02.f90 (98%) rename flang/test/Semantics/{ => OpenMP}/omp-declare-target03.f90 (87%) rename flang/test/Semantics/{ => OpenMP}/omp-declare-target04.f90 (87%) rename flang/test/Semantics/{ => OpenMP}/omp-declare-target05.f90 (95%) rename flang/test/Semantics/{ => OpenMP}/omp-default.f90 (94%) rename flang/test/Semantics/{ => OpenMP}/omp-default02.f90 (96%) rename flang/test/Semantics/{ => OpenMP}/omp-depend01.f90 (92%) rename flang/test/Semantics/{ => OpenMP}/omp-depend02.f90 (95%) rename flang/test/Semantics/{ => OpenMP}/omp-depend03.f90 (89%) rename flang/test/Semantics/{ => OpenMP}/omp-device-constructs.f90 (99%) rename flang/test/Semantics/{ => OpenMP}/omp-do-collapse-positivecases.f90 (94%) rename flang/test/Semantics/{ => OpenMP}/omp-do-collapse.f90 (92%) rename flang/test/Semantics/{ => OpenMP}/omp-do-cycle.f90 (95%) rename flang/test/Semantics/{ => OpenMP}/omp-do-ordered-positivecases.f90 (96%) rename flang/test/Semantics/{ => OpenMP}/omp-do-ordered.f90 (97%) rename flang/test/Semantics/{ => OpenMP}/omp-do-schedule01.f90 (85%) rename flang/test/Semantics/{ => OpenMP}/omp-do-schedule02.f90 (87%) rename flang/test/Semantics/{ => OpenMP}/omp-do-schedule03.f90 (93%) rename flang/test/Semantics/{ => OpenMP}/omp-do-schedule04.f90 (92%) rename flang/test/Semantics/{ => OpenMP}/omp-do01-positivecase.f90 (87%) rename flang/test/Semantics/{ => OpenMP}/omp-do01.f90 (86%) rename flang/test/Semantics/{ => OpenMP}/omp-do02.f90 (100%) rename flang/test/Semantics/{ => OpenMP}/omp-do03.f90 (86%) rename flang/test/Semantics/{ => OpenMP}/omp-do04-positivecase.f90 (90%) rename flang/test/Semantics/{ => OpenMP}/omp-do04.f90 (97%) rename flang/test/Semantics/{ => OpenMP}/omp-do05-positivecase.f90 (93%) rename flang/test/Semantics/{ => OpenMP}/omp-do05.f90 (99%) rename flang/test/Semantics/{ => OpenMP}/omp-do06-positivecases.f90 (91%) rename flang/test/Semantics/{ => OpenMP}/omp-do06.f90 (94%) rename flang/test/Semantics/{ => OpenMP}/omp-do07.f90 (100%) rename flang/test/Semantics/{ => OpenMP}/omp-do08.f90 (98%) rename flang/test/Semantics/{ => OpenMP}/omp-do09.f90 (89%) rename flang/test/Semantics/{ => OpenMP}/omp-do10.f90 (94%) rename flang/test/Semantics/{ => OpenMP}/omp-do11.f90 (93%) rename flang/test/Semantics/{ => OpenMP}/omp-do12.f90 (97%) rename flang/test/Semantics/{ => OpenMP}/omp-do13.f90 (98%) rename flang/test/Semantics/{ => OpenMP}/omp-do14.f90 (97%) rename flang/test/Semantics/{ => OpenMP}/omp-do15.f90 (97%) rename flang/test/Semantics/{ => OpenMP}/omp-do16.f90 (96%) rename flang/test/Semantics/{ => OpenMP}/omp-do17.f90 (95%) create mode 100644 flang/test/Semantics/OpenMP/omp-do18.f90 create mode 100644 flang/test/Semantics/OpenMP/omp-do19.f90 rename flang/test/Semantics/{ => OpenMP}/omp-firstprivate01.f90 (97%) rename flang/test/Semantics/{ => OpenMP}/omp-flush01.f90 (93%) rename flang/test/Semantics/{ => OpenMP}/omp-flush02.f90 (98%) rename flang/test/Semantics/{ => OpenMP}/omp-invalid-branch.f90 (100%) rename flang/test/Semantics/{ => OpenMP}/omp-lastprivate01.f90 (94%) rename flang/test/Semantics/{ => OpenMP}/omp-lastprivate02.f90 (94%) rename flang/test/Semantics/{ => OpenMP}/omp-linear-iter.f90 (98%) rename flang/test/Semantics/{ => OpenMP}/omp-loop-association.f90 (98%) rename flang/test/Semantics/{ => OpenMP}/omp-loop-simd01.f90 (86%) create mode 100644 flang/test/Semantics/OpenMP/omp-modfile-threadprivate.f90 rename flang/test/Semantics/{ => OpenMP}/omp-nested-barrier.f90 (98%) rename flang/test/Semantics/{ => OpenMP}/omp-nested-cancel.f90 (99%) rename flang/test/Semantics/{ => OpenMP}/omp-nested-cancellation-point.f90 (99%) rename flang/test/Semantics/{ => OpenMP}/omp-nested-distribute.f90 (97%) rename flang/test/Semantics/{ => OpenMP}/omp-nested-master.f90 (98%) rename flang/test/Semantics/{ => OpenMP}/omp-nested-simd.f90 (99%) rename flang/test/Semantics/{ => OpenMP}/omp-nested-target.f90 (95%) rename flang/test/Semantics/{ => OpenMP}/omp-nested-teams.f90 (98%) rename flang/test/Semantics/{ => OpenMP}/omp-nested01.f90 (93%) rename flang/test/Semantics/{ => OpenMP}/omp-no-dowhile-in-parallel.f90 (89%) rename flang/test/Semantics/{ => OpenMP}/omp-nontemporal.f90 (96%) rename flang/test/Semantics/{ => OpenMP}/omp-ordered-simd.f90 (98%) rename flang/test/Semantics/{ => OpenMP}/omp-ordered01.f90 (98%) rename flang/test/Semantics/{ => OpenMP}/omp-ordered02.f90 (98%) rename flang/test/Semantics/{ => OpenMP}/omp-ordered03.f90 (98%) rename flang/test/Semantics/{ => OpenMP}/omp-parallel-private01.f90 (90%) rename flang/test/Semantics/{ => OpenMP}/omp-parallel-private02.f90 (90%) rename flang/test/Semantics/{ => OpenMP}/omp-parallel-private03.f90 (92%) rename flang/test/Semantics/{ => OpenMP}/omp-parallel-private04.f90 (92%) rename flang/test/Semantics/{ => OpenMP}/omp-parallel-sections01.f90 (98%) rename flang/test/Semantics/{ => OpenMP}/omp-parallel-shared01.f90 (90%) rename flang/test/Semantics/{ => OpenMP}/omp-parallel-shared02.f90 (90%) rename flang/test/Semantics/{ => OpenMP}/omp-parallel-shared03.f90 (92%) rename flang/test/Semantics/{ => OpenMP}/omp-parallel-shared04.f90 (92%) rename flang/test/Semantics/{ => OpenMP}/omp-parallel01.f90 (100%) rename flang/test/Semantics/{ => OpenMP}/omp-parallel02.f90 (100%) rename flang/test/Semantics/{ => OpenMP}/omp-private-is-pointer-check.f90 (100%) rename flang/test/Semantics/{ => OpenMP}/omp-private01.f90 (88%) rename flang/test/Semantics/{ => OpenMP}/omp-private02.f90 (94%) rename flang/test/Semantics/{ => OpenMP}/omp-reduction01.f90 (83%) rename flang/test/Semantics/{ => OpenMP}/omp-reduction02.f90 (94%) rename flang/test/Semantics/{ => OpenMP}/omp-reduction03.f90 (85%) rename flang/test/Semantics/{ => OpenMP}/omp-reduction04.f90 (89%) rename flang/test/Semantics/{ => OpenMP}/omp-reduction05.f90 (93%) rename flang/test/Semantics/{ => OpenMP}/omp-reduction06.f90 (93%) rename flang/test/Semantics/{ => OpenMP}/omp-reduction07.f90 (98%) rename flang/test/Semantics/{ => OpenMP}/omp-reduction08.f90 (97%) rename flang/test/Semantics/{ => OpenMP}/omp-reduction09.f90 (97%) rename flang/test/Semantics/{ => OpenMP}/omp-reduction10.f90 (83%) rename flang/test/Semantics/{ => OpenMP}/omp-resolve01.f90 (86%) rename flang/test/Semantics/{ => OpenMP}/omp-resolve02.f90 (88%) rename flang/test/Semantics/{ => OpenMP}/omp-resolve03.f90 (91%) rename flang/test/Semantics/{ => OpenMP}/omp-resolve04.f90 (89%) rename flang/test/Semantics/{ => OpenMP}/omp-resolve05.f90 (90%) rename flang/test/Semantics/{ => OpenMP}/omp-resolve06.f90 (97%) rename flang/test/Semantics/{ => OpenMP}/omp-sections01.f90 (86%) rename flang/test/Semantics/{ => OpenMP}/omp-sections02.f90 (98%) rename flang/test/Semantics/{ => OpenMP}/omp-sections03.f90 (94%) rename flang/test/Semantics/{ => OpenMP}/omp-simd-aligned.f90 (94%) rename flang/test/Semantics/{ => OpenMP}/omp-simd-nontemporal.f90 (96%) rename flang/test/Semantics/{ => OpenMP}/omp-simd01.f90 (94%) rename flang/test/Semantics/{ => OpenMP}/omp-simd02.f90 (83%) rename flang/test/Semantics/{ => OpenMP}/omp-simd03.f90 (100%) rename flang/test/Semantics/{ => OpenMP}/omp-single01.f90 (85%) rename flang/test/Semantics/{ => OpenMP}/omp-single02.f90 (86%) rename flang/test/Semantics/{ => OpenMP}/omp-symbol01.f90 (96%) rename flang/test/Semantics/{ => OpenMP}/omp-symbol02.f90 (92%) rename flang/test/Semantics/{ => OpenMP}/omp-symbol03.f90 (92%) rename flang/test/Semantics/{ => OpenMP}/omp-symbol04.f90 (91%) rename flang/test/Semantics/{ => OpenMP}/omp-symbol05.f90 (94%) rename flang/test/Semantics/{ => OpenMP}/omp-symbol06.f90 (90%) rename flang/test/Semantics/{ => OpenMP}/omp-symbol07.f90 (94%) rename flang/test/Semantics/{ => OpenMP}/omp-symbol08.f90 (99%) rename flang/test/Semantics/{ => OpenMP}/omp-sync-critical01.f90 (93%) rename flang/test/Semantics/{ => OpenMP}/omp-sync-critical02.f90 (96%) rename flang/test/Semantics/{ => OpenMP}/omp-task01.f90 (100%) rename flang/test/Semantics/{ => OpenMP}/omp-taskgroup01.f90 (94%) rename flang/test/Semantics/{ => OpenMP}/omp-taskloop-simd01.f90 (82%) rename flang/test/Semantics/{ => OpenMP}/omp-taskloop01.f90 (87%) rename flang/test/Semantics/{ => OpenMP}/omp-taskloop02.f90 (100%) rename flang/test/Semantics/{ => OpenMP}/omp-taskloop03.f90 (100%) rename flang/test/Semantics/{ => OpenMP}/omp-threadprivate01.f90 (96%) rename flang/test/Semantics/{ => OpenMP}/omp-threadprivate02.f90 (97%) rename flang/test/Semantics/{ => OpenMP}/omp-threadprivate03.f90 (91%) rename flang/test/Semantics/{ => OpenMP}/omp-threadprivate04.f90 (95%) rename flang/test/Semantics/{ => OpenMP}/omp-threadprivate05.f90 (95%) rename flang/test/Semantics/{ => OpenMP}/omp-workshare01.f90 (94%) rename flang/test/Semantics/{ => OpenMP}/omp-workshare02.f90 (97%) rename flang/test/Semantics/{ => OpenMP}/omp-workshare03.f90 (92%) rename flang/test/Semantics/{ => OpenMP}/omp-workshare04.f90 (96%) rename flang/test/Semantics/{ => OpenMP}/omp-workshare05.f90 (95%) delete mode 100644 flang/test/Semantics/canondo18.f90 delete mode 100644 flang/test/Semantics/canondo19.f90 delete mode 100644 flang/test/Semantics/modfile49.f90 diff --git a/flang/test/Semantics/omp-allocate-directive.f90 b/flang/test/Semantics/OpenMP/omp-allocate-directive.f90 similarity index 91% rename from flang/test/Semantics/omp-allocate-directive.f90 rename to flang/test/Semantics/OpenMP/omp-allocate-directive.f90 index 00c0f6b..5204e4a 100644 --- a/flang/test/Semantics/omp-allocate-directive.f90 +++ b/flang/test/Semantics/OpenMP/omp-allocate-directive.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_errors.py %s %flang_fc1 -fopenmp +! RUN: %python %S/../test_errors.py %s %flang_fc1 -fopenmp ! Check OpenMP Allocate directive use omp_lib diff --git a/flang/test/Semantics/omp-allocate01.f90 b/flang/test/Semantics/OpenMP/omp-allocate01.f90 similarity index 92% rename from flang/test/Semantics/omp-allocate01.f90 rename to flang/test/Semantics/OpenMP/omp-allocate01.f90 index 74f8788..92a7c23 100644 --- a/flang/test/Semantics/omp-allocate01.f90 +++ b/flang/test/Semantics/OpenMP/omp-allocate01.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_errors.py %s %flang_fc1 -fopenmp +! RUN: %python %S/../test_errors.py %s %flang_fc1 -fopenmp ! OpenMP Version 5.0 ! 2.11.3 allocate Directive ! The allocate directive must appear in the same scope as the declarations of diff --git a/flang/test/Semantics/omp-allocate02.f90 b/flang/test/Semantics/OpenMP/omp-allocate02.f90 similarity index 92% rename from flang/test/Semantics/omp-allocate02.f90 rename to flang/test/Semantics/OpenMP/omp-allocate02.f90 index ba3957f7..a5c4f3f 100644 --- a/flang/test/Semantics/omp-allocate02.f90 +++ b/flang/test/Semantics/OpenMP/omp-allocate02.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_errors.py %s %flang_fc1 -fopenmp +! RUN: %python %S/../test_errors.py %s %flang_fc1 -fopenmp ! OpenMP Version 5.0 ! 2.11.3 allocate Directive ! At most one allocator clause can appear on the allocate directive. diff --git a/flang/test/Semantics/omp-allocate03.f90 b/flang/test/Semantics/OpenMP/omp-allocate03.f90 similarity index 92% rename from flang/test/Semantics/omp-allocate03.f90 rename to flang/test/Semantics/OpenMP/omp-allocate03.f90 index d1e9686..320a9c9 100644 --- a/flang/test/Semantics/omp-allocate03.f90 +++ b/flang/test/Semantics/OpenMP/omp-allocate03.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_errors.py %s %flang_fc1 -fopenmp +! RUN: %python %S/../test_errors.py %s %flang_fc1 -fopenmp ! OpenMP Version 5.0 ! 2.11.3 allocate Directive ! A variable that is part of another variable (as an array or diff --git a/flang/test/Semantics/omp-allocate04.f90 b/flang/test/Semantics/OpenMP/omp-allocate04.f90 similarity index 85% rename from flang/test/Semantics/omp-allocate04.f90 rename to flang/test/Semantics/OpenMP/omp-allocate04.f90 index d5d9730..405781b 100644 --- a/flang/test/Semantics/omp-allocate04.f90 +++ b/flang/test/Semantics/OpenMP/omp-allocate04.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_errors.py %s %flang_fc1 -fopenmp +! RUN: %python %S/../test_errors.py %s %flang_fc1 -fopenmp ! OpenMP Version 5.0 ! 2.11.3 allocate Directive ! Only the allocator clause is allowed on the allocate directive diff --git a/flang/test/Semantics/omp-allocate05.f90 b/flang/test/Semantics/OpenMP/omp-allocate05.f90 similarity index 92% rename from flang/test/Semantics/omp-allocate05.f90 rename to flang/test/Semantics/OpenMP/omp-allocate05.f90 index 89cf83d..04bcf91 100644 --- a/flang/test/Semantics/omp-allocate05.f90 +++ b/flang/test/Semantics/OpenMP/omp-allocate05.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_errors.py %s %flang_fc1 -fopenmp +! RUN: %python %S/../test_errors.py %s %flang_fc1 -fopenmp ! OpenMP Version 5.0 ! 2.11.3 allocate Directive ! allocate directives that appear in a target region must specify an allocator diff --git a/flang/test/Semantics/omp-allocate06.f90 b/flang/test/Semantics/OpenMP/omp-allocate06.f90 similarity index 91% rename from flang/test/Semantics/omp-allocate06.f90 rename to flang/test/Semantics/OpenMP/omp-allocate06.f90 index 2265134..68a7e88 100644 --- a/flang/test/Semantics/omp-allocate06.f90 +++ b/flang/test/Semantics/OpenMP/omp-allocate06.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_errors.py %s %flang_fc1 -fopenmp +! RUN: %python %S/../test_errors.py %s %flang_fc1 -fopenmp ! OpenMP Version 5.0 ! 2.11.3 allocate Directive ! List items specified in the allocate directive must not have the ALLOCATABLE attribute unless the directive is associated with an diff --git a/flang/test/Semantics/omp-allocate07.f90 b/flang/test/Semantics/OpenMP/omp-allocate07.f90 similarity index 94% rename from flang/test/Semantics/omp-allocate07.f90 rename to flang/test/Semantics/OpenMP/omp-allocate07.f90 index 80549f9..c01b35a 100644 --- a/flang/test/Semantics/omp-allocate07.f90 +++ b/flang/test/Semantics/OpenMP/omp-allocate07.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_errors.py %s %flang_fc1 -fopenmp +! RUN: %python %S/../test_errors.py %s %flang_fc1 -fopenmp ! OpenMP Version 5.0 ! 2.11.3 allocate Directive ! A type parameter inquiry cannot appear in an allocate directive. diff --git a/flang/test/Semantics/omp-allocate08.f90 b/flang/test/Semantics/OpenMP/omp-allocate08.f90 similarity index 96% rename from flang/test/Semantics/omp-allocate08.f90 rename to flang/test/Semantics/OpenMP/omp-allocate08.f90 index 2594933..65029d1 100644 --- a/flang/test/Semantics/omp-allocate08.f90 +++ b/flang/test/Semantics/OpenMP/omp-allocate08.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_errors.py %s %flang_fc1 -fopenmp +! RUN: %python %S/../test_errors.py %s %flang_fc1 -fopenmp ! OpenMP Version 5.0 ! 2.11.3 allocate Directive ! If list items within the ALLOCATE directive have the SAVE attribute, are a common block name, or are declared in the scope of a diff --git a/flang/test/Semantics/omp-atomic.f90 b/flang/test/Semantics/OpenMP/omp-atomic.f90 similarity index 94% rename from flang/test/Semantics/omp-atomic.f90 rename to flang/test/Semantics/OpenMP/omp-atomic.f90 index 86d9457..44f06b7 100644 --- a/flang/test/Semantics/omp-atomic.f90 +++ b/flang/test/Semantics/OpenMP/omp-atomic.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_errors.py %s %flang -fopenmp +! RUN: %python %S/../test_errors.py %s %flang -fopenmp use omp_lib ! Check OpenMP 2.13.6 atomic Construct diff --git a/flang/test/Semantics/omp-atomic01.f90 b/flang/test/Semantics/OpenMP/omp-atomic01.f90 similarity index 99% rename from flang/test/Semantics/omp-atomic01.f90 rename to flang/test/Semantics/OpenMP/omp-atomic01.f90 index b668de20..79f69e5 100644 --- a/flang/test/Semantics/omp-atomic01.f90 +++ b/flang/test/Semantics/OpenMP/omp-atomic01.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_errors.py %s %flang_fc1 -fopenmp +! RUN: %python %S/../test_errors.py %s %flang_fc1 -fopenmp ! Semantic checks for OpenMP 5.0 standard 2.17.7 atomic Construct. use omp_lib diff --git a/flang/test/Semantics/omp-atomic02.f90 b/flang/test/Semantics/OpenMP/omp-atomic02.f90 similarity index 98% rename from flang/test/Semantics/omp-atomic02.f90 rename to flang/test/Semantics/OpenMP/omp-atomic02.f90 index ec04fda..336949a 100644 --- a/flang/test/Semantics/omp-atomic02.f90 +++ b/flang/test/Semantics/OpenMP/omp-atomic02.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_errors.py %s %flang_fc1 -fopenmp +! RUN: %python %S/../test_errors.py %s %flang_fc1 -fopenmp ! OpenMP Atomic construct ! section 2.17.7 diff --git a/flang/test/Semantics/omp-atomic03.f90 b/flang/test/Semantics/OpenMP/omp-atomic03.f90 similarity index 97% rename from flang/test/Semantics/omp-atomic03.f90 rename to flang/test/Semantics/OpenMP/omp-atomic03.f90 index 4262416..f829e78 100644 --- a/flang/test/Semantics/omp-atomic03.f90 +++ b/flang/test/Semantics/OpenMP/omp-atomic03.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_errors.py %s %flang_fc1 -fopenmp +! RUN: %python %S/../test_errors.py %s %flang_fc1 -fopenmp ! OpenMP Atomic construct ! section 2.17.7 diff --git a/flang/test/Semantics/omp-atomic04.f90 b/flang/test/Semantics/OpenMP/omp-atomic04.f90 similarity index 98% rename from flang/test/Semantics/omp-atomic04.f90 rename to flang/test/Semantics/OpenMP/omp-atomic04.f90 index 15b832c..a81a091 100644 --- a/flang/test/Semantics/omp-atomic04.f90 +++ b/flang/test/Semantics/OpenMP/omp-atomic04.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_errors.py %s %flang_fc1 -fopenmp +! RUN: %python %S/../test_errors.py %s %flang_fc1 -fopenmp ! OpenMP Atomic construct ! section 2.17.7 diff --git a/flang/test/Semantics/omp-atomic05.f90 b/flang/test/Semantics/OpenMP/omp-atomic05.f90 similarity index 94% rename from flang/test/Semantics/omp-atomic05.f90 rename to flang/test/Semantics/OpenMP/omp-atomic05.f90 index 1ff13d6..7049267 100644 --- a/flang/test/Semantics/omp-atomic05.f90 +++ b/flang/test/Semantics/OpenMP/omp-atomic05.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_errors.py %s %flang -fopenmp +! RUN: %python %S/../test_errors.py %s %flang -fopenmp ! This tests the various semantics related to the clauses of various OpenMP atomic constructs diff --git a/flang/test/Semantics/omp-clause-validity01.f90 b/flang/test/Semantics/OpenMP/omp-clause-validity01.f90 similarity index 99% rename from flang/test/Semantics/omp-clause-validity01.f90 rename to flang/test/Semantics/OpenMP/omp-clause-validity01.f90 index 4391fad..e641493 100644 --- a/flang/test/Semantics/omp-clause-validity01.f90 +++ b/flang/test/Semantics/OpenMP/omp-clause-validity01.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_errors.py %s %flang_fc1 -fopenmp +! RUN: %python %S/../test_errors.py %s %flang_fc1 -fopenmp use omp_lib ! Check OpenMP clause validity for the following directives: ! diff --git a/flang/test/Semantics/omp-combined-constructs.f90 b/flang/test/Semantics/OpenMP/omp-combined-constructs.f90 similarity index 99% rename from flang/test/Semantics/omp-combined-constructs.f90 rename to flang/test/Semantics/OpenMP/omp-combined-constructs.f90 index c8d3d26..35ab6fc 100644 --- a/flang/test/Semantics/omp-combined-constructs.f90 +++ b/flang/test/Semantics/OpenMP/omp-combined-constructs.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_errors.py %s %flang -fopenmp +! RUN: %python %S/../test_errors.py %s %flang -fopenmp program main implicit none diff --git a/flang/test/Semantics/omp-copyin01.f90 b/flang/test/Semantics/OpenMP/omp-copyin01.f90 similarity index 91% rename from flang/test/Semantics/omp-copyin01.f90 rename to flang/test/Semantics/OpenMP/omp-copyin01.f90 index 6aba8a2..0051b5d 100644 --- a/flang/test/Semantics/omp-copyin01.f90 +++ b/flang/test/Semantics/OpenMP/omp-copyin01.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_errors.py %s %flang -fopenmp +! RUN: %python %S/../test_errors.py %s %flang -fopenmp ! OpenMP Version 4.5 ! 2.15.4.1 copyin Clause ! A list item that appears in a copyin clause must be threadprivate diff --git a/flang/test/Semantics/omp-copyin02.f90 b/flang/test/Semantics/OpenMP/omp-copyin02.f90 similarity index 91% rename from flang/test/Semantics/omp-copyin02.f90 rename to flang/test/Semantics/OpenMP/omp-copyin02.f90 index 8c92ccc..09b8766 100644 --- a/flang/test/Semantics/omp-copyin02.f90 +++ b/flang/test/Semantics/OpenMP/omp-copyin02.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_errors.py %s %flang -fopenmp +! RUN: %python %S/../test_errors.py %s %flang -fopenmp ! OpenMP Version 4.5 ! 2.15.4.1 copyin Clause ! A common block name that appears in a copyin clause must be declared to be diff --git a/flang/test/Semantics/omp-copyin03.f90 b/flang/test/Semantics/OpenMP/omp-copyin03.f90 similarity index 91% rename from flang/test/Semantics/omp-copyin03.f90 rename to flang/test/Semantics/OpenMP/omp-copyin03.f90 index 54a2604..7c3759a 100644 --- a/flang/test/Semantics/omp-copyin03.f90 +++ b/flang/test/Semantics/OpenMP/omp-copyin03.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_errors.py %s %flang -fopenmp +! RUN: %python %S/../test_errors.py %s %flang -fopenmp ! OpenMP Version 4.5 ! 2.15.4.1 copyin Clause ! A list item that appears in a copyin clause must be threadprivate. diff --git a/flang/test/Semantics/omp-copyin04.f90 b/flang/test/Semantics/OpenMP/omp-copyin04.f90 similarity index 88% rename from flang/test/Semantics/omp-copyin04.f90 rename to flang/test/Semantics/OpenMP/omp-copyin04.f90 index 297d42a..6f5e8df 100644 --- a/flang/test/Semantics/omp-copyin04.f90 +++ b/flang/test/Semantics/OpenMP/omp-copyin04.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_errors.py %s %flang -fopenmp +! RUN: %python %S/../test_errors.py %s %flang -fopenmp ! OpenMP Version 4.5 ! 2.15.4.1 copyin Clause ! A list item that appears in a copyin clause must be threadprivate diff --git a/flang/test/Semantics/omp-copyin05.f90 b/flang/test/Semantics/OpenMP/omp-copyin05.f90 similarity index 90% rename from flang/test/Semantics/omp-copyin05.f90 rename to flang/test/Semantics/OpenMP/omp-copyin05.f90 index 8f1ba29..142d5a7 100644 --- a/flang/test/Semantics/omp-copyin05.f90 +++ b/flang/test/Semantics/OpenMP/omp-copyin05.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_errors.py %s %flang -fopenmp +! RUN: %python %S/../test_errors.py %s %flang -fopenmp ! OpenMP Version 4.5 ! 2.15.4.1 copyin Clause ! A common block name that appears in a copyin clause must be declared to be diff --git a/flang/test/Semantics/omp-copyprivate01.f90 b/flang/test/Semantics/OpenMP/omp-copyprivate01.f90 similarity index 92% rename from flang/test/Semantics/omp-copyprivate01.f90 rename to flang/test/Semantics/OpenMP/omp-copyprivate01.f90 index 37912ed..d5cf273 100644 --- a/flang/test/Semantics/omp-copyprivate01.f90 +++ b/flang/test/Semantics/OpenMP/omp-copyprivate01.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_errors.py %s %flang_fc1 -fopenmp +! RUN: %python %S/../test_errors.py %s %flang_fc1 -fopenmp ! OpenMP Version 4.5 ! 2.15.4.2 copyprivate Clause ! A list item that appears in a copyprivate clause may not appear in a diff --git a/flang/test/Semantics/omp-copyprivate02.f90 b/flang/test/Semantics/OpenMP/omp-copyprivate02.f90 similarity index 90% rename from flang/test/Semantics/omp-copyprivate02.f90 rename to flang/test/Semantics/OpenMP/omp-copyprivate02.f90 index e2d408a..35fd6dd 100644 --- a/flang/test/Semantics/omp-copyprivate02.f90 +++ b/flang/test/Semantics/OpenMP/omp-copyprivate02.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_errors.py %s %flang_fc1 -fopenmp +! RUN: %python %S/../test_errors.py %s %flang_fc1 -fopenmp ! OpenMP Version 4.5 ! 2.15.4.2 copyprivate Clause ! Pointers with the INTENT(IN) attribute may not appear in a copyprivate clause. diff --git a/flang/test/Semantics/omp-copyprivate03.f90 b/flang/test/Semantics/OpenMP/omp-copyprivate03.f90 similarity index 93% rename from flang/test/Semantics/omp-copyprivate03.f90 rename to flang/test/Semantics/OpenMP/omp-copyprivate03.f90 index 0ca4909..eccc308 100644 --- a/flang/test/Semantics/omp-copyprivate03.f90 +++ b/flang/test/Semantics/OpenMP/omp-copyprivate03.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_errors.py %s %flang_fc1 -fopenmp +! RUN: %python %S/../test_errors.py %s %flang_fc1 -fopenmp ! OpenMP Version 4.5 ! 2.15.4.2 copyprivate Clause ! All list items that appear in the copyprivate clause must be either diff --git a/flang/test/Semantics/omp-declarative-directive.f90 b/flang/test/Semantics/OpenMP/omp-declarative-directive.f90 similarity index 97% rename from flang/test/Semantics/omp-declarative-directive.f90 rename to flang/test/Semantics/OpenMP/omp-declarative-directive.f90 index f53d73a..23ed8d5 100644 --- a/flang/test/Semantics/omp-declarative-directive.f90 +++ b/flang/test/Semantics/OpenMP/omp-declarative-directive.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_errors.py %s %flang -fopenmp +! RUN: %python %S/../test_errors.py %s %flang -fopenmp ! Check OpenMP declarative directives diff --git a/flang/test/Semantics/omp-declare-target01.f90 b/flang/test/Semantics/OpenMP/omp-declare-target01.f90 similarity index 98% rename from flang/test/Semantics/omp-declare-target01.f90 rename to flang/test/Semantics/OpenMP/omp-declare-target01.f90 index 972468f..3cb7cfb 100644 --- a/flang/test/Semantics/omp-declare-target01.f90 +++ b/flang/test/Semantics/OpenMP/omp-declare-target01.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_errors.py %s %flang_fc1 -fopenmp +! RUN: %python %S/../test_errors.py %s %flang_fc1 -fopenmp ! OpenMP Version 5.1 ! Check OpenMP construct validity for the following directives: ! 2.14.7 Declare Target Directive diff --git a/flang/test/Semantics/omp-declare-target02.f90 b/flang/test/Semantics/OpenMP/omp-declare-target02.f90 similarity index 98% rename from flang/test/Semantics/omp-declare-target02.f90 rename to flang/test/Semantics/OpenMP/omp-declare-target02.f90 index 2e4e5ee..57a2776 100644 --- a/flang/test/Semantics/omp-declare-target02.f90 +++ b/flang/test/Semantics/OpenMP/omp-declare-target02.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_errors.py %s %flang_fc1 -fopenmp +! RUN: %python %S/../test_errors.py %s %flang_fc1 -fopenmp ! OpenMP Version 5.1 ! Check OpenMP construct validity for the following directives: ! 2.14.7 Declare Target Directive diff --git a/flang/test/Semantics/omp-declare-target03.f90 b/flang/test/Semantics/OpenMP/omp-declare-target03.f90 similarity index 87% rename from flang/test/Semantics/omp-declare-target03.f90 rename to flang/test/Semantics/OpenMP/omp-declare-target03.f90 index 8b291f2..45064ff 100644 --- a/flang/test/Semantics/omp-declare-target03.f90 +++ b/flang/test/Semantics/OpenMP/omp-declare-target03.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_errors.py %s %flang_fc1 -fopenmp +! RUN: %python %S/../test_errors.py %s %flang_fc1 -fopenmp ! OpenMP Version 5.1 ! Check OpenMP construct validity for the following directives: ! 2.14.7 Declare Target Directive diff --git a/flang/test/Semantics/omp-declare-target04.f90 b/flang/test/Semantics/OpenMP/omp-declare-target04.f90 similarity index 87% rename from flang/test/Semantics/omp-declare-target04.f90 rename to flang/test/Semantics/OpenMP/omp-declare-target04.f90 index 9f3b775..24f8b4a 100644 --- a/flang/test/Semantics/omp-declare-target04.f90 +++ b/flang/test/Semantics/OpenMP/omp-declare-target04.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_errors.py %s %flang_fc1 -fopenmp +! RUN: %python %S/../test_errors.py %s %flang_fc1 -fopenmp ! OpenMP Version 5.1 ! Check OpenMP construct validity for the following directives: ! 2.14.7 Declare Target Directive diff --git a/flang/test/Semantics/omp-declare-target05.f90 b/flang/test/Semantics/OpenMP/omp-declare-target05.f90 similarity index 95% rename from flang/test/Semantics/omp-declare-target05.f90 rename to flang/test/Semantics/OpenMP/omp-declare-target05.f90 index 9d9c53a..2334a85 100644 --- a/flang/test/Semantics/omp-declare-target05.f90 +++ b/flang/test/Semantics/OpenMP/omp-declare-target05.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_errors.py %s %flang_fc1 -fopenmp +! RUN: %python %S/../test_errors.py %s %flang_fc1 -fopenmp ! OpenMP Version 5.1 ! Check OpenMP construct validity for the following directives: ! 2.14.7 Declare Target Directive diff --git a/flang/test/Semantics/omp-default.f90 b/flang/test/Semantics/OpenMP/omp-default.f90 similarity index 94% rename from flang/test/Semantics/omp-default.f90 rename to flang/test/Semantics/OpenMP/omp-default.f90 index e4f364c..94de7fa 100644 --- a/flang/test/Semantics/omp-default.f90 +++ b/flang/test/Semantics/OpenMP/omp-default.f90 @@ -1,4 +1,4 @@ -!RUN: %python %S/test_errors.py %s %flang -fopenmp +!RUN: %python %S/../test_errors.py %s %flang -fopenmp ! OpenMP Version 4.5 ! 2.15.3.1 default Clause program omp_default diff --git a/flang/test/Semantics/omp-default02.f90 b/flang/test/Semantics/OpenMP/omp-default02.f90 similarity index 96% rename from flang/test/Semantics/omp-default02.f90 rename to flang/test/Semantics/OpenMP/omp-default02.f90 index f508d6a..23f994b 100644 --- a/flang/test/Semantics/omp-default02.f90 +++ b/flang/test/Semantics/OpenMP/omp-default02.f90 @@ -1,4 +1,4 @@ -!RUN: %python %S/test_errors.py %s %flang -fopenmp +!RUN: %python %S/../test_errors.py %s %flang -fopenmp ! OpenMP Version 4.5 ! 2.15.3.1 default Clause - a positive test case. diff --git a/flang/test/Semantics/omp-depend01.f90 b/flang/test/Semantics/OpenMP/omp-depend01.f90 similarity index 92% rename from flang/test/Semantics/omp-depend01.f90 rename to flang/test/Semantics/OpenMP/omp-depend01.f90 index aedcb8b..29468f4 100644 --- a/flang/test/Semantics/omp-depend01.f90 +++ b/flang/test/Semantics/OpenMP/omp-depend01.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_errors.py %s %flang -fopenmp +! RUN: %python %S/../test_errors.py %s %flang -fopenmp ! OpenMP Version 4.5 ! 2.13.9 Depend Clause ! List items used in depend clauses cannot be zero-length array sections. diff --git a/flang/test/Semantics/omp-depend02.f90 b/flang/test/Semantics/OpenMP/omp-depend02.f90 similarity index 95% rename from flang/test/Semantics/omp-depend02.f90 rename to flang/test/Semantics/OpenMP/omp-depend02.f90 index e00c851..76c02c8 100644 --- a/flang/test/Semantics/omp-depend02.f90 +++ b/flang/test/Semantics/OpenMP/omp-depend02.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_errors.py %s %flang -fopenmp +! RUN: %python %S/../test_errors.py %s %flang -fopenmp ! OpenMP Version 4.5 ! 2.13.9 Depend Clause ! A variable that is part of another variable diff --git a/flang/test/Semantics/omp-depend03.f90 b/flang/test/Semantics/OpenMP/omp-depend03.f90 similarity index 89% rename from flang/test/Semantics/omp-depend03.f90 rename to flang/test/Semantics/OpenMP/omp-depend03.f90 index 9bca93a..e0eb683 100644 --- a/flang/test/Semantics/omp-depend03.f90 +++ b/flang/test/Semantics/OpenMP/omp-depend03.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_errors.py %s %flang -fopenmp +! RUN: %python %S/../test_errors.py %s %flang -fopenmp ! OpenMP Version 4.5 ! 2.13.9 Depend Clause ! Coarrays are not supported in depend clause diff --git a/flang/test/Semantics/omp-device-constructs.f90 b/flang/test/Semantics/OpenMP/omp-device-constructs.f90 similarity index 99% rename from flang/test/Semantics/omp-device-constructs.f90 rename to flang/test/Semantics/OpenMP/omp-device-constructs.f90 index 586cec6..80f7902 100644 --- a/flang/test/Semantics/omp-device-constructs.f90 +++ b/flang/test/Semantics/OpenMP/omp-device-constructs.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_errors.py %s %flang -fopenmp +! RUN: %python %S/../test_errors.py %s %flang -fopenmp ! Check OpenMP clause validity for the following directives: ! 2.10 Device constructs program main diff --git a/flang/test/Semantics/omp-do-collapse-positivecases.f90 b/flang/test/Semantics/OpenMP/omp-do-collapse-positivecases.f90 similarity index 94% rename from flang/test/Semantics/omp-do-collapse-positivecases.f90 rename to flang/test/Semantics/OpenMP/omp-do-collapse-positivecases.f90 index fecd4d5..6ad14fa 100644 --- a/flang/test/Semantics/omp-do-collapse-positivecases.f90 +++ b/flang/test/Semantics/OpenMP/omp-do-collapse-positivecases.f90 @@ -1,4 +1,4 @@ -!RUN: %python %S/test_errors.py %s %flang -fopenmp +!RUN: %python %S/../test_errors.py %s %flang -fopenmp ! OpenMP Version 4.5 ! 2.7.1 Collapse Clause Positive cases diff --git a/flang/test/Semantics/omp-do-collapse.f90 b/flang/test/Semantics/OpenMP/omp-do-collapse.f90 similarity index 92% rename from flang/test/Semantics/omp-do-collapse.f90 rename to flang/test/Semantics/OpenMP/omp-do-collapse.f90 index c7404e0..bc5412b 100644 --- a/flang/test/Semantics/omp-do-collapse.f90 +++ b/flang/test/Semantics/OpenMP/omp-do-collapse.f90 @@ -1,4 +1,4 @@ -!RUN: %python %S/test_errors.py %s %flang -fopenmp +!RUN: %python %S/../test_errors.py %s %flang -fopenmp ! OpenMP Version 4.5 ! 2.7.1 Collapse Clause program omp_doCollapse diff --git a/flang/test/Semantics/omp-do-cycle.f90 b/flang/test/Semantics/OpenMP/omp-do-cycle.f90 similarity index 95% rename from flang/test/Semantics/omp-do-cycle.f90 rename to flang/test/Semantics/OpenMP/omp-do-cycle.f90 index f01e10f..b6617ac 100644 --- a/flang/test/Semantics/omp-do-cycle.f90 +++ b/flang/test/Semantics/OpenMP/omp-do-cycle.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_errors.py %s %flang -fopenmp +! RUN: %python %S/../test_errors.py %s %flang -fopenmp ! OpenMP Version 4.5 ! Check for cycle statements leaving an OpenMP structured block diff --git a/flang/test/Semantics/omp-do-ordered-positivecases.f90 b/flang/test/Semantics/OpenMP/omp-do-ordered-positivecases.f90 similarity index 96% rename from flang/test/Semantics/omp-do-ordered-positivecases.f90 rename to flang/test/Semantics/OpenMP/omp-do-ordered-positivecases.f90 index 91a1721..d4c4e5b 100644 --- a/flang/test/Semantics/omp-do-ordered-positivecases.f90 +++ b/flang/test/Semantics/OpenMP/omp-do-ordered-positivecases.f90 @@ -1,4 +1,4 @@ -!RUN: %python %S/test_errors.py %s %flang -fopenmp +!RUN: %python %S/../test_errors.py %s %flang -fopenmp ! OpenMP Version 4.5 ! 2.7.1 Ordered Clause positive cases. diff --git a/flang/test/Semantics/omp-do-ordered.f90 b/flang/test/Semantics/OpenMP/omp-do-ordered.f90 similarity index 97% rename from flang/test/Semantics/omp-do-ordered.f90 rename to flang/test/Semantics/OpenMP/omp-do-ordered.f90 index f0cbd44..79ded3e1 100644 --- a/flang/test/Semantics/omp-do-ordered.f90 +++ b/flang/test/Semantics/OpenMP/omp-do-ordered.f90 @@ -1,4 +1,4 @@ -!RUN: %python %S/test_errors.py %s %flang -fopenmp +!RUN: %python %S/../test_errors.py %s %flang -fopenmp ! OpenMP Version 4.5 ! 2.7.1 Ordered Clause diff --git a/flang/test/Semantics/omp-do-schedule01.f90 b/flang/test/Semantics/OpenMP/omp-do-schedule01.f90 similarity index 85% rename from flang/test/Semantics/omp-do-schedule01.f90 rename to flang/test/Semantics/OpenMP/omp-do-schedule01.f90 index 2c52f96..1e0a8a6 100644 --- a/flang/test/Semantics/omp-do-schedule01.f90 +++ b/flang/test/Semantics/OpenMP/omp-do-schedule01.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_errors.py %s %flang -fopenmp +! RUN: %python %S/../test_errors.py %s %flang -fopenmp ! OpenMP Version 4.5 ! 2.7.1 Schedule Clause program omp_doSchedule diff --git a/flang/test/Semantics/omp-do-schedule02.f90 b/flang/test/Semantics/OpenMP/omp-do-schedule02.f90 similarity index 87% rename from flang/test/Semantics/omp-do-schedule02.f90 rename to flang/test/Semantics/OpenMP/omp-do-schedule02.f90 index 28f84d2..a7cbdc2 100644 --- a/flang/test/Semantics/omp-do-schedule02.f90 +++ b/flang/test/Semantics/OpenMP/omp-do-schedule02.f90 @@ -1,4 +1,4 @@ -!RUN: %python %S/test_errors.py %s %flang -fopenmp +!RUN: %python %S/../test_errors.py %s %flang -fopenmp ! OpenMP Version 4.5 ! 2.7.1 Schedule Clause program omp_doSchedule diff --git a/flang/test/Semantics/omp-do-schedule03.f90 b/flang/test/Semantics/OpenMP/omp-do-schedule03.f90 similarity index 93% rename from flang/test/Semantics/omp-do-schedule03.f90 rename to flang/test/Semantics/OpenMP/omp-do-schedule03.f90 index 4b5fb02..65f3529 100644 --- a/flang/test/Semantics/omp-do-schedule03.f90 +++ b/flang/test/Semantics/OpenMP/omp-do-schedule03.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_symbols.py %s %flang_fc1 -fopenmp +! RUN: %python %S/../test_symbols.py %s %flang_fc1 -fopenmp ! OpenMP Version 4.5 ! 2.7.1 Schedule Clause ! Test that does not catch non constant integer expressions like xx - xx. diff --git a/flang/test/Semantics/omp-do-schedule04.f90 b/flang/test/Semantics/OpenMP/omp-do-schedule04.f90 similarity index 92% rename from flang/test/Semantics/omp-do-schedule04.f90 rename to flang/test/Semantics/OpenMP/omp-do-schedule04.f90 index 05daa05..f36cb31 100644 --- a/flang/test/Semantics/omp-do-schedule04.f90 +++ b/flang/test/Semantics/OpenMP/omp-do-schedule04.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_symbols.py %s %flang_fc1 -fopenmp +! RUN: %python %S/../test_symbols.py %s %flang_fc1 -fopenmp ! OpenMP Version 4.5 ! 2.7.1 Schedule Clause ! Test that does not catch non constant integer expressions like xx - yy. diff --git a/flang/test/Semantics/omp-do01-positivecase.f90 b/flang/test/Semantics/OpenMP/omp-do01-positivecase.f90 similarity index 87% rename from flang/test/Semantics/omp-do01-positivecase.f90 rename to flang/test/Semantics/OpenMP/omp-do01-positivecase.f90 index a810f93..8d19cc2 100644 --- a/flang/test/Semantics/omp-do01-positivecase.f90 +++ b/flang/test/Semantics/OpenMP/omp-do01-positivecase.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_symbols.py %s %flang_fc1 -fopenmp +! RUN: %python %S/../test_symbols.py %s %flang_fc1 -fopenmp ! OpenMP Version 4.5 ! 2.7.1 Loop Construct ! The loop iteration variable may not appear in a firstprivate directive. diff --git a/flang/test/Semantics/omp-do01.f90 b/flang/test/Semantics/OpenMP/omp-do01.f90 similarity index 86% rename from flang/test/Semantics/omp-do01.f90 rename to flang/test/Semantics/OpenMP/omp-do01.f90 index ee256c8..78c3ba3 100644 --- a/flang/test/Semantics/omp-do01.f90 +++ b/flang/test/Semantics/OpenMP/omp-do01.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_errors.py %s %flang -fopenmp +! RUN: %python %S/../test_errors.py %s %flang -fopenmp ! OpenMP Version 4.5 ! 2.7.1 Loop Construct ! The loop iteration variable may not appear in a firstprivate directive. diff --git a/flang/test/Semantics/omp-do02.f90 b/flang/test/Semantics/OpenMP/omp-do02.f90 similarity index 100% rename from flang/test/Semantics/omp-do02.f90 rename to flang/test/Semantics/OpenMP/omp-do02.f90 diff --git a/flang/test/Semantics/omp-do03.f90 b/flang/test/Semantics/OpenMP/omp-do03.f90 similarity index 86% rename from flang/test/Semantics/omp-do03.f90 rename to flang/test/Semantics/OpenMP/omp-do03.f90 index f83cd7c..7ec84a0 100644 --- a/flang/test/Semantics/omp-do03.f90 +++ b/flang/test/Semantics/OpenMP/omp-do03.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_errors.py %s %flang -fopenmp +! RUN: %python %S/../test_errors.py %s %flang -fopenmp ! OpenMP Version 4.5 ! 2.7.1 Loop Construct diff --git a/flang/test/Semantics/omp-do04-positivecase.f90 b/flang/test/Semantics/OpenMP/omp-do04-positivecase.f90 similarity index 90% rename from flang/test/Semantics/omp-do04-positivecase.f90 rename to flang/test/Semantics/OpenMP/omp-do04-positivecase.f90 index 5a549a8..56eb333 100644 --- a/flang/test/Semantics/omp-do04-positivecase.f90 +++ b/flang/test/Semantics/OpenMP/omp-do04-positivecase.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_symbols.py %s %flang_fc1 -fopenmp +! RUN: %python %S/../test_symbols.py %s %flang_fc1 -fopenmp ! OpenMP Version 4.5 ! 2.7.1 Do Loop Constructs diff --git a/flang/test/Semantics/omp-do04.f90 b/flang/test/Semantics/OpenMP/omp-do04.f90 similarity index 97% rename from flang/test/Semantics/omp-do04.f90 rename to flang/test/Semantics/OpenMP/omp-do04.f90 index 8d327b4..6690f49 100644 --- a/flang/test/Semantics/omp-do04.f90 +++ b/flang/test/Semantics/OpenMP/omp-do04.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_errors.py %s %flang_fc1 -fopenmp +! RUN: %python %S/../test_errors.py %s %flang_fc1 -fopenmp ! OpenMP Version 4.5 ! 2.7.1 Loop Construct ! The loop iteration variable may not appear in a threadprivate directive. diff --git a/flang/test/Semantics/omp-do05-positivecase.f90 b/flang/test/Semantics/OpenMP/omp-do05-positivecase.f90 similarity index 93% rename from flang/test/Semantics/omp-do05-positivecase.f90 rename to flang/test/Semantics/OpenMP/omp-do05-positivecase.f90 index 9de1337..74ed8eb 100644 --- a/flang/test/Semantics/omp-do05-positivecase.f90 +++ b/flang/test/Semantics/OpenMP/omp-do05-positivecase.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_symbols.py %s %flang_fc1 -fopenmp +! RUN: %python %S/../test_symbols.py %s %flang_fc1 -fopenmp ! OpenMP Version 4.5 ! 2.7.1 Loop Construct restrictions on single directive. ! A positive case diff --git a/flang/test/Semantics/omp-do05.f90 b/flang/test/Semantics/OpenMP/omp-do05.f90 similarity index 99% rename from flang/test/Semantics/omp-do05.f90 rename to flang/test/Semantics/OpenMP/omp-do05.f90 index 9e207a0..c0f240d 100644 --- a/flang/test/Semantics/omp-do05.f90 +++ b/flang/test/Semantics/OpenMP/omp-do05.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_errors.py %s %flang -fopenmp +! RUN: %python %S/../test_errors.py %s %flang -fopenmp ! OpenMP Version 4.5 ! 2.7.1 Loop Construct restrictions on single directive. diff --git a/flang/test/Semantics/omp-do06-positivecases.f90 b/flang/test/Semantics/OpenMP/omp-do06-positivecases.f90 similarity index 91% rename from flang/test/Semantics/omp-do06-positivecases.f90 rename to flang/test/Semantics/OpenMP/omp-do06-positivecases.f90 index 0705710..7414125 100644 --- a/flang/test/Semantics/omp-do06-positivecases.f90 +++ b/flang/test/Semantics/OpenMP/omp-do06-positivecases.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_symbols.py %s %flang_fc1 -fopenmp +! RUN: %python %S/../test_symbols.py %s %flang_fc1 -fopenmp ! OpenMP Version 4.5 ! 2.7.1 Loop Construct ! The ordered clause must be present on the loop construct if any ordered diff --git a/flang/test/Semantics/omp-do06.f90 b/flang/test/Semantics/OpenMP/omp-do06.f90 similarity index 94% rename from flang/test/Semantics/omp-do06.f90 rename to flang/test/Semantics/OpenMP/omp-do06.f90 index 7902e68..86790c2 100644 --- a/flang/test/Semantics/omp-do06.f90 +++ b/flang/test/Semantics/OpenMP/omp-do06.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_errors.py %s %flang -fopenmp +! RUN: %python %S/../test_errors.py %s %flang -fopenmp ! OpenMP Version 4.5 ! 2.7.1 Loop Construct ! The ordered clause must be present on the loop construct if any ordered diff --git a/flang/test/Semantics/omp-do07.f90 b/flang/test/Semantics/OpenMP/omp-do07.f90 similarity index 100% rename from flang/test/Semantics/omp-do07.f90 rename to flang/test/Semantics/OpenMP/omp-do07.f90 diff --git a/flang/test/Semantics/omp-do08.f90 b/flang/test/Semantics/OpenMP/omp-do08.f90 similarity index 98% rename from flang/test/Semantics/omp-do08.f90 rename to flang/test/Semantics/OpenMP/omp-do08.f90 index f4d6f7d..3ba6307 100644 --- a/flang/test/Semantics/omp-do08.f90 +++ b/flang/test/Semantics/OpenMP/omp-do08.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_errors.py %s %flang -fopenmp +! RUN: %python %S/../test_errors.py %s %flang -fopenmp ! OpenMP Version 4.5 ! 2.7.1 Loop Construct diff --git a/flang/test/Semantics/omp-do09.f90 b/flang/test/Semantics/OpenMP/omp-do09.f90 similarity index 89% rename from flang/test/Semantics/omp-do09.f90 rename to flang/test/Semantics/OpenMP/omp-do09.f90 index 75b1ddc..af9f2e2 100644 --- a/flang/test/Semantics/omp-do09.f90 +++ b/flang/test/Semantics/OpenMP/omp-do09.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_errors.py %s %flang_fc1 -fopenmp +! RUN: %python %S/../test_errors.py %s %flang_fc1 -fopenmp ! OpenMP Version 4.5 ! 2.7.1 Loop Construct ! The do-loop cannot be a DO WHILE or a DO loop without loop control. diff --git a/flang/test/Semantics/omp-do10.f90 b/flang/test/Semantics/OpenMP/omp-do10.f90 similarity index 94% rename from flang/test/Semantics/omp-do10.f90 rename to flang/test/Semantics/OpenMP/omp-do10.f90 index d14278c..7e8105e 100644 --- a/flang/test/Semantics/omp-do10.f90 +++ b/flang/test/Semantics/OpenMP/omp-do10.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_errors.py %s %flang_fc1 -fopenmp +! RUN: %python %S/../test_errors.py %s %flang_fc1 -fopenmp ! OpenMP Version 4.5 ! 2.7.1 Loop Construct ! The DO loop iteration variable must be of type integer. diff --git a/flang/test/Semantics/omp-do11.f90 b/flang/test/Semantics/OpenMP/omp-do11.f90 similarity index 93% rename from flang/test/Semantics/omp-do11.f90 rename to flang/test/Semantics/OpenMP/omp-do11.f90 index e926993..4993922 100644 --- a/flang/test/Semantics/omp-do11.f90 +++ b/flang/test/Semantics/OpenMP/omp-do11.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_symbols.py %s %flang_fc1 -fopenmp +! RUN: %python %S/../test_symbols.py %s %flang_fc1 -fopenmp ! OpenMP Version 4.5 ! 2.7.1 Do Loop Constructs diff --git a/flang/test/Semantics/omp-do12.f90 b/flang/test/Semantics/OpenMP/omp-do12.f90 similarity index 97% rename from flang/test/Semantics/omp-do12.f90 rename to flang/test/Semantics/OpenMP/omp-do12.f90 index 36ba685..cc8e53a 100644 --- a/flang/test/Semantics/omp-do12.f90 +++ b/flang/test/Semantics/OpenMP/omp-do12.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_symbols.py %s %flang_fc1 -fopenmp +! RUN: %python %S/../test_symbols.py %s %flang_fc1 -fopenmp ! OpenMP Version 4.5 ! 2.7.1 Do Loop constructs. diff --git a/flang/test/Semantics/omp-do13.f90 b/flang/test/Semantics/OpenMP/omp-do13.f90 similarity index 98% rename from flang/test/Semantics/omp-do13.f90 rename to flang/test/Semantics/OpenMP/omp-do13.f90 index 2168375..6e9d1dd 100644 --- a/flang/test/Semantics/omp-do13.f90 +++ b/flang/test/Semantics/OpenMP/omp-do13.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_errors.py %s %flang_fc1 -fopenmp +! RUN: %python %S/../test_errors.py %s %flang_fc1 -fopenmp ! OpenMP Version 4.5 ! 2.7.1 Loop Construct diff --git a/flang/test/Semantics/omp-do14.f90 b/flang/test/Semantics/OpenMP/omp-do14.f90 similarity index 97% rename from flang/test/Semantics/omp-do14.f90 rename to flang/test/Semantics/OpenMP/omp-do14.f90 index 87e6f72..dc3818a 100644 --- a/flang/test/Semantics/omp-do14.f90 +++ b/flang/test/Semantics/OpenMP/omp-do14.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_symbols.py %s %flang_fc1 -fopenmp +! RUN: %python %S/../test_symbols.py %s %flang_fc1 -fopenmp ! OpenMP Version 4.5 ! 2.7.1 Do Loop constructs. diff --git a/flang/test/Semantics/omp-do15.f90 b/flang/test/Semantics/OpenMP/omp-do15.f90 similarity index 97% rename from flang/test/Semantics/omp-do15.f90 rename to flang/test/Semantics/OpenMP/omp-do15.f90 index 10099d6..45c591e 100644 --- a/flang/test/Semantics/omp-do15.f90 +++ b/flang/test/Semantics/OpenMP/omp-do15.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_errors.py %s %flang_fc1 -fopenmp +! RUN: %python %S/../test_errors.py %s %flang_fc1 -fopenmp ! OpenMP Version 4.5 ! 2.7.1 Loop Construct diff --git a/flang/test/Semantics/omp-do16.f90 b/flang/test/Semantics/OpenMP/omp-do16.f90 similarity index 96% rename from flang/test/Semantics/omp-do16.f90 rename to flang/test/Semantics/OpenMP/omp-do16.f90 index f312ba61d..15d13f6 100644 --- a/flang/test/Semantics/omp-do16.f90 +++ b/flang/test/Semantics/OpenMP/omp-do16.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_errors.py %s %flang_fc1 -fopenmp +! RUN: %python %S/../test_errors.py %s %flang_fc1 -fopenmp ! OpenMP Version 4.5 ! 2.7.1 Loop Construct diff --git a/flang/test/Semantics/omp-do17.f90 b/flang/test/Semantics/OpenMP/omp-do17.f90 similarity index 95% rename from flang/test/Semantics/omp-do17.f90 rename to flang/test/Semantics/OpenMP/omp-do17.f90 index 0b1245e..8339ce0 100644 --- a/flang/test/Semantics/omp-do17.f90 +++ b/flang/test/Semantics/OpenMP/omp-do17.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_symbols.py %s %flang_fc1 -fopenmp +! RUN: %python %S/../test_symbols.py %s %flang_fc1 -fopenmp ! OpenMP Version 4.5 ! 2.7.1 Do Loop constructs. diff --git a/flang/test/Semantics/OpenMP/omp-do18.f90 b/flang/test/Semantics/OpenMP/omp-do18.f90 new file mode 100644 index 0000000..cdac323 --- /dev/null +++ b/flang/test/Semantics/OpenMP/omp-do18.f90 @@ -0,0 +1,40 @@ +! RUN: %flang_fc1 -fdebug-unparse-with-symbols %s 2>&1 | FileCheck %s +! RUN: %flang_fc1 -fopenmp -fdebug-unparse-with-symbols %s 2>&1 | FileCheck %s +! CHECK-NOT: do *[1-9] + +program P +implicit none +integer OMP_GET_NUM_THREADS, OMP_GET_THREAD_NUM +integer NUMTHRDS, TID +integer N, CSZ, CNUM, I +parameter (N=100) +parameter (CSZ=10) +real A(N), B(N), C(N) + +do 10 I = 1, N + A(I) = I * 1.0 +10 continue + +B = A +CNUM = CSZ + +!$OMP PARALLEL SHARED(A,B,C,NUMTHRDS,CNUM) PRIVATE(I,TID) +TID = OMP_GET_THREAD_NUM() +if (TID .EQ. 0) then + NUMTHRDS = OMP_GET_NUM_THREADS() + print *, "Number of threads =", NUMTHRDS +end if +print *, "Thread", TID, " is starting..." + +!$OMP DO SCHEDULE(DYNAMIC,CNUM) +do 20 I = 1, N + C(I) = A(I) + B(I) + write (*,100) TID, I, C(I) +20 continue +!$OMP END DO NOWAIT + +print *, "Thread", TID, " done." + +!$OMP END PARALLEL +100 format(" Thread", I2, ": C(", I3, ")=", F8.2) +end program P diff --git a/flang/test/Semantics/OpenMP/omp-do19.f90 b/flang/test/Semantics/OpenMP/omp-do19.f90 new file mode 100644 index 0000000..3dab59d --- /dev/null +++ b/flang/test/Semantics/OpenMP/omp-do19.f90 @@ -0,0 +1,25 @@ +! RUN: %flang_fc1 -fopenmp -fdebug-unparse-with-symbols %s 2>&1 | FileCheck %s +! CHECK-NOT: do *[1-9] +! CHECK: omp simd + +program P +implicit none +integer N, I +parameter (N=100) +real A(N), B(N), C(N) + +!$OMP SIMD +do 10 I = 1, N + A(I) = I * 1.0 +10 continue + +B = A + +!$OMP SIMD +do 20 I = 1, N + C(I) = A(I) + B(I) + write (*,100) I, C(I) +20 continue + +100 format(" C(", I3, ")=", F8.2) +end program P diff --git a/flang/test/Semantics/omp-firstprivate01.f90 b/flang/test/Semantics/OpenMP/omp-firstprivate01.f90 similarity index 97% rename from flang/test/Semantics/omp-firstprivate01.f90 rename to flang/test/Semantics/OpenMP/omp-firstprivate01.f90 index 507d167..09f7b62 100644 --- a/flang/test/Semantics/omp-firstprivate01.f90 +++ b/flang/test/Semantics/OpenMP/omp-firstprivate01.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_errors.py %s %flang_fc1 -fopenmp +! RUN: %python %S/../test_errors.py %s %flang_fc1 -fopenmp ! OpenMP Version 4.5 ! 2.15.3.4 firstprivate Clause ! Variables that appear in a firstprivate clause on a distribute or diff --git a/flang/test/Semantics/omp-flush01.f90 b/flang/test/Semantics/OpenMP/omp-flush01.f90 similarity index 93% rename from flang/test/Semantics/omp-flush01.f90 rename to flang/test/Semantics/OpenMP/omp-flush01.f90 index 1eb9680..27324de 100644 --- a/flang/test/Semantics/omp-flush01.f90 +++ b/flang/test/Semantics/OpenMP/omp-flush01.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_errors.py %s %flang -fopenmp +! RUN: %python %S/../test_errors.py %s %flang -fopenmp ! 2.17.8 Flush construct [OpenMP 5.0] ! memory-order-clause -> diff --git a/flang/test/Semantics/omp-flush02.f90 b/flang/test/Semantics/OpenMP/omp-flush02.f90 similarity index 98% rename from flang/test/Semantics/omp-flush02.f90 rename to flang/test/Semantics/OpenMP/omp-flush02.f90 index a23f634..7700954 100644 --- a/flang/test/Semantics/omp-flush02.f90 +++ b/flang/test/Semantics/OpenMP/omp-flush02.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_errors.py %s %flang_fc1 -fopenmp +! RUN: %python %S/../test_errors.py %s %flang_fc1 -fopenmp ! Check OpenMP 5.0 - 2.17.8 flush Construct ! Restriction - diff --git a/flang/test/Semantics/omp-invalid-branch.f90 b/flang/test/Semantics/OpenMP/omp-invalid-branch.f90 similarity index 100% rename from flang/test/Semantics/omp-invalid-branch.f90 rename to flang/test/Semantics/OpenMP/omp-invalid-branch.f90 diff --git a/flang/test/Semantics/omp-lastprivate01.f90 b/flang/test/Semantics/OpenMP/omp-lastprivate01.f90 similarity index 94% rename from flang/test/Semantics/omp-lastprivate01.f90 rename to flang/test/Semantics/OpenMP/omp-lastprivate01.f90 index 1041555..acf91b8 100644 --- a/flang/test/Semantics/omp-lastprivate01.f90 +++ b/flang/test/Semantics/OpenMP/omp-lastprivate01.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_errors.py %s %flang_fc1 -fopenmp +! RUN: %python %S/../test_errors.py %s %flang_fc1 -fopenmp ! OpenMP Version 4.5 ! 2.15.3.5 lastprivate Clause ! A variable that appears in a lastprivate clause must be definable. diff --git a/flang/test/Semantics/omp-lastprivate02.f90 b/flang/test/Semantics/OpenMP/omp-lastprivate02.f90 similarity index 94% rename from flang/test/Semantics/omp-lastprivate02.f90 rename to flang/test/Semantics/OpenMP/omp-lastprivate02.f90 index 61e2329..c5bf9d7 100644 --- a/flang/test/Semantics/omp-lastprivate02.f90 +++ b/flang/test/Semantics/OpenMP/omp-lastprivate02.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_errors.py %s %flang_fc1 -fopenmp +! RUN: %python %S/../test_errors.py %s %flang_fc1 -fopenmp ! OpenMP Version 4.5 ! 2.15.3.5 lastprivate Clause ! A list item that is private within a parallel region, or that appears in diff --git a/flang/test/Semantics/omp-linear-iter.f90 b/flang/test/Semantics/OpenMP/omp-linear-iter.f90 similarity index 98% rename from flang/test/Semantics/omp-linear-iter.f90 rename to flang/test/Semantics/OpenMP/omp-linear-iter.f90 index 73389d9..8102c1a 100644 --- a/flang/test/Semantics/omp-linear-iter.f90 +++ b/flang/test/Semantics/OpenMP/omp-linear-iter.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_errors.py %s %flang -fopenmp +! RUN: %python %S/../test_errors.py %s %flang -fopenmp ! OpenMP Version 4.5 ! Various checks with the ordered construct diff --git a/flang/test/Semantics/omp-loop-association.f90 b/flang/test/Semantics/OpenMP/omp-loop-association.f90 similarity index 98% rename from flang/test/Semantics/omp-loop-association.f90 rename to flang/test/Semantics/OpenMP/omp-loop-association.f90 index de7c9cb..8a28fd8 100644 --- a/flang/test/Semantics/omp-loop-association.f90 +++ b/flang/test/Semantics/OpenMP/omp-loop-association.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_errors.py %s %flang -fopenmp +! RUN: %python %S/../test_errors.py %s %flang -fopenmp ! Check the association between OpenMPLoopConstruct and DoConstruct diff --git a/flang/test/Semantics/omp-loop-simd01.f90 b/flang/test/Semantics/OpenMP/omp-loop-simd01.f90 similarity index 86% rename from flang/test/Semantics/omp-loop-simd01.f90 rename to flang/test/Semantics/OpenMP/omp-loop-simd01.f90 index 0146a01..1887864 100644 --- a/flang/test/Semantics/omp-loop-simd01.f90 +++ b/flang/test/Semantics/OpenMP/omp-loop-simd01.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_errors.py %s %flang -fopenmp +! RUN: %python %S/../test_errors.py %s %flang -fopenmp ! OpenMP Version 4.5 ! 2.8.3 Loop simd Construct diff --git a/flang/test/Semantics/OpenMP/omp-modfile-threadprivate.f90 b/flang/test/Semantics/OpenMP/omp-modfile-threadprivate.f90 new file mode 100644 index 0000000..74147c0 --- /dev/null +++ b/flang/test/Semantics/OpenMP/omp-modfile-threadprivate.f90 @@ -0,0 +1,35 @@ +! RUN: %python %S/../test_modfile.py %s %flang_fc1 -fopenmp +! Check correct modfile generation for OpenMP threadprivate directive. + +module m + implicit none + type :: my_type(kind_param, len_param) + integer, KIND :: kind_param + integer, LEN :: len_param + integer :: t_i + integer :: t_arr(10) + end type + type(my_type(kind_param=2, len_param=4)) :: t + real, dimension(3) :: thrtest + real :: x + common /blk/ x + + !$omp threadprivate(thrtest, t, /blk/) +end + +!Expect: m.mod +!module m +!type::my_type(kind_param,len_param) +!integer(4),kind::kind_param +!integer(4),len::len_param +!integer(4)::t_i +!integer(4)::t_arr(1_8:10_8) +!end type +!type(my_type(kind_param=2_4,len_param=4_4))::t +!!$omp threadprivate(t) +!real(4)::thrtest(1_8:3_8) +!!$omp threadprivate(thrtest) +!real(4)::x +!!$omp threadprivate(x) +!common/blk/x +!end diff --git a/flang/test/Semantics/omp-nested-barrier.f90 b/flang/test/Semantics/OpenMP/omp-nested-barrier.f90 similarity index 98% rename from flang/test/Semantics/omp-nested-barrier.f90 rename to flang/test/Semantics/OpenMP/omp-nested-barrier.f90 index 14bc36d..cad31d7 100644 --- a/flang/test/Semantics/omp-nested-barrier.f90 +++ b/flang/test/Semantics/OpenMP/omp-nested-barrier.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_errors.py %s %flang_fc1 -fopenmp +! RUN: %python %S/../test_errors.py %s %flang_fc1 -fopenmp ! OpenMP Version 4.5 ! Various checks with the nesting of BARRIER construct diff --git a/flang/test/Semantics/omp-nested-cancel.f90 b/flang/test/Semantics/OpenMP/omp-nested-cancel.f90 similarity index 99% rename from flang/test/Semantics/omp-nested-cancel.f90 rename to flang/test/Semantics/OpenMP/omp-nested-cancel.f90 index 97b3dd5..afd94a5 100644 --- a/flang/test/Semantics/omp-nested-cancel.f90 +++ b/flang/test/Semantics/OpenMP/omp-nested-cancel.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_errors.py %s %flang -fopenmp +! RUN: %python %S/../test_errors.py %s %flang -fopenmp ! OpenMP Version 5.0 ! Check OpenMP construct validity for the following directives: diff --git a/flang/test/Semantics/omp-nested-cancellation-point.f90 b/flang/test/Semantics/OpenMP/omp-nested-cancellation-point.f90 similarity index 99% rename from flang/test/Semantics/omp-nested-cancellation-point.f90 rename to flang/test/Semantics/OpenMP/omp-nested-cancellation-point.f90 index e339e803..5392a31 100644 --- a/flang/test/Semantics/omp-nested-cancellation-point.f90 +++ b/flang/test/Semantics/OpenMP/omp-nested-cancellation-point.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_errors.py %s %flang -fopenmp +! RUN: %python %S/../test_errors.py %s %flang -fopenmp ! OpenMP Version 5.0 ! Check OpenMP construct validity for the following directives: diff --git a/flang/test/Semantics/omp-nested-distribute.f90 b/flang/test/Semantics/OpenMP/omp-nested-distribute.f90 similarity index 97% rename from flang/test/Semantics/omp-nested-distribute.f90 rename to flang/test/Semantics/OpenMP/omp-nested-distribute.f90 index 7baffdf..5103790 100644 --- a/flang/test/Semantics/omp-nested-distribute.f90 +++ b/flang/test/Semantics/OpenMP/omp-nested-distribute.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_errors.py %s %flang -fopenmp +! RUN: %python %S/../test_errors.py %s %flang -fopenmp ! Check OpenMP clause validity for the following directives: ! 2.10 Device constructs program main diff --git a/flang/test/Semantics/omp-nested-master.f90 b/flang/test/Semantics/OpenMP/omp-nested-master.f90 similarity index 98% rename from flang/test/Semantics/omp-nested-master.f90 rename to flang/test/Semantics/OpenMP/omp-nested-master.f90 index 0134674..ef7d2ce 100644 --- a/flang/test/Semantics/omp-nested-master.f90 +++ b/flang/test/Semantics/OpenMP/omp-nested-master.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_errors.py %s %flang_fc1 -fopenmp +! RUN: %python %S/../test_errors.py %s %flang_fc1 -fopenmp ! OpenMP Version 4.5 ! Various checks with the nesting of MASTER construct diff --git a/flang/test/Semantics/omp-nested-simd.f90 b/flang/test/Semantics/OpenMP/omp-nested-simd.f90 similarity index 99% rename from flang/test/Semantics/omp-nested-simd.f90 rename to flang/test/Semantics/OpenMP/omp-nested-simd.f90 index 33d5190..4149b6d 100644 --- a/flang/test/Semantics/omp-nested-simd.f90 +++ b/flang/test/Semantics/OpenMP/omp-nested-simd.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_errors.py %s %flang_fc1 -fopenmp +! RUN: %python %S/../test_errors.py %s %flang_fc1 -fopenmp ! OpenMP Version 4.5 ! Various checks with the nesting of SIMD construct diff --git a/flang/test/Semantics/omp-nested-target.f90 b/flang/test/Semantics/OpenMP/omp-nested-target.f90 similarity index 95% rename from flang/test/Semantics/omp-nested-target.f90 rename to flang/test/Semantics/OpenMP/omp-nested-target.f90 index ea061bd..f23cb03 100644 --- a/flang/test/Semantics/omp-nested-target.f90 +++ b/flang/test/Semantics/OpenMP/omp-nested-target.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_errors.py %s %flang_fc1 -fopenmp +! RUN: %python %S/../test_errors.py %s %flang_fc1 -fopenmp ! OpenMP Version 5.0 ! Check OpenMP construct validity for the following directives: diff --git a/flang/test/Semantics/omp-nested-teams.f90 b/flang/test/Semantics/OpenMP/omp-nested-teams.f90 similarity index 98% rename from flang/test/Semantics/omp-nested-teams.f90 rename to flang/test/Semantics/OpenMP/omp-nested-teams.f90 index 465ece4d..80c59e0 100644 --- a/flang/test/Semantics/omp-nested-teams.f90 +++ b/flang/test/Semantics/OpenMP/omp-nested-teams.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_errors.py %s %flang -fopenmp +! RUN: %python %S/../test_errors.py %s %flang -fopenmp ! OpenMP Version 5.0 ! Check OpenMP construct validity for the following directives: diff --git a/flang/test/Semantics/omp-nested01.f90 b/flang/test/Semantics/OpenMP/omp-nested01.f90 similarity index 93% rename from flang/test/Semantics/omp-nested01.f90 rename to flang/test/Semantics/OpenMP/omp-nested01.f90 index 602790c..49c964a 100644 --- a/flang/test/Semantics/omp-nested01.f90 +++ b/flang/test/Semantics/OpenMP/omp-nested01.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_errors.py %s %flang -fopenmp +! RUN: %python %S/../test_errors.py %s %flang -fopenmp ! Check OpenMP 2.17 Nesting of Regions diff --git a/flang/test/Semantics/omp-no-dowhile-in-parallel.f90 b/flang/test/Semantics/OpenMP/omp-no-dowhile-in-parallel.f90 similarity index 89% rename from flang/test/Semantics/omp-no-dowhile-in-parallel.f90 rename to flang/test/Semantics/OpenMP/omp-no-dowhile-in-parallel.f90 index 2cab4a4..fb864fd 100644 --- a/flang/test/Semantics/omp-no-dowhile-in-parallel.f90 +++ b/flang/test/Semantics/OpenMP/omp-no-dowhile-in-parallel.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_errors.py %s %flang -fopenmp +! RUN: %python %S/../test_errors.py %s %flang -fopenmp subroutine bug48308(x,i) real :: x(:) diff --git a/flang/test/Semantics/omp-nontemporal.f90 b/flang/test/Semantics/OpenMP/omp-nontemporal.f90 similarity index 96% rename from flang/test/Semantics/omp-nontemporal.f90 rename to flang/test/Semantics/OpenMP/omp-nontemporal.f90 index ea910be..6d24849 100644 --- a/flang/test/Semantics/omp-nontemporal.f90 +++ b/flang/test/Semantics/OpenMP/omp-nontemporal.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_errors.py %s %flang -fopenmp +! RUN: %python %S/../test_errors.py %s %flang -fopenmp ! REQUIRES: shell ! Check OpenMP clause validity for NONTEMPORAL clause diff --git a/flang/test/Semantics/omp-ordered-simd.f90 b/flang/test/Semantics/OpenMP/omp-ordered-simd.f90 similarity index 98% rename from flang/test/Semantics/omp-ordered-simd.f90 rename to flang/test/Semantics/OpenMP/omp-ordered-simd.f90 index a577572..c33ec74 100644 --- a/flang/test/Semantics/omp-ordered-simd.f90 +++ b/flang/test/Semantics/OpenMP/omp-ordered-simd.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_errors.py %s %flang -fopenmp +! RUN: %python %S/../test_errors.py %s %flang -fopenmp ! OpenMP Version 4.5 ! Various checks with the ordered construct diff --git a/flang/test/Semantics/omp-ordered01.f90 b/flang/test/Semantics/OpenMP/omp-ordered01.f90 similarity index 98% rename from flang/test/Semantics/omp-ordered01.f90 rename to flang/test/Semantics/OpenMP/omp-ordered01.f90 index 948ad41..9433120 100644 --- a/flang/test/Semantics/omp-ordered01.f90 +++ b/flang/test/Semantics/OpenMP/omp-ordered01.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_errors.py %s %flang -fopenmp +! RUN: %python %S/../test_errors.py %s %flang -fopenmp ! OpenMP Version 5.1 ! Check OpenMP construct validity for the following directives: ! 2.19.9 Ordered Construct diff --git a/flang/test/Semantics/omp-ordered02.f90 b/flang/test/Semantics/OpenMP/omp-ordered02.f90 similarity index 98% rename from flang/test/Semantics/omp-ordered02.f90 rename to flang/test/Semantics/OpenMP/omp-ordered02.f90 index 8b89912..ed320c8 100644 --- a/flang/test/Semantics/omp-ordered02.f90 +++ b/flang/test/Semantics/OpenMP/omp-ordered02.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_errors.py %s %flang -fopenmp +! RUN: %python %S/../test_errors.py %s %flang -fopenmp ! OpenMP Version 5.1 ! Check OpenMP construct validity for the following directives: ! 2.19.9 Ordered Construct diff --git a/flang/test/Semantics/omp-ordered03.f90 b/flang/test/Semantics/OpenMP/omp-ordered03.f90 similarity index 98% rename from flang/test/Semantics/omp-ordered03.f90 rename to flang/test/Semantics/OpenMP/omp-ordered03.f90 index 4d8b28c..8dd4d03 100644 --- a/flang/test/Semantics/omp-ordered03.f90 +++ b/flang/test/Semantics/OpenMP/omp-ordered03.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_errors.py %s %flang -fopenmp +! RUN: %python %S/../test_errors.py %s %flang -fopenmp ! OpenMP Version 5.1 ! Check OpenMP construct validity for the following directives: ! 2.19.9 Ordered Construct diff --git a/flang/test/Semantics/omp-parallel-private01.f90 b/flang/test/Semantics/OpenMP/omp-parallel-private01.f90 similarity index 90% rename from flang/test/Semantics/omp-parallel-private01.f90 rename to flang/test/Semantics/OpenMP/omp-parallel-private01.f90 index 210c72f..0f7ffca 100644 --- a/flang/test/Semantics/omp-parallel-private01.f90 +++ b/flang/test/Semantics/OpenMP/omp-parallel-private01.f90 @@ -1,4 +1,4 @@ -!RUN: %python %S/test_errors.py %s %flang -fopenmp +!RUN: %python %S/../test_errors.py %s %flang -fopenmp ! OpenMP Version 4.5 ! 2.15.3.3 parallel private Clause program omp_parallel_private diff --git a/flang/test/Semantics/omp-parallel-private02.f90 b/flang/test/Semantics/OpenMP/omp-parallel-private02.f90 similarity index 90% rename from flang/test/Semantics/omp-parallel-private02.f90 rename to flang/test/Semantics/OpenMP/omp-parallel-private02.f90 index 3af35f77..b649db9 100644 --- a/flang/test/Semantics/omp-parallel-private02.f90 +++ b/flang/test/Semantics/OpenMP/omp-parallel-private02.f90 @@ -1,4 +1,4 @@ -!RUN: %python %S/test_errors.py %s %flang -fopenmp +!RUN: %python %S/../test_errors.py %s %flang -fopenmp ! OpenMP Version 4.5 ! 2.15.3.3 parallel private Clause program omp_parallel_private diff --git a/flang/test/Semantics/omp-parallel-private03.f90 b/flang/test/Semantics/OpenMP/omp-parallel-private03.f90 similarity index 92% rename from flang/test/Semantics/omp-parallel-private03.f90 rename to flang/test/Semantics/OpenMP/omp-parallel-private03.f90 index 5d27781..1ec93e3 100644 --- a/flang/test/Semantics/omp-parallel-private03.f90 +++ b/flang/test/Semantics/OpenMP/omp-parallel-private03.f90 @@ -1,4 +1,4 @@ -!RUN: %python %S/test_errors.py %s %flang -fopenmp +!RUN: %python %S/../test_errors.py %s %flang -fopenmp ! OpenMP Version 4.5 ! 2.15.3.3 parallel private Clause program omp_parallel_private diff --git a/flang/test/Semantics/omp-parallel-private04.f90 b/flang/test/Semantics/OpenMP/omp-parallel-private04.f90 similarity index 92% rename from flang/test/Semantics/omp-parallel-private04.f90 rename to flang/test/Semantics/OpenMP/omp-parallel-private04.f90 index a751657..dbab156 100644 --- a/flang/test/Semantics/omp-parallel-private04.f90 +++ b/flang/test/Semantics/OpenMP/omp-parallel-private04.f90 @@ -1,4 +1,4 @@ -!RUN: %python %S/test_errors.py %s %flang -fopenmp +!RUN: %python %S/../test_errors.py %s %flang -fopenmp ! OpenMP Version 4.5 ! 2.15.3.3 parallel private Clause program omp_parallel_private diff --git a/flang/test/Semantics/omp-parallel-sections01.f90 b/flang/test/Semantics/OpenMP/omp-parallel-sections01.f90 similarity index 98% rename from flang/test/Semantics/omp-parallel-sections01.f90 rename to flang/test/Semantics/OpenMP/omp-parallel-sections01.f90 index b522a31..c5bfbdf 100644 --- a/flang/test/Semantics/omp-parallel-sections01.f90 +++ b/flang/test/Semantics/OpenMP/omp-parallel-sections01.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_errors.py %s %flang -fopenmp +! RUN: %python %S/../test_errors.py %s %flang -fopenmp ! OpenMP version 5.0.0 ! 2.13.3 parallel sections Construct ! The restrictions for the parallel construct and the sections construct apply diff --git a/flang/test/Semantics/omp-parallel-shared01.f90 b/flang/test/Semantics/OpenMP/omp-parallel-shared01.f90 similarity index 90% rename from flang/test/Semantics/omp-parallel-shared01.f90 rename to flang/test/Semantics/OpenMP/omp-parallel-shared01.f90 index 9c3fb71..d9ed9bc 100644 --- a/flang/test/Semantics/omp-parallel-shared01.f90 +++ b/flang/test/Semantics/OpenMP/omp-parallel-shared01.f90 @@ -1,4 +1,4 @@ -!RUN: %python %S/test_errors.py %s %flang -fopenmp +!RUN: %python %S/../test_errors.py %s %flang -fopenmp ! OpenMP Version 4.5 ! 2.15.3.2 parallel shared Clause program omp_parallel_shared diff --git a/flang/test/Semantics/omp-parallel-shared02.f90 b/flang/test/Semantics/OpenMP/omp-parallel-shared02.f90 similarity index 90% rename from flang/test/Semantics/omp-parallel-shared02.f90 rename to flang/test/Semantics/OpenMP/omp-parallel-shared02.f90 index 273a6c8..f46cfa1 100644 --- a/flang/test/Semantics/omp-parallel-shared02.f90 +++ b/flang/test/Semantics/OpenMP/omp-parallel-shared02.f90 @@ -1,4 +1,4 @@ -!RUN: %python %S/test_errors.py %s %flang -fopenmp +!RUN: %python %S/../test_errors.py %s %flang -fopenmp ! OpenMP Version 4.5 ! 2.15.3.2 parallel shared Clause program omp_parallel_shared diff --git a/flang/test/Semantics/omp-parallel-shared03.f90 b/flang/test/Semantics/OpenMP/omp-parallel-shared03.f90 similarity index 92% rename from flang/test/Semantics/omp-parallel-shared03.f90 rename to flang/test/Semantics/OpenMP/omp-parallel-shared03.f90 index 9ff7b24..801ffba 100644 --- a/flang/test/Semantics/omp-parallel-shared03.f90 +++ b/flang/test/Semantics/OpenMP/omp-parallel-shared03.f90 @@ -1,4 +1,4 @@ -!RUN: %python %S/test_errors.py %s %flang -fopenmp +!RUN: %python %S/../test_errors.py %s %flang -fopenmp ! OpenMP Version 4.5 ! 2.15.3.2 parallel shared Clause program omp_parallel_shared diff --git a/flang/test/Semantics/omp-parallel-shared04.f90 b/flang/test/Semantics/OpenMP/omp-parallel-shared04.f90 similarity index 92% rename from flang/test/Semantics/omp-parallel-shared04.f90 rename to flang/test/Semantics/OpenMP/omp-parallel-shared04.f90 index 1ddb758..6f170c6 100644 --- a/flang/test/Semantics/omp-parallel-shared04.f90 +++ b/flang/test/Semantics/OpenMP/omp-parallel-shared04.f90 @@ -1,4 +1,4 @@ -!RUN: %python %S/test_errors.py %s %flang -fopenmp +!RUN: %python %S/../test_errors.py %s %flang -fopenmp ! OpenMP Version 4.5 ! 2.15.3.2 parallel shared Clause program omp_parallel_shared diff --git a/flang/test/Semantics/omp-parallel01.f90 b/flang/test/Semantics/OpenMP/omp-parallel01.f90 similarity index 100% rename from flang/test/Semantics/omp-parallel01.f90 rename to flang/test/Semantics/OpenMP/omp-parallel01.f90 diff --git a/flang/test/Semantics/omp-parallel02.f90 b/flang/test/Semantics/OpenMP/omp-parallel02.f90 similarity index 100% rename from flang/test/Semantics/omp-parallel02.f90 rename to flang/test/Semantics/OpenMP/omp-parallel02.f90 diff --git a/flang/test/Semantics/omp-private-is-pointer-check.f90 b/flang/test/Semantics/OpenMP/omp-private-is-pointer-check.f90 similarity index 100% rename from flang/test/Semantics/omp-private-is-pointer-check.f90 rename to flang/test/Semantics/OpenMP/omp-private-is-pointer-check.f90 diff --git a/flang/test/Semantics/omp-private01.f90 b/flang/test/Semantics/OpenMP/omp-private01.f90 similarity index 88% rename from flang/test/Semantics/omp-private01.f90 rename to flang/test/Semantics/OpenMP/omp-private01.f90 index e5cc4ba..052823a 100644 --- a/flang/test/Semantics/omp-private01.f90 +++ b/flang/test/Semantics/OpenMP/omp-private01.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_errors.py %s %flang -fopenmp +! RUN: %python %S/../test_errors.py %s %flang -fopenmp ! OpenMP Version 4.5 ! 2.15.3.3 private Clause ! Pointers with the INTENT(IN) attribute may not appear in a private clause. diff --git a/flang/test/Semantics/omp-private02.f90 b/flang/test/Semantics/OpenMP/omp-private02.f90 similarity index 94% rename from flang/test/Semantics/omp-private02.f90 rename to flang/test/Semantics/OpenMP/omp-private02.f90 index fbc1da8..a81e319 100644 --- a/flang/test/Semantics/omp-private02.f90 +++ b/flang/test/Semantics/OpenMP/omp-private02.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_errors.py %s %flang -fopenmp +! RUN: %python %S/../test_errors.py %s %flang -fopenmp ! OpenMP Version 4.5 ! 2.15.3.3 private Clause ! Variables that appear in namelist statements may not appear in a private clause. diff --git a/flang/test/Semantics/omp-reduction01.f90 b/flang/test/Semantics/OpenMP/omp-reduction01.f90 similarity index 83% rename from flang/test/Semantics/omp-reduction01.f90 rename to flang/test/Semantics/OpenMP/omp-reduction01.f90 index 85e8669..0e1a8a5 100644 --- a/flang/test/Semantics/omp-reduction01.f90 +++ b/flang/test/Semantics/OpenMP/omp-reduction01.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_errors.py %s %flang_fc1 -fopenmp +! RUN: %python %S/../test_errors.py %s %flang_fc1 -fopenmp ! OpenMP Version 4.5 ! 2.15.3.6 Reduction Clause program omp_reduction diff --git a/flang/test/Semantics/omp-reduction02.f90 b/flang/test/Semantics/OpenMP/omp-reduction02.f90 similarity index 94% rename from flang/test/Semantics/omp-reduction02.f90 rename to flang/test/Semantics/OpenMP/omp-reduction02.f90 index 6343814..b96dd06 100644 --- a/flang/test/Semantics/omp-reduction02.f90 +++ b/flang/test/Semantics/OpenMP/omp-reduction02.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_errors.py %s %flang_fc1 -fopenmp +! RUN: %python %S/../test_errors.py %s %flang_fc1 -fopenmp ! OpenMP Version 4.5 ! 2.15.3.6 Reduction Clause program omp_reduction diff --git a/flang/test/Semantics/omp-reduction03.f90 b/flang/test/Semantics/OpenMP/omp-reduction03.f90 similarity index 85% rename from flang/test/Semantics/omp-reduction03.f90 rename to flang/test/Semantics/OpenMP/omp-reduction03.f90 index 7741579..1ddc290 100644 --- a/flang/test/Semantics/omp-reduction03.f90 +++ b/flang/test/Semantics/OpenMP/omp-reduction03.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_errors.py %s %flang_fc1 -fopenmp +! RUN: %python %S/../test_errors.py %s %flang_fc1 -fopenmp ! OpenMP Version 4.5 ! 2.15.3.6 Reduction Clause diff --git a/flang/test/Semantics/omp-reduction04.f90 b/flang/test/Semantics/OpenMP/omp-reduction04.f90 similarity index 89% rename from flang/test/Semantics/omp-reduction04.f90 rename to flang/test/Semantics/OpenMP/omp-reduction04.f90 index 0a8a306..eb96752 100644 --- a/flang/test/Semantics/omp-reduction04.f90 +++ b/flang/test/Semantics/OpenMP/omp-reduction04.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_errors.py %s %flang_fc1 -fopenmp +! RUN: %python %S/../test_errors.py %s %flang_fc1 -fopenmp ! OpenMP Version 4.5 ! 2.15.3.6 Reduction Clause program omp_Reduction diff --git a/flang/test/Semantics/omp-reduction05.f90 b/flang/test/Semantics/OpenMP/omp-reduction05.f90 similarity index 93% rename from flang/test/Semantics/omp-reduction05.f90 rename to flang/test/Semantics/OpenMP/omp-reduction05.f90 index 2281060..aa115ed 100644 --- a/flang/test/Semantics/omp-reduction05.f90 +++ b/flang/test/Semantics/OpenMP/omp-reduction05.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_errors.py %s %flang_fc1 -fopenmp +! RUN: %python %S/../test_errors.py %s %flang_fc1 -fopenmp ! OpenMP Version 4.5 ! 2.15.3.6 Reduction Clause diff --git a/flang/test/Semantics/omp-reduction06.f90 b/flang/test/Semantics/OpenMP/omp-reduction06.f90 similarity index 93% rename from flang/test/Semantics/omp-reduction06.f90 rename to flang/test/Semantics/OpenMP/omp-reduction06.f90 index 50b1736..58290c6 100644 --- a/flang/test/Semantics/omp-reduction06.f90 +++ b/flang/test/Semantics/OpenMP/omp-reduction06.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_errors.py %s %flang_fc1 -fopenmp +! RUN: %python %S/../test_errors.py %s %flang_fc1 -fopenmp ! OpenMP Version 4.5 ! 2.15.3.6 Reduction Clause diff --git a/flang/test/Semantics/omp-reduction07.f90 b/flang/test/Semantics/OpenMP/omp-reduction07.f90 similarity index 98% rename from flang/test/Semantics/omp-reduction07.f90 rename to flang/test/Semantics/OpenMP/omp-reduction07.f90 index 74178a9..a9aaa0a 100644 --- a/flang/test/Semantics/omp-reduction07.f90 +++ b/flang/test/Semantics/OpenMP/omp-reduction07.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_errors.py %s %flang_fc1 -fopenmp +! RUN: %python %S/../test_errors.py %s %flang_fc1 -fopenmp ! OpenMP Version 4.5 ! 2.15.3.6 Reduction Clause program omp_reduction diff --git a/flang/test/Semantics/omp-reduction08.f90 b/flang/test/Semantics/OpenMP/omp-reduction08.f90 similarity index 97% rename from flang/test/Semantics/omp-reduction08.f90 rename to flang/test/Semantics/OpenMP/omp-reduction08.f90 index e46585a..2fdc7f6 100644 --- a/flang/test/Semantics/omp-reduction08.f90 +++ b/flang/test/Semantics/OpenMP/omp-reduction08.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_symbols.py %s %flang_fc1 -fopenmp +! RUN: %python %S/../test_symbols.py %s %flang_fc1 -fopenmp ! OpenMP Version 4.5 ! 2.15.3.6 Reduction Clause Positive cases diff --git a/flang/test/Semantics/omp-reduction09.f90 b/flang/test/Semantics/OpenMP/omp-reduction09.f90 similarity index 97% rename from flang/test/Semantics/omp-reduction09.f90 rename to flang/test/Semantics/OpenMP/omp-reduction09.f90 index e1ca4b0..c8d4c44 100644 --- a/flang/test/Semantics/omp-reduction09.f90 +++ b/flang/test/Semantics/OpenMP/omp-reduction09.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_symbols.py %s %flang_fc1 -fopenmp +! RUN: %python %S/../test_symbols.py %s %flang_fc1 -fopenmp ! OpenMP Version 4.5 ! 2.15.3.6 Reduction Clause Positive cases. !DEF: /omp_reduction MainProgram diff --git a/flang/test/Semantics/omp-reduction10.f90 b/flang/test/Semantics/OpenMP/omp-reduction10.f90 similarity index 83% rename from flang/test/Semantics/omp-reduction10.f90 rename to flang/test/Semantics/OpenMP/omp-reduction10.f90 index 96e0b50..0f94594 100644 --- a/flang/test/Semantics/omp-reduction10.f90 +++ b/flang/test/Semantics/OpenMP/omp-reduction10.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_errors.py %s %flang_fc1 -fopenmp +! RUN: %python %S/../test_errors.py %s %flang_fc1 -fopenmp ! OpenMP Version 4.5 ! 2.15.3.6 Reduction Clause program omp_reduction diff --git a/flang/test/Semantics/omp-resolve01.f90 b/flang/test/Semantics/OpenMP/omp-resolve01.f90 similarity index 86% rename from flang/test/Semantics/omp-resolve01.f90 rename to flang/test/Semantics/OpenMP/omp-resolve01.f90 index b716c4a..79b6788 100644 --- a/flang/test/Semantics/omp-resolve01.f90 +++ b/flang/test/Semantics/OpenMP/omp-resolve01.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_errors.py %s %flang -fopenmp +! RUN: %python %S/../test_errors.py %s %flang -fopenmp ! 2.4 An array section designates a subset of the elements in an array. Although ! Substring shares similar syntax but cannot be treated as valid array section. diff --git a/flang/test/Semantics/omp-resolve02.f90 b/flang/test/Semantics/OpenMP/omp-resolve02.f90 similarity index 88% rename from flang/test/Semantics/omp-resolve02.f90 rename to flang/test/Semantics/OpenMP/omp-resolve02.f90 index 0bbf779..7c3d633 100644 --- a/flang/test/Semantics/omp-resolve02.f90 +++ b/flang/test/Semantics/OpenMP/omp-resolve02.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_errors.py %s %flang -fopenmp +! RUN: %python %S/../test_errors.py %s %flang -fopenmp ! Test the effect to name resolution from illegal clause diff --git a/flang/test/Semantics/omp-resolve03.f90 b/flang/test/Semantics/OpenMP/omp-resolve03.f90 similarity index 91% rename from flang/test/Semantics/omp-resolve03.f90 rename to flang/test/Semantics/OpenMP/omp-resolve03.f90 index 58fc4d5..b9306c4 100644 --- a/flang/test/Semantics/omp-resolve03.f90 +++ b/flang/test/Semantics/OpenMP/omp-resolve03.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_errors.py %s %flang -fopenmp +! RUN: %python %S/../test_errors.py %s %flang -fopenmp ! 2.15.3 Although variables in common blocks can be accessed by use association ! or host association, common block names cannot. As a result, a common block diff --git a/flang/test/Semantics/omp-resolve04.f90 b/flang/test/Semantics/OpenMP/omp-resolve04.f90 similarity index 89% rename from flang/test/Semantics/omp-resolve04.f90 rename to flang/test/Semantics/OpenMP/omp-resolve04.f90 index 147dc1a..7c61950 100644 --- a/flang/test/Semantics/omp-resolve04.f90 +++ b/flang/test/Semantics/OpenMP/omp-resolve04.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_errors.py %s %flang -fopenmp +! RUN: %python %S/../test_errors.py %s %flang -fopenmp ! 2.15.3 Data-Sharing Attribute Clauses ! A list item that specifies a given variable may not appear in more than diff --git a/flang/test/Semantics/omp-resolve05.f90 b/flang/test/Semantics/OpenMP/omp-resolve05.f90 similarity index 90% rename from flang/test/Semantics/omp-resolve05.f90 rename to flang/test/Semantics/OpenMP/omp-resolve05.f90 index a54feae..509e67b 100644 --- a/flang/test/Semantics/omp-resolve05.f90 +++ b/flang/test/Semantics/OpenMP/omp-resolve05.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_errors.py %s %flang -fopenmp +! RUN: %python %S/../test_errors.py %s %flang -fopenmp ! 2.15.3 Data-Sharing Attribute Clauses ! 2.15.3.1 default Clause diff --git a/flang/test/Semantics/omp-resolve06.f90 b/flang/test/Semantics/OpenMP/omp-resolve06.f90 similarity index 97% rename from flang/test/Semantics/omp-resolve06.f90 rename to flang/test/Semantics/OpenMP/omp-resolve06.f90 index 4711b00..1afc740 100644 --- a/flang/test/Semantics/omp-resolve06.f90 +++ b/flang/test/Semantics/OpenMP/omp-resolve06.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_errors.py %s %flang_fc1 -fopenmp +! RUN: %python %S/../test_errors.py %s %flang_fc1 -fopenmp use omp_lib !2.11.4 Allocate Clause !For any list item that is specified in the allocate diff --git a/flang/test/Semantics/omp-sections01.f90 b/flang/test/Semantics/OpenMP/omp-sections01.f90 similarity index 86% rename from flang/test/Semantics/omp-sections01.f90 rename to flang/test/Semantics/OpenMP/omp-sections01.f90 index 4ea7593..c26cc88 100644 --- a/flang/test/Semantics/omp-sections01.f90 +++ b/flang/test/Semantics/OpenMP/omp-sections01.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_errors.py %s %flang -fopenmp +! RUN: %python %S/../test_errors.py %s %flang -fopenmp ! OpenMP Version 4.5 ! 2.7.2 sections Construct diff --git a/flang/test/Semantics/omp-sections02.f90 b/flang/test/Semantics/OpenMP/omp-sections02.f90 similarity index 98% rename from flang/test/Semantics/omp-sections02.f90 rename to flang/test/Semantics/OpenMP/omp-sections02.f90 index c159780..bcdeb05 100644 --- a/flang/test/Semantics/omp-sections02.f90 +++ b/flang/test/Semantics/OpenMP/omp-sections02.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_errors.py %s %flang -fopenmp +! RUN: %python %S/../test_errors.py %s %flang -fopenmp ! OpenMP version 5.0.0 ! 2.8.1 sections construct ! The code enclosed in a sections construct must be a structured block. diff --git a/flang/test/Semantics/omp-sections03.f90 b/flang/test/Semantics/OpenMP/omp-sections03.f90 similarity index 94% rename from flang/test/Semantics/omp-sections03.f90 rename to flang/test/Semantics/OpenMP/omp-sections03.f90 index 35c1711..6977501 100644 --- a/flang/test/Semantics/omp-sections03.f90 +++ b/flang/test/Semantics/OpenMP/omp-sections03.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_errors.py %s %flang -fopenmp +! RUN: %python %S/../test_errors.py %s %flang -fopenmp !XFAIL: * ! OpenMP version 5.0.0 ! 2.8.1 sections construct diff --git a/flang/test/Semantics/omp-simd-aligned.f90 b/flang/test/Semantics/OpenMP/omp-simd-aligned.f90 similarity index 94% rename from flang/test/Semantics/omp-simd-aligned.f90 rename to flang/test/Semantics/OpenMP/omp-simd-aligned.f90 index 3870e21..9b42118 100644 --- a/flang/test/Semantics/omp-simd-aligned.f90 +++ b/flang/test/Semantics/OpenMP/omp-simd-aligned.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_errors.py %s %flang -fopenmp +! RUN: %python %S/../test_errors.py %s %flang -fopenmp ! OpenMP Version 4.5 ! 2.8.1 simd Construct diff --git a/flang/test/Semantics/omp-simd-nontemporal.f90 b/flang/test/Semantics/OpenMP/omp-simd-nontemporal.f90 similarity index 96% rename from flang/test/Semantics/omp-simd-nontemporal.f90 rename to flang/test/Semantics/OpenMP/omp-simd-nontemporal.f90 index a6b7123..a488edd 100644 --- a/flang/test/Semantics/omp-simd-nontemporal.f90 +++ b/flang/test/Semantics/OpenMP/omp-simd-nontemporal.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_errors.py %s %flang -fopenmp +! RUN: %python %S/../test_errors.py %s %flang -fopenmp ! OpenMP Version 4.5 ! 2.8.1 simd Construct diff --git a/flang/test/Semantics/omp-simd01.f90 b/flang/test/Semantics/OpenMP/omp-simd01.f90 similarity index 94% rename from flang/test/Semantics/omp-simd01.f90 rename to flang/test/Semantics/OpenMP/omp-simd01.f90 index 4fa166b..1aa2880 100644 --- a/flang/test/Semantics/omp-simd01.f90 +++ b/flang/test/Semantics/OpenMP/omp-simd01.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_errors.py %s %flang -fopenmp +! RUN: %python %S/../test_errors.py %s %flang -fopenmp ! OpenMP Version 5.0 ! 2.9.3.1 simd Construct ! - A program that branches into or out of a simd region is non-conforming. diff --git a/flang/test/Semantics/omp-simd02.f90 b/flang/test/Semantics/OpenMP/omp-simd02.f90 similarity index 83% rename from flang/test/Semantics/omp-simd02.f90 rename to flang/test/Semantics/OpenMP/omp-simd02.f90 index 0ac71c6..a627e2a 100644 --- a/flang/test/Semantics/omp-simd02.f90 +++ b/flang/test/Semantics/OpenMP/omp-simd02.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_errors.py %s %flang -fopenmp +! RUN: %python %S/../test_errors.py %s %flang -fopenmp ! OpenMP Version 4.5 ! 2.8.1 simd Construct diff --git a/flang/test/Semantics/omp-simd03.f90 b/flang/test/Semantics/OpenMP/omp-simd03.f90 similarity index 100% rename from flang/test/Semantics/omp-simd03.f90 rename to flang/test/Semantics/OpenMP/omp-simd03.f90 diff --git a/flang/test/Semantics/omp-single01.f90 b/flang/test/Semantics/OpenMP/omp-single01.f90 similarity index 85% rename from flang/test/Semantics/omp-single01.f90 rename to flang/test/Semantics/OpenMP/omp-single01.f90 index a129409..2e40bec 100644 --- a/flang/test/Semantics/omp-single01.f90 +++ b/flang/test/Semantics/OpenMP/omp-single01.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_errors.py %s %flang_fc1 -fopenmp +! RUN: %python %S/../test_errors.py %s %flang_fc1 -fopenmp ! OpenMP Version 4.5 ! 2.7.3 single Construct ! Symbol present on multiple clauses diff --git a/flang/test/Semantics/omp-single02.f90 b/flang/test/Semantics/OpenMP/omp-single02.f90 similarity index 86% rename from flang/test/Semantics/omp-single02.f90 rename to flang/test/Semantics/OpenMP/omp-single02.f90 index cd80e7c..03cf7fb 100644 --- a/flang/test/Semantics/omp-single02.f90 +++ b/flang/test/Semantics/OpenMP/omp-single02.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_errors.py %s %flang_fc1 -fopenmp +! RUN: %python %S/../test_errors.py %s %flang_fc1 -fopenmp ! OpenMP Version 4.5 ! 2.7.3 single Construct ! Copyprivate variable is not thread private or private in outer context diff --git a/flang/test/Semantics/omp-symbol01.f90 b/flang/test/Semantics/OpenMP/omp-symbol01.f90 similarity index 96% rename from flang/test/Semantics/omp-symbol01.f90 rename to flang/test/Semantics/OpenMP/omp-symbol01.f90 index 06d5d7c..cff2ecb 100644 --- a/flang/test/Semantics/omp-symbol01.f90 +++ b/flang/test/Semantics/OpenMP/omp-symbol01.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_symbols.py %s %flang_fc1 -fopenmp +! RUN: %python %S/../test_symbols.py %s %flang_fc1 -fopenmp ! Test clauses that accept list. ! 2.1 Directive Format diff --git a/flang/test/Semantics/omp-symbol02.f90 b/flang/test/Semantics/OpenMP/omp-symbol02.f90 similarity index 92% rename from flang/test/Semantics/omp-symbol02.f90 rename to flang/test/Semantics/OpenMP/omp-symbol02.f90 index de36505..d1c4998 100644 --- a/flang/test/Semantics/omp-symbol02.f90 +++ b/flang/test/Semantics/OpenMP/omp-symbol02.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_symbols.py %s %flang_fc1 -fopenmp +! RUN: %python %S/../test_symbols.py %s %flang_fc1 -fopenmp ! 1.4.1 Structure of the OpenMP Memory Model diff --git a/flang/test/Semantics/omp-symbol03.f90 b/flang/test/Semantics/OpenMP/omp-symbol03.f90 similarity index 92% rename from flang/test/Semantics/omp-symbol03.f90 rename to flang/test/Semantics/OpenMP/omp-symbol03.f90 index 4c37c5a..e6ba7de 100644 --- a/flang/test/Semantics/omp-symbol03.f90 +++ b/flang/test/Semantics/OpenMP/omp-symbol03.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_symbols.py %s %flang_fc1 -fopenmp +! RUN: %python %S/../test_symbols.py %s %flang_fc1 -fopenmp ! 1.4.1 Structure of the OpenMP Memory Model ! In the inner OpenMP region, SHARED `a` refers to the `a` in the outer OpenMP diff --git a/flang/test/Semantics/omp-symbol04.f90 b/flang/test/Semantics/OpenMP/omp-symbol04.f90 similarity index 91% rename from flang/test/Semantics/omp-symbol04.f90 rename to flang/test/Semantics/OpenMP/omp-symbol04.f90 index cf892a9..d49524c 100644 --- a/flang/test/Semantics/omp-symbol04.f90 +++ b/flang/test/Semantics/OpenMP/omp-symbol04.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_symbols.py %s %flang_fc1 -fopenmp +! RUN: %python %S/../test_symbols.py %s %flang_fc1 -fopenmp ! 2.15.3 Data-Sharing Attribute Clauses ! Both PARALLEL and DO (worksharing) directives need to create new scope, diff --git a/flang/test/Semantics/omp-symbol05.f90 b/flang/test/Semantics/OpenMP/omp-symbol05.f90 similarity index 94% rename from flang/test/Semantics/omp-symbol05.f90 rename to flang/test/Semantics/OpenMP/omp-symbol05.f90 index 72be56f..a1c0e55 100644 --- a/flang/test/Semantics/omp-symbol05.f90 +++ b/flang/test/Semantics/OpenMP/omp-symbol05.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_symbols.py %s %flang_fc1 -fopenmp +! RUN: %python %S/../test_symbols.py %s %flang_fc1 -fopenmp ! 2.15.2 threadprivate Directive ! The threadprivate directive specifies that variables are replicated, diff --git a/flang/test/Semantics/omp-symbol06.f90 b/flang/test/Semantics/OpenMP/omp-symbol06.f90 similarity index 90% rename from flang/test/Semantics/omp-symbol06.f90 rename to flang/test/Semantics/OpenMP/omp-symbol06.f90 index 5b6621f..37d9243 100644 --- a/flang/test/Semantics/omp-symbol06.f90 +++ b/flang/test/Semantics/OpenMP/omp-symbol06.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_symbols.py %s %flang_fc1 -fopenmp +! RUN: %python %S/../test_symbols.py %s %flang_fc1 -fopenmp ! 2.15.3 Data-Sharing Attribute Clauses ! A list item that specifies a given variable may not appear in more than diff --git a/flang/test/Semantics/omp-symbol07.f90 b/flang/test/Semantics/OpenMP/omp-symbol07.f90 similarity index 94% rename from flang/test/Semantics/omp-symbol07.f90 rename to flang/test/Semantics/OpenMP/omp-symbol07.f90 index 0d88276..ed44e13 100644 --- a/flang/test/Semantics/omp-symbol07.f90 +++ b/flang/test/Semantics/OpenMP/omp-symbol07.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_symbols.py %s %flang_fc1 -fopenmp +! RUN: %python %S/../test_symbols.py %s %flang_fc1 -fopenmp ! Generic tests ! 1. subroutine or function calls should not be fixed for DSA or DMA diff --git a/flang/test/Semantics/omp-symbol08.f90 b/flang/test/Semantics/OpenMP/omp-symbol08.f90 similarity index 99% rename from flang/test/Semantics/omp-symbol08.f90 rename to flang/test/Semantics/OpenMP/omp-symbol08.f90 index 25b49ee..ab3988b 100644 --- a/flang/test/Semantics/omp-symbol08.f90 +++ b/flang/test/Semantics/OpenMP/omp-symbol08.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_symbols.py %s %flang_fc1 -fopenmp +! RUN: %python %S/../test_symbols.py %s %flang_fc1 -fopenmp ! 2.15.1.1 Predetermined rules for associated do-loops index variable ! a) The loop iteration variable(s) in the associated do-loop(s) of a do, diff --git a/flang/test/Semantics/omp-sync-critical01.f90 b/flang/test/Semantics/OpenMP/omp-sync-critical01.f90 similarity index 93% rename from flang/test/Semantics/omp-sync-critical01.f90 rename to flang/test/Semantics/OpenMP/omp-sync-critical01.f90 index 7c80076..b597eb1 100644 --- a/flang/test/Semantics/omp-sync-critical01.f90 +++ b/flang/test/Semantics/OpenMP/omp-sync-critical01.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_errors.py %s %flang -fopenmp +! RUN: %python %S/../test_errors.py %s %flang -fopenmp ! OpenMP Version 5.0 ! 2.17.1 critical construct diff --git a/flang/test/Semantics/omp-sync-critical02.f90 b/flang/test/Semantics/OpenMP/omp-sync-critical02.f90 similarity index 96% rename from flang/test/Semantics/omp-sync-critical02.f90 rename to flang/test/Semantics/OpenMP/omp-sync-critical02.f90 index cf78a3c..dac031f 100644 --- a/flang/test/Semantics/omp-sync-critical02.f90 +++ b/flang/test/Semantics/OpenMP/omp-sync-critical02.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_errors.py %s %flang -fopenmp +! RUN: %python %S/../test_errors.py %s %flang -fopenmp ! OpenMP Version 5.0 ! 2.17.1 critical construct diff --git a/flang/test/Semantics/omp-task01.f90 b/flang/test/Semantics/OpenMP/omp-task01.f90 similarity index 100% rename from flang/test/Semantics/omp-task01.f90 rename to flang/test/Semantics/OpenMP/omp-task01.f90 diff --git a/flang/test/Semantics/omp-taskgroup01.f90 b/flang/test/Semantics/OpenMP/omp-taskgroup01.f90 similarity index 94% rename from flang/test/Semantics/omp-taskgroup01.f90 rename to flang/test/Semantics/OpenMP/omp-taskgroup01.f90 index c220c66..a249412 100644 --- a/flang/test/Semantics/omp-taskgroup01.f90 +++ b/flang/test/Semantics/OpenMP/omp-taskgroup01.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_errors.py %s %flang -fopenmp +! RUN: %python %S/../test_errors.py %s %flang -fopenmp use omp_lib implicit none diff --git a/flang/test/Semantics/omp-taskloop-simd01.f90 b/flang/test/Semantics/OpenMP/omp-taskloop-simd01.f90 similarity index 82% rename from flang/test/Semantics/omp-taskloop-simd01.f90 rename to flang/test/Semantics/OpenMP/omp-taskloop-simd01.f90 index e0ca7cf..bb7266a5 100644 --- a/flang/test/Semantics/omp-taskloop-simd01.f90 +++ b/flang/test/Semantics/OpenMP/omp-taskloop-simd01.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_errors.py %s %flang -fopenmp +! RUN: %python %S/../test_errors.py %s %flang -fopenmp ! OpenMP Version 5.0 ! 2.10.3 taskloop simd Construct diff --git a/flang/test/Semantics/omp-taskloop01.f90 b/flang/test/Semantics/OpenMP/omp-taskloop01.f90 similarity index 87% rename from flang/test/Semantics/omp-taskloop01.f90 rename to flang/test/Semantics/OpenMP/omp-taskloop01.f90 index 14be62e..6bef584 100644 --- a/flang/test/Semantics/omp-taskloop01.f90 +++ b/flang/test/Semantics/OpenMP/omp-taskloop01.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_errors.py %s %flang -fopenmp +! RUN: %python %S/../test_errors.py %s %flang -fopenmp ! OpenMP Version 4.5 ! 2.9.2 taskloop Construct diff --git a/flang/test/Semantics/omp-taskloop02.f90 b/flang/test/Semantics/OpenMP/omp-taskloop02.f90 similarity index 100% rename from flang/test/Semantics/omp-taskloop02.f90 rename to flang/test/Semantics/OpenMP/omp-taskloop02.f90 diff --git a/flang/test/Semantics/omp-taskloop03.f90 b/flang/test/Semantics/OpenMP/omp-taskloop03.f90 similarity index 100% rename from flang/test/Semantics/omp-taskloop03.f90 rename to flang/test/Semantics/OpenMP/omp-taskloop03.f90 diff --git a/flang/test/Semantics/omp-threadprivate01.f90 b/flang/test/Semantics/OpenMP/omp-threadprivate01.f90 similarity index 96% rename from flang/test/Semantics/omp-threadprivate01.f90 rename to flang/test/Semantics/OpenMP/omp-threadprivate01.f90 index 95175f0..309d209 100644 --- a/flang/test/Semantics/omp-threadprivate01.f90 +++ b/flang/test/Semantics/OpenMP/omp-threadprivate01.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_errors.py %s %flang_fc1 -fopenmp +! RUN: %python %S/../test_errors.py %s %flang_fc1 -fopenmp ! OpenMP Version 5.1 ! Check OpenMP construct validity for the following directives: ! 2.21.2 Threadprivate Directive diff --git a/flang/test/Semantics/omp-threadprivate02.f90 b/flang/test/Semantics/OpenMP/omp-threadprivate02.f90 similarity index 97% rename from flang/test/Semantics/omp-threadprivate02.f90 rename to flang/test/Semantics/OpenMP/omp-threadprivate02.f90 index 5978a8e..7f6e8dc 100644 --- a/flang/test/Semantics/omp-threadprivate02.f90 +++ b/flang/test/Semantics/OpenMP/omp-threadprivate02.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_errors.py %s %flang_fc1 -fopenmp +! RUN: %python %S/../test_errors.py %s %flang_fc1 -fopenmp ! OpenMP Version 5.1 ! Check OpenMP construct validity for the following directives: ! 2.21.2 Threadprivate Directive diff --git a/flang/test/Semantics/omp-threadprivate03.f90 b/flang/test/Semantics/OpenMP/omp-threadprivate03.f90 similarity index 91% rename from flang/test/Semantics/omp-threadprivate03.f90 rename to flang/test/Semantics/OpenMP/omp-threadprivate03.f90 index 5a9e0db..d5ce4a9 100644 --- a/flang/test/Semantics/omp-threadprivate03.f90 +++ b/flang/test/Semantics/OpenMP/omp-threadprivate03.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_errors.py %s %flang_fc1 -fopenmp +! RUN: %python %S/../test_errors.py %s %flang_fc1 -fopenmp ! OpenMP Version 5.1 ! Check OpenMP construct validity for the following directives: ! 2.21.2 Threadprivate Directive diff --git a/flang/test/Semantics/omp-threadprivate04.f90 b/flang/test/Semantics/OpenMP/omp-threadprivate04.f90 similarity index 95% rename from flang/test/Semantics/omp-threadprivate04.f90 rename to flang/test/Semantics/OpenMP/omp-threadprivate04.f90 index 45684fc..2612e9d 100644 --- a/flang/test/Semantics/omp-threadprivate04.f90 +++ b/flang/test/Semantics/OpenMP/omp-threadprivate04.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_errors.py %s %flang_fc1 -fopenmp +! RUN: %python %S/../test_errors.py %s %flang_fc1 -fopenmp ! OpenMP Version 5.1 ! Check OpenMP construct validity for the following directives: ! 2.21.2 Threadprivate Directive diff --git a/flang/test/Semantics/omp-threadprivate05.f90 b/flang/test/Semantics/OpenMP/omp-threadprivate05.f90 similarity index 95% rename from flang/test/Semantics/omp-threadprivate05.f90 rename to flang/test/Semantics/OpenMP/omp-threadprivate05.f90 index 610b6b2..cdbf370 100644 --- a/flang/test/Semantics/omp-threadprivate05.f90 +++ b/flang/test/Semantics/OpenMP/omp-threadprivate05.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_errors.py %s %flang_fc1 -fopenmp +! RUN: %python %S/../test_errors.py %s %flang_fc1 -fopenmp ! OpenMP Version 5.1 ! Check OpenMP construct validity for the following directives: ! 2.21.2 Threadprivate Directive diff --git a/flang/test/Semantics/omp-workshare01.f90 b/flang/test/Semantics/OpenMP/omp-workshare01.f90 similarity index 94% rename from flang/test/Semantics/omp-workshare01.f90 rename to flang/test/Semantics/OpenMP/omp-workshare01.f90 index 52d65bb..9667a30 100644 --- a/flang/test/Semantics/omp-workshare01.f90 +++ b/flang/test/Semantics/OpenMP/omp-workshare01.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_errors.py %s %flang -fopenmp +! RUN: %python %S/../test_errors.py %s %flang -fopenmp ! OpenMP Version 4.5 ! 2.7.4 workshare Construct ! Invalid do construct inside !$omp workshare diff --git a/flang/test/Semantics/omp-workshare02.f90 b/flang/test/Semantics/OpenMP/omp-workshare02.f90 similarity index 97% rename from flang/test/Semantics/omp-workshare02.f90 rename to flang/test/Semantics/OpenMP/omp-workshare02.f90 index c53b323..e099ecb 100644 --- a/flang/test/Semantics/omp-workshare02.f90 +++ b/flang/test/Semantics/OpenMP/omp-workshare02.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_errors.py %s %flang -fopenmp +! RUN: %python %S/../test_errors.py %s %flang -fopenmp ! OpenMP Version 4.5 ! 2.7.4 workshare Construct ! The !omp workshare construct must not contain any user defined diff --git a/flang/test/Semantics/omp-workshare03.f90 b/flang/test/Semantics/OpenMP/omp-workshare03.f90 similarity index 92% rename from flang/test/Semantics/omp-workshare03.f90 rename to flang/test/Semantics/OpenMP/omp-workshare03.f90 index e8e2241..09d46ab 100644 --- a/flang/test/Semantics/omp-workshare03.f90 +++ b/flang/test/Semantics/OpenMP/omp-workshare03.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_errors.py %s %flang -fopenmp +! RUN: %python %S/../test_errors.py %s %flang -fopenmp ! OpenMP Version 4.5 ! 2.7.4 workshare Construct ! All array assignments, scalar assignments, and masked array assignments diff --git a/flang/test/Semantics/omp-workshare04.f90 b/flang/test/Semantics/OpenMP/omp-workshare04.f90 similarity index 96% rename from flang/test/Semantics/omp-workshare04.f90 rename to flang/test/Semantics/OpenMP/omp-workshare04.f90 index 0c1e2b1..0ec635e 100644 --- a/flang/test/Semantics/omp-workshare04.f90 +++ b/flang/test/Semantics/OpenMP/omp-workshare04.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_errors.py %s %flang -fopenmp +! RUN: %python %S/../test_errors.py %s %flang -fopenmp ! OpenMP Version 4.5 ! 2.7.4 workshare Construct ! Checks for OpenMP Workshare construct diff --git a/flang/test/Semantics/omp-workshare05.f90 b/flang/test/Semantics/OpenMP/omp-workshare05.f90 similarity index 95% rename from flang/test/Semantics/omp-workshare05.f90 rename to flang/test/Semantics/OpenMP/omp-workshare05.f90 index 70a8426..b57053e 100644 --- a/flang/test/Semantics/omp-workshare05.f90 +++ b/flang/test/Semantics/OpenMP/omp-workshare05.f90 @@ -1,4 +1,4 @@ -! RUN: %python %S/test_errors.py %s %flang -fopenmp +! RUN: %python %S/../test_errors.py %s %flang -fopenmp ! OpenMP Version 4.5 ! 2.7.4 workshare Construct ! Checks for OpenMP Parallel constructs enclosed in Workshare constructs diff --git a/flang/test/Semantics/canondo05.f90 b/flang/test/Semantics/canondo05.f90 index cdac323..934f8a0 100644 --- a/flang/test/Semantics/canondo05.f90 +++ b/flang/test/Semantics/canondo05.f90 @@ -1,40 +1,28 @@ -! RUN: %flang_fc1 -fdebug-unparse-with-symbols %s 2>&1 | FileCheck %s -! RUN: %flang_fc1 -fopenmp -fdebug-unparse-with-symbols %s 2>&1 | FileCheck %s -! CHECK-NOT: do *[1-9] +! Check that if there is a label or a name on an label-do-stmt, +! then it is not lost when rewriting it to an non-label-do-stmt. -program P -implicit none -integer OMP_GET_NUM_THREADS, OMP_GET_THREAD_NUM -integer NUMTHRDS, TID -integer N, CSZ, CNUM, I -parameter (N=100) -parameter (CSZ=10) -real A(N), B(N), C(N) +! RUN: %flang_fc1 -fdebug-unparse-with-symbols -pedantic %s 2>&1 | FileCheck %s -do 10 I = 1, N - A(I) = I * 1.0 -10 continue +! CHECK: end do +! CHECK: 2 do +! CHECK: mainloop: do +! CHECK: end do mainloop -B = A -CNUM = CSZ +! CHECK-NOT: do [1-9] -!$OMP PARALLEL SHARED(A,B,C,NUMTHRDS,CNUM) PRIVATE(I,TID) -TID = OMP_GET_THREAD_NUM() -if (TID .EQ. 0) then - NUMTHRDS = OMP_GET_NUM_THREADS() - print *, "Number of threads =", NUMTHRDS -end if -print *, "Thread", TID, " is starting..." +subroutine foo() + do 1 i=1,2 + goto 2 +1 continue +2 do 3 i=1,2 +3 continue -!$OMP DO SCHEDULE(DYNAMIC,CNUM) -do 20 I = 1, N - C(I) = A(I) + B(I) - write (*,100) TID, I, C(I) -20 continue -!$OMP END DO NOWAIT - -print *, "Thread", TID, " done." - -!$OMP END PARALLEL -100 format(" Thread", I2, ": C(", I3, ")=", F8.2) -end program P + mainloop : do 4 i=1,100 + do j=1,20 + if (j==i) then + ! cycle mainloop: TODO: fix invalid complaints that mainloop construct + ! is not in scope. + end if + end do +4 end do mainloop +end subroutine diff --git a/flang/test/Semantics/canondo06.f90 b/flang/test/Semantics/canondo06.f90 index 3dab59d..15d9a3a 100644 --- a/flang/test/Semantics/canondo06.f90 +++ b/flang/test/Semantics/canondo06.f90 @@ -1,25 +1,28 @@ -! RUN: %flang_fc1 -fopenmp -fdebug-unparse-with-symbols %s 2>&1 | FileCheck %s -! CHECK-NOT: do *[1-9] -! CHECK: omp simd +! Error test -- DO loop uses obsolete loop termination statement (warning) +! See R1131 and C1133 -program P -implicit none -integer N, I -parameter (N=100) -real A(N), B(N), C(N) +! By default, this is not an error and label do are rewritten to non-label do. +! A warning is generated with -pedantic -!$OMP SIMD -do 10 I = 1, N - A(I) = I * 1.0 -10 continue +! RUN: %flang_fc1 -fdebug-unparse-with-symbols -pedantic %s 2>%t.stderr | FileCheck %s -B = A +! CHECK: end do -!$OMP SIMD -do 20 I = 1, N - C(I) = A(I) + B(I) - write (*,100) I, C(I) -20 continue +! The following CHECK-NOT actively uses the fact that the leading zero of labels +! would be removed in the unparse but not the line linked to warnings. We do +! not want to see label do in the unparse only. +! CHECK-NOT: do [1-9] -100 format(" C(", I3, ")=", F8.2) -end program P +! RUN: FileCheck --check-prefix=ERR --input-file=%t.stderr %s +! ERR: A DO loop should terminate with an END DO or CONTINUE + +subroutine foo10() + real :: a(10, 10), b(10, 10) = 1.0 + do 01 k=1,4 + where (a%t.stderr | FileCheck %s - -! CHECK: end do - -! The following CHECK-NOT actively uses the fact that the leading zero of labels -! would be removed in the unparse but not the line linked to warnings. We do -! not want to see label do in the unparse only. -! CHECK-NOT: do [1-9] - -! RUN: FileCheck --check-prefix=ERR --input-file=%t.stderr %s -! ERR: A DO loop should terminate with an END DO or CONTINUE - -subroutine foo10() - real :: a(10, 10), b(10, 10) = 1.0 - do 01 k=1,4 - where (a&1 | FileCheck %s - -! CHECK: end do -! CHECK: 2 do -! CHECK: mainloop: do -! CHECK: end do mainloop - -! CHECK-NOT: do [1-9] - -subroutine foo() - do 1 i=1,2 - goto 2 -1 continue -2 do 3 i=1,2 -3 continue - - mainloop : do 4 i=1,100 - do j=1,20 - if (j==i) then - ! cycle mainloop: TODO: fix invalid complaints that mainloop construct - ! is not in scope. - end if - end do -4 end do mainloop -end subroutine diff --git a/flang/test/Semantics/modfile47.f90 b/flang/test/Semantics/modfile47.f90 index 4d268d8..0302580 100644 --- a/flang/test/Semantics/modfile47.f90 +++ b/flang/test/Semantics/modfile47.f90 @@ -1,35 +1,19 @@ -! RUN: %python %S/test_modfile.py %s %flang_fc1 -fopenmp -! Check correct modfile generation for OpenMP threadprivate directive. - -module m - implicit none - type :: my_type(kind_param, len_param) - integer, KIND :: kind_param - integer, LEN :: len_param - integer :: t_i - integer :: t_arr(10) - end type - type(my_type(kind_param=2, len_param=4)) :: t - real, dimension(3) :: thrtest - real :: x - common /blk/ x - - !$omp threadprivate(thrtest, t, /blk/) +! RUN: %python %S/test_errors.py %s %flang_fc1 +subroutine foo +end +subroutine iso_fortran_env +end +subroutine bad1 + !ERROR: 'foo' is not a module + use foo +end +subroutine ok1 + use, intrinsic :: iso_fortran_env +end +subroutine ok2 + use iso_fortran_env +end +subroutine bad2 + !ERROR: 'iso_fortran_env' is not a module + use, non_intrinsic :: iso_fortran_env end - -!Expect: m.mod -!module m -!type::my_type(kind_param,len_param) -!integer(4),kind::kind_param -!integer(4),len::len_param -!integer(4)::t_i -!integer(4)::t_arr(1_8:10_8) -!end type -!type(my_type(kind_param=2_4,len_param=4_4))::t -!!$omp threadprivate(t) -!real(4)::thrtest(1_8:3_8) -!!$omp threadprivate(thrtest) -!real(4)::x -!!$omp threadprivate(x) -!common/blk/x -!end diff --git a/flang/test/Semantics/modfile49.f90 b/flang/test/Semantics/modfile49.f90 deleted file mode 100644 index 0302580..0000000 --- a/flang/test/Semantics/modfile49.f90 +++ /dev/null @@ -1,19 +0,0 @@ -! RUN: %python %S/test_errors.py %s %flang_fc1 -subroutine foo -end -subroutine iso_fortran_env -end -subroutine bad1 - !ERROR: 'foo' is not a module - use foo -end -subroutine ok1 - use, intrinsic :: iso_fortran_env -end -subroutine ok2 - use iso_fortran_env -end -subroutine bad2 - !ERROR: 'iso_fortran_env' is not a module - use, non_intrinsic :: iso_fortran_env -end -- 2.7.4