From 93bbeabd2011405c780e5b386d5ac6ebe5e5b36d Mon Sep 17 00:00:00 2001 From: RuigeLee Date: Sun, 14 Apr 2024 20:16:49 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"=E6=B5=8B=E8=AF=95=EF=BC=9A=E5=88=A0?= =?UTF-8?q?=E9=99=A4PR=E7=81=AF=E8=8A=82=E7=9C=81=E8=B5=84=E6=BA=90?= =?UTF-8?q?=EF=BC=8C=E5=88=A0=E9=99=A4=E6=BB=A4=E6=B3=A2=E5=99=A8=EF=BC=8C?= =?UTF-8?q?=E7=B2=98=E6=BB=9E=E7=8E=B0=E8=B1=A1=E7=BB=93=E6=9D=9F"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit d0806a0433e49da49dede6aa898db67b5cae84d2. --- src/main/scala/backBoard/LocalRegisters.scala | 157 +++++++++--------- 1 file changed, 78 insertions(+), 79 deletions(-) diff --git a/src/main/scala/backBoard/LocalRegisters.scala b/src/main/scala/backBoard/LocalRegisters.scala index 6565223..ae7c3c8 100644 --- a/src/main/scala/backBoard/LocalRegisters.scala +++ b/src/main/scala/backBoard/LocalRegisters.scala @@ -112,14 +112,12 @@ trait BackBoardSlvStatusPR { this: BackBoardSlvLocal => val LED_PR = IO(Output( Bool() )) - LED_PR := false.B - - // ~Mux1H(Seq( - // ( statusPR === "b00".U ) -> flash2HZ, - // ( statusPR === "b01".U ) -> flash1HZ, - // ( statusPR === "b10".U ) -> true.B, - // ( statusPR === "b11".U ) -> false.B, - // )) + LED_PR := ~Mux1H(Seq( + ( statusPR === "b00".U ) -> flash2HZ, + ( statusPR === "b01".U ) -> flash1HZ, + ( statusPR === "b10".U ) -> true.B, + ( statusPR === "b11".U ) -> false.B, + )) } @@ -133,103 +131,104 @@ trait BackBoardSlvIn { this: BackBoardSlvLocal => val in = IO(Input(UInt((8*gp).W))) - // val flitCnt = RegInit(MixedVecInit(Seq( 0.U(1.W), 0.U((log2Ceil(256/flitNum)).W), 0.U(1.W), 0.U(1.W), 0.U(1.W), 0.U(1.W), 0.U(1.W), 0.U(1.W), 0.U(1.W)) )) - // val flitTrigger = Wire(Vec(9, Bool())) + val flitCnt = RegInit(MixedVecInit(Seq( 0.U(1.W), 0.U((log2Ceil(256/flitNum)).W), 0.U(1.W), 0.U(1.W), 0.U(1.W), 0.U(1.W), 0.U(1.W), 0.U(1.W), 0.U(1.W)) )) + val flitTrigger = Wire(Vec(9, Bool())) - // flitTrigger(0) := ~RegNext(flitTrigger(0)) + flitTrigger(0) := ~RegNext(flitTrigger(0)) - // flitTrigger(1) := flitCnt(1) >= (256/flitNum-1).U - // when( ~RegNext(usTrigger) & usTrigger ){ - // when( flitTrigger(1) ){ - // flitCnt(1) := 0.U - // } .otherwise{ - // flitCnt(1) := flitCnt(1) + 1.U - // } + // flitTrigger(1) := usTrigger - // } + flitTrigger(1) := flitCnt(1) >= (256/flitNum-1).U + when( ~RegNext(usTrigger) & usTrigger ){ + when( flitTrigger(1) ){ + flitCnt(1) := 0.U + } .otherwise{ + flitCnt(1) := flitCnt(1) + 1.U + } - // flitTrigger(2) := flitCnt(2) === 1.U - // when( ~RegNext(flitTrigger(1)) & flitTrigger(1) ){ - // flitCnt(2) := flitCnt(2) + 1.U - // } + } - // flitTrigger(3) := flitCnt(3) === 1.U - // when( ~RegNext(flitTrigger(2)) & flitTrigger(2) ){ - // flitCnt(3) := flitCnt(3) + 1.U - // } + flitTrigger(2) := flitCnt(2) === 1.U + when( ~RegNext(flitTrigger(1)) & flitTrigger(1) ){ + flitCnt(2) := flitCnt(2) + 1.U + } - // flitTrigger(4) := flitCnt(4) === 1.U - // when( ~RegNext(flitTrigger(3)) & flitTrigger(3) ){ - // flitCnt(4) := flitCnt(4) + 1.U - // } + flitTrigger(3) := flitCnt(3) === 1.U + when( ~RegNext(flitTrigger(2)) & flitTrigger(2) ){ + flitCnt(3) := flitCnt(3) + 1.U + } - // flitTrigger(5) := flitCnt(5) === 1.U - // when( ~RegNext(flitTrigger(4)) & flitTrigger(4) ){ - // flitCnt(5) := flitCnt(5) + 1.U - // } + flitTrigger(4) := flitCnt(4) === 1.U + when( ~RegNext(flitTrigger(3)) & flitTrigger(3) ){ + flitCnt(4) := flitCnt(4) + 1.U + } - // flitTrigger(6) := flitCnt(6) === 1.U - // when( ~RegNext(flitTrigger(5)) & flitTrigger(5) ){ - // flitCnt(6) := flitCnt(6) + 1.U - // } + flitTrigger(5) := flitCnt(5) === 1.U + when( ~RegNext(flitTrigger(4)) & flitTrigger(4) ){ + flitCnt(5) := flitCnt(5) + 1.U + } - // flitTrigger(7) := flitCnt(7) === 1.U - // when( ~RegNext(flitTrigger(6)) & flitTrigger(6) ){ - // flitCnt(7) := flitCnt(7) + 1.U - // } + flitTrigger(6) := flitCnt(6) === 1.U + when( ~RegNext(flitTrigger(5)) & flitTrigger(5) ){ + flitCnt(6) := flitCnt(6) + 1.U + } - // flitTrigger(8) := flitCnt(8) === 1.U - // when( ~RegNext(flitTrigger(7)) & flitTrigger(7) ){ - // flitCnt(8) := flitCnt(8) + 1.U - // } + flitTrigger(7) := flitCnt(7) === 1.U + when( ~RegNext(flitTrigger(6)) & flitTrigger(6) ){ + flitCnt(7) := flitCnt(7) + 1.U + } + + flitTrigger(8) := flitCnt(8) === 1.U + when( ~RegNext(flitTrigger(7)) & flitTrigger(7) ){ + flitCnt(8) := flitCnt(8) + 1.U + } for( j <- 0 until gp ) { - // val digitalFilter = RegEnable( downReg(4+j), 1.U, statusPage === 0.U ) + val digitalFilter = RegEnable( downReg(4+j), 1.U, statusPage === 0.U ) - // val digitalIn = Reg( Vec(8, Bool()) ) + val digitalIn = Reg( Vec(8, Bool()) ) when( statusPage === 0.U ){ - // upReg(2+j) := Cat( digitalIn.reverse ) - upReg(2+j) := in(8*j+7, 8*j) + upReg(2+j) := Cat( digitalIn.reverse ) upReg(4+j) := downReg(4+j) } - // for( i <- 0 until 8 ) { + for( i <- 0 until 8 ) { - // val flitter = RegInit(VecInit( Seq.fill(flitNum){false.B})) - // val flitHi = RegInit(0.U((log2Ceil(flitNum+1)).W)) + val flitter = RegInit(VecInit( Seq.fill(flitNum){false.B})) + val flitHi = RegInit(0.U((log2Ceil(flitNum+1)).W)) - // ( 0 until 9 ).map{ k => - // when( digitalFilter === k.U ){ - // when( (if( k == 0 ){ true.B } else {~RegNext(flitTrigger(k)) & flitTrigger(k)}) ){ - // flitter(0) := in(i+8*j) - // (1 until flitNum).map{ k => - // flitter(k) := flitter(k-1) - // } + ( 0 until 9 ).map{ k => + when( digitalFilter === k.U ){ + when( (if( k == 0 ){ true.B } else {~RegNext(flitTrigger(k)) & flitTrigger(k)}) ){ + flitter(0) := in(i+8*j) + (1 until flitNum).map{ k => + flitter(k) := flitter(k-1) + } - // when( (~flitter(flitNum-1) & ~in(i+8*j)) | (flitter(flitNum-1) & in(i+8*j)) ){ - // flitHi := flitHi - // } .elsewhen( ~flitter(flitNum-1) & in(i+8*j) ){ - // flitHi := flitHi + 1.U - // } .elsewhen( flitter(flitNum-1) & ~in(i+8*j) ){ - // flitHi := flitHi - 1.U - // } + when( (~flitter(flitNum-1) & ~in(i+8*j)) | (flitter(flitNum-1) & in(i+8*j)) ){ + flitHi := flitHi + } .elsewhen( ~flitter(flitNum-1) & in(i+8*j) ){ + flitHi := flitHi + 1.U + } .elsewhen( flitter(flitNum-1) & ~in(i+8*j) ){ + flitHi := flitHi - 1.U + } - // when( flitHi >= (flitNum*4/5).U ){ - // digitalIn(i) := true.B - // } .elsewhen( flitHi <= (flitNum/5).U ){ - // digitalIn(i) := false.B - // } + when( flitHi >= (flitNum*4/5).U ){ + digitalIn(i) := true.B + } .elsewhen( flitHi <= (flitNum/5).U ){ + digitalIn(i) := false.B + } - // assert( flitHi <= flitNum.U ) - // assert( flitter.count( (k:Bool) => k === true.B ) === flitHi ) + assert( flitHi <= flitNum.U ) + assert( flitter.count( (k:Bool) => k === true.B ) === flitHi ) - // } - // } - // } - // } + } + } + } + } } }