Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenXiangShan
XiangShan
提交
39ea0b38
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,发现更多精彩内容 >>
提交
39ea0b38
编写于
7月 31, 2020
作者:
L
Lingrui98
浏览文件
操作
浏览文件
下载
差异文件
Merge remote-tracking branch 'origin/dev-frontend-tage' into dev-frontend
上级
87e3f53a
77b94f47
变更
2
展开全部
隐藏空白更改
内联
并排
Showing
2 changed file
with
397 addition
and
370 deletion
+397
-370
src/main/scala/xiangshan/frontend/BPU.scala
src/main/scala/xiangshan/frontend/BPU.scala
+17
-20
src/main/scala/xiangshan/frontend/Tage.scala
src/main/scala/xiangshan/frontend/Tage.scala
+380
-350
未找到文件。
src/main/scala/xiangshan/frontend/BPU.scala
浏览文件 @
39ea0b38
...
...
@@ -55,7 +55,7 @@ abstract class BasePredictor extends XSModule {
// An implementation MUST extend the IO bundle with a response
// and the special input from other predictors, as well as
// the metas to store in BRQ
abstract
class
Resp
extends
XSBundle
with
PredictorResponse
{}
abstract
class
Resp
extends
PredictorResponse
{}
abstract
class
FromOthers
extends
XSBundle
{}
abstract
class
Meta
extends
XSBundle
{}
...
...
@@ -64,7 +64,7 @@ abstract class BasePredictor extends XSModule {
val
pc
=
Flipped
(
ValidIO
(
UInt
(
VAddrBits
.
W
)))
val
hist
=
Input
(
UInt
(
HistoryLength
.
W
))
val
inMask
=
Input
(
UInt
(
PredictWidth
.
W
))
val
update
=
Flipped
(
ValidIO
(
new
BranchUpdateInfo
))
val
update
=
Flipped
(
ValidIO
(
new
BranchUpdateInfo
WithHist
))
}
}
...
...
@@ -83,15 +83,12 @@ abstract class BPUStage extends XSModule {
val
in
=
Flipped
(
Decoupled
(
new
BPUStageIO
))
val
pred
=
Decoupled
(
new
BranchPrediction
)
val
out
=
Decoupled
(
new
BPUStageIO
)
val
inFire
=
OutPut
(
Bool
())
}
def
npc
(
pc
:
UInt
,
instCount
:
UInt
)
=
pc
+
(
instCount
<<
1.
U
)
io
.
in
.
ready
=
!
outValid
||
io
.
out
.
fire
()
&&
io
.
pred
.
fire
()
val
inFire
=
io
.
in
.
fire
()
val
inLatch
=
RegEnable
(
io
.
in
.
bits
,
inFire
)
io
.
inFire
:=
inFire
val
predValid
=
RegInit
(
false
.
B
)
val
outFire
=
io
.
out
.
fire
()
...
...
@@ -307,7 +304,7 @@ class BPU extends BaseBPU {
//**********************Stage 1****************************//
val
s1_fire
=
s1
.
io
.
in
Fire
val
s1_fire
=
s1
.
io
.
in
.
fire
()
val
s1_resp_in
=
new
PredictorResponse
val
s1_brInfo_in
=
VecInit
(
0.
U
.
asTypeOf
(
Vec
(
PredictWidth
,
new
BranchInfo
)))
...
...
@@ -316,8 +313,8 @@ class BPU extends BaseBPU {
val
s1_inLatch
=
RegEnable
(
io
.
in
,
s1_fire
)
ubtb
.
io
.
flush
:=
io
.
flush
(
0
)
// TODO: fix this
ubtb
.
io
.
in
.
pc
.
valid
:=
s1_inLatch
.
valid
ubtb
.
io
.
in
.
pc
.
bits
:=
s1_inLatch
.
bits
.
pc
ubtb
.
io
.
pc
.
valid
:=
s1_inLatch
.
valid
ubtb
.
io
.
pc
.
bits
:=
s1_inLatch
.
bits
.
pc
ubtb
.
io
.
inMask
:=
s1_inLatch
.
bits
.
inMask
// Wrap ubtb response into resp_in and brInfo_in
...
...
@@ -328,8 +325,8 @@ class BPU extends BaseBPU {
}
btb
.
io
.
flush
:=
io
.
flush
(
0
)
// TODO: fix this
btb
.
io
.
in
.
pc
.
valid
:=
io
.
in
.
valid
btb
.
io
.
in
.
pc
.
bits
:=
io
.
in
.
bits
.
pc
btb
.
io
.
pc
.
valid
:=
io
.
in
.
valid
btb
.
io
.
pc
.
bits
:=
io
.
in
.
bits
.
pc
btb
.
io
.
inMask
:=
io
.
in
.
bits
.
inMask
// Wrap btb response into resp_in and brInfo_in
...
...
@@ -339,8 +336,8 @@ class BPU extends BaseBPU {
}
bim
.
io
.
flush
:=
io
.
flush
(
0
)
// TODO: fix this
bim
.
io
.
in
.
pc
.
valid
:=
io
.
in
.
valid
bim
.
io
.
in
.
pc
.
bits
:=
io
.
in
.
bits
.
pc
bim
.
io
.
pc
.
valid
:=
io
.
in
.
valid
bim
.
io
.
pc
.
bits
:=
io
.
in
.
bits
.
pc
bim
.
io
.
inMask
:=
io
.
in
.
bits
.
inMask
// Wrap bim response into resp_in and brInfo_in
...
...
@@ -358,18 +355,18 @@ class BPU extends BaseBPU {
s1
.
io
.
in
.
bits
.
brInfo
<>
s1_brInfo_in
tage
.
io
.
flush
:=
io
.
flush
(
0
)
// TODO: fix this
tage
.
io
.
in
.
pc
.
valid
:=
s1
.
io
.
out
.
fire
()
tage
.
io
.
in
.
pc
.
bits
:=
s1
.
io
.
out
.
bits
.
pc
// PC from s1
tage
.
io
.
in
.
hist
:=
io
.
in
.
hist
// The inst is from s1
tage
.
io
.
in
.
in
Mask
:=
s1
.
io
.
out
.
bits
.
mask
tage
.
io
.
in
.
s3Fire
:=
s3
.
io
.
inFire
// Tell tage to march 1 stage
tage
.
io
.
fromOthers
<>
s1
.
io
.
out
.
resp
.
bim
// Use bim results from s1
tage
.
io
.
flush
:=
io
.
flush
(
1
)
// TODO: fix this
tage
.
io
.
pc
.
valid
:=
s1
.
io
.
out
.
fire
()
tage
.
io
.
pc
.
bits
:=
s1
.
io
.
out
.
bits
.
pc
// PC from s1
tage
.
io
.
hist
:=
io
.
in
.
hist
// The inst is from s1
tage
.
io
.
inMask
:=
s1
.
io
.
out
.
bits
.
mask
tage
.
io
.
s3Fire
:=
s3
.
io
.
in
.
fire
()
// Tell tage to march 1 stage
tage
.
io
.
bim
<>
s1
.
io
.
out
.
resp
.
bim
// Use bim results from s1
// Wrap tage response and meta into s3.io.in.bits
// This is ugly
s3
.
io
.
in
.
bits
.
resp
.
tage
<>
tage
.
io
.
out
s3
.
io
.
in
.
bits
.
resp
.
tage
<>
tage
.
io
.
resp
for
(
i
<-
0
until
PredictWidth
)
{
s3
.
io
.
in
.
bits
.
brInfo
(
i
).
tageMeta
:=
tage
.
io
.
meta
(
i
)
}
...
...
src/main/scala/xiangshan/frontend/Tage.scala
浏览文件 @
39ea0b38
此差异已折叠。
点击以展开。
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录