Black box top-level IO fix (#655)

3 files changed, 37 insertions, 0 deletions

diff --git a/src/test/resources/chisel3/BlackBoxTest.v b/src/test/resources/chisel3/BlackBoxTest.v
index f88fb4ee..234d3a93 100644
--- a/src/test/resources/chisel3/BlackBoxTest.v
+++ b/src/test/resources/chisel3/BlackBoxTest.v
@@ -12,6 +12,13 @@ module BlackBoxPassthrough(
   assign out = in;
 endmodule
 
+module BlackBoxPassthrough2(
+    input  [0:0] in,
+    output [0:0] out
+);
+  assign out = in;
+endmodule
+
 module BlackBoxMinus(
     input  [15:0] in1,
     input  [15:0] in2,
diff --git a/src/test/scala/chiselTests/BlackBox.scala b/src/test/scala/chiselTests/BlackBox.scala
index 983039c5..27895a54 100644
--- a/src/test/scala/chiselTests/BlackBox.scala
+++ b/src/test/scala/chiselTests/BlackBox.scala
@@ -25,6 +25,14 @@ class BlackBoxPassthrough extends BlackBox {
   })
 }
 
+// Test Flip on top-level IO
+class BlackBoxPassthrough2 extends BlackBox {
+  val io = IO(Flipped(new Bundle() {
+    val in = Output(Bool())
+    val out = Input(Bool())
+  }))
+}
+
 class BlackBoxRegister extends BlackBox {
   val io = IO(new Bundle() {
     val clock = Input(Clock())
@@ -45,6 +53,14 @@ class BlackBoxTester extends BasicTester {
   stop()
 }
 
+class BlackBoxFlipTester extends BasicTester {
+  val blackBox = Module(new BlackBoxPassthrough2)
+
+  blackBox.io.in := 1.U
+  assert(blackBox.io.out === 1.U)
+  stop()
+}
+
 /** Instantiate multiple BlackBoxes with similar interfaces but different
   * functionality. Used to detect failures in BlackBox naming and module
   * deduplication.
@@ -140,6 +156,10 @@ class BlackBoxSpec extends ChiselFlatSpec {
     assertTesterPasses({ new BlackBoxTester },
         Seq("/chisel3/BlackBoxTest.v"))
   }
+  "A BlackBoxed with flipped IO" should "work" in {
+    assertTesterPasses({ new BlackBoxFlipTester },
+        Seq("/chisel3/BlackBoxTest.v"))
+  }
   "Multiple BlackBoxes" should "work" in {
     assertTesterPasses({ new MultiBlackBoxTester },
         Seq("/chisel3/BlackBoxTest.v"))
diff --git a/src/test/scala/chiselTests/Direction.scala b/src/test/scala/chiselTests/Direction.scala
index 9b353840..49d0ab77 100644
--- a/src/test/scala/chiselTests/Direction.scala
+++ b/src/test/scala/chiselTests/Direction.scala
@@ -36,6 +36,12 @@ class BadSubDirection extends DirectionHaver {
   io.inBundle.out := 0.U
 }
 
+class TopDirectionOutput extends Module {
+  val io = IO(Output(new DirectionedBundle))
+  io.in := 42.U
+  io.out := 117.U
+}
+
 class DirectionSpec extends ChiselPropSpec with Matchers {
 
   //TODO: In Chisel3 these are actually FIRRTL errors. Remove from tests?
@@ -52,4 +58,8 @@ class DirectionSpec extends ChiselPropSpec with Matchers {
      elaborate(new BadSubDirection)
     }
   }
+
+  property("Top-level forced outputs should be assignable") {
+    elaborate(new TopDirectionOutput)
+  }
 }