Skip to content

Commit b354fe0

Browse files
skc7skc7
committed
[OpenMP] Use workdistribute instead of coexecute
1 parent 483045d commit b354fe0

File tree

8 files changed

+152
-161
lines changed

8 files changed

+152
-161
lines changed

‎flang/include/flang/Semantics/openmp-directive-sets.h

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ static const OmpDirectiveSet topTargetSet{
143143
Directive::OMPD_target_teams_distribute_parallel_do_simd,
144144
Directive::OMPD_target_teams_distribute_simd,
145145
Directive::OMPD_target_teams_loop,
146-
Directive::OMPD_target_teams_coexecute,
146+
Directive::OMPD_target_teams_workdistribute,
147147
};
148148

149149
static const OmpDirectiveSet allTargetSet{topTargetSet};
@@ -173,7 +173,7 @@ static const OmpDirectiveSet topTeamsSet{
173173
Directive::OMPD_teams_distribute_parallel_do_simd,
174174
Directive::OMPD_teams_distribute_simd,
175175
Directive::OMPD_teams_loop,
176-
Directive::OMPD_teams_coexecute,
176+
Directive::OMPD_teams_workdistribute,
177177
};
178178

179179
static const OmpDirectiveSet bottomTeamsSet{
@@ -189,14 +189,14 @@ static const OmpDirectiveSet allTeamsSet{
189189
Directive::OMPD_target_teams_distribute_parallel_do_simd,
190190
Directive::OMPD_target_teams_distribute_simd,
191191
Directive::OMPD_target_teams_loop,
192-
Directive::OMPD_target_teams_coexecute,
192+
Directive::OMPD_target_teams_workdistribute,
193193
} | topTeamsSet,
194194
};
195195

