完成探针和索引
This commit is contained in:
@@ -23,7 +23,7 @@ class MasterParserIO extends Bundle{
|
||||
val rxEnq = Output( Bool())
|
||||
val txDeq = Output( Bool())
|
||||
|
||||
val trigAddr = Input( Vec(2, UInt(15.W)) )
|
||||
// val trigAddr = Input( Vec(2, UInt(15.W)) )
|
||||
|
||||
val timeStamp = Input(UInt(64.W))
|
||||
|
||||
@@ -119,8 +119,8 @@ abstract class MasterParserBase extends Module{
|
||||
|
||||
|
||||
|
||||
io.rxEnq := io.trigAddr(0) === txCnt & io.downOut.fire
|
||||
io.txDeq := io.trigAddr(1) === (rxCnt + 1.U) & io.upIn.fire
|
||||
io.rxEnq := io.downOut.fire & io.downOut.bits.tlast
|
||||
io.txDeq := io.upIn.fire & io.upIn.bits.tlast
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -231,8 +231,8 @@ trait ShinTopMaster{ this: ShinTopBase =>
|
||||
masterParser.io.req := io.req
|
||||
io.rsp := masterParser.io.rsp
|
||||
|
||||
masterParser.io.trigAddr(0) := "hff".U
|
||||
masterParser.io.trigAddr(1) := "hff".U
|
||||
// masterParser.io.trigAddr(0) := "hff".U
|
||||
// masterParser.io.trigAddr(1) := "hff".U
|
||||
|
||||
masterParser.io.timeStamp := io.timeStamp
|
||||
}
|
||||
|
||||
@@ -76,7 +76,8 @@ abstract class SlaveParserBase extends Module{
|
||||
val downSendGen = Module(new SlaveSendGen)
|
||||
val upSendGen = Module(new SlaveSendGen)
|
||||
|
||||
val isReadyToProbe = RegInit(false.B)
|
||||
val isReadyToProbe = RegInit(false.B)
|
||||
val isAckProbe = RegInit(false.B)
|
||||
val isLastDevice: Bool = RegInit(true.B)
|
||||
val isDeviceModified: Bool = RegInit(true.B)
|
||||
|
||||
@@ -107,6 +108,9 @@ abstract class SlaveParserBase extends Module{
|
||||
} .elsewhen( downRecParser.io.frameReq.fire & downRecParser.io.frameReq.bits.frameStyle === FRAME_STYLE_COMMON ){//下行来了一个普通包
|
||||
isDownSendPend := true.B
|
||||
downFrameInfo := downRecParser.io.frameReq.bits
|
||||
} .elsewhen( downRecParser.io.frameReq.fire & downRecParser.io.frameReq.bits.frameStyle === FRAME_STYLE_PROBE ){//下行来了一个嗅探包
|
||||
isDownSendPend := true.B
|
||||
downFrameInfo := downRecParser.io.frameReq.bits
|
||||
}
|
||||
|
||||
when( upSendGen.io.frameReq.fire ){
|
||||
@@ -118,8 +122,8 @@ abstract class SlaveParserBase extends Module{
|
||||
|
||||
|
||||
downSendGen.io.frameReq.valid :=
|
||||
isDownSendPend & downRecParser.io.subMsgReq.fire //| 下行转发
|
||||
//isDownSendProbe //下行探针
|
||||
isDownSendPend & downFrameInfo.frameStyle === FRAME_STYLE_COMMON & downRecParser.io.subMsgReq.fire | //下行转发
|
||||
isDownSendPend & downFrameInfo.frameStyle === FRAME_STYLE_PROBE //下行探针
|
||||
|
||||
// assert( OneHot(isDownSendPend, isDownSendProbe) )
|
||||
|
||||
@@ -136,13 +140,13 @@ abstract class SlaveParserBase extends Module{
|
||||
|
||||
upSendGen.io.frameReq.valid :=
|
||||
isUpSendPend & upRecParser.io.subMsgReq.fire | //上行转发
|
||||
isReadyToProbe // 上行探针
|
||||
isAckProbe // 上行探针
|
||||
|
||||
assert( ~(isUpSendPend & isReadyToProbe), "Assert Failed, Check Softwave, Probe is Sent while transfering!\n" )
|
||||
assert( ~(isUpSendPend & isAckProbe), "Assert Failed, Check Softwave, Probe is Sent while transfering!\n" )
|
||||
|
||||
upSendGen.io.frameReq.bits := Mux1H(Seq(
|
||||
isUpSendPend -> upFrameInfo, //上行转发
|
||||
isReadyToProbe -> upFrameProbeInfo, //上行探针
|
||||
isAckProbe -> upFrameProbeInfo, //上行探针
|
||||
))
|
||||
|
||||
|
||||
@@ -616,8 +620,8 @@ trait SlaveParserSync{ this: SlaveParserBase =>
|
||||
trait SlaveParserProbe{ this: SlaveParserBase =>
|
||||
|
||||
|
||||
val ProbeRecAim = 20000.U
|
||||
val probeRecCnt = RegInit(0.U(32.W))
|
||||
val ProbeRecAim = 31.U
|
||||
val probeRecCnt = RegInit(0.U(5.W))
|
||||
val isWatchDogOverflow = probeRecCnt === ProbeRecAim
|
||||
|
||||
|
||||
@@ -634,7 +638,11 @@ trait SlaveParserProbe{ this: SlaveParserBase =>
|
||||
isReadyToProbe := false.B
|
||||
}
|
||||
|
||||
|
||||
when( downRecParser.io.frameReq.fire & downRecParser.io.frameReq.bits.frameStyle === FRAME_STYLE_PROBE ){ //下行来了一个嗅探包
|
||||
isAckProbe := true.B
|
||||
} .elsewhen( upSendGen.io.frameReq.fire & upSendGen.io.frameReq.bits.frameStyle === FRAME_STYLE_PROBE ){ //上行发送回复嗅探包
|
||||
isAckProbe := false.B
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -83,7 +83,7 @@ class SlaveRecParser extends Module{
|
||||
|
||||
|
||||
|
||||
io.frameReq.valid := (stateCurr === STATE_HEADER) & (stateNext === STATE_PAYLOAD_INDEX_STYLE)
|
||||
io.frameReq.valid := (stateCurr === STATE_HEADER) & (stateNext =/= STATE_HEADER)
|
||||
val frameHeader = Reg(new FrameHeader)
|
||||
io.frameReq.bits.frameLenAim := frameHeader.frameLenAim
|
||||
io.frameReq.bits.frameStyle := frameHeader.frameStyle
|
||||
@@ -172,8 +172,8 @@ class SlaveRecParser extends Module{
|
||||
( stateCurr === STATE_HEADER ) -> Mux( isShortRx, STATE_ERROR,
|
||||
Mux( lengthCnt =/= (4-1).U, STATE_HEADER,
|
||||
MuxCase( STATE_ERROR, Array(
|
||||
( io.rec.bits.tdata(1,0) === FRAME_STYLE_COMMON ) -> STATE_PAYLOAD_INDEX_STYLE,
|
||||
( io.rec.bits.tdata(1,0) === FRAME_STYLE_PROBE ) -> STATE_CRC,
|
||||
( frameHeader.frameStyle === FRAME_STYLE_COMMON ) -> STATE_PAYLOAD_INDEX_STYLE,
|
||||
( frameHeader.frameStyle === FRAME_STYLE_PROBE ) -> STATE_CRC,
|
||||
))
|
||||
)
|
||||
),
|
||||
|
||||
@@ -31,6 +31,8 @@ class SlaveSendGen extends Module{
|
||||
|
||||
val crc = Module(new crc32_8)
|
||||
|
||||
val FRAME_STYLE_COMMON = 0.U
|
||||
val FRAME_STYLE_PROBE = 1.U
|
||||
|
||||
val STATE_IDLE = 0.U //空闲
|
||||
val STATE_FRAME_HEADER = 1.U //长度/ /保留2bits //包类型
|
||||
@@ -107,7 +109,11 @@ class SlaveSendGen extends Module{
|
||||
|
||||
stateNext := Mux1H(Seq(
|
||||
(stateCurr === STATE_IDLE) -> Mux( io.frameReq.fire, STATE_FRAME_HEADER, STATE_IDLE ),
|
||||
(stateCurr === STATE_FRAME_HEADER) -> Mux( lengthCnt === (4-1).U, Mux( io.subMsgReq.valid, STATE_SUBMSG_HEADER, STATE_ERROR ), STATE_FRAME_HEADER),
|
||||
(stateCurr === STATE_FRAME_HEADER) -> Mux( lengthCnt === (4-1).U, Mux(
|
||||
frameInfo.frameStyle === FRAME_STYLE_COMMON,
|
||||
Mux(io.subMsgReq.valid, STATE_SUBMSG_HEADER, STATE_ERROR),
|
||||
STATE_CRC ),
|
||||
STATE_FRAME_HEADER),
|
||||
(stateCurr === STATE_SUBMSG_HEADER) -> Mux( lengthCnt === (8-1).U, STATE_SUBMSG_DATA, STATE_SUBMSG_HEADER),
|
||||
(stateCurr === STATE_SUBMSG_DATA) ->
|
||||
Mux( lengthCnt === subMsgInfoSel.length-1.U, //已经发送完成该子报文
|
||||
|
||||
Reference in New Issue
Block a user