Skip to content

Commit b124c04

Browse files
authored
[Flang][OpenMP] Remove omp.simd reduction block args (#111523)
This patch reverts previous changes to create entry block arguments for reduction variables attached to `simd` constructs. This can't currently be done because reduction variables stored in the corresponding clause structure are not added to the `omp.simd` operation when created, as this is not supported yet. Adding block arguments for non-existent reduction variables results in some tests from the Fujitsu compiler testsuite breaking: https://linaro.atlassian.net/browse/LLVM-1389.
1 parent cc99bdd commit b124c04

File tree

1 file changed

+4
-12
lines changed

1 file changed

+4
-12
lines changed

flang/lib/Lower/OpenMP/OpenMP.cpp

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2072,9 +2072,7 @@ static void genStandaloneSimd(lower::AbstractConverter &converter,
20722072
loopNestClauseOps, iv);
20732073

20742074
EntryBlockArgs simdArgs;
2075-
// TODO: Add private syms and vars.
2076-
simdArgs.reduction.syms = simdReductionSyms;
2077-
simdArgs.reduction.vars = simdClauseOps.reductionVars;
2075+
// TODO: Add private, reduction syms and vars.
20782076
auto simdOp =
20792077
genWrapperOp<mlir::omp::SimdOp>(converter, loc, simdClauseOps, simdArgs);
20802078

@@ -2232,9 +2230,7 @@ static void genCompositeDistributeParallelDoSimd(
22322230
wsloopOp.setComposite(/*val=*/true);
22332231

22342232
EntryBlockArgs simdArgs;
2235-
// TODO: Add private syms and vars.
2236-
simdArgs.reduction.syms = simdReductionSyms;
2237-
simdArgs.reduction.vars = simdClauseOps.reductionVars;
2233+
// TODO: Add private, reduction syms and vars.
22382234
auto simdOp =
22392235
genWrapperOp<mlir::omp::SimdOp>(converter, loc, simdClauseOps, simdArgs);
22402236
simdOp.setComposite(/*val=*/true);
@@ -2291,9 +2287,7 @@ static void genCompositeDistributeSimd(lower::AbstractConverter &converter,
22912287
distributeOp.setComposite(/*val=*/true);
22922288

22932289
EntryBlockArgs simdArgs;
2294-
// TODO: Add private syms and vars.
2295-
simdArgs.reduction.syms = simdReductionSyms;
2296-
simdArgs.reduction.vars = simdClauseOps.reductionVars;
2290+
// TODO: Add private, reduction syms and vars.
22972291
auto simdOp =
22982292
genWrapperOp<mlir::omp::SimdOp>(converter, loc, simdClauseOps, simdArgs);
22992293
simdOp.setComposite(/*val=*/true);
@@ -2350,9 +2344,7 @@ static void genCompositeDoSimd(lower::AbstractConverter &converter,
23502344
wsloopOp.setComposite(/*val=*/true);
23512345

23522346
EntryBlockArgs simdArgs;
2353-
// TODO: Add private syms and vars.
2354-
simdArgs.reduction.syms = simdReductionSyms;
2355-
simdArgs.reduction.vars = simdClauseOps.reductionVars;
2347+
// TODO: Add private, reduction syms and vars.
23562348
auto simdOp =
23572349
genWrapperOp<mlir::omp::SimdOp>(converter, loc, simdClauseOps, simdArgs);
23582350
simdOp.setComposite(/*val=*/true);

0 commit comments

Comments
 (0)