Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenXiangShan
XiangShan
提交
0633d6c4
X
XiangShan
项目概览
OpenXiangShan
/
XiangShan
11 个月 前同步成功
通知
1183
Star
3914
Fork
526
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
X
XiangShan
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
0633d6c4
编写于
1月 12, 2021
作者:
Y
Yinan Xu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
roq: use SyncDataModuleTemplate
上级
f6f819c2
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
81 addition
and
73 deletion
+81
-73
src/main/scala/xiangshan/backend/roq/Roq.scala
src/main/scala/xiangshan/backend/roq/Roq.scala
+81
-73
未找到文件。
src/main/scala/xiangshan/backend/roq/Roq.scala
浏览文件 @
0633d6c4
...
...
@@ -75,6 +75,7 @@ class RoqDeqPtrWrapper extends XSModule with HasCircularQueuePtrHelper {
val
commitType
=
Input
(
CommitType
())
// output: the CommitWidth deqPtr
val
out
=
Vec
(
CommitWidth
,
Output
(
new
RoqPtr
))
val
next_out
=
Vec
(
CommitWidth
,
Output
(
new
RoqPtr
))
})
val
deqPtrVec
=
RegInit
(
VecInit
((
0
until
CommitWidth
).
map
(
_
.
U
.
asTypeOf
(
new
RoqPtr
))))
...
...
@@ -93,15 +94,19 @@ class RoqDeqPtrWrapper extends XSModule with HasCircularQueuePtrHelper {
// when io.intrBitSetReg, only one instruction is allowed to commit
val
commitCnt
=
Mux
(
io
.
intrBitSetReg
,
io
.
deq_v
(
0
)
&&
io
.
deq_w
(
0
),
normalCommitCnt
)
when
(
redirectOutValid
)
{
deqPtrVec
:=
VecInit
((
0
until
CommitWidth
).
map
(
_
.
U
.
asTypeOf
(
new
RoqPtr
)))
}.
elsewhen
(
io
.
state
===
0.
U
)
{
deqPtrVec
:=
deqPtrVec
.
map
(
_
+
commitCnt
)
val
resetDeqPtrVec
=
VecInit
((
0
until
CommitWidth
).
map
(
_
.
U
.
asTypeOf
(
new
RoqPtr
)))
val
commitDeqPtrVec
=
VecInit
(
deqPtrVec
.
map
(
_
+
commitCnt
))
val
deqPtrVec_next
=
Mux
(
redirectOutValid
,
resetDeqPtrVec
,
Mux
(
io
.
state
===
0.
U
,
commitDeqPtrVec
,
deqPtrVec
))
deqPtrVec
:=
deqPtrVec_next
io
.
next_out
:=
deqPtrVec_next
io
.
out
:=
deqPtrVec
when
(
io
.
state
===
0.
U
)
{
XSInfo
(
io
.
state
===
0.
U
&&
commitCnt
>
0.
U
,
"retired %d insts\n"
,
commitCnt
)
}
io
.
out
:=
deqPtrVec
}
class
RoqEnqPtrWrapper
extends
XSModule
with
HasCircularQueuePtrHelper
{
...
...
@@ -250,10 +255,10 @@ class Roq(numWbPorts: Int) extends XSModule with HasCircularQueuePtrHelper {
* (1) read: commits/walk/exception
* (2) write: write back from exe units
*/
val
dispatchData
=
Module
(
new
As
yncDataModuleTemplate
(
new
RoqDispatchData
,
RoqSize
,
CommitWidth
,
RenameWidth
))
val
dispatchData
=
Module
(
new
S
yncDataModuleTemplate
(
new
RoqDispatchData
,
RoqSize
,
CommitWidth
,
RenameWidth
))
val
dispatchDataRead
=
dispatchData
.
io
.
rdata
val
writebackData
=
Module
(
new
As
yncDataModuleTemplate
(
new
RoqWbData
,
RoqSize
,
CommitWidth
,
numWbPorts
))
val
writebackData
=
Module
(
new
S
yncDataModuleTemplate
(
new
RoqWbData
,
RoqSize
,
CommitWidth
,
numWbPorts
))
val
writebackDataRead
=
writebackData
.
io
.
rdata
def
mergeExceptionVec
(
dpData
:
RoqDispatchData
,
wbData
:
RoqWbData
)
=
{
...
...
@@ -387,9 +392,13 @@ class Roq(numWbPorts: Int) extends XSModule with HasCircularQueuePtrHelper {
// extra space is used when roq has no enough space, but mispredict recovery needs such info to walk regmap
require
(
RenameWidth
<=
CommitWidth
)
val
needExtraSpaceForMPR
=
VecInit
((
0
until
RenameWidth
).
map
(
i
=>
io
.
redirect
.
valid
&&
io
.
enq
.
needAlloc
(
i
)))
val
extraSpaceForMPR
=
Reg
(
Vec
(
RenameWidth
,
new
RoqDispatchData
))
val
usedSpaceForMPR
=
Reg
(
Vec
(
RenameWidth
,
Bool
()))
when
(
io
.
enq
.
needAlloc
.
asUInt
.
orR
&&
io
.
redirect
.
valid
)
{
usedSpaceForMPR
:=
io
.
enq
.
needAlloc
extraSpaceForMPR
:=
dispatchData
.
io
.
wdata
XSDebug
(
"roq full, switched to s_extrawalk. needExtraSpaceForMPR: %b\n"
,
io
.
enq
.
needAlloc
.
asUInt
)
}
// wiring to csr
val
(
wflags
,
fpWen
)
=
(
0
until
CommitWidth
).
map
(
i
=>
{
...
...
@@ -421,7 +430,6 @@ class Roq(numWbPorts: Int) extends XSModule with HasCircularQueuePtrHelper {
}.
elsewhen
(
state
===
s_extrawalk
)
{
io
.
commits
.
valid
(
i
)
:=
(
if
(
i
<
RenameWidth
)
usedSpaceForMPR
(
RenameWidth
-
i
-
1
)
else
false
.
B
)
io
.
commits
.
info
(
i
)
:=
(
if
(
i
<
RenameWidth
)
extraSpaceForMPR
(
RenameWidth
-
i
-
1
)
else
DontCare
)
state
:=
s_walk
}
XSInfo
(
state
===
s_idle
&&
io
.
commits
.
valid
(
i
),
...
...
@@ -456,66 +464,24 @@ class Roq(numWbPorts: Int) extends XSModule with HasCircularQueuePtrHelper {
io
.
bcommit
:=
Mux
(
io
.
commits
.
isWalk
,
0.
U
,
PopCount
(
cfiCommitVec
))
/**
* read and write of data modules
*/
val
commitReadAddr
=
Mux
(
state
===
s_idle
,
VecInit
(
deqPtrVec
.
map
(
_
.
value
)),
VecInit
(
walkPtrVec
.
map
(
_
.
value
)))
dispatchData
.
io
.
wen
:=
canEnqueue
dispatchData
.
io
.
waddr
:=
enqPtrVec
.
map
(
_
.
value
)
dispatchData
.
io
.
wdata
.
zip
(
io
.
enq
.
req
.
map
(
_
.
bits
)).
map
{
case
(
wdata
,
req
)
=>
wdata
.
ldest
:=
req
.
ctrl
.
ldest
wdata
.
rfWen
:=
req
.
ctrl
.
rfWen
wdata
.
fpWen
:=
req
.
ctrl
.
fpWen
wdata
.
wflags
:=
req
.
ctrl
.
fpu
.
wflags
wdata
.
commitType
:=
req
.
ctrl
.
commitType
wdata
.
pdest
:=
req
.
pdest
wdata
.
old_pdest
:=
req
.
old_pdest
wdata
.
lqIdx
:=
req
.
lqIdx
wdata
.
sqIdx
:=
req
.
sqIdx
wdata
.
pc
:=
req
.
cf
.
pc
wdata
.
crossPageIPFFix
:=
req
.
cf
.
crossPageIPFFix
wdata
.
exceptionVec
:=
req
.
cf
.
exceptionVec
}
dispatchData
.
io
.
raddr
:=
commitReadAddr
writebackData
.
io
.
wen
:=
io
.
exeWbResults
.
map
(
_
.
valid
)
writebackData
.
io
.
waddr
:=
io
.
exeWbResults
.
map
(
_
.
bits
.
uop
.
roqIdx
.
value
)
writebackData
.
io
.
wdata
.
zip
(
io
.
exeWbResults
.
map
(
_
.
bits
)).
map
{
case
(
wdata
,
wb
)
=>
wdata
.
exceptionVec
:=
wb
.
uop
.
cf
.
exceptionVec
wdata
.
fflags
:=
wb
.
fflags
wdata
.
flushPipe
:=
wb
.
uop
.
ctrl
.
flushPipe
}
writebackData
.
io
.
raddr
:=
commitReadAddr
/**
* state changes
* (1) redirect: from s_valid to s_walk or s_extrawalk (depends on whether there're pending instructions in dispatch1)
* (2) s_extrawalk to s_walk
* (3) s_walk to s_idle: end of walking
* (1) exceptions: when exception occurs, cancels all and switch to s_idle
* (2) redirect: switch to s_walk or s_extrawalk (depends on whether there're pending instructions in dispatch1)
* (3) walk: when walking comes to the end, switch to s_walk
* (4) s_extrawalk to s_walk
*/
//exit walk state when all roq entry is commited
when
(
state
===
s_walk
&&
walkFinished
)
{
state
:=
s_idle
}
// when redirect, walk back roq entries
when
(
io
.
redirect
.
valid
)
{
state
:=
s_walk
}
// no enough space for walk, allocate extra space
when
(
needExtraSpaceForMPR
.
asUInt
.
orR
&&
io
.
redirect
.
valid
)
{
usedSpaceForMPR
:=
needExtraSpaceForMPR
extraSpaceForMPR
:=
dispatchData
.
io
.
wdata
state
:=
s_extrawalk
XSDebug
(
"roq full, switched to s_extrawalk. needExtraSpaceForMPR: %b\n"
,
needExtraSpaceForMPR
.
asUInt
)
}
// when exception occurs, cancels all and switch to s_idle
when
(
io
.
redirectOut
.
valid
)
{
state
:=
s_idle
}
val
state_next
=
Mux
(
io
.
redirectOut
.
valid
,
s_idle
,
Mux
(
io
.
redirect
.
valid
,
Mux
(
io
.
enq
.
needAlloc
.
asUInt
.
orR
,
s_extrawalk
,
s_walk
),
Mux
(
state
===
s_walk
&&
walkFinished
,
s_idle
,
Mux
(
state
===
s_extrawalk
,
s_walk
,
state
)
)
)
)
state
:=
state_next
/**
* pointers and counters
...
...
@@ -530,6 +496,7 @@ class Roq(numWbPorts: Int) extends XSModule with HasCircularQueuePtrHelper {
deqPtrGenModule
.
io
.
hasNoSpecExec
:=
hasNoSpecExec
deqPtrGenModule
.
io
.
commitType
:=
deqDispatchData
.
commitType
deqPtrVec
:=
deqPtrGenModule
.
io
.
out
val
deqPtrVec_next
=
deqPtrGenModule
.
io
.
next_out
val
enqPtrGenModule
=
Module
(
new
RoqEnqPtrWrapper
)
enqPtrGenModule
.
io
.
state
:=
state
...
...
@@ -547,14 +514,17 @@ class Roq(numWbPorts: Int) extends XSModule with HasCircularQueuePtrHelper {
enqPtr
:=
enqPtrGenModule
.
io
.
out
val
thisCycleWalkCount
=
Mux
(
walkFinished
,
walkCounter
,
CommitWidth
.
U
)
when
(
io
.
redirect
.
valid
&&
state
=/=
s_extrawalk
)
{
walkPtrVec
:=
Mux
(
state
===
s_walk
,
// next walkPtrVec:
// (1) redirect occurs: update according to state
// (2) walk: move backwards
val
walkPtrVec_next
=
Mux
(
io
.
redirect
.
valid
&&
state
=/=
s_extrawalk
,
Mux
(
state
===
s_walk
,
VecInit
(
walkPtrVec
.
map
(
_
-
thisCycleWalkCount
)),
VecInit
((
0
until
CommitWidth
).
map
(
i
=>
enqPtr
-
(
i
+
1
).
U
))
)
}.
elsewhen
(
state
===
s_walk
)
{
walkPtrVec
:=
VecInit
(
walkPtrVec
.
map
(
_
-
CommitWidth
.
U
)
)
}
)
,
Mux
(
state
===
s_walk
,
VecInit
(
walkPtrVec
.
map
(
_
-
CommitWidth
.
U
)),
walkPtrVec
)
)
walkPtrVec
:=
walkPtrVec_next
val
lastCycleRedirect
=
RegNext
(
io
.
redirect
.
valid
)
val
trueValidCounter
=
Mux
(
lastCycleRedirect
,
distanceBetween
(
enqPtr
,
deqPtr
),
validCounter
)
...
...
@@ -595,6 +565,8 @@ class Roq(numWbPorts: Int) extends XSModule with HasCircularQueuePtrHelper {
* All events: (1) enqueue (dispatch); (2) writeback; (3) cancel; (4) dequeue (commit);
* All states: (1) valid; (2) writebacked; (3) flagBkup
*/
val
commitReadAddr
=
Mux
(
state
===
s_idle
,
VecInit
(
deqPtrVec
.
map
(
_
.
value
)),
VecInit
(
walkPtrVec
.
map
(
_
.
value
)))
// enqueue logic writes 6 valid
for
(
i
<-
0
until
RenameWidth
)
{
when
(
canEnqueue
(
i
)
&&
!
io
.
redirect
.
valid
)
{
...
...
@@ -642,6 +614,42 @@ class Roq(numWbPorts: Int) extends XSModule with HasCircularQueuePtrHelper {
}
}
/**
* read and write of data modules
*/
val
commitReadAddr_next
=
Mux
(
state_next
===
s_idle
,
VecInit
(
deqPtrVec_next
.
map
(
_
.
value
)),
VecInit
(
walkPtrVec_next
.
map
(
_
.
value
))
)
dispatchData
.
io
.
wen
:=
canEnqueue
dispatchData
.
io
.
waddr
:=
enqPtrVec
.
map
(
_
.
value
)
dispatchData
.
io
.
wdata
.
zip
(
io
.
enq
.
req
.
map
(
_
.
bits
)).
map
{
case
(
wdata
,
req
)
=>
wdata
.
ldest
:=
req
.
ctrl
.
ldest
wdata
.
rfWen
:=
req
.
ctrl
.
rfWen
wdata
.
fpWen
:=
req
.
ctrl
.
fpWen
wdata
.
wflags
:=
req
.
ctrl
.
fpu
.
wflags
wdata
.
commitType
:=
req
.
ctrl
.
commitType
wdata
.
pdest
:=
req
.
pdest
wdata
.
old_pdest
:=
req
.
old_pdest
wdata
.
lqIdx
:=
req
.
lqIdx
wdata
.
sqIdx
:=
req
.
sqIdx
wdata
.
pc
:=
req
.
cf
.
pc
wdata
.
crossPageIPFFix
:=
req
.
cf
.
crossPageIPFFix
wdata
.
exceptionVec
:=
req
.
cf
.
exceptionVec
}
dispatchData
.
io
.
raddr
:=
commitReadAddr_next
writebackData
.
io
.
wen
:=
io
.
exeWbResults
.
map
(
_
.
valid
)
writebackData
.
io
.
waddr
:=
io
.
exeWbResults
.
map
(
_
.
bits
.
uop
.
roqIdx
.
value
)
writebackData
.
io
.
wdata
.
zip
(
io
.
exeWbResults
.
map
(
_
.
bits
)).
map
{
case
(
wdata
,
wb
)
=>
wdata
.
exceptionVec
:=
wb
.
uop
.
cf
.
exceptionVec
wdata
.
fflags
:=
wb
.
fflags
wdata
.
flushPipe
:=
wb
.
uop
.
ctrl
.
flushPipe
}
writebackData
.
io
.
raddr
:=
commitReadAddr_next
/**
* debug info
*/
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录