summaryrefslogtreecommitdiff
path: root/src/test/scala/chiselTests/BundleSpec.scala
diff options
context:
space:
mode:
authorSchuyler Eldridge2020-06-16 11:59:15 -0400
committerSchuyler Eldridge2020-06-22 20:00:10 -0400
commit6e03f63d525aac0bdf4a59b6fe66a0b4d5a3a25a (patch)
tree482481bcfe93ea5dfcece80772ce1957fb68c74c /src/test/scala/chiselTests/BundleSpec.scala
parentcc4fa583690292d690804144fe92427f0c9f5fdf (diff)
Use ChiselStage in Tests
This migrates the tests to Chisel 3.4/FIRRTL 1.4. This primarily involves removing usages of deprecated methods including: - Remove usages of Driver - Use ChiselStage methods instead of BackendCompilationUtilities methods - Use Dependency API for custom transforms - Use extractCause to unpack StackError Signed-off-by: Schuyler Eldridge <schuyler.eldridge@ibm.com>
Diffstat (limited to 'src/test/scala/chiselTests/BundleSpec.scala')
-rw-r--r--src/test/scala/chiselTests/BundleSpec.scala21
1 files changed, 11 insertions, 10 deletions
diff --git a/src/test/scala/chiselTests/BundleSpec.scala b/src/test/scala/chiselTests/BundleSpec.scala
index c5f40c8a..d19e5d5f 100644
--- a/src/test/scala/chiselTests/BundleSpec.scala
+++ b/src/test/scala/chiselTests/BundleSpec.scala
@@ -3,6 +3,7 @@
package chiselTests
import chisel3._
+import chisel3.stage.ChiselStage
import chisel3.testers.BasicTester
trait BundleSpecUtils {
@@ -55,9 +56,9 @@ trait BundleSpecUtils {
}
}
-class BundleSpec extends ChiselFlatSpec with BundleSpecUtils {
+class BundleSpec extends ChiselFlatSpec with BundleSpecUtils with Utils {
"Bundles with the same fields but in different orders" should "bulk connect" in {
- elaborate { new MyModule(new BundleFooBar, new BundleBarFoo) }
+ ChiselStage.elaborate { new MyModule(new BundleFooBar, new BundleBarFoo) }
}
"Bundles" should "follow UInt serialization/deserialization API" in {
@@ -65,18 +66,18 @@ class BundleSpec extends ChiselFlatSpec with BundleSpecUtils {
}
"Bulk connect on Bundles" should "check that the fields match" in {
- (the [ChiselException] thrownBy {
- elaborate { new MyModule(new BundleFooBar, new BundleFoo) }
+ (the [ChiselException] thrownBy extractCause[ChiselException] {
+ ChiselStage.elaborate { new MyModule(new BundleFooBar, new BundleFoo) }
}).getMessage should include ("Right Record missing field")
- (the [ChiselException] thrownBy {
- elaborate { new MyModule(new BundleFoo, new BundleFooBar) }
+ (the [ChiselException] thrownBy extractCause[ChiselException] {
+ ChiselStage.elaborate { new MyModule(new BundleFoo, new BundleFooBar) }
}).getMessage should include ("Left Record missing field")
}
"Bundles" should "not be able to use Seq for constructing hardware" in {
- (the[ChiselException] thrownBy {
- elaborate {
+ (the[ChiselException] thrownBy extractCause[ChiselException] {
+ ChiselStage.elaborate {
new Module {
val io = IO(new Bundle {
val b = new BadSeqBundle
@@ -116,8 +117,8 @@ class BundleSpec extends ChiselFlatSpec with BundleSpecUtils {
}
"Bundles" should "not have aliased fields" in {
- (the[ChiselException] thrownBy {
- elaborate { new Module {
+ (the[ChiselException] thrownBy extractCause[ChiselException] {
+ ChiselStage.elaborate { new Module {
val io = IO(Output(new Bundle {
val a = UInt(8.W)
val b = a