vtype: add valid signal for vsetvl instruction when calculate output

OpenXiangShan · May 22, 2024 · ac41d90 · ac41d90
1 parent 96d4617
commit ac41d90
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 6 deletions.
diff --git a/src/main/scala/xiangshan/backend/Backend.scala b/src/main/scala/xiangshan/backend/Backend.scala
@@ -384,7 +384,8 @@ class BackendImp(override val wrapper: Backend)(implicit p: Parameters) extends
   csrio.fpu.dirty_fs := ctrlBlock.io.robio.csr.dirty_fs
   csrio.vpu <> 0.U.asTypeOf(csrio.vpu) // Todo
 
-  val vsetvlVType = intExuBlock.io.vtype.getOrElse(0.U.asTypeOf(new VType))
+  val fromVsetVType = intExuBlock.io.vtype.getOrElse(0.U.asTypeOf((Valid(new VType))))
+  val vsetvlVType = RegEnable(fromVsetVType.bits, 0.U.asTypeOf(new VType), fromVsetVType.valid)
   ctrlBlock.io.robio.vsetvlVType := vsetvlVType
 
   val debugVconfig = dataPath.io.debugVconfig match {

diff --git a/src/main/scala/xiangshan/backend/exu/ExeUnit.scala b/src/main/scala/xiangshan/backend/exu/ExeUnit.scala
@@ -39,7 +39,7 @@ class ExeUnitIO(params: ExeUnitParams)(implicit p: Parameters) extends XSBundle
   val fenceio = OptionWrapper(params.hasFence, new FenceIO)
   val frm = OptionWrapper(params.needSrcFrm, Input(Frm()))
   val vxrm = OptionWrapper(params.needSrcVxrm, Input(Vxrm()))
-  val vtype = OptionWrapper(params.writeVConfig, new VType)
+  val vtype = OptionWrapper(params.writeVConfig, (Valid(new VType)))
   val vlIsZero = OptionWrapper(params.writeVConfig, Output(Bool()))
   val vlIsVlmax = OptionWrapper(params.writeVConfig, Output(Bool()))
 }

diff --git a/src/main/scala/xiangshan/backend/exu/ExuBlock.scala b/src/main/scala/xiangshan/backend/exu/ExuBlock.scala
@@ -71,7 +71,7 @@ class ExuBlockIO(implicit p: Parameters, params: SchdBlockParams) extends XSBund
   val fenceio = OptionWrapper(params.hasFence, new FenceIO)
   val frm = OptionWrapper(params.needSrcFrm, Input(Frm()))
   val vxrm = OptionWrapper(params.needSrcVxrm, Input(Vxrm()))
-  val vtype = OptionWrapper(params.writeVConfig, new VType)
+  val vtype = OptionWrapper(params.writeVConfig, (Valid(new VType)))
   val vlIsZero = OptionWrapper(params.writeVConfig, Output(Bool()))
   val vlIsVlmax = OptionWrapper(params.writeVConfig, Output(Bool()))
 }
diff --git a/src/main/scala/xiangshan/backend/fu/FuncUnit.scala b/src/main/scala/xiangshan/backend/fu/FuncUnit.scala
@@ -84,7 +84,7 @@ class FuncUnitIO(cfg: FuConfig)(implicit p: Parameters) extends XSBundle {
   val fenceio = OptionWrapper(cfg.isFence, new FenceIO)
   val frm = OptionWrapper(cfg.needSrcFrm, Input(UInt(3.W)))
   val vxrm = OptionWrapper(cfg.needSrcVxrm, Input(UInt(2.W)))
-  val vtype = OptionWrapper(cfg.writeVConfig, new VType)
+  val vtype = OptionWrapper(cfg.writeVConfig, (Valid(new VType)))
   val vlIsZero = OptionWrapper(cfg.writeVConfig, Output(Bool()))
   val vlIsVlmax = OptionWrapper(cfg.writeVConfig, Output(Bool()))
 }

diff --git a/src/main/scala/xiangshan/backend/fu/wrapper/VSet.scala b/src/main/scala/xiangshan/backend/fu/wrapper/VSet.scala
@@ -76,7 +76,8 @@ class VSetRiWvf(cfg: FuConfig)(implicit p: Parameters) extends VSetBase(cfg) {
 
   out.res.data := vsetModule.io.out.vconfig.vl
 
-  if (cfg.writeVConfig) io.vtype.get := vsetModule.io.out.vconfig.vtype
+  if (cfg.writeVConfig) io.vtype.get.bits := vsetModule.io.out.vconfig.vtype
+  if (cfg.writeVConfig) io.vtype.get.valid := io.out.valid
   if (cfg.writeVConfig) io.vlIsZero.get := vl === 0.U
   if (cfg.writeVConfig) io.vlIsVlmax.get := vl === vlmax
 
@@ -106,7 +107,8 @@ class VSetRvfWvf(cfg: FuConfig)(implicit p: Parameters) extends VSetBase(cfg) {
   out.res.data := Mux(vsetModule.io.out.vconfig.vtype.illegal, 0.U,
                       Mux(VSETOpType.isKeepVl(in.ctrl.fuOpType), oldVL, vsetModule.io.out.vconfig.vl))
 
-  if (cfg.writeVConfig) io.vtype.get := vsetModule.io.out.vconfig.vtype
+  if (cfg.writeVConfig) io.vtype.get.bits := vsetModule.io.out.vconfig.vtype
+  if (cfg.writeVConfig) io.vtype.get.valid := io.out.valid
   if (cfg.writeVConfig) io.vlIsZero.get := res.vl === 0.U
   if (cfg.writeVConfig) io.vlIsVlmax.get := res.vl === vlmax