[FIRRTL] Group instance-like ops using FInstanceLike

llvm · Nov 21, 2023 · 1aa8ff5 · 1aa8ff5
1 parent 16e0c57
commit 1aa8ff5
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 10 deletions.
diff --git a/include/circt/Dialect/FIRRTL/FIRRTLDeclarations.td b/include/circt/Dialect/FIRRTL/FIRRTLDeclarations.td
@@ -41,6 +41,7 @@ class HardwareDeclOp<string mnemonic, list <Trait> traits = []> :
       "firrtl::WhenOp", "firrtl::MatchOp"]>]> {}
 
 def InstanceOp : HardwareDeclOp<"instance", [
+    DeclareOpInterfaceMethods<FInstanceLike>,
     DeclareOpInterfaceMethods<SymbolUserOpInterface>,
     DeclareOpInterfaceMethods<InstanceGraphInstanceOpInterface, [
       "getModuleName",
@@ -597,10 +598,12 @@ def ClockGateIntrinsicOp : FIRRTLOp<"int.clock_gate", [Pure]> {
 def ObjectOp :  FIRRTLOp<"object", [
     ParentOneOf<["firrtl::FModuleOp, firrtl::ClassOp"]>,
     DeclareOpInterfaceMethods<SymbolUserOpInterface>,
+    DeclareOpInterfaceMethods<FInstanceLike, [
+      "getReferencedModule"
+    ]>,
     DeclareOpInterfaceMethods<InstanceGraphInstanceOpInterface, [
       "getReferencedModuleName",
       "getReferencedModuleNameAttr",
-      "getReferencedModule",
       "getReferencedModuleSlow"
     ]>,
     DeclareOpInterfaceMethods<OpAsmOpInterface, [

diff --git a/include/circt/Dialect/FIRRTL/FIRRTLOpInterfaces.td b/include/circt/Dialect/FIRRTL/FIRRTLOpInterfaces.td
@@ -356,6 +356,23 @@ def FModuleLike : OpInterface<"FModuleLike", [Symbol, PortList, InstanceGraphMod
   }];
 }
 
+def FInstanceLike : OpInterface<"FInstanceLike", [
+  InstanceGraphInstanceOpInterface
+]> {
+  let cppNamespace = "circt::firrtl";
+  let description = "Provide common  instance information.";
+
+  let methods = [
+    InterfaceMethod<"Get the referenced module via a symbol table.",
+    "::mlir::Operation *", "getReferencedModule",
+    (ins "const SymbolTable&":$symtbl),
+    /*methodBody=*/[{}],
+    /*defaultImplementation=*/[{
+      return symtbl.lookup($_op.getReferencedModuleName());
+    }]>,
+  ];
+}
+
 def ClassLike : OpInterface<"ClassLike", [FModuleLike]> {
   let cppNamespace = "circt::firrtl";
   let description = "Provide common class information.";

diff --git a/include/circt/Support/InstanceGraphInterface.td b/include/circt/Support/InstanceGraphInterface.td
@@ -49,15 +49,7 @@ def InstanceGraphInstanceOpInterface : OpInterface<"InstanceOpInterface"> {
     /*defaultImplementation=*/[{
         return SymbolTable::lookupNearestSymbolFrom(
             $_op, getReferencedModuleNameAttr());
-    }]>,
-
-    InterfaceMethod<"Get the referenced module via a symbol table.",
-    "::mlir::Operation *", "getReferencedModule",
-    (ins "const SymbolTable&":$symtbl),
-    /*methodBody=*/[{}],
-    /*defaultImplementation=*/[{
-      return symtbl.lookup(getReferencedModuleName());
-    }]>,
+    }]>
   ];
 }