Skip to content

Commit 914bbc8

Browse files
chore(dispatch): remove useless code and files (#4288)
1 parent a94ed9a commit 914bbc8

15 files changed

+7
-2424
lines changed

scripts/top-down/configs.py

-12
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,6 @@
2828
'IntFlStall': 'MergeFreelistStall',
2929
'FpFlStall': 'MergeFreelistStall',
3030

31-
'IntDqStall': 'MergeCoreDQStall',
32-
'FpDqStall': 'MergeCoreDQStall',
33-
'LsDqStall': 'MergeMemDQStall',
34-
3531
'LoadTLBStall': 'MergeLoad',
3632
'LoadL1Stall': 'MergeLoad',
3733
'LoadL2Stall': 'MergeLoad',
@@ -82,10 +78,6 @@
8278
'IntFlStall': 'MergeFreelistStall',
8379
'FpFlStall': 'MergeFreelistStall',
8480

85-
'IntDqStall': 'MergeDispatchQueueStall',
86-
'FpDqStall': 'MergeDispatchQueueStall',
87-
'LsDqStall': 'MergeDispatchQueueStall',
88-
8981
'LoadTLBStall': 'DTlbStall',
9082
'LoadL1Stall': 'LoadL1Bound',
9183
'LoadL2Stall': 'LoadL2Bound',
@@ -142,10 +134,6 @@
142134
'IntFlStall': fr'{XS_CORE_PREFIX}.backend.ctrlBlock\.dispatch: IntFlStall,\s+(\d+)',
143135
'FpFlStall': fr'{XS_CORE_PREFIX}.backend.ctrlBlock\.dispatch: FpFlStall,\s+(\d+)',
144136

145-
'IntDqStall': fr'{XS_CORE_PREFIX}.backend.ctrlBlock\.dispatch: IntDqStall,\s+(\d+)',
146-
'FpDqStall': fr'{XS_CORE_PREFIX}.backend.ctrlBlock\.dispatch: FpDqStall,\s+(\d+)',
147-
'LsDqStall': fr'{XS_CORE_PREFIX}.backend.ctrlBlock\.dispatch: LsDqStall,\s+(\d+)',
148-
149137
'LoadTLBStall': fr'{XS_CORE_PREFIX}.backend.ctrlBlock\.dispatch: LoadTLBStall,\s+(\d+)',
150138
'LoadL1Stall': fr'{XS_CORE_PREFIX}.backend.ctrlBlock\.dispatch: LoadL1Stall,\s+(\d+)',
151139
'LoadL2Stall': fr'{XS_CORE_PREFIX}.backend.ctrlBlock\.dispatch: LoadL2Stall,\s+(\d+)',

src/main/scala/top/Configs.scala

-10
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ import xiangshan.frontend.icache.ICacheParameters
2929
import freechips.rocketchip.devices.debug._
3030
import openLLC.OpenLLCParam
3131
import freechips.rocketchip.diplomacy._
32-
import xiangshan.backend.dispatch.DispatchParameters
3332
import xiangshan.backend.regfile.{IntPregParams, VfPregParams}
3433
import xiangshan.cache.DCacheParameters
3534
import xiangshan.cache.mmu.{L2TLBParameters, TLBParameters}
@@ -96,15 +95,6 @@ class MinimalConfig(n: Int = 1) extends Config(
9695
StoreBufferThreshold = 3,
9796
IssueQueueSize = 10,
9897
IssueQueueCompEntrySize = 4,
99-
dpParams = DispatchParameters(
100-
IntDqSize = 12,
101-
FpDqSize = 12,
102-
LsDqSize = 12,
103-
IntDqDeqWidth = 8,
104-
FpDqDeqWidth = 6,
105-
VecDqDeqWidth = 6,
106-
LsDqDeqWidth = 6
107-
),
10898
intPreg = IntPregParams(
10999
numEntries = 64,
110100
numRead = None,

src/main/scala/xiangshan/Parameters.scala

+1-16
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ import huancun._
2323
import system.SoCParamsKey
2424
import xiangshan.backend.datapath.RdConfig._
2525
import xiangshan.backend.datapath.WbConfig._
26-
import xiangshan.backend.dispatch.DispatchParameters
2726
import xiangshan.backend.exu.ExeUnitParams
2827
import xiangshan.backend.fu.FuConfig._
2928
import xiangshan.backend.issue.{IntScheduler, IssueBlockParams, MemScheduler, SchdBlockParams, SchedulerType, VfScheduler, FpScheduler}
@@ -179,15 +178,6 @@ case class XSCoreParameters
179178
VTypeBufferSize: Int = 64, // used to reorder vtype
180179
IssueQueueSize: Int = 24,
181180
IssueQueueCompEntrySize: Int = 16,
182-
dpParams: DispatchParameters = DispatchParameters(
183-
IntDqSize = 16,
184-
FpDqSize = 16,
185-
LsDqSize = 18,
186-
IntDqDeqWidth = 8,
187-
FpDqDeqWidth = 6,
188-
VecDqDeqWidth = 6,
189-
LsDqDeqWidth = 6,
190-
),
191181
intPreg: PregParams = IntPregParams(
192182
numEntries = 224,
193183
numRead = None,
@@ -421,7 +411,6 @@ case class XSCoreParameters
421411
numDeqOutside = 0,
422412
schdType = schdType,
423413
rfDataWidth = intPreg.dataCfg.dataWidth,
424-
numUopIn = dpParams.IntDqDeqWidth,
425414
)
426415
}
427416

@@ -444,7 +433,6 @@ case class XSCoreParameters
444433
numDeqOutside = 0,
445434
schdType = schdType,
446435
rfDataWidth = fpPreg.dataCfg.dataWidth,
447-
numUopIn = dpParams.FpDqDeqWidth,
448436
)
449437
}
450438

