fixup! [FIRRTL] Fix Grand Central and Layers Directories

llvm · Feb 28, 2024 · 0a451ea · 0a451ea
1 parent 6264b95
commit 0a451ea
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 4 deletions.
diff --git a/lib/Dialect/FIRRTL/Transforms/GrandCentral.cpp b/lib/Dialect/FIRRTL/Transforms/GrandCentral.cpp
@@ -1731,10 +1731,10 @@ void GrandCentralPass::runOnOperation() {
         // Skip modules that we've visited, that are are under the companion
         // module, or are bound/under a layer block.
         if (auto block = a->getInstance()->getParentOfType<LayerBlockOp>()) {
-          auto diag =
-              a->getInstance().emitOpError()
-              << "is instantiated under a layerblock op which is unexpected by "
-                 "GrandCentral (did you forget to run the LowerLayers pass?)";
+          auto diag = a->getInstance().emitOpError()
+                      << "is instantiated under a '" << block.getOperationName()
+                      << "' op which is unexpected by GrandCentral (did you "
+                         "forget to run the LowerLayers pass?)";
           diag.attachNote(block.getLoc())
               << "the '" << block.getOperationName() << "' op is here";
           removalError = true;

diff --git a/test/Dialect/FIRRTL/grand-central-errors.mlir b/test/Dialect/FIRRTL/grand-central-errors.mlir
@@ -375,3 +375,36 @@ firrtl.circuit "CompanionWithOutputs"
     firrtl.instance dut @DUT()
   }
 }
+
+// -----
+
+firrtl.circuit "UnexpectedLayer"
+  attributes {annotations = [
+    {class = "sifive.enterprise.grandcentral.AugmentedBundleType",
+     defName = "Foo",
+     elements = [
+       {class = "sifive.enterprise.grandcentral.AugmentedBundleType",
+        defName = "Bar",
+        elements = [],
+        name = "bar"}],
+     id = 0 : i64,
+     name = "MyView"}]}  {
+  firrtl.layer @A bind {}
+  firrtl.module private @MyView_companion()
+    attributes {annotations = [{
+      class = "sifive.enterprise.grandcentral.ViewAnnotation.companion",
+      id = 0 : i64,
+      name = "MyView"}]} {}
+  firrtl.module private @Foo() {}
+  firrtl.module private @DUT() {
+    firrtl.instance MyView_companion  @MyView_companion()
+    // expected-note @below {{the 'firrtl.layerblock' op is here}}
+    firrtl.layerblock @A {
+      // expected-error @below {{'firrtl.instance' op is instantiated under a 'firrtl.layerblock' op}}
+      firrtl.instance foo @Foo()
+    }
+  }
+  firrtl.module @UnexpectedLayer() {
+    firrtl.instance dut @DUT()
+  }
+}