summaryrefslogtreecommitdiff
path: root/src/test/scala/chiselTests/NamingAnnotationTest.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/NamingAnnotationTest.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/NamingAnnotationTest.scala')
-rw-r--r--src/test/scala/chiselTests/NamingAnnotationTest.scala15
1 files changed, 8 insertions, 7 deletions
diff --git a/src/test/scala/chiselTests/NamingAnnotationTest.scala b/src/test/scala/chiselTests/NamingAnnotationTest.scala
index a02dfe56..41cba1de 100644
--- a/src/test/scala/chiselTests/NamingAnnotationTest.scala
+++ b/src/test/scala/chiselTests/NamingAnnotationTest.scala
@@ -5,6 +5,7 @@ package chiselTests
import chisel3._
import chisel3.experimental.chiselName
import chisel3.internal.InstanceId
+import chisel3.stage.ChiselStage
import scala.collection.mutable.ListBuffer
@@ -102,7 +103,7 @@ class NamedModule extends NamedModuleTester {
val test = expectName(FunctionMockup(), "test")
val test2 = expectName(test +& 2.U, "test2")
val test3 = expectName(ImplicitlyNamed(), "test3")
-
+
val test4 = new NonModule
expectName(test4.value, "test4_value")
expectName(test4.inner.value, "test4_inner_value")
@@ -237,30 +238,30 @@ class NamingAnnotationSpec extends ChiselPropSpec {
property("NamedModule should have function hierarchical names") {
// TODO: clean up test style
var module: NamedModule = null
- elaborate { module = new NamedModule; module }
+ ChiselStage.elaborate { module = new NamedModule; module }
assert(module.getNameFailures() == Nil)
}
property("NameCollisionModule should disambiguate collisions") {
// TODO: clean up test style
var module: NameCollisionModule = null
- elaborate { module = new NameCollisionModule; module }
+ ChiselStage.elaborate { module = new NameCollisionModule; module }
assert(module.getNameFailures() == Nil)
}
property("PartialNamedModule should have partial names") {
// TODO: clean up test style
var module: PartialNamedModule = null
- elaborate { module = new PartialNamedModule; module }
+ ChiselStage.elaborate { module = new PartialNamedModule; module }
assert(module.getNameFailures() == Nil)
}
property("NonNamedModule should elaborate") {
- elaborate { new NonNamedModule }
+ ChiselStage.elaborate { new NonNamedModule }
}
property("NonNamedFunction should elaborate") {
- elaborate { new NonNamedFunction }
+ ChiselStage.elaborate { new NonNamedFunction }
}
property("NonBuilderFunction should run outside a Builder context") {
@@ -269,7 +270,7 @@ class NamingAnnotationSpec extends ChiselPropSpec {
property("NoChiselNamePrefix should prevent prefixing when using @chiselName") {
var module: NoChiselNamePrefixTester = null
- elaborate { module = new NoChiselNamePrefixTester; module }
+ ChiselStage.elaborate { module = new NoChiselNamePrefixTester; module }
assert(module.getNameFailures().isEmpty)
}
}