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

Remove need for separate SpikeCosimResources

Browse Source
This commit is contained in:
Jerry Zhao
2023-02-15 10:17:08 -08:00
parent 1766501795
commit 89090f6b90
3 changed files with 54 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
generators/chipyard/src/main/resources/vsrc/cospike.v
View File

@@ -20,46 +20,42 @@ import "DPI-C" function void cospike_cosim(input longint cycle,
); );
module CospikeResources #( module SpikeCosim #(
parameter ISA, parameter ISA,
parameter PMPREGIONS, parameter PMPREGIONS,
parameter MEM0_BASE, parameter MEM0_BASE,
parameter MEM0_SIZE, parameter MEM0_SIZE,
parameter NHARTS, parameter NHARTS,
parameter BOOTROM) parameter BOOTROM) (
(); input clock,
input reset,
input [63:0] cycle,
input [63:0] hartid,
input trace_0_valid,
input [63:0] trace_0_iaddr,
input [31:0] trace_0_insn,
input trace_0_exception,
input trace_0_interrupt,
input [63:0] trace_0_cause,
input trace_0_has_wdata,
input [63:0] trace_0_wdata,
input trace_1_valid,
input [63:0] trace_1_iaddr,
input [31:0] trace_1_insn,
input trace_1_exception,
input trace_1_interrupt,
input [63:0] trace_1_cause,
input trace_1_has_wdata,
input [63:0] trace_1_wdata
);
initial begin initial begin
cospike_set_sysinfo(ISA, PMPREGIONS, MEM0_BASE, MEM0_SIZE, NHARTS, BOOTROM); cospike_set_sysinfo(ISA, PMPREGIONS, MEM0_BASE, MEM0_SIZE, NHARTS, BOOTROM);
end; end;
endmodule; // CospikeResources
module SpikeCosim (
input clock,
input reset,
input [63:0] cycle,
input [63:0] hartid,
input trace_0_valid,
input [63:0] trace_0_iaddr,
input [31:0] trace_0_insn,
input trace_0_exception,
input trace_0_interrupt,
input [63:0] trace_0_cause,
input trace_0_has_wdata,
input [63:0] trace_0_wdata,
input trace_1_valid,
input [63:0] trace_1_iaddr,
input [31:0] trace_1_insn,
input trace_1_exception,
input trace_1_interrupt,
input [63:0] trace_1_cause,
input trace_1_has_wdata,
input [63:0] trace_1_wdata
);
always @(posedge clock) begin always @(posedge clock) begin
if (!reset) begin if (!reset) begin

28
generators/chipyard/src/main/scala/Cospike.scala
View File

@@ -12,27 +12,23 @@ import freechips.rocketchip.util._
import testchipip.TileTraceIO import testchipip.TileTraceIO
class CospikeResources( case class SpikeCosimConfig(
isa: String, isa: String,
pmpregions: Int, pmpregions: Int,
mem0_base: BigInt, mem0_base: BigInt,
mem0_size: BigInt, mem0_size: BigInt,
nharts: Int, nharts: Int,
bootrom: String bootrom: String
) extends BlackBox(Map( )
"ISA" -> StringParam(isa),
"PMPREGIONS" -> IntParam(pmpregions),
"MEM0_BASE" -> IntParam(mem0_base),
"MEM0_SIZE" -> IntParam(mem0_size),
"NHARTS" -> IntParam(nharts),
"BOOTROM" -> StringParam(bootrom)
)) with HasBlackBoxResource {
val io = IO(new Bundle {})
addResource("/csrc/cospike.cc")
addResource("/vsrc/cospike.v")
}
class SpikeCosim extends BlackBox with HasBlackBoxResource class SpikeCosim(cfg: SpikeCosimConfig) extends BlackBox(Map(
"ISA" -> StringParam(cfg.isa),
"PMPREGIONS" -> IntParam(cfg.pmpregions),
"MEM0_BASE" -> IntParam(cfg.mem0_base),
"MEM0_SIZE" -> IntParam(cfg.mem0_size),
"NHARTS" -> IntParam(cfg.nharts),
"BOOTROM" -> StringParam(cfg.bootrom)
)) with HasBlackBoxResource
{ {
addResource("/csrc/cospike.cc") addResource("/csrc/cospike.cc")
addResource("/vsrc/cospike.v") addResource("/vsrc/cospike.v")
@@ -56,8 +52,8 @@ class SpikeCosim extends BlackBox with HasBlackBoxResource
object SpikeCosim object SpikeCosim
{ {
def apply(trace: TileTraceIO, hartid: Int) = { def apply(trace: TileTraceIO, hartid: Int, cfg: SpikeCosimConfig) = {
val cosim = Module(new SpikeCosim) val cosim = Module(new SpikeCosim(cfg))
val cycle = withClockAndReset(trace.clock, trace.reset) { val cycle = withClockAndReset(trace.clock, trace.reset) {
val r = RegInit(0.U(64.W)) val r = RegInit(0.U(64.W))
r := r + 1.U r := r + 1.U

17
generators/chipyard/src/main/scala/HarnessBinders.scala
View File

@@ -338,14 +338,15 @@ class WithCospike extends ComposeHarnessBinder({
implicit val p = chipyard.iobinders.GetSystemParameters(system) implicit val p = chipyard.iobinders.GetSystemParameters(system)
val chipyardSystem = system.asInstanceOf[ChipyardSystemModule[_]].outer.asInstanceOf[ChipyardSystem] val chipyardSystem = system.asInstanceOf[ChipyardSystemModule[_]].outer.asInstanceOf[ChipyardSystem]
val tiles = chipyardSystem.tiles val tiles = chipyardSystem.tiles
val isa = tiles.headOption.map(_.isaDTS).getOrElse("") val cfg = SpikeCosimConfig(
val mem0_base = p(ExtMem).map(_.master.base).getOrElse(BigInt(0)) isa = tiles.headOption.map(_.isaDTS).getOrElse(""),
val mem0_size = p(ExtMem).map(_.master.size).getOrElse(BigInt(0)) mem0_base = p(ExtMem).map(_.master.base).getOrElse(BigInt(0)),
val pmpregions = tiles.headOption.map(_.tileParams.core.nPMPs).getOrElse(0) mem0_size = p(ExtMem).map(_.master.size).getOrElse(BigInt(0)),
val nharts = tiles.size pmpregions = tiles.headOption.map(_.tileParams.core.nPMPs).getOrElse(0),
val bootrom = chipyardSystem.bootROM.map(_.module.contents.toArray.mkString(" ")).getOrElse("") nharts = tiles.size,
val resources = Module(new CospikeResources(isa, pmpregions, mem0_base, mem0_size, nharts, bootrom)) bootrom = chipyardSystem.bootROM.map(_.module.contents.toArray.mkString(" ")).getOrElse("")
ports.map { p => p.traces.zipWithIndex.map(t => SpikeCosim(t._1, t._2)) } )
ports.map { p => p.traces.zipWithIndex.map(t => SpikeCosim(t._1, t._2, cfg)) }
} }
}) })