From b5d34af81cdc4a65c062ee684c64920e0c3432c3 Mon Sep 17 00:00:00 2001 From: Shupei Fan Date: Sat, 7 Dec 2024 06:31:48 +0000 Subject: [PATCH] [t1emu & t1rocketemu] use clocked DPI for axi read --- t1emu/src/AXI4SlaveAgent.scala | 48 ++++++++++++++------------ t1rocketemu/src/AXI4SlaveAgent.scala | 51 +++++++++++++++------------- 2 files changed, 55 insertions(+), 44 deletions(-) diff --git a/t1emu/src/AXI4SlaveAgent.scala b/t1emu/src/AXI4SlaveAgent.scala index da4601c2d..25df65a2a 100644 --- a/t1emu/src/AXI4SlaveAgent.scala +++ b/t1emu/src/AXI4SlaveAgent.scala @@ -5,7 +5,7 @@ package org.chipsalliance.t1.t1emu.dpi // TODO: upstream to AMBA as VIP import chisel3._ -import chisel3.util.circt.dpi.{RawClockedVoidFunctionCall, RawUnclockedNonVoidFunctionCall} +import chisel3.util.circt.dpi.{RawClockedNonVoidFunctionCall, RawClockedVoidFunctionCall} import chisel3.util.{isPow2, log2Ceil} import org.chipsalliance.amba.axi4.bundle.{ ARChannel, @@ -189,26 +189,32 @@ class AXI4SlaveAgent(parameter: AXI4SlaveAgentParameter) // AR channel.ARREADY := !cam(arPtr).valid - when(channel.ARREADY && channel.ARVALID) { - cam(arPtr).arid := channel.ARID - cam(arPtr).arlen := channel.ARLEN - cam(arPtr).readPayload := RawUnclockedNonVoidFunctionCall( - s"axi_read_${parameter.name}", - new ReadPayload(parameter.readPayloadSize, parameter.axiParameter.dataWidth) - )( - when.cond && !io.gateRead, - io.channelId, - channel.ARID.asTypeOf(UInt(64.W)), - channel.ARADDR.asTypeOf(UInt(64.W)), - channel.ARLEN.asTypeOf(UInt(64.W)), - channel.ARSIZE.asTypeOf(UInt(64.W)), - channel.ARBURST.asTypeOf(UInt(64.W)), - channel.ARLOCK.asTypeOf(UInt(64.W)), - channel.ARCACHE.asTypeOf(UInt(64.W)), - channel.ARPROT.asTypeOf(UInt(64.W)), - channel.ARQOS.asTypeOf(UInt(64.W)), - channel.ARREGION.asTypeOf(UInt(64.W)) - ) + + val arFire = channel.ARREADY && channel.ARVALID + val readPlayload = RawClockedNonVoidFunctionCall( + s"axi_read_${parameter.name}", + new ReadPayload(parameter.readPayloadSize, parameter.axiParameter.dataWidth) + )( + io.clock, + !io.gateRead && arFire, + io.channelId, + parameter.axiParameter.dataWidth.U(64.W), + channel.ARID.asTypeOf(UInt(64.W)), + channel.ARADDR.asTypeOf(UInt(64.W)), + channel.ARLEN.asTypeOf(UInt(64.W)), + channel.ARSIZE.asTypeOf(UInt(64.W)), + channel.ARBURST.asTypeOf(UInt(64.W)), + channel.ARLOCK.asTypeOf(UInt(64.W)), + channel.ARCACHE.asTypeOf(UInt(64.W)), + channel.ARPROT.asTypeOf(UInt(64.W)), + channel.ARQOS.asTypeOf(UInt(64.W)), + channel.ARREGION.asTypeOf(UInt(64.W)) + ) + + when(RegNext(arFire, false.B)) { + cam(arPtr).arid := RegNext(channel.ARID, 0.U) + cam(arPtr).arlen := RegNext(channel.ARLEN, 0.U) + cam(arPtr).readPayload := readPlayload cam(arPtr).readPayloadIndex := 0.U cam(arPtr).valid := true.B arPtr := arPtr + 1.U diff --git a/t1rocketemu/src/AXI4SlaveAgent.scala b/t1rocketemu/src/AXI4SlaveAgent.scala index 2a9348c69..7fd217160 100644 --- a/t1rocketemu/src/AXI4SlaveAgent.scala +++ b/t1rocketemu/src/AXI4SlaveAgent.scala @@ -5,7 +5,7 @@ package org.chipsalliance.t1.t1rocketemu.dpi // TODO: upstream to AMBA as VIP import chisel3._ -import chisel3.util.circt.dpi.{RawClockedVoidFunctionCall, RawUnclockedNonVoidFunctionCall} +import chisel3.util.circt.dpi.{RawClockedNonVoidFunctionCall, RawClockedVoidFunctionCall} import chisel3.util.{isPow2, log2Ceil} import org.chipsalliance.amba.axi4.bundle.{ ARChannel, @@ -189,28 +189,33 @@ class AXI4SlaveAgent(parameter: AXI4SlaveAgentParameter) // AR channel.ARREADY := !cam(arPtr).valid - when(channel.ARREADY && channel.ARVALID) { - cam(arPtr).arid := channel.ARID - cam(arPtr).arlen := channel.ARLEN - cam(arPtr).user := channel.ARUSER - cam(arPtr).readPayload := RawUnclockedNonVoidFunctionCall( - s"axi_read_${parameter.name}", - new ReadPayload(parameter.readPayloadSize, parameter.axiParameter.dataWidth) - )( - when.cond && !io.gateRead, - io.channelId, - parameter.axiParameter.dataWidth.U(64.W), - channel.ARID.asTypeOf(UInt(64.W)), - channel.ARADDR.asTypeOf(UInt(64.W)), - channel.ARLEN.asTypeOf(UInt(64.W)), - channel.ARSIZE.asTypeOf(UInt(64.W)), - channel.ARBURST.asTypeOf(UInt(64.W)), - channel.ARLOCK.asTypeOf(UInt(64.W)), - channel.ARCACHE.asTypeOf(UInt(64.W)), - channel.ARPROT.asTypeOf(UInt(64.W)), - channel.ARQOS.asTypeOf(UInt(64.W)), - channel.ARREGION.asTypeOf(UInt(64.W)) - ) + + val arFire = channel.ARREADY && channel.ARVALID + val readPlayload = RawClockedNonVoidFunctionCall( + s"axi_read_${parameter.name}", + new ReadPayload(parameter.readPayloadSize, parameter.axiParameter.dataWidth) + )( + io.clock, + !io.gateRead && arFire, + io.channelId, + parameter.axiParameter.dataWidth.U(64.W), + channel.ARID.asTypeOf(UInt(64.W)), + channel.ARADDR.asTypeOf(UInt(64.W)), + channel.ARLEN.asTypeOf(UInt(64.W)), + channel.ARSIZE.asTypeOf(UInt(64.W)), + channel.ARBURST.asTypeOf(UInt(64.W)), + channel.ARLOCK.asTypeOf(UInt(64.W)), + channel.ARCACHE.asTypeOf(UInt(64.W)), + channel.ARPROT.asTypeOf(UInt(64.W)), + channel.ARQOS.asTypeOf(UInt(64.W)), + channel.ARREGION.asTypeOf(UInt(64.W)) + ) + + when(RegNext(arFire, false.B)) { + cam(arPtr).arid := RegNext(channel.ARID, 0.U) + cam(arPtr).arlen := RegNext(channel.ARLEN, 0.U) + cam(arPtr).user := RegNext(channel.ARUSER, 0.U) + cam(arPtr).readPayload := readPlayload cam(arPtr).readPayloadIndex := 0.U cam(arPtr).valid := true.B arPtr := arPtr + 1.U