196-
static const OmpDirectiveSet allCoexecuteSet{
197-
Directive::OMPD_coexecute,
198-
Directive::OMPD_teams_coexecute,
199-
Directive::OMPD_target_teams_coexecute,
196+
static const OmpDirectiveSet allWorkdistributeSet{
197+
Directive::OMPD_workdistribute,
198+
Directive::OMPD_teams_workdistribute,
199+
Directive::OMPD_target_teams_workdistribute,
200200
};
201201

202202
//===----------------------------------------------------------------------===//
@@ -239,9 +239,9 @@ static const OmpDirectiveSet blockConstructSet{
239239
Directive::OMPD_taskgroup,
240240
Directive::OMPD_teams,
241241
Directive::OMPD_workshare,
242-
Directive::OMPD_target_teams_coexecute,
243-
Directive::OMPD_teams_coexecute,
244-
Directive::OMPD_coexecute,
242+
Directive::OMPD_target_teams_workdistribute,
243+
Directive::OMPD_teams_workdistribute,
244+
Directive::OMPD_workdistribute,
245245
};
246246

247247
static const OmpDirectiveSet loopConstructSet{
@@ -306,7 +306,7 @@ static const OmpDirectiveSet workShareSet{
306306
Directive::OMPD_scope,
307307
Directive::OMPD_sections,
308308
Directive::OMPD_single,
309-
Directive::OMPD_coexecute,
309+
Directive::OMPD_workdistribute,
310310
} | allDoSet,
311311
};
312312

@@ -389,7 +389,7 @@ static const OmpDirectiveSet nestedReduceWorkshareAllowedSet{
389389
};
390390

391391
static const OmpDirectiveSet nestedTeamsAllowedSet{
392-
Directive::OMPD_coexecute,
392+
Directive::OMPD_workdistribute,
393393
Directive::OMPD_distribute,
394394
Directive::OMPD_distribute_parallel_do,
395395
Directive::OMPD_distribute_parallel_do_simd,

‎flang/lib/Lower/OpenMP/OpenMP.cpp

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2592,14 +2592,14 @@ genTeamsOp(lower::AbstractConverter &converter, lower::SymMap &symTable,
25922592
queue, item, clauseOps);
25932593
}
25942594

2595-
static mlir::omp::CoexecuteOp
2596-
genCoexecuteOp(lower::AbstractConverter &converter, lower::SymMap &symTable,
2595+
static mlir::omp::WorkdistributeOp
2596+
genWorkdistributeOp(lower::AbstractConverter &converter, lower::SymMap &symTable,
25972597
semantics::SemanticsContext &semaCtx, lower::pft::Evaluation &eval,
25982598
mlir::Location loc, const ConstructQueue &queue,
25992599
ConstructQueue::const_iterator item) {
2600-
return genOpWithBody<mlir::omp::CoexecuteOp>(
2600+
return genOpWithBody<mlir::omp::WorkdistributeOp>(
26012601
OpWithBodyGenInfo(converter, symTable, semaCtx, loc, eval,
2602-
llvm::omp::Directive::OMPD_coexecute), queue, item);
2602+
llvm::omp::Directive::OMPD_workdistribute), queue, item);
26032603
}
26042604

26052605
//===----------------------------------------------------------------------===//
@@ -3763,14 +3763,13 @@ static void genOMPDispatch(lower::AbstractConverter &converter,
37633763
newOp = genTeamsOp(converter, symTable, stmtCtx, semaCtx, eval, loc, queue,
37643764
item);
37653765
break;
3766-
case llvm::omp::Directive::OMPD_coexecute:
3767-
newOp = genCoexecuteOp(converter, symTable, semaCtx, eval, loc, queue, item);
3768-
break;
37693766
case llvm::omp::Directive::OMPD_tile:
37703767
case llvm::omp::Directive::OMPD_unroll:
37713768
TODO(loc, "Unhandled loop directive (" +
37723769
llvm::omp::getOpenMPDirectiveName(dir) + ")");
3773-
// case llvm::omp::Directive::OMPD_workdistribute:
3770+
case llvm::omp::Directive::OMPD_workdistribute:
3771+
newOp = genWorkdistributeOp(converter, symTable, semaCtx, eval, loc, queue, item);
3772+
break;
37743773
case llvm::omp::Directive::OMPD_workshare:
37753774
newOp = genWorkshareOp(converter, symTable, stmtCtx, semaCtx, eval, loc,
37763775
queue, item);

‎flang/lib/Parser/openmp-parsers.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1350,15 +1350,15 @@ TYPE_PARSER(
13501350
"SINGLE" >> pure(llvm::omp::Directive::OMPD_single),
13511351
"TARGET DATA" >> pure(llvm::omp::Directive::OMPD_target_data),
13521352
"TARGET PARALLEL" >> pure(llvm::omp::Directive::OMPD_target_parallel),
1353-
"TARGET TEAMS COEXECUTE" >> pure(llvm::omp::Directive::OMPD_target_teams_coexecute),
1353+
"TARGET TEAMS WORKDISTRIBUTE" >> pure(llvm::omp::Directive::OMPD_target_teams_workdistribute),
13541354
"TARGET TEAMS" >> pure(llvm::omp::Directive::OMPD_target_teams),
13551355
"TARGET" >> pure(llvm::omp::Directive::OMPD_target),
13561356
"TASK"_id >> pure(llvm::omp::Directive::OMPD_task),
13571357
"TASKGROUP" >> pure(llvm::omp::Directive::OMPD_taskgroup),
1358-
"TEAMS COEXECUTE" >> pure(llvm::omp::Directive::OMPD_teams_coexecute),
1358+
"TEAMS WORKDISTRIBUTE" >> pure(llvm::omp::Directive::OMPD_teams_workdistribute),
13591359
"TEAMS" >> pure(llvm::omp::Directive::OMPD_teams),
13601360
"WORKSHARE" >> pure(llvm::omp::Directive::OMPD_workshare),
1361-
"COEXECUTE" >> pure(llvm::omp::Directive::OMPD_coexecute))))
1361+
"WORKDISTRIBUTE" >> pure(llvm::omp::Directive::OMPD_workdistribute))))
13621362

13631363
TYPE_PARSER(sourced(construct<OmpBeginBlockDirective>(
13641364
sourced(Parser<OmpBlockDirective>{}), Parser<OmpClauseList>{})))

