Skip to content

Commit fa22100

Browse files
committed
Revert "[flang] Introduce hlfir.elemental lowerings to omp.workshare_loop_nest (#104748)"
This reverts commit 40c8938. Linking errors in buildbot build
1 parent 40c8938 commit fa22100

File tree

8 files changed

+4
-430
lines changed

8 files changed

+4
-430
lines changed

flang/lib/Optimizer/HLFIR/Transforms/BufferizeHLFIR.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
#include "flang/Optimizer/HLFIR/HLFIRDialect.h"
2727
#include "flang/Optimizer/HLFIR/HLFIROps.h"
2828
#include "flang/Optimizer/HLFIR/Passes.h"
29-
#include "flang/Optimizer/OpenMP/Passes.h"
3029
#include "mlir/Dialect/OpenMP/OpenMPDialect.h"
3130
#include "mlir/IR/Dominance.h"
3231
#include "mlir/IR/PatternMatch.h"
@@ -793,8 +792,7 @@ struct ElementalOpConversion
793792
// Generate a loop nest looping around the fir.elemental shape and clone
794793
// fir.elemental region inside the inner loop.
795794
hlfir::LoopNest loopNest =
796-
hlfir::genLoopNest(loc, builder, extents, !elemental.isOrdered(),
797-
flangomp::shouldUseWorkshareLowering(elemental));
795+
hlfir::genLoopNest(loc, builder, extents, !elemental.isOrdered());
798796
auto insPt = builder.saveInsertionPoint();
799797
builder.setInsertionPointToStart(loopNest.body);
800798
auto yield = hlfir::inlineElementalOp(loc, builder, elemental,

flang/lib/Optimizer/HLFIR/Transforms/OptimizedBufferization.cpp

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
#include "flang/Optimizer/HLFIR/HLFIRDialect.h"
2121
#include "flang/Optimizer/HLFIR/HLFIROps.h"
2222
#include "flang/Optimizer/HLFIR/Passes.h"
23-
#include "flang/Optimizer/OpenMP/Passes.h"
2423
#include "flang/Optimizer/Transforms/Utils.h"
2524
#include "mlir/Dialect/Func/IR/FuncOps.h"
2625
#include "mlir/IR/Dominance.h"
@@ -483,8 +482,7 @@ llvm::LogicalResult ElementalAssignBufferization::matchAndRewrite(
483482
// Generate a loop nest looping around the hlfir.elemental shape and clone
484483
// hlfir.elemental region inside the inner loop
485484
hlfir::LoopNest loopNest =
486-
hlfir::genLoopNest(loc, builder, extents, !elemental.isOrdered(),
487-
flangomp::shouldUseWorkshareLowering(elemental));
485+
hlfir::genLoopNest(loc, builder, extents, !elemental.isOrdered());
488486
builder.setInsertionPointToStart(loopNest.body);
489487
auto yield = hlfir::inlineElementalOp(loc, builder, elemental,
490488
loopNest.oneBasedIndices);
@@ -555,8 +553,7 @@ llvm::LogicalResult BroadcastAssignBufferization::matchAndRewrite(
555553
llvm::SmallVector<mlir::Value> extents =
556554
hlfir::getIndexExtents(loc, builder, shape);
557555
hlfir::LoopNest loopNest =
558-
hlfir::genLoopNest(loc, builder, extents, /*isUnordered=*/true,
559-
flangomp::shouldUseWorkshareLowering(assign));
556+
hlfir::genLoopNest(loc, builder, extents, /*isUnordered=*/true);
560557
builder.setInsertionPointToStart(loopNest.body);
561558
auto arrayElement =
562559
hlfir::getElementAt(loc, builder, lhs, loopNest.oneBasedIndices);
@@ -654,8 +651,7 @@ llvm::LogicalResult VariableAssignBufferization::matchAndRewrite(
654651
llvm::SmallVector<mlir::Value> extents =
655652
hlfir::getIndexExtents(loc, builder, shape);
656653
hlfir::LoopNest loopNest =
657-
hlfir::genLoopNest(loc, builder, extents, /*isUnordered=*/true,
658-
flangomp::shouldUseWorkshareLowering(assign));
654+
hlfir::genLoopNest(loc, builder, extents, /*isUnordered=*/true);
659655
builder.setInsertionPointToStart(loopNest.body);
660656
auto rhsArrayElement =
661657
hlfir::getElementAt(loc, builder, rhs, loopNest.oneBasedIndices);

flang/test/HLFIR/bufferize-workshare.fir

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

flang/test/Integration/OpenMP/workshare-array-array-assign.f90

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

flang/test/Integration/OpenMP/workshare-axpy.f90

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

flang/test/Integration/OpenMP/workshare-scalar-array-assign.f90

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

flang/test/Integration/OpenMP/workshare-scalar-array-mul.f90

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

0 commit comments

Comments
 (0)