xin/ysyx-workbench
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Compare commits

base: xin:a5790308f094f7c3aacdccde53627839e80f9004
Branches Tags
xin:master
xin:refactor-npc
xin:tracer-ysyx
xin:pa0
..
compare: xin:d9efde7a44875fbe829ccd4ffae3d75fac0c8eee
Branches Tags
xin:refactor-npc
xin:master
xin:tracer-ysyx
xin:pa0

No commits in common. "a5790308f094f7c3aacdccde53627839e80f9004" and "d9efde7a44875fbe829ccd4ffae3d75fac0c8eee" have entirely different histories.
a5790308f0 ... d9efde7a44

15 changed files with 240 additions and 606 deletions
Show stats Expand all files Collapse all files

2
.scalafmt.conf
View file

@ -1,2 +0,0 @@
version = 3.7.17
runner.dialect = scala213source3

7
flake.nix
View file

@ -50,13 +50,6 @@
enable = true; enable = true;
types_or = pkgs.lib.mkForce [ "c" "c++" ]; types_or = pkgs.lib.mkForce [ "c" "c++" ];
}; };
scalafmt = {
enable = true;
package = pkgs.scalafmt;
name = "Scalafmt";
types = [ "scala" ];
entry = "${pkgs.scalafmt}/bin/scalafmt --non-interactive";
};
}; };
}; };
}; };

17
npc/core/build.sbt
View file

@ -1,8 +1,9 @@
ThisBuild / scalaVersion := "2.13.12" ThisBuild / scalaVersion := "2.13.12"
ThisBuild / version := "0.1.0" ThisBuild / version := "0.1.0"
val chiselVersion = "6.2.0" val chiselVersion = "6.2.0"
val circeVersion = "0.14.1" val circeVersion = "0.14.1"
lazy val root = (project in file(".")) lazy val root = (project in file("."))
.settings( .settings(
@ -11,7 +12,7 @@ lazy val root = (project in file("."))
"org.chipsalliance" %% "chisel" % chiselVersion, "org.chipsalliance" %% "chisel" % chiselVersion,
"edu.berkeley.cs" %% "chiseltest" % "6.0.0" % "test", "edu.berkeley.cs" %% "chiseltest" % "6.0.0" % "test",
"com.chuusai" %% "shapeless" % "2.3.3", "com.chuusai" %% "shapeless" % "2.3.3",
"com.github.scopt" %% "scopt" % "4.1.0" "com.github.scopt" %% "scopt" % "4.1.0",
) ++ Seq( ) ++ Seq(
"io.circe" %% "circe-core", "io.circe" %% "circe-core",
"io.circe" %% "circe-generic", "io.circe" %% "circe-generic",
@ -22,9 +23,7 @@ lazy val root = (project in file("."))
"-deprecation", "-deprecation",
"-feature", "-feature",
"-Xcheckinit", "-Xcheckinit",
"-Ymacro-annotations" "-Ymacro-annotations",
), ),
addCompilerPlugin( addCompilerPlugin("org.chipsalliance" % "chisel-plugin" % chiselVersion cross CrossVersion.full),
"org.chipsalliance" % "chisel-plugin" % chiselVersion cross CrossVersion.full )
)
)

108
npc/core/src/main/scala/components/CSR.scala
View file

@ -1,108 +0,0 @@
package flow.components
import chisel3._
import chisel3.util.log2Ceil
import scala.reflect.runtime.universe._
import cats.instances.MapInstances
import dataclass.data
import chisel3.util.experimental.decode.{decoder, TruthTable}
import shapeless.HNil
import flow.Params
import chisel3.util.BitPat
import chisel3.util.Fill
class CSRControlInterface extends Bundle {
object csrRead extends ChiselEnum {
val csrReadDisabled, csrReadEnabled = Value
}
object csrWrite extends ChiselEnum {
val csrWriteDisabled, csrWriteEnabled = Value
}
val readEnable = Input(csrRead())
val writeEnable = Input(csrWrite())
def ctrlBindPorts = {
readEnable :: writeEnable :: HNil
}
}
class CSRCore(implicit val p: Params) extends Module {
val control = IO(new CSRControlInterface)
val in = IO(new Bundle {
val csrAddr = Input(UInt(p.csrAddrWidth))
val writeData = Input(UInt(p.XLEN))
})
val out = IO(new Bundle {
val readData = Output(UInt(p.XLEN))
val readValid = Output(Bool())
})
implicit class fromChiselEnumToBool[T <: EnumType](x: T) {
def B: Bool = {
x.asUInt =/= 0.U
}
}
val nameToAddr = Map(
"mstatus" -> 0x300,
"mtvec" -> 0x305,
"mie" -> 0x304,
"mepc" -> 0x341,
"mcause" -> 0x342,
"mtval" -> 0x343,
"mip" -> 0x344
)
val csrSize = nameToAddr.size
val addrToIndex = nameToAddr.zipWithIndex
.map(x => {
val (name: String, csrAddr: Int) = x._1
val index = x._2
csrAddr -> index
})
.toMap
val indexToAddr = addrToIndex.map(_.swap)
val csrIndexWidth = log2Ceil(csrSize).W
private val align = (x: UInt, w: Width) => BitPat(x.litValue.U(w))
val csrIndex = decoder(
in.csrAddr,
TruthTable(
addrToIndex.map(x =>
// Addr Index
(align(x._1.U, p.csrAddrWidth), align(x._2.U, csrIndexWidth))
),
align(addrToIndex.head._2.U, csrIndexWidth)
)
)
val csrIndexValid = !(
csrIndex === BitPat(0.U) &&
in.csrAddr =/= align(indexToAddr(0).U, p.csrAddrWidth)
)
val regs = RegInit(VecInit(Seq.fill(csrSize)(0.U(p.XLEN))))
val regReadValue = regs(csrIndex)
val delayWriteData = RegNext(in.writeData, 0.U(p.XLEN))
val delayWriteEnable = RegNext(control.writeEnable)
when(control.writeEnable.B) {
regs(csrIndex) := delayWriteData
}
when(control.readEnable.B) {
out.readData := regReadValue
out.readValid := true.B && csrIndexValid
} otherwise {
out.readData := 0.U(p.XLEN)
out.readValid := false.B && csrIndexValid
}
}

3
npc/core/src/main/scala/components/Mem.scala
View file

