[FIRRTL] Use InnerRefUserOpInterface for bind op

Drop the SymbolUserOpInterface in favour of InnerRefUserOpInterface. Using this
new trait makes verification for the bind op faster and simpler, because the
verification method is handed an inner symbol table.

Author: rwy7

include/circt/Dialect/FIRRTL/FIRRTLStatements.td

@@ -414,7 +414,7 @@ def LayerBlockOp : FIRRTLOp<
 //===----------------------------------------------------------------------===//
 
 def BindOp : FIRRTLOp<"bind",
-    [DeclareOpInterfaceMethods<SymbolUserOpInterface>]> {
+    [DeclareOpInterfaceMethods<InnerRefUserOpInterface>]> {
   let summary = "Indirect instantiation statement";
   let description = [{
     Indirectly instantiate a module from the context of another module. BindOp

lib/Dialect/FIRRTL/FIRRTLOps.cpp

@@ -6398,32 +6398,23 @@ void HierarchicalModuleNameOp::getAsmResultNames(
 // BindOp
 //===----------------------------------------------------------------------===//
 
-namespace {
-template <class Op>
-Op findInnerSym(StringAttr name, Block *body) {
-  for (auto &op : llvm::reverse(body->getOperations()))
-    if (auto target = dyn_cast<Op>(op))
-      if (auto innerSym = target.getInnerSym())
-        if (innerSym->getSymName() == name)
-          return target;
-  return {};
-}
-} // namespace
+LogicalResult BindOp::verifyInnerRefs(hw::InnerRefNamespace &ns) {
+  auto ref = getInstanceAttr();
+  auto target = ns.lookup(ref);
+  if (!target)
+    return emitError()
+      << "has target that cannot be resolved: " << ref;
+
+  if (!target.isOpOnly())
+    return emitError() << "target " << ref << " is not an operation";
+
+  auto instance = dyn_cast<InstanceOp>(target.getOp());
+  if (!instance)
+    return emitError() << "target " << ref << " is not an instance";
+
+  if (!instance.getDoNotPrint())
+    return emitError() << "target " << ref << " is not marked doNotPrint";
 
-LogicalResult BindOp::verifySymbolUses(SymbolTableCollection &symbolTable) {
-  auto circuit = getOperation()->getParentOfType<CircuitOp>();
-  auto module = dyn_cast_or_null<FModuleOp>(
-      symbolTable.lookupSymbolIn(circuit, getInstance().getModule()));
-  if (!module)
-    return emitError("Referenced module doesn't exist ")
-           << getInstance().getModule() << "::" << getInstance().getName();
-  auto inst =
-      findInnerSym<InstanceOp>(getInstance().getName(), module.getBodyBlock());
-  if (!inst)
-    return emitError("Referenced instance doesn't exist ")
-           << getInstance().getModule() << "::" << getInstance().getName();
-  if (!inst.getDoNotPrint())
-    return emitError("Referenced instance isn't marked as doNotPrint");
   return success();
 }
 

test/Dialect/FIRRTL/errors.mlir

@@ -2890,15 +2890,15 @@ firrtl.circuit "SimulationPortType3" {
 
 firrtl.circuit "BindTargetMissingModule" {
   firrtl.module @BindTargetMissing() {}
-  // expected-error @below {{Referenced module doesn't exist "XXX"::"YYY}}
+  // expected-error @below {{has target that cannot be resolved: #hw.innerNameRef<@XXX::@YYY>}}
   firrtl.bind <@XXX::@YYY>
 }
 
 // -----
 
 firrtl.circuit "BindTargetMissingInstance" {
   firrtl.module @BindTargetMissingInstance() {}
-  // expected-error @below {{Referenced instance doesn't exist "BindTargetMissingInstance"::"YYY"}}
+  // expected-error @below {{has target that cannot be resolved: #hw.innerNameRef<@BindTargetMissingInstance::@YYY>}}
   firrtl.bind <@BindTargetMissingInstance::@YYY>
 }
 
@@ -2910,6 +2910,6 @@ firrtl.circuit "BindTargetMissingDoNotPrintFlag" {
     firrtl.instance target sym @target @Target()
   }
 
-  // expected-error @below  {{Referenced instance isn't marked as doNotPrint}}
+  // expected-error @below  {{target #hw.innerNameRef<@BindTargetMissingDoNotPrintFlag::@target> is not marked doNotPrint}}
   firrtl.bind <@BindTargetMissingDoNotPrintFlag::@target>
 }