[MLIR][mlir-link] Rework to operate with dialect interface

trailofbits · Feb 23, 2025 · 4125200 · 4125200
1 parent 76a0819
commit 4125200
Show file tree

Hide file tree

Showing 9 changed files with 752 additions and 294 deletions.
diff --git a/llvm/lib/Linker/IRMover.cpp b/llvm/lib/Linker/IRMover.cpp
@@ -606,6 +606,8 @@ Value *IRLinker::materialize(Value *V, bool ForIndirectSymbol) {
     return *NewProto;
 
   // If we already created the body, just return.
+  // TODO: This is too llvm-specific.
+  // Make part of interface isMaterialized method?
   if (auto *F = dyn_cast<Function>(New)) {
     if (!F->isDeclaration())
       return New;

diff --git a/mlir/include/mlir/Interfaces/LinkageInterfaces.td b/mlir/include/mlir/Interfaces/LinkageInterfaces.td
@@ -242,14 +242,15 @@ def GlobalValueLinkageOpInterface : OpInterface<"GlobalValueLinkageOpInterface">
     >,
     InterfaceMethod<
       /*desc=*/        "Returns linked name of the operation",
-      /*returnType=*/  "FailureOr<StringRef>",
+      /*returnType=*/  "StringRef",
       /*methodName=*/  "getLinkedName",
       /*args=*/        (ins),
       /*methodBody=*/  [{}],
       /*defaultImplementation=*/[{
         if (auto symbol = dyn_cast<SymbolOpInterface>($_op.getOperation()))
           return symbol.getName();
-        return emitError($_op.getLoc(), "expected a symbol operation");
+        assert(false && "expected a symbol operation");
+        return "";
       }]
     >
   ];
@@ -276,8 +277,8 @@ def FunctionLinkageOpInterface
   let cppNamespace = "::mlir";
 }
 
-def GlobalFuncLinkageOpInterface
-  : OpInterface<"GlobalFuncLinkageOpInterface",
+def GlobalIFuncLinkageOpInterface
+  : OpInterface<"GlobalIFuncLinkageOpInterface",
                 [GlobalObjectLinkageOpInterface]> {
   let description = [{ WIP }];
   let cppNamespace = "::mlir";

diff --git a/mlir/include/mlir/Linker/IRMover.h b/mlir/include/mlir/Linker/IRMover.h
@@ -11,14 +11,11 @@
 
 #include "mlir/IR/BuiltinOps.h"
 
-#include "mlir/Interfaces/LinkageInterfaces.h"
+#include "mlir/Linker/LinkerInterface.h"
 
 using llvm::Error;
 
-namespace mlir {
-
-
-
+namespace mlir::link {
 
 class IRMover {
 public:
@@ -27,13 +24,12 @@ class IRMover {
   LinkableModuleOpInterface getComposite() { return composite; }
   MLIRContext *getContext() { return composite->getContext(); }
 
-  Error move(OwningOpRef<Operation *> src,
-                    ArrayRef<GlobalValueLinkageOpInterface> valuesToLink);
+  Error move(OwningOpRef<Operation *> src, ArrayRef<GlobalValue> valuesToLink);
 
-  private:
-    LinkableModuleOpInterface composite;
-  };
+private:
+  LinkableModuleOpInterface composite;
+};
 
-} // namespace mlir
+} // namespace mlir::link
 
 #endif
diff --git a/mlir/include/mlir/Linker/Linker.h b/mlir/include/mlir/Linker/Linker.h
@@ -13,7 +13,7 @@
 
 #include "mlir/Interfaces/LinkageInterfaces.h"
 
-namespace mlir {
+namespace mlir::link {
 
 using InternalizeCallbackFn =
     std::function<void(LinkableModuleOpInterface, const StringSet<> &)>;
@@ -97,6 +97,6 @@ class Linker {
   IRMover mover;
 };
 
-} // namespace mlir
+} // namespace mlir::link
 
 #endif