Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

all isaDTS strings to lowercase #3333

Merged
merged 1 commit into from
Apr 26, 2023
Merged

all isaDTS strings to lowercase #3333

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/scala/rocket/RocketCore.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ case class RocketCoreParams(
val instBits: Int = if (useCompressed) 16 else 32
val lrscCycles: Int = 80 // worst case is 14 mispredicted branches + slop
val traceHasWdata: Boolean = false // ooo wb, so no wdata in trace
override val customIsaExt = Some("Xrocket") // CEASE instruction
override val customIsaExt = Some("xrocket") // CEASE instruction
override def minFLen: Int = fpu.map(_.minFLen).getOrElse(32)
override def customCSRs(implicit p: Parameters) = new RocketCustomCSRs
}
Expand Down
16 changes: 8 additions & 8 deletions src/main/scala/tile/BaseTile.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,14 +109,14 @@ trait HasNonDiplomaticTileParameters {
// rdcycle[h], rdinstret[h] is implemented
// rdtime[h] is not implemented, and could be provided by software emulation
// see https://github.com/chipsalliance/rocket-chip/issues/3207
//Some(Seq("Zicntr")) ++
Some(Seq("Zicsr", "Zifencei", "Zihpm")) ++
Option.when(tileParams.core.fpu.nonEmpty && tileParams.core.fpu.get.fLen >= 16 && tileParams.core.fpu.get.minFLen <= 16)(Seq("Zfh")) ++
Option.when(tileParams.core.useBitManip)(Seq("Zba", "Zbb", "Zbc")) ++
Option.when(tileParams.core.hasBitManipCrypto)(Seq("Zbkb", "Zbkc", "Zbkx")) ++
Option.when(tileParams.core.useBitManip)(Seq("Zbs")) ++
Option.when(tileParams.core.useCryptoNIST)(Seq("Zknd", "Zkne", "Zknh")) ++
Option.when(tileParams.core.useCryptoSM)(Seq("Zksed", "Zksh")) ++
//Some(Seq("zicntr")) ++
Some(Seq("zicsr", "zifencei", "zihpm")) ++
Option.when(tileParams.core.fpu.nonEmpty && tileParams.core.fpu.get.fLen >= 16 && tileParams.core.fpu.get.minFLen <= 16)(Seq("zfh")) ++
Option.when(tileParams.core.useBitManip)(Seq("zba", "zbb", "zbc")) ++
Option.when(tileParams.core.hasBitManipCrypto)(Seq("zbkb", "zbkc", "zbkx")) ++
Option.when(tileParams.core.useBitManip)(Seq("zbs")) ++
Option.when(tileParams.core.useCryptoNIST)(Seq("zknd", "zkne", "zknh")) ++
Option.when(tileParams.core.useCryptoSM)(Seq("zksed", "zksh")) ++
tileParams.core.customIsaExt.map(Seq(_))
).flatten
val multiLetterString = multiLetterExt.mkString("_")
Expand Down