From e3bdbb2041443b9a93cccce04ee35aff2fe713af Mon Sep 17 00:00:00 2001 From: abejgonzalez Date: Mon, 17 Jan 2022 14:46:12 -0800 Subject: [PATCH] Update Chipyard --- generators/chipyard/src/main/scala/example/TutorialTile.scala | 2 ++ .../chipyard/src/main/scala/example/dsptools/GenericFIR.scala | 4 ---- .../main/scala/example/dsptools/StreamingPassthrough.scala | 2 -- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/generators/chipyard/src/main/scala/example/TutorialTile.scala b/generators/chipyard/src/main/scala/example/TutorialTile.scala index fad51c01..97294428 100644 --- a/generators/chipyard/src/main/scala/example/TutorialTile.scala +++ b/generators/chipyard/src/main/scala/example/TutorialTile.scala @@ -28,6 +28,7 @@ case class MyCoreParams( enableToFromHostCaching: Boolean = false, ) extends CoreParams { val useVM: Boolean = true + val useHypervisor: Boolean = false val useUser: Boolean = true val useSupervisor: Boolean = false val useDebug: Boolean = true @@ -41,6 +42,7 @@ case class MyCoreParams( val fpu: Option[FPUParams] = Some(FPUParams()) // copied fma latencies from Rocket val nLocalInterrupts: Int = 0 val useNMI: Boolean = false + val nPTECacheEntries: Int = 0 // TODO: Check val nPMPs: Int = 0 // TODO: Check val pmpGranularity: Int = 4 // copied from Rocket val nBreakpoints: Int = 0 // TODO: Check diff --git a/generators/chipyard/src/main/scala/example/dsptools/GenericFIR.scala b/generators/chipyard/src/main/scala/example/dsptools/GenericFIR.scala index ed16b25d..b92ca181 100644 --- a/generators/chipyard/src/main/scala/example/dsptools/GenericFIR.scala +++ b/generators/chipyard/src/main/scala/example/dsptools/GenericFIR.scala @@ -25,8 +25,6 @@ case object GenericFIRKey extends Field[Option[GenericFIRParams]](None) class GenericFIRCellBundle[T<:Data:Ring](genIn:T, genOut:T) extends Bundle { val data: T = genIn.cloneType val carry: T = genOut.cloneType - - override def cloneType: this.type = GenericFIRCellBundle(genIn, genOut).asInstanceOf[this.type] } object GenericFIRCellBundle { def apply[T<:Data:Ring](genIn:T, genOut:T): GenericFIRCellBundle[T] = new GenericFIRCellBundle(genIn, genOut) @@ -43,8 +41,6 @@ object GenericFIRCellIO { class GenericFIRBundle[T<:Data:Ring](proto: T) extends Bundle { val data: T = proto.cloneType - - override def cloneType: this.type = GenericFIRBundle(proto).asInstanceOf[this.type] } object GenericFIRBundle { def apply[T<:Data:Ring](proto: T): GenericFIRBundle[T] = new GenericFIRBundle(proto) diff --git a/generators/chipyard/src/main/scala/example/dsptools/StreamingPassthrough.scala b/generators/chipyard/src/main/scala/example/dsptools/StreamingPassthrough.scala index 923f12e2..fe02c996 100644 --- a/generators/chipyard/src/main/scala/example/dsptools/StreamingPassthrough.scala +++ b/generators/chipyard/src/main/scala/example/dsptools/StreamingPassthrough.scala @@ -26,8 +26,6 @@ case object StreamingPassthroughKey extends Field[Option[StreamingPassthroughPar class StreamingPassthroughBundle[T<:Data:Ring](proto: T) extends Bundle { val data: T = proto.cloneType - - override def cloneType: this.type = StreamingPassthroughBundle(proto).asInstanceOf[this.type] } object StreamingPassthroughBundle { def apply[T<:Data:Ring](proto: T): StreamingPassthroughBundle[T] = new StreamingPassthroughBundle(proto)