‎flang/lib/Semantics/resolve-directives.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1607,9 +1607,9 @@ bool OmpAttributeVisitor::Pre(const parser::OpenMPBlockConstruct &x) {
16071607
case llvm::omp::Directive::OMPD_task:
16081608
case llvm::omp::Directive::OMPD_taskgroup:
16091609
case llvm::omp::Directive::OMPD_teams:
1610-
case llvm::omp::Directive::OMPD_coexecute:
1611-
case llvm::omp::Directive::OMPD_teams_coexecute:
1612-
case llvm::omp::Directive::OMPD_target_teams_coexecute:
1610+
case llvm::omp::Directive::OMPD_workdistribute:
1611+
case llvm::omp::Directive::OMPD_teams_workdistribute:
1612+
case llvm::omp::Directive::OMPD_target_teams_workdistribute:
16131613
case llvm::omp::Directive::OMPD_workshare:
16141614
case llvm::omp::Directive::OMPD_parallel_workshare:
16151615
case llvm::omp::Directive::OMPD_target_teams:
@@ -1643,9 +1643,9 @@ void OmpAttributeVisitor::Post(const parser::OpenMPBlockConstruct &x) {
16431643
case llvm::omp::Directive::OMPD_target:
16441644
case llvm::omp::Directive::OMPD_task:
16451645
case llvm::omp::Directive::OMPD_teams:
1646-
case llvm::omp::Directive::OMPD_coexecute:
1647-
case llvm::omp::Directive::OMPD_teams_coexecute:
1648-
case llvm::omp::Directive::OMPD_target_teams_coexecute:
1646+
case llvm::omp::Directive::OMPD_workdistribute:
1647+
case llvm::omp::Directive::OMPD_teams_workdistribute:
1648+
case llvm::omp::Directive::OMPD_target_teams_workdistribute:
16491649
case llvm::omp::Directive::OMPD_parallel_workshare:
16501650
case llvm::omp::Directive::OMPD_target_teams:
16511651
case llvm::omp::Directive::OMPD_target_parallel: {

‎flang/test/Lower/OpenMP/coexecute.f90

Lines changed: 0 additions & 59 deletions
This file was deleted.

‎flang/test/Lower/OpenMP/workdistribute.f90

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
! RUN: %flang_fc1 -emit-hlfir -fopenmp %s -o - | FileCheck %s
2+
3+
! CHECK-LABEL: func @_QPtarget_teams_workdistribute
4+
subroutine target_teams_workdistribute()
5+
! CHECK: omp.target
6+
! CHECK: omp.teams
7+
! CHECK: omp.workdistribute
8+
!$omp target teams workdistribute
9+
! CHECK: fir.call
10+
call f1()
11+
! CHECK: omp.terminator
12+
! CHECK: omp.terminator
13+
! CHECK: omp.terminator
14+
!$omp end target teams workdistribute
15+
end subroutine target_teams_workdistribute
16+
17+
! CHECK-LABEL: func @_QPteams_workdistribute
18+
subroutine teams_workdistribute()
19+
! CHECK: omp.teams
20+
! CHECK: omp.workdistribute
21+
!$omp teams workdistribute
22+
! CHECK: fir.call
23+
call f1()
24+
! CHECK: omp.terminator
25+
! CHECK: omp.terminator
26+
!$omp end teams workdistribute
27+
end subroutine teams_workdistribute
28+
29+
! CHECK-LABEL: func @_QPtarget_teams_workdistribute_m
30+
subroutine target_teams_workdistribute_m()
31+
! CHECK: omp.target
32+
! CHECK: omp.teams
33+
! CHECK: omp.workdistribute
34+
!$omp target
35+
!$omp teams
36+
!$omp workdistribute
37+
! CHECK: fir.call
38+
call f1()
39+
! CHECK: omp.terminator
40+
! CHECK: omp.terminator
41+
! CHECK: omp.terminator
42+
!$omp end workdistribute
43+
!$omp end teams
44+
!$omp end target
45+
end subroutine target_teams_workdistribute_m
46+
47+
! CHECK-LABEL: func @_QPteams_workdistribute_m
48+
subroutine teams_workdistribute_m()
49+
! CHECK: omp.teams
50+
! CHECK: omp.workdistribute
51+
!$omp teams
52+
!$omp workdistribute
53+
! CHECK: fir.call
54+
call f1()
55+
! CHECK: omp.terminator
56+
! CHECK: omp.terminator
57+
!$omp end workdistribute
58+
!$omp end teams
59+
end subroutine teams_workdistribute_m

0 commit comments

Comments
 (0)