Skip to content

Commit c5de661

Browse files
authored
[Flang][OpenMP] NFC: Flang OpenMP passes cleanup (#107386)
For consistency, this patch renames the `FunctionFiltering` pass to `FunctionFilteringPass`. Also, OpenMP pass-related `#define`s are removed from flang/Optimizer/Transforms/Passes.h, since `#define`s don't have an effect there after moving related passes to flang/Optimizer/OpenMP/Passes.td.
1 parent 12c4d26 commit c5de661

File tree

4 files changed

+4
-7
lines changed

4 files changed

+4
-7
lines changed

flang/include/flang/Optimizer/OpenMP/Passes.td

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ def MarkDeclareTargetPass
2828
let dependentDialects = ["mlir::omp::OpenMPDialect"];
2929
}
3030

31-
def FunctionFiltering : Pass<"omp-function-filtering"> {
31+
def FunctionFilteringPass : Pass<"omp-function-filtering"> {
3232
let summary = "Filters out functions intended for the host when compiling "
3333
"for the target device.";
3434
let dependentDialects = [

flang/include/flang/Optimizer/Transforms/Passes.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,6 @@ namespace fir {
5353
#define GEN_PASS_DECL_STACKRECLAIM
5454
#define GEN_PASS_DECL_LOOPVERSIONING
5555
#define GEN_PASS_DECL_ADDALIASTAGS
56-
#define GEN_PASS_DECL_OMPMAPINFOFINALIZATIONPASS
57-
#define GEN_PASS_DECL_OMPMARKDECLARETARGETPASS
58-
#define GEN_PASS_DECL_OMPFUNCTIONFILTERING
5956
#define GEN_PASS_DECL_VSCALEATTR
6057
#define GEN_PASS_DECL_FUNCTIONATTR
6158
#define GEN_PASS_DECL_CONSTANTARGUMENTGLOBALISATIONOPT

flang/include/flang/Tools/CLOptions.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,7 @@ inline void createOpenMPFIRPassPipeline(
370370
pm.addPass(flangomp::createMapInfoFinalizationPass());
371371
pm.addPass(flangomp::createMarkDeclareTargetPass());
372372
if (isTargetDevice)
373-
pm.addPass(flangomp::createFunctionFiltering());
373+
pm.addPass(flangomp::createFunctionFilteringPass());
374374
}
375375

376376
#if !defined(FLANG_EXCLUDE_CODEGEN)

flang/lib/Optimizer/OpenMP/FunctionFiltering.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@
2222
#include "llvm/ADT/SmallVector.h"
2323

2424
namespace flangomp {
25-
#define GEN_PASS_DEF_FUNCTIONFILTERING
25+
#define GEN_PASS_DEF_FUNCTIONFILTERINGPASS
2626
#include "flang/Optimizer/OpenMP/Passes.h.inc"
2727
} // namespace flangomp
2828

2929
using namespace mlir;
3030

3131
namespace {
3232
class FunctionFilteringPass
33-
: public flangomp::impl::FunctionFilteringBase<FunctionFilteringPass> {
33+
: public flangomp::impl::FunctionFilteringPassBase<FunctionFilteringPass> {
3434
public:
3535
FunctionFilteringPass() = default;
3636

0 commit comments

Comments
 (0)