Skip to content

[MLIR][mlir-link] Allow togling linkOnlyNeeded per module. #56

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.

Sign up for GitHub

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

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

[MLIR][mlir-link] Allow togling linkOnlyNeeded per module. #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions mlir/include/mlir/Linker/LLVMLinkerMixin.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,8 +183,8 @@ class LLVMLinkerMixin {
bool alreadyDeclared =
alreadyDefinedOrDeclared && derived.isDeclaration(pair.dst);

// Don't import globals that are already declared
if (derived.shouldLinkOnlyNeeded() && !alreadyDeclared)
// Don't import globals that are already defined
if (derived.shouldLinkOnlyNeeded() && !alreadyDeclared && !forDependency)
return false;

// Private dependencies are gonna be renamed and linked
Expand Down
12 changes: 8 additions & 4 deletions mlir/include/mlir/Linker/Linker.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,10 @@ class Linker {
Linker(MLIRContext *context, const LinkerOptions &options = {})
: context(context), options(options) {}

/// Add a module to be linked
LogicalResult addModule(OwningOpRef<ModuleOp> src);

LogicalResult addModule(OwningOpRef<ModuleOp> src, bool onlyNeeded);

/// Perform linking and materialization in the destination module.
/// Returns the linked module.
OwningOpRef<ModuleOp> link(bool sortSymbols = false);
Expand All @@ -71,16 +72,19 @@ class Linker {
LogicalResult emitFileError(const Twine &fileName, const Twine &message);
LogicalResult emitError(const Twine &message);

/// Return the flags controlling the linker behavior for the current module
unsigned getFlags() const;

private:
/// Setup the linker based on the first module
LogicalResult initializeLinker(ModuleOp src);

/// Add a module to be linked
LogicalResult addModule(OwningOpRef<ModuleOp> src, unsigned flags);

/// Obtain the linker interface for the given module
ModuleLinkerInterface *getModuleLinkerInterface(ModuleOp op);

/// Return the flags controlling the linker behavior for the current module
unsigned getFlags() const;

/// Preprocess the given module before linking with the given flags
LogicalResult summarize(ModuleOp src, unsigned flags);

Expand Down
11 changes: 11 additions & 0 deletions mlir/lib/Linker/Linker.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,19 @@ ModuleLinkerInterface *Linker::getModuleLinkerInterface(ModuleOp op) {
}

LogicalResult Linker::addModule(OwningOpRef<ModuleOp> src) {
return addModule(std::move(src), getFlags());
}

LogicalResult Linker::addModule(OwningOpRef<ModuleOp> src, bool onlyNeeded) {
unsigned flags = getFlags();
if (onlyNeeded)
flags |= LinkerFlags::LinkOnlyNeeded;
else
flags &= ~LinkerFlags::LinkOnlyNeeded;
return addModule(std::move(src), flags);
}

LogicalResult Linker::addModule(OwningOpRef<ModuleOp> src, unsigned flags) {
ModuleOp mod = [&] {
if (options.shouldKeepModulesAlive()) {
modules.push_back(std::move(src));
Expand Down