Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MLIR][Flang][OpenMP] Remove unused global variables in offload target module #97

Merged
merged 1 commit into from
Jun 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions flang/include/flang/Optimizer/Transforms/Passes.h
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ std::unique_ptr<mlir::Pass> createAlgebraicSimplificationPass();
std::unique_ptr<mlir::Pass>
createAlgebraicSimplificationPass(const mlir::GreedyRewriteConfig &config);

std::unique_ptr<mlir::Pass> createOMPGlobalFilteringPass();
std::unique_ptr<mlir::Pass> createVScaleAttrPass();
std::unique_ptr<mlir::Pass>
createVScaleAttrPass(std::pair<unsigned, unsigned> vscaleAttr);
Expand Down
10 changes: 10 additions & 0 deletions flang/include/flang/Optimizer/Transforms/Passes.td
Original file line number Diff line number Diff line change
Expand Up @@ -349,6 +349,16 @@ def OMPFunctionFiltering : Pass<"omp-function-filtering"> {
];
}

def OMPGlobalFiltering : Pass<"omp-global-filtering"> {
let summary = "Filters out globals intended for the host when compiling "
"for the target device.";
let constructor = "::fir::createOMPGlobalFilteringPass()";
let dependentDialects = [
"mlir::func::FuncDialect",
"fir::FIROpsDialect"
];
}

def VScaleAttr : Pass<"vscale-attr", "mlir::func::FuncOp"> {
let summary = "Add vscale_range attribute to functions";
let description = [{
Expand Down
4 changes: 3 additions & 1 deletion flang/include/flang/Tools/CLOptions.inc
Original file line number Diff line number Diff line change
Expand Up @@ -354,8 +354,10 @@ inline void createOpenMPFIRPassPipeline(mlir::PassManager &pm,
pm, fir::createOMPMapInfoFinalizationPass);

pm.addPass(fir::createOMPMarkDeclareTargetPass());
if (isTargetDevice)
if (isTargetDevice) {
pm.addPass(fir::createOMPFunctionFiltering());
pm.addPass(fir::createOMPGlobalFilteringPass());
}
}

#if !defined(FLANG_EXCLUDE_CODEGEN)
Expand Down
1 change: 1 addition & 0 deletions flang/lib/Optimizer/Transforms/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ add_flang_library(FIRTransforms
PolymorphicOpConversion.cpp
LoopVersioning.cpp
OMPFunctionFiltering.cpp
OMPGlobalFiltering.cpp
OMPMapInfoFinalization.cpp
OMPMarkDeclareTarget.cpp
VScaleAttr.cpp
Expand Down
64 changes: 64 additions & 0 deletions flang/lib/Optimizer/Transforms/OMPGlobalFiltering.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
//===- OMPFunctionFiltering.cpp -------------------------------------------===//
//
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
//
//===----------------------------------------------------------------------===//
//
// This file implements transforms to filter out functions intended for the host
// when compiling for the device and vice versa.
//
//===----------------------------------------------------------------------===//

#include "flang/Optimizer/Dialect/FIRDialect.h"
#include "flang/Optimizer/Dialect/FIROpsSupport.h"
#include "flang/Optimizer/Transforms/Passes.h"

#include "mlir/Dialect/Func/IR/FuncOps.h"
#include "mlir/Dialect/OpenMP/OpenMPDialect.h"
#include "mlir/Dialect/OpenMP/OpenMPInterfaces.h"
#include "mlir/IR/BuiltinOps.h"
#include "llvm/ADT/SmallVector.h"

namespace fir {
#define GEN_PASS_DEF_OMPGLOBALFILTERING
#include "flang/Optimizer/Transforms/Passes.h.inc"
} // namespace fir

using namespace mlir;

namespace {
class OMPGlobalFilteringPass
: public fir::impl::OMPGlobalFilteringBase<OMPGlobalFilteringPass> {
public:
OMPGlobalFilteringPass() = default;

void runOnOperation() override {
auto op = dyn_cast<omp::OffloadModuleInterface>(getOperation());
if (!op || !op.getIsTargetDevice())
return;

op->walk<WalkOrder::PreOrder>([&](fir::GlobalOp globalOp) {
bool symbolUnused = true;
SymbolTable::UseRange globalUses = *globalOp.getSymbolUses(op);
for (SymbolTable::SymbolUse use : globalUses) {
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think setting symbolUnused can be simplified by using llvm::any_of() instead of this loop.

if (use.getUser() == globalOp)
continue;
symbolUnused = false;
break;
}

// Remove unused host symbols with external linkage
// TODO: Add support for declare target global variables
if (symbolUnused && !globalOp.getLinkName())
globalOp.erase();
return WalkResult::advance();
});
}
};
} // namespace

std::unique_ptr<Pass> fir::createOMPGlobalFilteringPass() {
return std::make_unique<OMPGlobalFilteringPass>();
}