From 6e03f63d525aac0bdf4a59b6fe66a0b4d5a3a25a Mon Sep 17 00:00:00 2001 From: Schuyler Eldridge Date: Tue, 16 Jun 2020 11:59:15 -0400 Subject: 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 --- src/test/scala/chiselTests/FixedPointSpec.scala | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/test/scala/chiselTests/FixedPointSpec.scala') diff --git a/src/test/scala/chiselTests/FixedPointSpec.scala b/src/test/scala/chiselTests/FixedPointSpec.scala index 7d6ec6a3..c5aab7e4 100644 --- a/src/test/scala/chiselTests/FixedPointSpec.scala +++ b/src/test/scala/chiselTests/FixedPointSpec.scala @@ -5,6 +5,7 @@ package chiselTests import chisel3._ import chisel3.experimental.FixedPoint import chisel3.internal.firrtl.{BinaryPoint, Width} +import chisel3.stage.ChiselStage import chisel3.testers.BasicTester import org.scalatest._ import org.scalatest.flatspec.AnyFlatSpec @@ -148,7 +149,7 @@ class FixedPointLitExtractTester extends BasicTester { stop() } -class FixedPointSpec extends ChiselPropSpec { +class FixedPointSpec extends ChiselPropSpec with Utils { property("should allow set binary point") { assertTesterPasses { new SBPTester } } @@ -159,7 +160,9 @@ class FixedPointSpec extends ChiselPropSpec { assertTesterPasses { new FixedPointMuxTester } } property("Negative shift amounts are invalid") { - a [ChiselException] should be thrownBy { elaborate(new NegativeShift(FixedPoint(1.W, 0.BP))) } + a [ChiselException] should be thrownBy extractCause[ChiselException] { + ChiselStage.elaborate(new NegativeShift(FixedPoint(1.W, 0.BP))) + } } property("Bit extraction on literals should work for all non-negative indices") { assertTesterPasses(new FixedPointLitExtractTester) -- cgit v1.2.3