From 0a03f320192d617a24eb5e27d1740f85ce4271b3 Mon Sep 17 00:00:00 2001
From: Chrisqcwx <3075401625@qq.com>
Date: Tue, 1 Aug 2023 18:57:44 +0800
Subject: [PATCH] refactor: rename file

---
 src/src/CoreCpuTop.scala                                    | 4 ++--
 .../{NewDispatchStage.scala => DispatchStage.scala}         | 6 +++---
 .../dispatch/{NewRenameStage.scala => RenameStage.scala}    | 6 +++---
 src/src/pipeline/execution/Alu.scala                        | 2 +-
 src/src/pipeline/execution/{NewDiv.scala => Div.scala}      | 2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)
 rename src/src/pipeline/dispatch/{NewDispatchStage.scala => DispatchStage.scala} (98%)
 rename src/src/pipeline/dispatch/{NewRenameStage.scala => RenameStage.scala} (98%)
 rename src/src/pipeline/execution/{NewDiv.scala => Div.scala} (99%)

diff --git a/src/src/CoreCpuTop.scala b/src/src/CoreCpuTop.scala
index b3a71321..aee2485c 100644
--- a/src/src/CoreCpuTop.scala
+++ b/src/src/CoreCpuTop.scala
@@ -103,8 +103,8 @@ class CoreCpuTop extends Module {
   val iCache           = Module(new ICache)
   val frontend         = Module(new Frontend)
   val instQueue        = Module(new MultiInstQueue)
-  val renameStage      = Module(new NewRenameStage)
-  val dispatchStage    = Module(new NewDispatchStage)
+  val renameStage      = Module(new RenameStage)
+  val dispatchStage    = Module(new DispatchStage)
   val exeForMemStage   = Module(new ExeForMemStage)
   val exePassWbStage_1 = Module(new ExePassWbStage(supportBranchCsr = true))
   val exePassWbStage_2 = Module(new ExePassWbStage(supportBranchCsr = false))
diff --git a/src/src/pipeline/dispatch/NewDispatchStage.scala b/src/src/pipeline/dispatch/DispatchStage.scala
similarity index 98%
rename from src/src/pipeline/dispatch/NewDispatchStage.scala
rename to src/src/pipeline/dispatch/DispatchStage.scala
index 0e172475..7ae57401 100644
--- a/src/src/pipeline/dispatch/NewDispatchStage.scala
+++ b/src/src/pipeline/dispatch/DispatchStage.scala
@@ -22,7 +22,7 @@ import pmu.bundles.PmuDispatchBundle
 //   def default = 0.U.asTypeOf(new DispatchNdPort)
 // }
 
-class NewDispatchPeerPort extends Bundle {
+class DispatchPeerPort extends Bundle {
 
   val plv = Input(UInt(2.W))
 
@@ -33,7 +33,7 @@ class NewDispatchPeerPort extends Bundle {
   val pmu_dispatchInfos = if (Param.usePmu) Some(Output(Vec(Param.pipelineNum, new PmuDispatchBundle))) else None
 }
 
-class NewDispatchStage(
+class DispatchStage(
   issueNum:       Int = Param.issueInstInfoMaxNum,
   pipelineNum:    Int = Param.pipelineNum,
   outQueueLength: Int = Param.dispatchOutQueueLength)
@@ -41,7 +41,7 @@ class NewDispatchStage(
       new ReservationStationBundle,
       new ExeNdPort,
       ReservationStationBundle.default,
-      Some(new NewDispatchPeerPort),
+      Some(new DispatchPeerPort),
       issueNum,
       pipelineNum,
       outQueueLength,
diff --git a/src/src/pipeline/dispatch/NewRenameStage.scala b/src/src/pipeline/dispatch/RenameStage.scala
similarity index 98%
rename from src/src/pipeline/dispatch/NewRenameStage.scala
rename to src/src/pipeline/dispatch/RenameStage.scala
index f42488dc..d04fcd7b 100644
--- a/src/src/pipeline/dispatch/NewRenameStage.scala
+++ b/src/src/pipeline/dispatch/RenameStage.scala
@@ -31,7 +31,7 @@ object RegReadNdPort {
   )
 }
 
-class NewRenamePeerPort(
+class RenamePeerPort(
   issueNum:    Int = Param.issueInstInfoMaxNum,
   pipelineNum: Int = Param.pipelineNum)
     extends Bundle {
@@ -44,7 +44,7 @@ class NewRenamePeerPort(
   val writebacks = Input(Vec(pipelineNum, new InstWbNdPort))
 }
 
-class NewRenameStage(
+class RenameStage(
   issueNum:          Int = Param.issueInstInfoMaxNum,
   pipelineNum:       Int = Param.pipelineNum,
   reservationLength: Int = Param.Width.ReservationStation._length)
@@ -52,7 +52,7 @@ class NewRenameStage(
   val io = IO(new Bundle {
     val ins     = Vec(issueNum, Flipped(Decoupled(new FetchInstDecodeNdPort)))
     val outs    = Vec(issueNum, Decoupled(new ReservationStationBundle))
-    val peer    = Some(new NewRenamePeerPort)
+    val peer    = Some(new RenamePeerPort)
     val isFlush = Input(Bool())
   })
   protected val selectedIns: Vec[FetchInstDecodeNdPort] = Wire(
diff --git a/src/src/pipeline/execution/Alu.scala b/src/src/pipeline/execution/Alu.scala
index 99998ebc..3aba0b97 100644
--- a/src/src/pipeline/execution/Alu.scala
+++ b/src/src/pipeline/execution/Alu.scala
@@ -148,7 +148,7 @@ class Alu extends Module {
     ).contains(io.aluInst.op)
   )
 
-  val divStage = Module(new NewDiv)
+  val divStage = Module(new Div)
 
   val divisorValid = WireDefault(rop =/= 0.U)
 
diff --git a/src/src/pipeline/execution/NewDiv.scala b/src/src/pipeline/execution/Div.scala
similarity index 99%
rename from src/src/pipeline/execution/NewDiv.scala
rename to src/src/pipeline/execution/Div.scala
index 3683c715..042995f4 100644
--- a/src/src/pipeline/execution/NewDiv.scala
+++ b/src/src/pipeline/execution/Div.scala
@@ -10,7 +10,7 @@ object DivState extends ChiselEnum {
 }
 
 // Attention : 如果运行时输入数据，输入无效
-class NewDiv extends Module {
+class Div extends Module {
 
   val io = IO(new Bundle {
     val divInst = Input(Valid(new MulDivInstNdPort))