@ -24,8 +24,7 @@ class RamControlInterface(addrWidth: Int) extends Bundle {
/* FIXME: Extends here might not be the best solution. /* FIXME: Extends here might not be the best solution.
* We need a way to merge two bundles together * We need a way to merge two bundles together
*/ */
class RamInterface[T <: Data](tpe: T, addrWidth: Int) class RamInterface[T <: Data](tpe: T, addrWidth: Int) extends RamControlInterface(addrWidth) {
extends RamControlInterface(addrWidth) {
val clock = Input(Clock()) val clock = Input(Clock())
val reset = Input(Reset()) val reset = Input(Reset())
val writeAddr = Input(UInt(addrWidth.W)) val writeAddr = Input(UInt(addrWidth.W))

6
npc/core/src/main/scala/components/ProgramCounter.scala
View file

@ -30,11 +30,11 @@ class ProgramCounter[T <: UInt](tpe: T) extends Module {
// pc := in.pcSrcs(control.srcSelect.asUInt) // pc := in.pcSrcs(control.srcSelect.asUInt)
import control.SrcSelect._ import control.SrcSelect._
when(control.useImmB === true.B) { when( control.useImmB === true.B ) {
pc_reg := pc_reg + in.immB pc_reg := pc_reg + in.immB
}.elsewhen(control.srcSelect === pStaticNpc) { }. elsewhen( control.srcSelect === pStaticNpc) {
pc_reg := pc_reg + 4.U pc_reg := pc_reg + 4.U
}.elsewhen(control.srcSelect === pExeOut) { }. elsewhen( control.srcSelect === pExeOut) {
pc_reg := in.exeOut pc_reg := in.exeOut
} }
out := pc_reg out := pc_reg

10
npc/core/src/main/scala/components/RegisterFile.scala
View file

@ -5,7 +5,7 @@ import chisel3.util.log2Ceil
import chisel3.util.UIntToOH import chisel3.util.UIntToOH
import chisel3.util.MuxLookup import chisel3.util.MuxLookup
import chisel3.experimental.Trace._ import chisel3.experimental.Trace._
import shapeless.{HList, HNil, ::} import shapeless.{ HList, HNil, :: }
class RegControl extends Bundle { class RegControl extends Bundle {
object WriteSelect extends ChiselEnum { object WriteSelect extends ChiselEnum {
@ -21,8 +21,7 @@ class RegControl extends Bundle {
traceName(writeEnable) traceName(writeEnable)
} }
class RegisterFile[T <: Data](tpe: T, regCount: Int, numReadPorts: Int) class RegisterFile[T <: Data](tpe: T, regCount: Int, numReadPorts: Int) extends Module {
extends Module {
require(numReadPorts >= 0) require(numReadPorts >= 0)
val control = IO(new RegControl) val control = IO(new RegControl)
val dataAddrWidth = log2Ceil(regCount).W val dataAddrWidth = log2Ceil(regCount).W
@ -41,10 +40,7 @@ class RegisterFile[T <: Data](tpe: T, regCount: Int, numReadPorts: Int)
for ((reg, i) <- regFile.zipWithIndex.tail) { for ((reg, i) <- regFile.zipWithIndex.tail) {
reg := Mux( reg := Mux(
writeAddrOH(i.U(log2Ceil(regCount).W)) && control.writeEnable, writeAddrOH(i.U(log2Ceil(regCount).W)) && control.writeEnable, in.writeData(control.writeSelect.asUInt), reg)
in.writeData(control.writeSelect.asUInt),
reg
)
} }
regFile(0) := 0.U regFile(0) := 0.U

21
npc/core/src/main/scala/top/ArgParse.scala
View file

@ -1,16 +1,16 @@
package flow package flow
import scopt.{OParser, DefaultOEffectSetup} import scopt.{ OParser, DefaultOEffectSetup }
import java.io.File import java.io.File
case class CliOptions( case class CliOptions(
targetDir: File = new File("."), targetDir: File = new File("."),
configFile: Option[File] = None, configFile: Option[File] = None,
argsFile: Option[File] = None, argsFile: Option[File] = None,
verilatorConfigFileOut: File = new File("conf.vlt") verilatorConfigFileOut: File = new File("conf.vlt"),
) { ) {
val builder = OParser.builder[CliOptions] val builder = OParser.builder[CliOptions]
val parser = { val parser = {
import builder._ import builder._
OParser.sequence( OParser.sequence(
programName("flow"), programName("flow"),
@ -33,19 +33,14 @@ case class CliOptions(
def parse(args: Array[String]): CliOptions = { def parse(args: Array[String]): CliOptions = {
OParser.runParser(parser, args, CliOptions()) match { OParser.runParser(parser, args, CliOptions()) match {
case (result, effects) => case (result, effects) =>
OParser.runEffects( OParser.runEffects(effects, new DefaultOEffectSetup {
effects, // ignore terminate
new DefaultOEffectSetup { override def terminate(exitState: Either[String, Unit]): Unit = ()
// ignore terminate })
override def terminate(exitState: Either[String, Unit]): Unit = ()
}
)
result match { result match {
case Some(cliOptions: CliOptions) => { return cliOptions } case Some(cliOptions: CliOptions) => { return cliOptions }
case _ => { case _ => { throw new IllegalArgumentException("Wrong command line argument") }
throw new IllegalArgumentException("Wrong command line argument")
}
} }
} }
} }

20
npc/core/src/main/scala/top/Config.scala
View file

@ -3,20 +3,14 @@ package flow
import io.circe.generic.JsonCodec import io.circe.generic.JsonCodec
// Which group of signals to trace // Which group of signals to trace
@JsonCodec case class TraceConfig( @JsonCodec case class TraceConfig (
enable: Boolean = false, enable: Boolean = false,
registers: Array[Int] = Array(), registers: Array[Int] = Array(),
mem: Array[(Int, Int)] = Array() mem: Array[(Int, Int)] = Array(),
) )
@JsonCodec case class Config( @JsonCodec case class Config(
// Whether to enable Difftest // Whether to enable Difftest
enableDifftest: Boolean = true, enableDifftest: Boolean = true,
traceConfig: TraceConfig = TraceConfig() traceConfig: TraceConfig = TraceConfig(),
)
import chisel3._
case class Params(
XLEN: Width,
csrAddrWidth: Width = 12.W
) )

444
npc/core/src/main/scala/top/FlowMain.scala
View file

@ -8,7 +8,7 @@ import chisel3.experimental.Trace._
import shapeless.{HNil, ::} import shapeless.{HNil, ::}
import shapeless.HList import shapeless.HList
import shapeless.ops.coproduct.Prepend import shapeless.ops.coproduct.Prepend
import chisel3.util.{BinaryMemoryFile, HexMemoryFile} import chisel3.util.{ BinaryMemoryFile, HexMemoryFile }
import chisel3.experimental.Trace import chisel3.experimental.Trace
import scala.collection.IndexedSeqView import scala.collection.IndexedSeqView
@ -18,7 +18,6 @@ import flow.components.RamControlInterface
object RV32Inst { object RV32Inst {
private val bp = BitPat private val bp = BitPat
// format: off
val lui = this.bp("b???????_?????_?????_???_?????_01101_11") val lui = this.bp("b???????_?????_?????_???_?????_01101_11")
val auipc = this.bp("b???????_?????_?????_???_?????_00101_11") val auipc = this.bp("b???????_?????_?????_???_?????_00101_11")
@ -73,33 +72,28 @@ object RV32Inst {
val remu = this.bp("b0000001_?????_?????_111_?????_01100_11") val remu = this.bp("b0000001_?????_?????_111_?????_01100_11")
val inv = this.bp("b???????_?????_?????_???_?????_?????_??") val inv = this.bp("b???????_?????_?????_???_?????_?????_??")
// format: on
} }
import flow.components.{RegControl, PcControlInterface, ALUControlInterface} import flow.components.{RegControl, PcControlInterface, ALUControlInterface}
class Control(width: Int) extends RawModule { class Control(width: Int) extends RawModule {
// Helpers // Helpers
class WrapList[T](vl: T) { type Type = T; val v = vl } class WrapList[T](vl: T) { type Type = T; val v = vl}
object wrap extends Poly1 { object wrap extends Poly1 {
implicit def default[A] = at[A](Right(_).withLeft[Int]) implicit def default[A] = at[A](Right(_).withLeft[Int])
} }
def lit(x: Element) = { x.litValue.toInt } def lit(x: Element) = { x.litValue.toInt }
def toBits(t: dst.Type): BitPat = { def toBits(t: dst.Type): BitPat = {
val list = t.toList val list = t.toList
list list.map(e => e match {
.map(e => case Right(x) => BitPat(lit(x).U(x.getWidth.W))
e match { case Left(x) => BitPat.dontCare(x)
case Right(x) => BitPat(lit(x).U(x.getWidth.W)) }).reduceLeft(_ ## _)
case Left(x) => BitPat.dontCare(x)
}
)
.reduceLeft(_ ## _)
} }
val r = Right val r = Right
def l[T <: Any](x: T) = x match { def l[T <: Any](x: T) = x match {
case x: ChiselEnum => Left(log2Ceil(x.all.length)) case x: ChiselEnum => Left(log2Ceil(x.all.length))
case x: Data => Left(x.getWidth) case x: Data => Left(x.getWidth)
case _ => throw new IllegalArgumentException case _ => throw new IllegalArgumentException
} }
val inst = IO(Input(UInt(width.W))) val inst = IO(Input(UInt(width.W)))
@ -109,12 +103,11 @@ class Control(width: Int) extends RawModule {
val alu = IO(Flipped(new ALUControlInterface)) val alu = IO(Flipped(new ALUControlInterface))
val ram = IO(Flipped(new RamControlInterface(32))) val ram = IO(Flipped(new RamControlInterface(32)))
val dst = new WrapList( val dst = new WrapList((
(reg.ctrlBindPorts ++ reg.ctrlBindPorts ++
pc.ctrlBindPorts ++ pc.ctrlBindPorts ++
alu.ctrlBindPorts ++ alu.ctrlBindPorts ++
ram.ctrlBindPorts).map(wrap) ram.ctrlBindPorts).map(wrap))
)
val dstList = dst.v.toList val dstList = dst.v.toList
val controlWidth = dstList.map(_.toOption.get.getWidth).reduce(_ + _) val controlWidth = dstList.map(_.toOption.get.getWidth).reduce(_ + _)
@ -131,286 +124,209 @@ class Control(width: Int) extends RawModule {
import alu.SrcBSelect._ import alu.SrcBSelect._
import pc._ import pc._
import RV32Inst._ import RV32Inst._
// format: off
val ControlMapping: Array[(BitPat, dst.Type)] = Array( val ControlMapping: Array[(BitPat, dst.Type)] = Array(
// Regs | writeEnable :: writeSelect :: HNil // Regs | writeEnable :: writeSelect :: HNil
// PC | useImmB :: srcSelect :: HNil // PC | useImmB :: srcSelect :: HNil
// Exe | op :: srcASelect :: srcBSelect :: signExt :: HNil // Exe | op :: srcASelect :: srcBSelect :: signExt :: HNil
// Mem | valid :: writeMask :: writeEnable :: HNil // Mem | valid :: writeMask :: writeEnable :: HNil
(lui , ( (lui , (r(true.B) :: r(rAluOut) ::
r(true.B) :: r(rAluOut) :: r(false.B) :: r(pStaticNpc)::
r(false.B) :: r(pStaticNpc):: r(aOpAdd) :: r(aSrcAZero) :: r(aSrcBImmU) :: r(false.B) ::
r(aOpAdd) :: r(aSrcAZero) :: r(aSrcBImmU) :: r(false.B) :: r(false.B) :: l(UInt(4.W)):: r(false.B) :: HNil)),
r(false.B) :: l(UInt(4.W)):: r(false.B) :: HNil
)),
(auipc , ( (auipc , (r(true.B) :: r(rAluOut) ::
r(true.B) :: r(rAluOut) :: r(false.B) :: r(pStaticNpc)::
r(false.B) :: r(pStaticNpc):: r(aOpAdd) :: r(aSrcAPc) :: r(aSrcBImmU) :: r(false.B) ::
r(aOpAdd) :: r(aSrcAPc) :: r(aSrcBImmU) :: r(false.B) :: r(false.B) :: l(UInt(4.W)):: r(false.B) :: HNil)),
r(false.B) :: l(UInt(4.W)):: r(false.B) :: HNil
)),
// ---- Control Transfer Instructions ---- // ---- Control Transfer Instructions ----
(jal , ( (jal , (r(true.B) :: r(rNpc) ::
r(true.B) :: r(rNpc) :: r(false.B) :: r(pExeOut) ::
r(false.B) :: r(pExeOut) :: r(aOpAdd) :: r(aSrcAPc) :: r(aSrcBImmJ) :: r(false.B) ::
r(aOpAdd) :: r(aSrcAPc) :: r(aSrcBImmJ) :: r(false.B) :: r(false.B) :: l(UInt(4.W)):: r(false.B) :: HNil)),
r(false.B) :: l(UInt(4.W)):: r(false.B) :: HNil
)),
(jalr , ( (jalr , (r(true.B) :: r(rNpc) ::
r(true.B) :: r(rNpc) :: r(false.B) :: r(pExeOut) ::
r(false.B) :: r(pExeOut) :: r(aOpAdd) :: r(aSrcARs1) :: r(aSrcBImmI) :: r(false.B) ::
r(aOpAdd) :: r(aSrcARs1) :: r(aSrcBImmI) :: r(false.B) :: r(false.B) :: l(UInt(4.W)):: r(false.B) :: HNil)),
r(false.B) :: l(UInt(4.W)):: r(false.B) :: HNil
)),
(beq , ( (beq , (r(false.B) :: l(WriteSelect) ::
r(false.B) :: l(WriteSelect) :: r(true.B) :: r(pStaticNpc) ::
r(true.B) :: r(pStaticNpc) :: r(aOpSlt) :: r(aSrcARs1) :: r(aSrcBRs2) :: l(Bool()) ::
r(aOpSlt) :: r(aSrcARs1) :: r(aSrcBRs2) :: l(Bool()) :: r(false.B) :: l(UInt(4.W)):: r(false.B) :: HNil)),
r(false.B) :: l(UInt(4.W)):: r(false.B) :: HNil
)),
(bne , ( (bne , (r(false.B) :: l(WriteSelect) ::
r(false.B) :: l(WriteSelect) :: r(true.B) :: r(pStaticNpc) ::
r(true.B) :: r(pStaticNpc) :: r(aOpSlt) :: r(aSrcARs1) :: r(aSrcBRs2) :: l(Bool()) ::
r(aOpSlt) :: r(aSrcARs1) :: r(aSrcBRs2) :: l(Bool()) :: r(false.B) :: l(UInt(4.W)):: r(false.B) :: HNil)),
r(false.B) :: l(UInt(4.W)):: r(false.B) :: HNil
)),
(blt , ( (blt , (r(false.B) :: l(WriteSelect) ::
r(false.B) :: l(WriteSelect) :: r(true.B) :: r(pStaticNpc) ::
r(true.B) :: r(pStaticNpc) :: r(aOpSlt) :: r(aSrcARs1) :: r(aSrcBRs2) :: r(true.B) ::
r(aOpSlt) :: r(aSrcARs1) :: r(aSrcBRs2) :: r(true.B) :: r(false.B) :: l(UInt(4.W)):: r(false.B) :: HNil)),
r(false.B) :: l(UInt(4.W)):: r(false.B) :: HNil
)),
(bge , ( (bge , (r(false.B) :: l(WriteSelect) ::
r(false.B) :: l(WriteSelect) :: r(true.B) :: r(pStaticNpc) ::
r(true.B) :: r(pStaticNpc) :: r(aOpSlt) :: r(aSrcARs1) :: r(aSrcBRs2) :: r(true.B) ::
r(aOpSlt) :: r(aSrcARs1) :: r(aSrcBRs2) :: r(true.B) :: r(false.B) :: l(UInt(4.W)):: r(false.B) :: HNil)),
r(false.B) :: l(UInt(4.W)):: r(false.B) :: HNil
)),
(bltu , ( (bltu , (r(false.B) :: l(WriteSelect)::
r(false.B) :: l(WriteSelect):: r(true.B) :: r(pStaticNpc) ::
r(true.B) :: r(pStaticNpc) :: r(aOpSltu) :: r(aSrcARs1) :: r(aSrcBRs2) :: r(false.B) ::
r(aOpSltu) :: r(aSrcARs1) :: r(aSrcBRs2) :: r(false.B) :: r(false.B) :: l(UInt(4.W)) :: r(false.B) :: HNil)),
r(false.B) :: l(UInt(4.W)) :: r(false.B) :: HNil
)),
(bgeu , ( (bgeu , (r(false.B) :: l(WriteSelect)::
r(false.B) :: l(WriteSelect):: r(true.B) :: r(pStaticNpc) ::
r(true.B) :: r(pStaticNpc) :: r(aOpSltu) :: r(aSrcARs1) :: r(aSrcBRs2) :: r(false.B) ::
r(aOpSltu) :: r(aSrcARs1) :: r(aSrcBRs2) :: r(false.B) :: r(false.B) :: l(UInt(4.W)) :: r(false.B) :: HNil)),
r(false.B) :: l(UInt(4.W)) :: r(false.B) :: HNil
)),
// ---- Memory Access Instructions ---- // ---- Memory Access Instructions ----
(lb , ( (lb , (r(true.B) :: r(rMemOut) ::
r(true.B) :: r(rMemOut) :: r(false.B) :: r(pStaticNpc) ::
r(false.B) :: r(pStaticNpc) :: r(aOpAdd) :: r(aSrcARs1) :: r(aSrcBImmI) :: l(Bool()) ::
r(aOpAdd) :: r(aSrcARs1) :: r(aSrcBImmI) :: l(Bool()) :: r(true.B) :: r(1.U(4.W)) :: r(false.B) :: HNil)),
r(true.B) :: r(1.U(4.W)) :: r(false.B) :: HNil
)),
(lbu , ( (lbu , (r(true.B) :: r(rMemOut) ::
r(true.B) :: r(rMemOut) :: r(false.B) :: r(pStaticNpc) ::
r(false.B) :: r(pStaticNpc) :: r(aOpAdd) :: r(aSrcARs1) :: r(aSrcBImmI) :: l(Bool()) ::
r(aOpAdd) :: r(aSrcARs1) :: r(aSrcBImmI) :: l(Bool()) :: r(true.B) :: r(0.U(4.W)) :: r(false.B) :: HNil)),
r(true.B) :: r(0.U(4.W)) :: r(false.B) :: HNil
)),
(lh , ( (lh , (r(true.B) :: r(rMemOut) ::
r(true.B) :: r(rMemOut) :: r(false.B) :: r(pStaticNpc) ::
r(false.B) :: r(pStaticNpc) :: r(aOpAdd) :: r(aSrcARs1) :: r(aSrcBImmI) :: l(Bool()) ::
r(aOpAdd) :: r(aSrcARs1) :: r(aSrcBImmI) :: l(Bool()) :: r(true.B) :: r(3.U(4.W)) :: r(false.B) :: HNil)),
r(true.B) :: r(3.U(4.W)) :: r(false.B) :: HNil
)),
(lhu , ( (lhu , (r(true.B) :: r(rMemOut) ::
r(true.B) :: r(rMemOut) :: r(false.B) :: r(pStaticNpc) ::
r(false.B) :: r(pStaticNpc) :: r(aOpAdd) :: r(aSrcARs1) :: r(aSrcBImmI) :: l(Bool()) ::
r(aOpAdd) :: r(aSrcARs1) :: r(aSrcBImmI) :: l(Bool()) :: r(true.B) :: r(2.U(4.W)) :: r(false.B) :: HNil)),
r(true.B) :: r(2.U(4.W)) :: r(false.B) :: HNil
)),
(lw , ( (lw , (r(true.B) :: r(rMemOut) ::
r(true.B) :: r(rMemOut) :: r(false.B) :: r(pStaticNpc) ::
r(false.B) :: r(pStaticNpc) :: r(aOpAdd) :: r(aSrcARs1) :: r(aSrcBImmI) :: l(Bool()) ::
r(aOpAdd) :: r(aSrcARs1) :: r(aSrcBImmI) :: l(Bool()) :: r(true.B) :: r(14.U(4.W)) :: r(false.B) :: HNil)),
r(true.B) :: r(14.U(4.W)) :: r(false.B) :: HNil
)),
(sb , ( (sb , (r(false.B) :: l(WriteSelect)::
r(false.B) :: l(WriteSelect):: r(false.B) :: r(pStaticNpc) ::
r(false.B) :: r(pStaticNpc) :: r(aOpAdd) :: r(aSrcARs1) :: r(aSrcBImmS) :: l(Bool()) ::
r(aOpAdd) :: r(aSrcARs1) :: r(aSrcBImmS) :: l(Bool()) :: r(true.B) :: r(1.U(4.W)) :: r(true.B) :: HNil)),
r(true.B) :: r(1.U(4.W)) :: r(true.B) :: HNil
)),
(sh , ( (sh , (r(false.B) :: l(WriteSelect)::
r(false.B) :: l(WriteSelect):: r(false.B) :: r(pStaticNpc) ::
r(false.B) :: r(pStaticNpc) :: r(aOpAdd) :: r(aSrcARs1) :: r(aSrcBImmS) :: l(Bool()) ::
r(aOpAdd) :: r(aSrcARs1) :: r(aSrcBImmS) :: l(Bool()) :: r(true.B) :: r(3.U(4.W)) :: r(true.B) :: HNil)),
r(true.B) :: r(3.U(4.W)) :: r(true.B) :: HNil
)),
(sw , ( (sw , (r(false.B) :: l(WriteSelect)::
r(false.B) :: l(WriteSelect):: r(false.B) :: r(pStaticNpc) ::
r(false.B) :: r(pStaticNpc) :: r(aOpAdd) :: r(aSrcARs1) :: r(aSrcBImmS) :: l(Bool()) ::
r(aOpAdd) :: r(aSrcARs1) :: r(aSrcBImmS) :: l(Bool()) :: r(true.B) :: r(15.U(4.W)) :: r(true.B) :: HNil)),
r(true.B) :: r(15.U(4.W)) :: r(true.B) :: HNil
)),
// ---- Integer Computational Instructions --- // ---- Integer Computational Instructions ---
(addi , ( (addi , (r(true.B) :: r(rAluOut) ::
r(true.B) :: r(rAluOut) :: r(false.B) :: r(pStaticNpc) ::
r(false.B) :: r(pStaticNpc) :: r(aOpAdd) :: r(aSrcARs1) :: r(aSrcBImmI) :: l(Bool()) ::
r(aOpAdd) :: r(aSrcARs1) :: r(aSrcBImmI) :: l(Bool()) :: r(false.B) :: l(UInt(4.W)):: r(false.B) :: HNil)),
r(false.B) :: l(UInt(4.W)):: r(false.B) :: HNil
)),
(slti , ( (slti , (r(true.B) :: r(rAluOut) ::
r(true.B) :: r(rAluOut) :: r(false.B) :: r(pStaticNpc) ::
r(false.B) :: r(pStaticNpc) :: r(aOpSlt) :: r(aSrcARs1) :: r(aSrcBImmI) :: r(true.B) ::
r(aOpSlt) :: r(aSrcARs1) :: r(aSrcBImmI) :: r(true.B) :: r(false.B) :: l(UInt(4.W)):: r(false.B) :: HNil)),
r(false.B) :: l(UInt(4.W)):: r(false.B) :: HNil
)),
(sltiu , ( (sltiu , (r(true.B) :: r(rAluOut) ::
r(true.B) :: r(rAluOut) :: r(false.B) :: r(pStaticNpc) ::
r(false.B) :: r(pStaticNpc) :: r(aOpSltu) :: r(aSrcARs1) :: r(aSrcBImmI) :: r(false.B) ::
r(aOpSltu) :: r(aSrcARs1) :: r(aSrcBImmI) :: r(false.B) :: r(false.B) :: l(UInt(4.W)):: r(false.B) :: HNil)),
r(false.B) :: l(UInt(4.W)):: r(false.B) :: HNil
)),
(xori , ( (xori , (r(true.B) :: r(rAluOut) ::
r(true.B) :: r(rAluOut) :: r(false.B) :: r(pStaticNpc) ::
r(false.B) :: r(pStaticNpc) :: r(aOpXor) :: r(aSrcARs1) :: r(aSrcBImmI) :: l(Bool()) ::
r(aOpXor) :: r(aSrcARs1) :: r(aSrcBImmI) :: l(Bool()) :: r(false.B) :: l(UInt(4.W)):: r(false.B) :: HNil)),
r(false.B) :: l(UInt(4.W)):: r(false.B) :: HNil
)),
(ori , ( (ori , (r(true.B) :: r(rAluOut) ::
r(true.B) :: r(rAluOut) :: r(false.B) :: r(pStaticNpc) ::
r(false.B) :: r(pStaticNpc) :: r(aOpOr) :: r(aSrcARs1) :: r(aSrcBImmI) :: l(Bool()) ::
r(aOpOr) :: r(aSrcARs1) :: r(aSrcBImmI) :: l(Bool()) :: r(false.B) :: l(UInt(4.W)):: r(false.B) :: HNil)),
r(false.B) :: l(UInt(4.W)):: r(false.B) :: HNil
)),
(andi , ( (andi , (r(true.B) :: r(rAluOut) ::
r(true.B) :: r(rAluOut) :: r(false.B) :: r(pStaticNpc) ::
r(false.B) :: r(pStaticNpc) :: r(aOpAnd) :: r(aSrcARs1) :: r(aSrcBImmI) :: l(Bool()) ::
r(aOpAnd) :: r(aSrcARs1) :: r(aSrcBImmI) :: l(Bool()) :: r(false.B) :: l(UInt(4.W)):: r(false.B) :: HNil)),
r(false.B) :: l(UInt(4.W)):: r(false.B) :: HNil
)),
(slli , ( (slli , (r(true.B) :: r(rAluOut) ::
r(true.B) :: r(rAluOut) :: r(false.B) :: r(pStaticNpc) ::
r(false.B) :: r(pStaticNpc) :: r(aOpSll) :: r(aSrcARs1) :: r(aSrcBImmI) :: l(Bool()) ::
r(aOpSll) :: r(aSrcARs1) :: r(aSrcBImmI) :: l(Bool()) :: r(false.B) :: l(UInt(4.W)):: r(false.B) :: HNil)),
r(false.B) :: l(UInt(4.W)):: r(false.B) :: HNil
)),
(srli , ( (srli , (r(true.B) :: r(rAluOut) ::
r(true.B) :: r(rAluOut) :: r(false.B) :: r(pStaticNpc) ::
r(false.B) :: r(pStaticNpc) :: r(aOpSrl) :: r(aSrcARs1) :: r(aSrcBImmI) :: l(Bool()) ::
r(aOpSrl) :: r(aSrcARs1) :: r(aSrcBImmI) :: l(Bool()) :: r(false.B) :: l(UInt(4.W)):: r(false.B) :: HNil)),
r(false.B) :: l(UInt(4.W)):: r(false.B) :: HNil
)),
(srai , ( (srai , (r(true.B) :: r(rAluOut) ::
r(true.B) :: r(rAluOut) :: r(false.B) :: r(pStaticNpc) ::
r(false.B) :: r(pStaticNpc) :: r(aOpSra) :: r(aSrcARs1) :: r(aSrcBImmI) :: l(Bool()) ::
r(aOpSra) :: r(aSrcARs1) :: r(aSrcBImmI) :: l(Bool()) :: r(false.B) :: l(UInt(4.W)):: r(false.B) :: HNil)),
r(false.B) :: l(UInt(4.W)):: r(false.B) :: HNil
)),
(add , ( (add , (r(true.B) :: r(rAluOut) ::
r(true.B) :: r(rAluOut) :: r(false.B) :: r(pStaticNpc) ::
r(false.B) :: r(pStaticNpc) :: r(aOpAdd) :: r(aSrcARs1) :: r(aSrcBRs2) :: l(Bool()) ::
r(aOpAdd) :: r(aSrcARs1) :: r(aSrcBRs2) :: l(Bool()) :: r(false.B) :: l(UInt(4.W)):: r(false.B) :: HNil)),
r(false.B) :: l(UInt(4.W)):: r(false.B) :: HNil
)),
(sub , ( (sub , (r(true.B) :: r(rAluOut) ::
r(true.B) :: r(rAluOut) :: r(false.B) :: r(pStaticNpc) ::
r(false.B) :: r(pStaticNpc) :: r(aOpSub) :: r(aSrcARs1) :: r(aSrcBRs2) :: l(Bool()) ::
r(aOpSub) :: r(aSrcARs1) :: r(aSrcBRs2) :: l(Bool()) :: r(false.B) :: l(UInt(4.W)):: r(false.B) :: HNil)),
r(false.B) :: l(UInt(4.W)):: r(false.B) :: HNil
)),
(sll , ( (sll , (r(true.B) :: r(rAluOut) ::
r(true.B) :: r(rAluOut) :: r(false.B) :: r(pStaticNpc) ::
r(false.B) :: r(pStaticNpc) :: r(aOpSll) :: r(aSrcARs1) :: r(aSrcBRs2) :: l(Bool()) ::
r(aOpSll) :: r(aSrcARs1) :: r(aSrcBRs2) :: l(Bool()) :: r(false.B) :: l(UInt(4.W)):: r(false.B) :: HNil)),
r(false.B) :: l(UInt(4.W)):: r(false.B) :: HNil
)),
(slt , ( (slt , (r(true.B) :: r(rAluOut) ::
r(true.B) :: r(rAluOut) :: r(false.B) :: r(pStaticNpc) ::
r(false.B) :: r(pStaticNpc) :: r(aOpSlt) :: r(aSrcARs1) :: r(aSrcBRs2) :: r(true.B) ::
r(aOpSlt) :: r(aSrcARs1) :: r(aSrcBRs2) :: r(true.B) :: r(false.B) :: l(UInt(4.W)):: r(false.B) :: HNil)),
r(false.B) :: l(UInt(4.W)):: r(false.B) :: HNil
)),
(sltu , ( (sltu , (r(true.B) :: r(rAluOut) ::
r(true.B) :: r(rAluOut) :: r(false.B) :: r(pStaticNpc) ::
r(false.B) :: r(pStaticNpc) :: r(aOpSltu) :: r(aSrcARs1) :: r(aSrcBRs2) :: r(false.B) ::
r(aOpSltu) :: r(aSrcARs1) :: r(aSrcBRs2) :: r(false.B) :: r(false.B) :: l(UInt(4.W)):: r(false.B) :: HNil)),
r(false.B) :: l(UInt(4.W)):: r(false.B) :: HNil
)),
(xor , ( (xor , (r(true.B) :: r(rAluOut) ::
r(true.B) :: r(rAluOut) :: r(false.B) :: r(pStaticNpc) ::
r(false.B) :: r(pStaticNpc) :: r(aOpXor) :: r(aSrcARs1) :: r(aSrcBRs2) :: l(Bool()) ::
r(aOpXor) :: r(aSrcARs1) :: r(aSrcBRs2) :: l(Bool()) :: r(false.B) :: l(UInt(4.W)):: r(false.B) :: HNil)),
r(false.B) :: l(UInt(4.W)):: r(false.B) :: HNil
)),
(srl , ( (srl , (r(true.B) :: r(rAluOut) ::
r(true.B) :: r(rAluOut) :: r(false.B) :: r(pStaticNpc) ::
r(false.B) :: r(pStaticNpc) :: r(aOpSrl) :: r(aSrcARs1) :: r(aSrcBRs2) :: l(Bool()) ::
r(aOpSrl) :: r(aSrcARs1) :: r(aSrcBRs2) :: l(Bool()) :: r(false.B) :: l(UInt(4.W)):: r(false.B) :: HNil)),
r(false.B) :: l(UInt(4.W)):: r(false.B) :: HNil
)),
(sra , ( (sra , (r(true.B) :: r(rAluOut) ::
r(true.B) :: r(rAluOut) :: r(false.B) :: r(pStaticNpc) ::
r(false.B) :: r(pStaticNpc) :: r(aOpSra) :: r(aSrcARs1) :: r(aSrcBRs2) :: l(Bool()) ::
r(aOpSra) :: r(aSrcARs1) :: r(aSrcBRs2) :: l(Bool()) :: r(false.B) :: l(UInt(4.W)):: r(false.B) :: HNil)),
r(false.B) :: l(UInt(4.W)):: r(false.B) :: HNil
)),
(or , ( (or , (r(true.B) :: r(rAluOut) ::
r(true.B) :: r(rAluOut) :: r(false.B) :: r(pStaticNpc) ::
r(false.B) :: r(pStaticNpc) :: r(aOpOr) :: r(aSrcARs1) :: r(aSrcBRs2) :: l(Bool()) ::
r(aOpOr) :: r(aSrcARs1) :: r(aSrcBRs2) :: l(Bool()) :: r(false.B) :: l(UInt(4.W)):: r(false.B) :: HNil)),
r(false.B) :: l(UInt(4.W)):: r(false.B) :: HNil
)),
(and , ( (and , (r(true.B) :: r(rAluOut) ::
r(true.B) :: r(rAluOut) :: r(false.B) :: r(pStaticNpc) ::
r(false.B) :: r(pStaticNpc) :: r(aOpAnd) :: r(aSrcARs1) :: r(aSrcBRs2) :: l(Bool()) ::
r(aOpAnd) :: r(aSrcARs1) :: r(aSrcBRs2) :: l(Bool()) :: r(false.B) :: l(UInt(4.W)):: r(false.B) :: HNil)),
r(false.B) :: l(UInt(4.W)):: r(false.B) :: HNil
)),
) )
// format: on
val default = BitPat(0.U(controlWidth.W)) val default = BitPat(0.U(controlWidth.W))
// println(s"ControlMapping = ${ControlMapping.map(it => (it._1 -> toBits(it._2))).foreach(x => println(x._2))}\n") // println(s"ControlMapping = ${ControlMapping.map(it => (it._1 -> toBits(it._2))).foreach(x => println(x._2))}\n")
val out = decoder( val out = decoder(
inst, inst,
TruthTable(ControlMapping.map(it => (it._1 -> toBits(it._2))), default) TruthTable(ControlMapping.map(it => (it._1 -> toBits(it._2))), default))
)
val srcList = slices.map(s => out(s._1, s._2)) val srcList = slices.map(s => out(s._1, s._2))
assert(out != default) assert(out != default)
@ -447,13 +363,7 @@ class Flow extends Module {
val npc = Wire(dataType) val npc = Wire(dataType)
npc := pc.out + 4.U npc := pc.out + 4.U
pc.in.exeOut := alu.out.result pc.in.exeOut := alu.out.result
pc.in.immB := Cat( pc.in.immB := Cat(Fill(20, inst(31)), inst(7), inst(30, 25), inst(11, 8), 0.U(1.W))
Fill(20, inst(31)),
inst(7),
inst(30, 25),
inst(11, 8),
0.U(1.W)
)
control.inst := inst control.inst := inst
reg.control <> control.reg reg.control <> control.reg
@ -477,8 +387,7 @@ class Flow extends Module {
Fill(8, ram.io.writeMask(3)), Fill(8, ram.io.writeMask(3)),
Fill(8, ram.io.writeMask(2)), Fill(8, ram.io.writeMask(2)),
Fill(8, ram.io.writeMask(1)), Fill(8, ram.io.writeMask(1)),
"b11111111".U "b11111111".U)
)
val doSignExt = control.ram.writeMask(0) val doSignExt = control.ram.writeMask(0)
val signExt16 = control.ram.writeMask(1) val signExt16 = control.ram.writeMask(1)
@ -486,14 +395,10 @@ class Flow extends Module {
reg.in.writeData(lit(rMemOut)) := maskedData reg.in.writeData(lit(rMemOut)) := maskedData
// printf(cf"!doSignExt\n") // printf(cf"!doSignExt\n")
}.elsewhen(signExt16) { }.elsewhen(signExt16) {
reg.in.writeData(lit(rMemOut)) := Cat( reg.in.writeData(lit(rMemOut)) := Cat(Fill(16, maskedData(15)), maskedData(15, 0))
Fill(16, maskedData(15)),
maskedData(15, 0)
)
// printf(cf"elsewhen\n") // printf(cf"elsewhen\n")
}.otherwise { }.otherwise {
reg.in reg.in.writeData(lit(rMemOut)) := Cat(Fill(24, maskedData(7)), maskedData(7, 0))
.writeData(lit(rMemOut)) := Cat(Fill(24, maskedData(7)), maskedData(7, 0))
// printf(cf"otherwise\n") // printf(cf"otherwise\n")
} }
// printf(cf"maskedData = ${maskedData}, writeData = ${reg.in.writeData(lit(rMemOut))}\n") // printf(cf"maskedData = ${maskedData}, writeData = ${reg.in.writeData(lit(rMemOut))}\n")
@ -522,21 +427,8 @@ class Flow extends Module {
alu.in.b(lit(aSrcBRs2)) := reg.out.src(1) alu.in.b(lit(aSrcBRs2)) := reg.out.src(1)
// alu.in.b(lit(aSrcBImmI)) := inst(31, 20).pad(aSrcBImmI.getWidth) // alu.in.b(lit(aSrcBImmI)) := inst(31, 20).pad(aSrcBImmI.getWidth)
alu.in.b(lit(aSrcBImmI)) := Cat(Fill(20, inst(31)), inst(31, 20)) alu.in.b(lit(aSrcBImmI)) := Cat(Fill(20, inst(31)), inst(31, 20))
alu.in.b(lit(aSrcBImmJ)) := Cat( alu.in.b(lit(aSrcBImmJ)) := Cat(Fill(12, inst(31)), inst(19, 12), inst(20), inst(30, 25), inst(24, 21), 0.U(1.W))
Fill(12, inst(31)), alu.in.b(lit(aSrcBImmS)) := Cat(Fill(20, inst(31)), inst(31), inst(30, 25), inst(11, 8), inst(7))
inst(19, 12),
inst(20),
inst(30, 25),
inst(24, 21),
0.U(1.W)
)
alu.in.b(lit(aSrcBImmS)) := Cat(
Fill(20, inst(31)),
inst(31),
inst(30, 25),
inst(11, 8),
inst(7)
)
alu.in.b(lit(aSrcBImmU)) := Cat(inst(31, 12), 0.U(12.W)) alu.in.b(lit(aSrcBImmU)) := Cat(inst(31, 12), 0.U(12.W))
Trace.traceName(pc.out) Trace.traceName(pc.out)

57
npc/core/src/main/scala/top/Main.scala
View file

@ -13,6 +13,7 @@ import java.io.PrintWriter
import scala.io.Source import scala.io.Source
import java.io.File import java.io.File
// TODO: Generate verilator config file // TODO: Generate verilator config file
object VerilogMain extends App { object VerilogMain extends App {
@ -26,58 +27,46 @@ object VerilogMain extends App {
source.close() source.close()
io.circe.parser.decode[Config](jsonString) match { io.circe.parser.decode[Config](jsonString) match {
case Right(x) => x case Right(x) => x
case Left(e) => throw e case Left(e) => throw e
} }
} }
case None => Config(traceConfig = TraceConfig(enable = true)) case None => Config(traceConfig = TraceConfig(enable = true))
} }
val annos = (new ChiselStage).execute( val annos = (new ChiselStage).execute(
Array( Array("--target-dir", opt.targetDir.toString, "--target", "systemverilog", "--split-verilog", "--full-stacktrace"),
"--target-dir",
opt.targetDir.toString,
"--target",
"systemverilog",
"--split-verilog",
"--full-stacktrace"
),
Seq( Seq(
) ++ (if (config.traceConfig.enable)
Seq(ChiselGeneratorAnnotation(() => new Flow)) ) ++ (if(config.traceConfig.enable) Seq(ChiselGeneratorAnnotation(() => new Flow)) else Seq())
else Seq())
) )
if (config.traceConfig.enable) { if(config.traceConfig.enable) {
val dut = annos val dut = annos.collectFirst { case DesignAnnotation(dut) => dut }.get.asInstanceOf[Flow]
.collectFirst { case DesignAnnotation(dut) => dut }
.get
.asInstanceOf[Flow]
val verilatorConfigSeq = finalTargetMap(annos).values.flatten val verilatorConfigSeq = finalTargetMap(annos)
.values
.flatten
.map(ct => .map(ct =>
s"""public_flat_rd -module "${ct.tokens.collectFirst { s"""public_flat_rd -module "${
case OfModule(m) => m ct.tokens.collectFirst { case OfModule(m) => m }.get
}.get}" -var "${ct.tokens.collectFirst { case Ref(r) => r }.get}"""" }" -var "${ct.tokens.collectFirst { case Ref(r) => r }.get}"""")
) finalTargetMap(annos)
finalTargetMap(annos).values.flatten .values
.foreach(ct => .flatten
println(s"""TOP.${ct.circuit}.${ct.path .foreach(
.map { case (Instance(i), _) => i } ct => println(s"""TOP.${ct.circuit}.${ct.path.map { case (Instance(i), _) => i }.mkString(".")}.${ct.tokens.collectFirst {
.mkString(".")}.${ct.tokens.collectFirst { case Ref(r) => case Ref(r) => r
r }.get}""")
}.get}""")
) )
val verilatorConfigWriter = new PrintWriter( val verilatorConfigWriter = new PrintWriter(new File(opt.targetDir, opt.verilatorConfigFileOut.toString()))
new File(opt.targetDir, opt.verilatorConfigFileOut.toString())
)
verilatorConfigWriter.write("`verilator_config\n") verilatorConfigWriter.write("`verilator_config\n")
try { try {
for (ct <- verilatorConfigSeq) { for(ct <- verilatorConfigSeq) {
verilatorConfigWriter.println(ct) verilatorConfigWriter.println(ct)
} }
} finally { } finally {
verilatorConfigWriter.close() verilatorConfigWriter.close()
} }
} }
} }

54
npc/core/src/main/scala/utils/Keyboard.scala
View file

@ -55,7 +55,7 @@ class KeyboardController extends Module {
} }
class KeyboardSegController extends Module { class KeyboardSegController extends Module {
val io = IO(new Bundle { val io = IO(new Bundle{
val keycode = Flipped(Decoupled(UInt(8.W))) val keycode = Flipped(Decoupled(UInt(8.W)))
val segs = Vec(8, UInt(8.W)) val segs = Vec(8, UInt(8.W))
}) })
@ -66,60 +66,30 @@ class KeyboardSegController extends Module {
// 0x1C.U -> 0x41.U, ... // 0x1C.U -> 0x41.U, ...
val keycode_to_ascii = Seq( val keycode_to_ascii = Seq(
0x1c.U, 0x1C.U, 0x32.U, 0x21.U, 0x23.U, 0x24.U, 0x2B.U,
0x32.U, 0x34.U, 0x33.U, 0x43.U, 0x3B.U, 0x42.U, 0x4B.U,
0x21.U, 0x3A.U, 0x31.U, 0x44.U, 0x4D.U, 0x15.U, 0x2D.U,
0x23.U, 0x1B.U, 0x2C.U, 0x3C.U, 0x2A.U, 0x1D.U, 0x22.U,
0x24.U, 0x35.U, 0x1A.U, 0x45.U, 0x16.U, 0x1E.U, 0x26.U,
0x2b.U, 0x25.U, 0x2E.U, 0x36.U, 0x3D.U, 0x3E.U, 0x46.U,
0x34.U, ).zip(((0x41 to 0x5A) ++ (0x30 to 0x39)).map(_.U))
0x33.U,
0x43.U,
0x3b.U,
0x42.U,
0x4b.U,
0x3a.U,
0x31.U,
0x44.U,
0x4d.U,
0x15.U,
0x2d.U,
0x1b.U,
0x2c.U,
0x3c.U,
0x2a.U,
0x1d.U,
0x22.U,
0x35.U,
0x1a.U,
0x45.U,
0x16.U,
0x1e.U,
0x26.U,
0x25.U,
0x2e.U,
0x36.U,
0x3d.U,
0x3e.U,
0x46.U
).zip(((0x41 to 0x5a) ++ (0x30 to 0x39)).map(_.U))
val keycode = RegInit(0.U(8.W)) val keycode = RegInit(0.U(8.W))
val counter = Counter(0xff) val counter = Counter(0xFF)
val release_state = RegInit(Bool(), false.B) val release_state = RegInit(Bool(), false.B)
when(io.keycode.ready && io.keycode.valid) { when(io.keycode.ready && io.keycode.valid) {
when(io.keycode.bits === 0xf0.U) { when(io.keycode.bits === 0xF0.U) {
release_state := true.B release_state := true.B
}.elsewhen(!release_state) { }.elsewhen(!release_state) {
counter.inc() counter.inc()
keycode := io.keycode.bits keycode := io.keycode.bits
}.otherwise { }.otherwise{
// Release code on io.keycode.bits // Release code on io.keycode.bits
release_state := false.B release_state := false.B
} }
} }
val keycode_digits = VecInit(keycode(3, 0)) ++ VecInit(keycode(7, 4)) val keycode_digits = VecInit(keycode(3,0)) ++ VecInit(keycode(7,4))
val ascii = MuxLookup(keycode, 0.U)(keycode_to_ascii) val ascii = MuxLookup(keycode, 0.U)(keycode_to_ascii)
val seg_contoller = Module(new SegControllerGenerator(8, UInt(8.W))) val seg_contoller = Module(new SegControllerGenerator(8, UInt(8.W)))

30
npc/core/src/main/scala/utils/SegControllerGenerator.scala
View file

@ -9,32 +9,16 @@ class SegControllerGenerator[T <: Data](seg_count: Int, t: T) extends Module {
val in_segs = Input(Vec(seg_count / ((t.getWidth + 3) / 4), t)) val in_segs = Input(Vec(seg_count / ((t.getWidth + 3) / 4), t))
val segs = Output(Vec(seg_count, UInt(8.W))) val segs = Output(Vec(seg_count, UInt(8.W)))
}) })
val digit_to_seg = ((0 until 16) val digit_to_seg = ((0 until 16).map(_.U)).zip(Seq(
.map(_.U)) "b00000011".U, "b10011111".U, "b00100101".U, "b00001101".U,
.zip( "b10011001".U, "b01001001".U, "b01000001".U, "b00011111".U,
Seq( "b00000001".U, "b00001001".U, "b00010001".U, "b11000001".U,
"b00000011".U, "b01100011".U, "b10000101".U, "b01100001".U, "b01110001".U,
"b10011111".U, ))
"b00100101".U,
"b00001101".U,
"b10011001".U,
"b01001001".U,
"b01000001".U,
"b00011111".U,
"b00000001".U,
"b00001001".U,
"b00010001".U,
"b11000001".U,
"b01100011".U,
"b10000101".U,
"b01100001".U,
"b01110001".U
)
)
val vec = io.in_segs.asTypeOf(Vec(seg_count, UInt(4.W))) val vec = io.in_segs.asTypeOf(Vec(seg_count, UInt(4.W)))
val segs = VecInit(Seq.fill(seg_count)(0.U(8.W))) val segs = VecInit(Seq.fill(seg_count)(0.U(8.W)))
segs := vec.map(MuxLookup(_, 0xff.U)(digit_to_seg)) segs := vec.map(MuxLookup(_, 0xFF.U)(digit_to_seg))
io.segs := segs io.segs := segs
} }

59
npc/core/src/test/scala/CSR.scala
View file

@ -1,59 +0,0 @@
package flow.tests
import chisel3._
import chiseltest._
import org.scalatest.freespec.AnyFreeSpec
import chiseltest.simulator.WriteVcdAnnotation
import flow.components.CSRCore
import flow.tests.defaultParams
class CSRSpec extends AnyFreeSpec with ChiselScalatestTester {
implicit val p: flow.Params = defaultParams()
"should compile" in {
test(new CSRCore) { c =>
c.clock.step(1)
}
}
"Write" - {
"delayed" in {
test(new CSRCore) { c =>
val tv = BigInt("deadbeef", 16)
c.in.csrAddr.poke(c.nameToAddr("mstatus"))
c.in.writeData.poke(tv)
c.control.writeEnable.poke(c.control.csrWrite.csrWriteEnabled)
c.clock.step(1)
c.control.readEnable.poke(c.control.csrRead.csrReadEnabled)
c.out.readData.expect(0)
c.out.readValid.expect(1)
c.clock.step(1)
c.out.readValid.expect(1)
c.out.readData.expect(tv)
}
}
}
"Read" - {
"controlled by readEnable" in {
test(new CSRCore) { c =>
val tv = BigInt("deadbeef", 16)
c.in.csrAddr.poke(c.nameToAddr("mstatus"))
c.in.writeData.poke(tv)
c.control.readEnable.poke(c.control.csrRead.csrReadEnabled)
c.control.writeEnable.poke(c.control.csrWrite.csrWriteEnabled)
c.clock.step(1)
c.control.readEnable.poke(c.control.csrRead.csrReadDisabled)
c.out.readData.expect(0)
c.out.readValid.expect(0)
c.clock.step(1)
c.out.readData.expect(0)
c.out.readValid.expect(0)
}
}
}
}

8
npc/core/src/test/scala/params.scala
View file

@ -1,8 +0,0 @@
package flow.tests
import chisel3._
import flow.Params
object defaultParams {
def apply(): Params = new Params(XLEN = 32.W)
}