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

asBool() to asBool

Browse Source
This commit is contained in:
Jerry Zhao
2023-06-20 17:09:18 -07:00
parent 2ef368b05d
commit 2d45407aad
3 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
build.sbt
View File

@@ -1,9 +1,6 @@
// See LICENSE for license details. // See LICENSE for license details.
val defaultVersions = Map( val defaultVersions = Map("chisel3" -> "3.6.0")
"chisel3" -> "3.5.5",
"chisel-iotesters" -> "2.5.5"
)
organization := "edu.berkeley.cs" organization := "edu.berkeley.cs"
version := "0.4-SNAPSHOT" version := "0.4-SNAPSHOT"
@@ -13,7 +10,7 @@ scalacOptions := Seq("-deprecation", "-feature", "-language:reflectiveCalls")
Test / scalacOptions ++= Seq("-language:reflectiveCalls") Test / scalacOptions ++= Seq("-language:reflectiveCalls")
fork := true fork := true
mainClass := Some("barstools.macros.MacroCompiler") mainClass := Some("barstools.macros.MacroCompiler")
libraryDependencies ++= Seq("chisel3","chisel-iotesters").map { libraryDependencies ++= Seq("chisel3").map {
dep: String => "edu.berkeley.cs" %% dep % sys.props.getOrElse(dep + "Version", defaultVersions(dep)) dep: String => "edu.berkeley.cs" %% dep % sys.props.getOrElse(dep + "Version", defaultVersions(dep))
} }
libraryDependencies ++= Seq( libraryDependencies ++= Seq(

2
src/main/scala/barstools/iocell/chisel/IOCell.scala
View File

@@ -153,7 +153,7 @@ object IOCell {
* @param name An optional name or name prefix to use for naming IO cells * @param name An optional name or name prefix to use for naming IO cells
* @return A Seq of all generated IO cell instances * @return A Seq of all generated IO cell instances
*/ */
val toSyncReset: (Reset) => Bool = _.asBool() val toSyncReset: (Reset) => Bool = _.asBool
val toAsyncReset: (Reset) => AsyncReset = _.asAsyncReset val toAsyncReset: (Reset) => AsyncReset = _.asAsyncReset
def generateFromSignal[T <: Data, R <: Reset]( def generateFromSignal[T <: Data, R <: Reset](
coreSignal: T, coreSignal: T,

2
src/main/scala/barstools/tapeout/transforms/utils/ProgrammaticBundle.scala
View File

@@ -8,7 +8,6 @@ class CustomBundle[T <: Data](elts: (String, T)*) extends Record {
val elements = ListMap(elts.map { case (field, elt) => field -> chiselTypeOf(elt) }: _*) val elements = ListMap(elts.map { case (field, elt) => field -> chiselTypeOf(elt) }: _*)
def apply(elt: String): T = elements(elt) def apply(elt: String): T = elements(elt)
def apply(elt: Int): T = elements(elt.toString) def apply(elt: Int): T = elements(elt.toString)
override def cloneType = (new CustomBundle(elements.toList: _*)).asInstanceOf[this.type]
} }
class CustomIndexedBundle[T <: Data](elts: (Int, T)*) extends Record { class CustomIndexedBundle[T <: Data](elts: (Int, T)*) extends Record {
@@ -17,7 +16,6 @@ class CustomIndexedBundle[T <: Data](elts: (Int, T)*) extends Record {
// TODO: Make an equivalent to the below work publicly (or only on subclasses?) // TODO: Make an equivalent to the below work publicly (or only on subclasses?)
def indexedElements = ListMap(elts.map { case (field, elt) => field -> chiselTypeOf(elt) }: _*) def indexedElements = ListMap(elts.map { case (field, elt) => field -> chiselTypeOf(elt) }: _*)
def apply(elt: Int): T = elements(elt.toString) def apply(elt: Int): T = elements(elt.toString)
override def cloneType = (new CustomIndexedBundle(indexedElements.toList: _*)).asInstanceOf[this.type]
} }
object CustomIndexedBundle { object CustomIndexedBundle {