aboutsummaryrefslogtreecommitdiff
path: root/src/test/scala/firrtlTests/ChirrtlMemSpec.scala
diff options
context:
space:
mode:
authorJack Koenig2018-02-27 18:07:11 -0800
committerGitHub2018-02-27 18:07:11 -0800
commitc7eb1570dfb1c7701ea32d1209982a053f3cec1d (patch)
tree3f509b202d82841c5dad5588d1f953a25d389b44 /src/test/scala/firrtlTests/ChirrtlMemSpec.scala
parentb90fc784a1819c1d7905910130a7da022214bc22 (diff)
Refactor Annotations (#721)
- Old Annotation renamed to deprecated LegacyAnnotation - Annotation is now a trait that can be extended - New JsonProtocol for Annotation [de]serialization - Replace AnnotationMap with AnnotationSeq - Deprecate Transform.getMyAnnotations - Update Transforms - Turn on deprecation warnings - Remove deprecated Driver.compile - Make AnnotationTests abstract with Legacy and Json subclasses - Add functionality to convert LegacyAnnotations of built-in annos This will give a noisy warning and is more of a best effort than a robust solution. Fixes #475 Closes #609
Diffstat (limited to 'src/test/scala/firrtlTests/ChirrtlMemSpec.scala')
-rw-r--r--src/test/scala/firrtlTests/ChirrtlMemSpec.scala25
1 files changed, 8 insertions, 17 deletions
diff --git a/src/test/scala/firrtlTests/ChirrtlMemSpec.scala b/src/test/scala/firrtlTests/ChirrtlMemSpec.scala
index d039cc96..74d39286 100644
--- a/src/test/scala/firrtlTests/ChirrtlMemSpec.scala
+++ b/src/test/scala/firrtlTests/ChirrtlMemSpec.scala
@@ -78,8 +78,7 @@ circuit foo :
io.out <= bar
""".stripMargin
- val annotationMap = AnnotationMap(Nil)
- val res = compileAndEmit(CircuitState(parse(input), ChirrtlForm, Some(annotationMap)))
+ val res = compileAndEmit(CircuitState(parse(input), ChirrtlForm))
// Check correctness of firrtl
parse(res.getEmittedCircuit.value)
}
@@ -104,14 +103,13 @@ circuit foo :
io.out <= bar
""".stripMargin
- val annotationMap = AnnotationMap(Nil)
- val res = compileAndEmit(CircuitState(parse(input), ChirrtlForm, Some(annotationMap)))
+ val res = compileAndEmit(CircuitState(parse(input), ChirrtlForm))
// Check correctness of firrtl
parse(res.getEmittedCircuit.value)
}
ignore should "Memories should not have validif on port clocks when declared in a when" in {
- val input =
+ val input =
""";buildInfoPackage: chisel3, version: 3.0-SNAPSHOT, scalaVersion: 2.11.11, sbtVersion: 0.13.16, builtAtString: 2017-10-06 20:55:20.367, builtAtMillis: 1507323320367
|circuit Stack :
| module Stack :
@@ -157,8 +155,7 @@ circuit foo :
| skip @[Stack.scala 19:16]
| io.dataOut <= out @[Stack.scala 31:14]
""".stripMargin
- val annotationMap = AnnotationMap(Nil)
- val res = (new LowFirrtlCompiler).compile(CircuitState(parse(input), ChirrtlForm, Some(annotationMap)), Nil).circuit
+ val res = (new LowFirrtlCompiler).compile(CircuitState(parse(input), ChirrtlForm), Seq()).circuit
assert(res search {
case Connect(_, WSubField(WSubField(WRef("stack_mem", _, _, _), "_T_35",_, _), "clk", _, _), WRef("clock", _, _, _)) => true
case Connect(_, WSubField(WSubField(WRef("stack_mem", _, _, _), "_T_17",_, _), "clk", _, _), WRef("clock", _, _, _)) => true
@@ -179,8 +176,7 @@ circuit foo :
| read mport bar = mem[addr], clock
| out <= bar
|""".stripMargin
- val annotationMap = AnnotationMap(Nil)
- val res = (new LowFirrtlCompiler).compile(CircuitState(parse(input), ChirrtlForm, Some(annotationMap)), Nil).circuit
+ val res = (new LowFirrtlCompiler).compile(CircuitState(parse(input), ChirrtlForm), Seq()).circuit
assert(res search {
case Connect(_, WSubField(WSubField(WRef("mem", _, _, _), "bar",_, _), "clk", _, _), WRef("clock", _, _, _)) => true
})
@@ -201,8 +197,7 @@ circuit foo :
| read mport bar = mem[addr], local
| out <= bar
|""".stripMargin
- val annotationMap = AnnotationMap(Nil)
- val res = new LowFirrtlCompiler().compile(CircuitState(parse(input), ChirrtlForm, Some(annotationMap)), Nil).circuit
+ val res = new LowFirrtlCompiler().compile(CircuitState(parse(input), ChirrtlForm), Seq()).circuit
assert(res search {
case Connect(_, WSubField(WSubField(WRef("mem", _, _, _), "bar",_, _), "clk", _, _), WRef("clock", _, _, _)) => true
})
@@ -223,9 +218,7 @@ circuit foo :
| read mport bar = mem[addr], asClock(local)
| out <= bar
|""".stripMargin
- val annotationMap = AnnotationMap(Nil)
-
- val res = new LowFirrtlCompiler().compile(CircuitState(parse(input), ChirrtlForm, Some(annotationMap)), Nil).circuit
+ val res = new LowFirrtlCompiler().compile(CircuitState(parse(input), ChirrtlForm), Seq()).circuit
assert(res search {
case Connect(_, WSubField(WSubField(WRef("mem", _, _, _), "bar",_, _), "clk", _, _), DoPrim(AsClock, Seq(WRef("clock", _, _, _)), Nil, _)) => true
})
@@ -246,9 +239,7 @@ circuit foo :
| read mport bar = mem[addr], asClock(clock)
| out <= bar
|""".stripMargin
- val annotationMap = AnnotationMap(Nil)
-
- val res = (new HighFirrtlCompiler).compile(CircuitState(parse(input), ChirrtlForm, Some(annotationMap)), Nil).circuit
+ val res = (new HighFirrtlCompiler).compile(CircuitState(parse(input), ChirrtlForm), Seq()).circuit
assert(res search {
case Connect(_, SubField(SubField(Reference("mem", _), "bar", _), "clk", _), DoPrim(AsClock, Seq(Reference("clock", _)), _, _)) => true
})