Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenXiangShan
XiangShan
提交
c065abe4
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,发现更多精彩内容 >>
提交
c065abe4
编写于
8月 06, 2020
作者:
L
linjiawei
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
mem: fix tlb miss replay bug
上级
c105c2d3
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
42 addition
and
15 deletion
+42
-15
src/main/scala/xiangshan/backend/issue/IssueQueue.scala
src/main/scala/xiangshan/backend/issue/IssueQueue.scala
+9
-3
src/main/scala/xiangshan/mem/StoreUnit.scala
src/main/scala/xiangshan/mem/StoreUnit.scala
+33
-12
未找到文件。
src/main/scala/xiangshan/backend/issue/IssueQueue.scala
浏览文件 @
c065abe4
...
...
@@ -36,6 +36,11 @@ class IssueQueue
val
tlbHit
=
io
.
tlbFeedback
.
valid
&&
io
.
tlbFeedback
.
bits
.
hit
val
tlbMiss
=
io
.
tlbFeedback
.
valid
&&
!
io
.
tlbFeedback
.
bits
.
hit
XSDebug
(
io
.
tlbFeedback
.
valid
,
"tlb feedback: hit: %d roqIdx: %d\n"
,
io
.
tlbFeedback
.
bits
.
hit
,
io
.
tlbFeedback
.
bits
.
roqIdx
)
/*
invalid --[enq]--> valid --[deq]--> wait --[tlbHit]--> invalid
wait --[replay]--> replay --[cnt]--> valid
...
...
@@ -222,7 +227,7 @@ class IssueQueue
XSDebug
(
false
,
s
===
s_invalid
,
"-"
)
XSDebug
(
false
,
s
===
s_valid
,
"v"
)
XSDebug
(
false
,
s
===
s_wait
,
"w"
)
XSDebug
(
false
,
s
===
s_replay
,
"
r
"
)
XSDebug
(
false
,
s
===
s_replay
,
"
p
"
)
})
XSDebug
(
false
,
true
.
B
,
"\n"
)
...
...
@@ -233,10 +238,11 @@ class IssueQueue
XSDebug
(
false
,
true
.
B
,
"\n"
)
XSDebug
(
"State Dump: "
)
readyVec
.
reverse
.
foreach
(
r
=>{
for
(
i
<-
readyVec
.
indices
.
reverse
){
val
r
=
readyVec
(
idxQueue
(
i
))
XSDebug
(
false
,
r
,
p
"r"
)
XSDebug
(
false
,
!
r
,
p
"-"
)
}
)
}
XSDebug
(
false
,
true
.
B
,
"\n"
)
// assert(!(tlbMiss && realDeqValid), "Error: realDeqValid should be false when replay valid!")
...
...
src/main/scala/xiangshan/mem/StoreUnit.scala
浏览文件 @
c065abe4
...
...
@@ -19,16 +19,32 @@ class StoreUnit extends XSModule {
// Store Pipeline
//-------------------------------------------------------
val
s2_out
=
Wire
(
Decoupled
(
new
LsPipelineBundle
))
val
s3_in
=
Wire
((
Decoupled
(
new
LsPipelineBundle
)))
XSDebug
(
s2_out
.
valid
,
"S2: pc 0x%x addr 0x%x -> 0x%x op %b data 0x%x mask %x\n"
,
s2_out
.
bits
.
uop
.
cf
.
pc
,
s2_out
.
bits
.
vaddr
,
s2_out
.
bits
.
paddr
,
s2_out
.
bits
.
uop
.
ctrl
.
fuOpType
,
s2_out
.
bits
.
data
,
s2_out
.
bits
.
mask
)
XSDebug
(
s3_in
.
valid
,
"S3: pc 0x%x addr 0x%x -> 0x%x op %b data 0x%x mask %x\n"
,
s3_in
.
bits
.
uop
.
cf
.
pc
,
s3_in
.
bits
.
vaddr
,
s3_in
.
bits
.
paddr
,
s3_in
.
bits
.
uop
.
ctrl
.
fuOpType
,
s3_in
.
bits
.
data
,
s3_in
.
bits
.
mask
)
// XSDebug(s4_in.valid, "S4: pc 0x%x addr 0x%x -> 0x%x op %b data 0x%x\n",
// s4_in.bits.uop.cf.pc , s4_in.bits.vaddr , s4_in.bits.paddr , s4_in.bits.uop.ctrl.fuOpType , s4_in.bits.data )
val
s3_in
=
Wire
(
Decoupled
(
new
LsPipelineBundle
))
private
def
printPipeLine
(
pipeline
:
LsPipelineBundle
,
cond
:
Bool
,
name
:
String
)
:
Unit
=
{
val
uop
=
pipeline
.
uop
XSDebug
(
cond
,
name
+
p
" pc ${Hexadecimal(uop.cf.pc)} "
+
p
"addr ${Hexadecimal(pipeline.vaddr)} -> ${Hexadecimal(pipeline.paddr)} "
+
p
"op ${Binary(uop.ctrl.fuOpType)} "
+
p
"data ${pipeline.data} "
+
p
"mask ${pipeline.mask}\n"
)
}
printPipeLine
(
s2_out
.
bits
,
s2_out
.
valid
,
"S2"
)
// TODO: is this nesscary ?
XSDebug
(
s2_out
.
fire
(),
"store req: pc 0x%x addr 0x%x -> 0x%x op %b data 0x%x\n"
,
s2_out
.
bits
.
uop
.
cf
.
pc
,
s2_out
.
bits
.
vaddr
,
s2_out
.
bits
.
paddr
,
s2_out
.
bits
.
uop
.
ctrl
.
fuOpType
,
s2_out
.
bits
.
data
)
s2_out
.
bits
.
uop
.
cf
.
pc
,
s2_out
.
bits
.
vaddr
,
s2_out
.
bits
.
paddr
,
s2_out
.
bits
.
uop
.
ctrl
.
fuOpType
,
s2_out
.
bits
.
data
)
printPipeLine
(
s3_in
.
bits
,
s3_in
.
valid
,
"S3"
)
//-------------------------------------------------------
// ST Pipeline Stage 2
...
...
@@ -59,9 +75,14 @@ class StoreUnit extends XSModule {
//-------------------------------------------------------
// Send TLB feedback to store issue queue
io
.
tlbFeedback
.
valid
:=
s3_in
.
fire
()
io
.
tlbFeedback
.
bits
.
hit
:=
!
s3_in
.
bits
.
miss
io
.
tlbFeedback
.
bits
.
roqIdx
:=
s3_in
.
bits
.
uop
.
roqIdx
io
.
tlbFeedback
.
valid
:=
RegNext
(
io
.
stin
.
valid
&&
s2_out
.
ready
)
io
.
tlbFeedback
.
bits
.
hit
:=
RegNext
(!
s2_out
.
bits
.
miss
)
io
.
tlbFeedback
.
bits
.
roqIdx
:=
RegNext
(
s2_out
.
bits
.
uop
.
roqIdx
)
XSDebug
(
io
.
tlbFeedback
.
valid
,
"S3 Store: tlbHit: %d roqIdx: %d\n"
,
io
.
tlbFeedback
.
bits
.
hit
,
io
.
tlbFeedback
.
bits
.
roqIdx
)
// get paddr from dtlb, check if rollback is needed
// writeback store inst to lsroq
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录