@@ -467,7 +455,6 @@ case class XSCoreParameters
467455
numDeqOutside = 0,
468456
schdType = schdType,
469457
rfDataWidth = vfPreg.dataCfg.dataWidth,
470-
numUopIn = dpParams.VecDqDeqWidth,
471458
)
472459
}
473460

@@ -508,7 +495,6 @@ case class XSCoreParameters
508495
numDeqOutside = 0,
509496
schdType = schdType,
510497
rfDataWidth = rfDataWidth,
511-
numUopIn = dpParams.LsDqDeqWidth,
512498
)
513499
}
514500

@@ -771,7 +757,7 @@ trait HasXSParameter {
771757
def maxElemPerVreg: Int = coreParams.maxElemPerVreg
772758

773759
def IntRefCounterWidth = log2Ceil(RobSize)
774-
def LSQEnqWidth = coreParams.dpParams.LsDqDeqWidth
760+
def LSQEnqWidth = RenameWidth
775761
def LSQLdEnqWidth = LSQEnqWidth min backendParams.numLoadDp
776762
def LSQStEnqWidth = LSQEnqWidth min backendParams.numStoreDp
777763
def VirtualLoadQueueSize = coreParams.VirtualLoadQueueSize
@@ -786,7 +772,6 @@ trait HasXSParameter {
786772
def StoreQueueNWriteBanks = coreParams.StoreQueueNWriteBanks
787773
def StoreQueueForwardWithMask = coreParams.StoreQueueForwardWithMask
788774
def VlsQueueSize = coreParams.VlsQueueSize
789-
def dpParams = coreParams.dpParams
790775

791776
def MemIQSizeMax = backendParams.memSchdParams.get.issueBlockParams.map(_.numEntries).max
792777
def IQSizeMax = backendParams.allSchdParams.map(_.issueBlockParams.map(_.numEntries).max).max

src/main/scala/xiangshan/backend/BackendParams.scala

-1
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,6 @@ case class BackendParams(
113113
def CsrCnt = allSchdParams.map(_.CsrCnt).sum
114114
def IqCnt = allSchdParams.map(_.issueBlockParams.length).sum
115115

116-
def numPcReadPort = allSchdParams.map(_.numPcReadPort).sum
117116
def numPcMemReadPort = allExuParams.filter(_.needPc).size
118117
def numTargetReadPort = allRealExuParams.count(x => x.needTarget)
119118

src/main/scala/xiangshan/backend/CtrlBlock.scala

+1-3
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import xiangshan.backend.Bundles.{DecodedInst, DynInst, ExceptionInfo, ExuOutput
2828
import xiangshan.backend.ctrlblock.{DebugLSIO, DebugLsInfoBundle, LsTopdownInfo, MemCtrl, RedirectGenerator}
2929
import xiangshan.backend.datapath.DataConfig.{FpData, IntData, V0Data, VAddrData, VecData, VlData}
3030
import xiangshan.backend.decode.{DecodeStage, FusionDecoder}
31-
import xiangshan.backend.dispatch.{CoreDispatchTopDownIO, Dispatch, DispatchQueue}
31+
import xiangshan.backend.dispatch.{CoreDispatchTopDownIO}
3232
import xiangshan.backend.dispatch.NewDispatch
3333
import xiangshan.backend.fu.PFEvent
3434
import xiangshan.backend.fu.vector.Bundles.{VType, Vl}
@@ -80,12 +80,10 @@ class CtrlBlockImp(
8080
"trace" -> TraceGroupNum
8181
))
8282

83-
private val numPcMemReadForExu = params.numPcReadPort
8483
private val numPcMemRead = pcMemRdIndexes.maxIdx
8584

8685
// now pcMem read for exu is moved to PcTargetMem (OG0)
8786
println(s"pcMem read num: $numPcMemRead")
88-
println(s"pcMem read num for exu: $numPcMemReadForExu")
8987

9088
val io = IO(new CtrlBlockIO())
9189

src/main/scala/xiangshan/backend/Scheduler.scala

Whitespace-only changes.

0 commit comments

Comments
 (0)