Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenXiangShan
XiangShan
提交
cfecd676
X
XiangShan
项目概览
OpenXiangShan
/
XiangShan
9 个月 前同步成功
通知
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,体验更适合开发者的 AI 搜索 >>
提交
cfecd676
编写于
11月 25, 2022
作者:
Y
Yinan Xu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
rob, mmu: fix bug of not specifying signal width
上级
c7f264a6
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
5 addition
and
5 deletion
+5
-5
src/main/scala/xiangshan/backend/rob/Rob.scala
src/main/scala/xiangshan/backend/rob/Rob.scala
+1
-1
src/main/scala/xiangshan/cache/mmu/MMUConst.scala
src/main/scala/xiangshan/cache/mmu/MMUConst.scala
+1
-1
src/main/scala/xiangshan/cache/mmu/PageTableCache.scala
src/main/scala/xiangshan/cache/mmu/PageTableCache.scala
+2
-2
src/main/scala/xiangshan/cache/mmu/PageTableWalker.scala
src/main/scala/xiangshan/cache/mmu/PageTableWalker.scala
+1
-1
未找到文件。
src/main/scala/xiangshan/backend/rob/Rob.scala
浏览文件 @
cfecd676
...
...
@@ -997,7 +997,7 @@ class RobImp(outer: Rob)(implicit p: Parameters) extends LazyModuleImp(outer)
}
//difftest signals
val
firstValidCommit
=
(
deqPtr
+
PriorityMux
(
io
.
commits
.
commitValid
,
VecInit
(
List
.
tabulate
(
CommitWidth
)(
_
.
U
)))).
value
val
firstValidCommit
=
(
deqPtr
+
PriorityMux
(
io
.
commits
.
commitValid
,
VecInit
(
List
.
tabulate
(
CommitWidth
)(
_
.
U
(
log2Up
(
CommitWidth
).
W
)
)))).
value
val
wdata
=
Wire
(
Vec
(
CommitWidth
,
UInt
(
XLEN
.
W
)))
val
wpc
=
Wire
(
Vec
(
CommitWidth
,
UInt
(
XLEN
.
W
)))
...
...
src/main/scala/xiangshan/cache/mmu/MMUConst.scala
浏览文件 @
cfecd676
...
...
@@ -117,7 +117,7 @@ trait HasTlbConst extends HasXSParameter {
def
replaceWrapper
(
v
:
UInt
,
lruIdx
:
UInt
)
:
UInt
=
{
val
width
=
v
.
getWidth
val
emptyIdx
=
ParallelPriorityMux
((
0
until
width
).
map
(
i
=>
(!
v
(
i
),
i
.
U
)))
val
emptyIdx
=
ParallelPriorityMux
((
0
until
width
).
map
(
i
=>
(!
v
(
i
),
i
.
U
(
log2Up
(
width
).
W
)
)))
val
full
=
Cat
(
v
).
andR
Mux
(
full
,
lruIdx
,
emptyIdx
)
}
...
...
src/main/scala/xiangshan/cache/mmu/PageTableCache.scala
浏览文件 @
cfecd676
...
...
@@ -280,7 +280,7 @@ class PtwCache(parentName:String = "Unknown")(implicit p: Parameters) extends XS
val
hitWayEntry
=
ParallelPriorityMux
(
hitVec
zip
ramDatas
)
val
hitWayData
=
hitWayEntry
.
entries
val
hit
=
ParallelOR
(
hitVec
)
val
hitWay
=
ParallelPriorityMux
(
hitVec
zip
(
0
until
l2tlbParams
.
l2nWays
).
map
(
_
.
U
))
val
hitWay
=
ParallelPriorityMux
(
hitVec
zip
(
0
until
l2tlbParams
.
l2nWays
).
map
(
_
.
U
(
log2Up
(
l2tlbParams
.
l2nWays
).
W
)
))
val
eccError
=
hitWayEntry
.
decode
()
ridx
.
suggestName
(
s
"l2_ridx"
)
...
...
@@ -326,7 +326,7 @@ class PtwCache(parentName:String = "Unknown")(implicit p: Parameters) extends XS
val
hitWayData
=
hitWayEntry
.
entries
val
hitWayEcc
=
hitWayEntry
.
ecc
val
hit
=
ParallelOR
(
hitVec
)
val
hitWay
=
ParallelPriorityMux
(
hitVec
zip
(
0
until
l2tlbParams
.
l3nWays
).
map
(
_
.
U
))
val
hitWay
=
ParallelPriorityMux
(
hitVec
zip
(
0
until
l2tlbParams
.
l3nWays
).
map
(
_
.
U
(
log2Up
(
l2tlbParams
.
l3nWays
).
W
)
))
val
eccError
=
hitWayEntry
.
decode
()
when
(
hit
&&
stageCheck_valid_1cycle
)
{
ptwl3replace
.
access
(
genPtwL3SetIdx
(
check_vpn
),
hitWay
)
}
...
...
src/main/scala/xiangshan/cache/mmu/PageTableWalker.scala
浏览文件 @
cfecd676
...
...
@@ -281,7 +281,7 @@ class LLPTW(implicit p: Parameters) extends XSModule with HasPtwConst with HasPe
mem_arb
.
io
.
in
(
i
).
valid
:=
is_mems
(
i
)
&&
!
io
.
mem
.
req_mask
(
i
)
}
val
cache_ptr
=
ParallelMux
(
is_cache
,
(
0
until
l2tlbParams
.
llptwsize
).
map
(
_
.
U
))
val
cache_ptr
=
ParallelMux
(
is_cache
,
(
0
until
l2tlbParams
.
llptwsize
).
map
(
_
.
U
(
log2Up
(
l2tlbParams
.
llptwsize
).
W
)
))
// duplicate req
// to_wait: wait for the last to access mem, set to mem_resp
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录