wu-arch/chipyard
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix issues after chisel update for august 2019

Browse Source
This commit is contained in:
Colin Schmidt
2019-10-23 10:56:02 -07:00
parent 3bba55ccc8
commit e4cce07c78
3 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tapeout/src/main/scala/transforms/ResetInverter.scala
View File

@@ -58,7 +58,9 @@ class ResetInverterTransform extends Transform {
trait ResetInverter {
self: chisel3.Module =>
def invert(component: InstanceId): Unit = {
annotate(chisel3.experimental.ChiselAnnotation(component, classOf[ResetInverterTransform], "invert"))
def invert[T <: chisel3.experimental.LegacyModule](module: T): Unit = {
chisel3.experimental.annotate(new chisel3.experimental.ChiselAnnotation{
def toFirrtl: Annotation = ResetInverterAnnotation(module.toNamed)
})
}
}

6
tapeout/src/main/scala/transforms/retime/Retime.scala
View File

@@ -39,7 +39,9 @@ class RetimeTransform extends Transform {
trait RetimeLib {
self: chisel3.Module =>
def retime(component: InstanceId): Unit = {
annotate(chisel3.experimental.ChiselAnnotation(component, classOf[RetimeTransform], "retime"))
def retime[T <: chisel3.experimental.LegacyModule](module: T): Unit = {
chisel3.experimental.annotate(new chisel3.experimental.ChiselAnnotation{
def toFirrtl: Annotation = RetimeAnnotation(module.toNamed)
})
}
}

8
tapeout/src/main/scala/transforms/utils/ProgrammaticBundle.scala
View File

@@ -4,7 +4,7 @@ import chisel3._
import scala.collection.immutable.ListMap
class CustomBundle[T <: Data](elts: (String, T)*) extends Record {
val elements = ListMap(elts map { case (field, elt) => field -> elt.chiselCloneType }: _*)
val elements = ListMap(elts map { case (field, elt) => field -> chiselTypeOf(elt) }: _*)
def apply(elt: String): T = elements(elt)
def apply(elt: Int): T = elements(elt.toString)
override def cloneType = (new CustomBundle(elements.toList: _*)).asInstanceOf[this.type]
@@ -12,9 +12,9 @@ class CustomBundle[T <: Data](elts: (String, T)*) extends Record {
class CustomIndexedBundle[T <: Data](elts: (Int, T)*) extends Record {
// Must be String, Data
val elements = ListMap(elts map { case (field, elt) => field.toString -> elt.chiselCloneType }: _*)
val elements = ListMap(elts map { case (field, elt) => field.toString -> chiselTypeOf(elt) }: _*)
// TODO: Make an equivalent to the below work publicly (or only on subclasses?)
def indexedElements = ListMap(elts map { case (field, elt) => field -> elt.chiselCloneType }: _*)
def indexedElements = ListMap(elts map { case (field, elt) => field -> chiselTypeOf(elt) }: _*)
def apply(elt: Int): T = elements(elt.toString)
override def cloneType = (new CustomIndexedBundle(indexedElements.toList: _*)).asInstanceOf[this.type]
}
@@ -23,4 +23,4 @@ object CustomIndexedBundle {
def apply[T <: Data](gen: T, idxs: Seq[Int]) = new CustomIndexedBundle(idxs.map(_ -> gen): _*)
// Allows Vecs of elements of different types/widths
def apply[T <: Data](gen: Seq[T]) = new CustomIndexedBundle(gen.zipWithIndex.map{ case (elt, field) => field -> elt }: _*)
}
}