[MLIR][mlir-link] Simplify and generalize linker interfaces

Author: xlauko

mlir/include/mlir/Dialect/LLVMIR/LLVMDialect.h

@@ -28,7 +28,6 @@
 #include "mlir/Interfaces/ControlFlowInterfaces.h"
 #include "mlir/Interfaces/FunctionInterfaces.h"
 #include "mlir/Interfaces/InferTypeOpInterface.h"
-#include "mlir/Interfaces/LinkageInterfaces.h"
 #include "mlir/Interfaces/SideEffectInterfaces.h"
 #include "mlir/Interfaces/ViewLikeInterface.h"
 #include "mlir/Support/ThreadLocalCache.h"

mlir/include/mlir/Dialect/LLVMIR/LLVMOps.td

@@ -22,7 +22,6 @@ include "mlir/IR/SymbolInterfaces.td"
 include "mlir/Interfaces/CallInterfaces.td"
 include "mlir/Interfaces/ControlFlowInterfaces.td"
 include "mlir/Interfaces/InferTypeOpInterface.td"
-include "mlir/Interfaces/LinkageInterfaces.td"
 include "mlir/Interfaces/MemorySlotInterfaces.td"
 include "mlir/Interfaces/SideEffectInterfaces.td"
 include "mlir/Interfaces/ViewLikeInterface.td"
@@ -1227,10 +1226,7 @@ def LLVM_AddressOfOp : LLVM_Op<"mlir.addressof",
 }
 
 def LLVM_GlobalOp : LLVM_Op<"mlir.global",
-    [IsolatedFromAbove, SingleBlockImplicitTerminator<"ReturnOp">, Symbol,
-    GlobalVariableLinkageOpInterface,
-    DeclareOpInterfaceMethods<GlobalValueLinkageOpInterface>,
-    DeclareOpInterfaceMethods<GlobalVariableLinkageOpInterface>]> {
+    [IsolatedFromAbove, SingleBlockImplicitTerminator<"ReturnOp">, Symbol]> {
   let arguments = (ins
     TypeAttr:$global_type,
     UnitAttr:$constant,
@@ -1382,9 +1378,6 @@ def LLVM_GlobalOp : LLVM_Op<"mlir.global",
     }
   }];
 
-  let extraClassDefinition = [{
-    bool $cppClass::isDeclarationForLinkage() { return getInitializerRegion().empty() && !getValue(); }
-  }];
   let hasCustomAssemblyFormat = 1;
   let hasVerifier = 1;
   let hasRegionVerifier = 1;
@@ -1500,9 +1493,7 @@ def LLVM_ComdatOp : LLVM_Op<"comdat", [NoTerminator, NoRegionArguments, SymbolTa
 }
 
 def LLVM_LLVMFuncOp : LLVM_Op<"func", [
-    AutomaticAllocationScope, IsolatedFromAbove, FunctionOpInterface,
-    FunctionLinkageOpInterface,
-    DeclareOpInterfaceMethods<GlobalValueLinkageOpInterface>]> {
+    AutomaticAllocationScope, IsolatedFromAbove, FunctionOpInterface]> {
   let summary = "LLVM dialect function.";
 
   let description = [{
@@ -1629,11 +1620,6 @@ def LLVM_LLVMFuncOp : LLVM_Op<"func", [
 
     /// Returns true if the `optimize_none` attribute is set, false otherwise.
     bool isOptimizeNone() { return bool(getOptimizeNoneAttr()); }
-
-  }];
-
-  let extraClassDefinition = [{
-    bool $cppClass::isDeclarationForLinkage() { return getBody().empty(); }
   }];
 
   let hasCustomAssemblyFormat = 1;

mlir/include/mlir/IR/BuiltinOps.td

@@ -20,7 +20,6 @@ include "mlir/IR/RegionKindInterface.td"
 include "mlir/IR/SymbolInterfaces.td"
 include "mlir/Interfaces/CastInterfaces.td"
 include "mlir/Interfaces/DataLayoutInterfaces.td"
-include "mlir/Interfaces/LinkageInterfaces.td"
 include "mlir/Interfaces/SideEffectInterfaces.td"
 
 // Base class for Builtin dialect ops.

mlir/include/mlir/Interfaces/CMakeLists.txt

@@ -7,7 +7,6 @@ add_mlir_interface(DestinationStyleOpInterface)
 add_mlir_interface(FunctionInterfaces)
 add_mlir_interface(InferIntRangeInterface)
 add_mlir_interface(InferTypeOpInterface)
-add_mlir_interface(LinkageInterfaces)
 add_mlir_interface(LoopLikeInterface)
 add_mlir_interface(ParallelCombiningOpInterface)
 add_mlir_interface(RuntimeVerifiableOpInterface)