change the gpu requant write addr

Author: Amanda Shi

software/gemmini-rocc-tests

@@ -175,7 +175,8 @@ class MxRequantizer[T <: Data](
   dontTouch(quantized_buffer)
   dontTouch( should_compute)
   should_compute := false.B
-
+  val quant_half_counter = RegInit(false.B)
+  val first_half_buf     = RegInit(0.U(128.W))
 
   val total_bits_per_element = WireDefault(0.U(5.W))
   total_bits_per_element := 1.U  +&  exp_bits  +&  mant_bits 
@@ -213,7 +214,13 @@ class MxRequantizer[T <: Data](
     data_buffer_counter := ~data_buffer_counter
   }
 
-  
+  val gpu_addr = RegInit(0.U((32).W))
+  when(io.requant_data_in_gpu.fire && data_buffer_counter === 0.U && total_bits_per_element === 8.U){
+    gpu_addr := (io.requant_data_in_gpu.bits.address >> 1)
+  }.elsewhen(io.requant_data_in_gpu.fire && data_buffer_counter === 0.U && total_bits_per_element =/= 8.U && !quant_half_counter){
+    gpu_addr := (io.requant_data_in_gpu.bits.address >> 2)
+  }
+
   when(io.mxacc_req.mx_data_in.fire) {
     pipe_in.valid := true.B
     pipe_in.bits.mx_mode := io.mxacc_req.mx_mode
@@ -232,9 +239,11 @@ class MxRequantizer[T <: Data](
     pipe_in.bits.out.full_mx_data_out := VecInit(combined.reverse).asTypeOf(half_acc_row_t)
     pipe_in.bits.out.fromDMA := false.B
     pipe_in.bits.is_gpu := true.B
-    pipe_in.bits.gpu_addr := io.requant_data_in_gpu.bits.address
+    pipe_in.bits.gpu_addr := gpu_addr
   }
 
+
+  
   // for (i <- 1 until pipelineLatency) {
   //   pipelined_out(i) := pipelined_out(i-1)
   // }
@@ -276,8 +285,7 @@ class MxRequantizer[T <: Data](
   // }
 
   // Two-cycle accumulation registers for FP4 / FP6:
-  val quant_half_counter = RegInit(false.B)
-  val first_half_buf     = RegInit(0.U(128.W))
+
 
 
   val fp6_lut_out     = Cat(quantLut.io.projected_data.bits.reverse)        
@@ -369,7 +377,7 @@ class MxRequantizer[T <: Data](
 
 
   final_pipe_out.ready := Mux(final_pipe_out.bits.is_gpu,
-    io.requant_data_out.ready,
+    io.requant_data_out.ready  || final_pipe_out.bits.out.is_garbage,
     io.mxacc_req.mx_data_out.ready)
   oldest_pipe_out.ready := final_pipe_out.ready
 
@@ -378,33 +386,33 @@ class MxRequantizer[T <: Data](
   val helding_flag = RegInit(0.U)
   when (io.requant_data_out.fire){
     helding_flag := 0.U
-  }.elsewhen(final_pipe_out.bits.is_gpu && final_pipe_out.valid && !io.requant_data_out.ready){
+  }.elsewhen(final_pipe_out.bits.is_gpu && final_pipe_out.valid && !io.requant_data_out.ready && !final_pipe_out.bits.out.is_garbage){
     helding_flag := 1.U
   }
 
-  when(final_pipe_out.bits.is_gpu && final_pipe_out.valid){
+  when(final_pipe_out.bits.is_gpu && final_pipe_out.valid && !final_pipe_out.bits.out.is_garbage){
     when(helding_flag === 1.U && io.requant_data_out.ready){
       io.requant_data_out.bits.data := gpu_out_held
       io.requant_data_out.valid := true.B
       io.requant_data_out.bits.dataType := RequantizerDataType(format_reg)
-      io.requant_data_out.bits.address := Mux(format_reg===0.U, final_pipe_out.bits.gpu_addr, final_pipe_out.bits.gpu_addr >>1)
+      io.requant_data_out.bits.address :=  final_pipe_out.bits.gpu_addr
     }.elsewhen(helding_flag === 0.U && io.requant_data_out.ready){
       io.requant_data_out.bits.data := final_pipe_out.bits.out.quant_mx_data_out.asUInt
       io.requant_data_out.valid := true.B
       io.requant_data_out.bits.dataType := RequantizerDataType(format_reg)
-      io.requant_data_out.bits.address := Mux(format_reg===0.U, final_pipe_out.bits.gpu_addr, final_pipe_out.bits.gpu_addr >> 1)
+      io.requant_data_out.bits.address :=  final_pipe_out.bits.gpu_addr
     }.otherwise{
       gpu_out_held := final_pipe_out.bits.out.quant_mx_data_out.asUInt
       io.requant_data_out.bits.data := 0.U
       io.requant_data_out.valid := false.B
       io.requant_data_out.bits.dataType := RequantizerDataType(format_reg)
-      io.requant_data_out.bits.address := Mux(format_reg===0.U, final_pipe_out.bits.gpu_addr, final_pipe_out.bits.gpu_addr >> 1)
+      io.requant_data_out.bits.address := final_pipe_out.bits.gpu_addr
     }
   }.otherwise{
     io.requant_data_out.bits.data := 0.U
     io.requant_data_out.valid := false.B
     io.requant_data_out.bits.dataType := RequantizerDataType(format_reg)
-    io.requant_data_out.bits.address := Mux(format_reg===0.U, final_pipe_out.bits.gpu_addr, final_pipe_out.bits.gpu_addr >> 1)
+    io.requant_data_out.bits.address := final_pipe_out.bits.gpu_addr
   }
 
   should_compute := false.B