Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenXiangShan
XiangShan
提交
7dc9c096
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 搜索 >>
提交
7dc9c096
编写于
8月 31, 2023
作者:
S
sinsanction
提交者:
huxuan0307
9月 01, 2023
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Backend, Fusion: enable fused_lui_load
上级
4f92d37a
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
18 addition
and
3 deletion
+18
-3
src/main/scala/xiangshan/backend/datapath/DataPath.scala
src/main/scala/xiangshan/backend/datapath/DataPath.scala
+10
-0
src/main/scala/xiangshan/backend/decode/DecodeUnit.scala
src/main/scala/xiangshan/backend/decode/DecodeUnit.scala
+1
-1
src/main/scala/xiangshan/backend/issue/IssueQueue.scala
src/main/scala/xiangshan/backend/issue/IssueQueue.scala
+6
-1
src/main/scala/xiangshan/backend/rename/Rename.scala
src/main/scala/xiangshan/backend/rename/Rename.scala
+1
-1
未找到文件。
src/main/scala/xiangshan/backend/datapath/DataPath.scala
浏览文件 @
7dc9c096
...
@@ -10,6 +10,7 @@ import utils.SeqUtils._
...
@@ -10,6 +10,7 @@ import utils.SeqUtils._
import
xiangshan._
import
xiangshan._
import
xiangshan.backend.BackendParams
import
xiangshan.backend.BackendParams
import
xiangshan.backend.Bundles._
import
xiangshan.backend.Bundles._
import
xiangshan.backend.decode.ImmUnion
import
xiangshan.backend.datapath.DataConfig._
import
xiangshan.backend.datapath.DataConfig._
import
xiangshan.backend.datapath.RdConfig._
import
xiangshan.backend.datapath.RdConfig._
import
xiangshan.backend.issue.
{
ImmExtractor
,
IntScheduler
,
MemScheduler
,
VfScheduler
}
import
xiangshan.backend.issue.
{
ImmExtractor
,
IntScheduler
,
MemScheduler
,
VfScheduler
}
...
@@ -316,6 +317,11 @@ class DataPathImp(override val wrapper: DataPath)(implicit p: Parameters, params
...
@@ -316,6 +317,11 @@ class DataPathImp(override val wrapper: DataPath)(implicit p: Parameters, params
s1_data
.
params
.
immType
.
map
(
_
.
litValue
)
s1_data
.
params
.
immType
.
map
(
_
.
litValue
)
)
)
}
}
}
else
if
(
s1_data
.
params
.
hasLoadFu
)
{
// dirty code for fused_lui_load
when
(
SrcType
.
isImm
(
s0
.
bits
.
srcType
(
0
)))
{
s1_data
.
src
(
0
)
:=
ImmUnion
.
U
.
toImm32
(
s0
.
bits
.
common
.
imm
(
s0
.
bits
.
common
.
imm
.
getWidth
-
1
,
ImmUnion
.
I
.
len
))
}
}
}
}
}
// IQ(s0) --[Data]--> s1Reg ---------- end
// IQ(s0) --[Data]--> s1Reg ---------- end
...
@@ -396,6 +402,10 @@ class DataPathImp(override val wrapper: DataPath)(implicit p: Parameters, params
...
@@ -396,6 +402,10 @@ class DataPathImp(override val wrapper: DataPath)(implicit p: Parameters, params
when
(
SrcType
.
isImm
(
s1_srcType
(
i
)(
j
)(
0
)))
{
when
(
SrcType
.
isImm
(
s1_srcType
(
i
)(
j
)(
0
)))
{
sinkData
.
src
(
0
)
:=
s1_toExuData
(
i
)(
j
).
src
(
0
)
sinkData
.
src
(
0
)
:=
s1_toExuData
(
i
)(
j
).
src
(
0
)
}
}
}
else
if
(
sinkData
.
params
.
hasLoadFu
)
{
when
(
SrcType
.
isImm
(
s1_srcType
(
i
)(
j
)(
0
)))
{
sinkData
.
src
(
0
)
:=
s1_toExuData
(
i
)(
j
).
src
(
0
)
}
}
}
// s1Reg --[Data]--> exu(s1) ---------- end
// s1Reg --[Data]--> exu(s1) ---------- end
}
}
...
...
src/main/scala/xiangshan/backend/decode/DecodeUnit.scala
浏览文件 @
7dc9c096
...
@@ -613,7 +613,7 @@ case class Imm_LUI_LOAD() {
...
@@ -613,7 +613,7 @@ case class Imm_LUI_LOAD() {
def
getLuiImm
(
uop
:
DynInst
)
:
UInt
=
{
def
getLuiImm
(
uop
:
DynInst
)
:
UInt
=
{
val
loadImmLen
=
Imm_I
().
len
val
loadImmLen
=
Imm_I
().
len
val
imm_u
=
Cat
(
uop
.
psrc
(
1
),
uop
.
psrc
(
0
),
uop
.
imm
(
ImmUnion
.
maxLen
-
1
,
loadImmLen
))
val
imm_u
=
Cat
(
uop
.
psrc
(
1
),
uop
.
psrc
(
0
),
uop
.
imm
(
ImmUnion
.
maxLen
-
1
,
loadImmLen
))
Imm_U
().
do_toImm32
(
imm_u
)
Cat
(
Imm_U
().
toImm32
(
imm_u
)(
31
,
loadImmLen
),
uop
.
imm
(
loadImmLen
-
1
,
0
)
)
}
}
}
}
...
...
src/main/scala/xiangshan/backend/issue/IssueQueue.scala
浏览文件 @
7dc9c096
...
@@ -8,7 +8,7 @@ import utility.HasCircularQueuePtrHelper
...
@@ -8,7 +8,7 @@ import utility.HasCircularQueuePtrHelper
import
utils._
import
utils._
import
xiangshan._
import
xiangshan._
import
xiangshan.backend.Bundles._
import
xiangshan.backend.Bundles._
import
xiangshan.backend.decode.
ImmUnion
import
xiangshan.backend.decode.
{
ImmUnion
,
Imm_LUI_LOAD
}
import
xiangshan.backend.datapath.DataConfig._
import
xiangshan.backend.datapath.DataConfig._
import
xiangshan.backend.datapath.DataSource
import
xiangshan.backend.datapath.DataSource
import
xiangshan.backend.fu.
{
FuConfig
,
FuType
}
import
xiangshan.backend.fu.
{
FuConfig
,
FuType
}
...
@@ -467,6 +467,11 @@ class IssueQueueImp(override val wrapper: IssueQueue)(implicit p: Parameters, va
...
@@ -467,6 +467,11 @@ class IssueQueueImp(override val wrapper: IssueQueue)(implicit p: Parameters, va
val
lui_imm
=
Cat
(
deqEntryVec
(
i
).
bits
.
payload
.
lsrc
(
1
),
deqEntryVec
(
i
).
bits
.
payload
.
lsrc
(
0
),
deqEntryVec
(
i
).
bits
.
imm
(
ImmUnion
.
maxLen
-
1
,
0
))
val
lui_imm
=
Cat
(
deqEntryVec
(
i
).
bits
.
payload
.
lsrc
(
1
),
deqEntryVec
(
i
).
bits
.
payload
.
lsrc
(
0
),
deqEntryVec
(
i
).
bits
.
imm
(
ImmUnion
.
maxLen
-
1
,
0
))
deq
.
bits
.
common
.
imm
:=
ImmUnion
.
LUI32
.
toImm32
(
lui_imm
)
deq
.
bits
.
common
.
imm
:=
ImmUnion
.
LUI32
.
toImm32
(
lui_imm
)
}
}
// dirty code for fused_lui_load
when
(
SrcType
.
isImm
(
deqEntryVec
(
i
).
bits
.
payload
.
srcType
(
0
))
&&
deqEntryVec
(
i
).
bits
.
payload
.
fuType
===
FuType
.
ldu
.
U
)
{
deq
.
bits
.
common
.
imm
:=
Imm_LUI_LOAD
().
getLuiImm
(
deqEntryVec
(
i
).
bits
.
payload
)
}
}
}
io
.
deqDelay
.
zip
(
io
.
fromCancelNetwork
).
foreach
{
case
(
deqDly
,
deq
)
=>
io
.
deqDelay
.
zip
(
io
.
fromCancelNetwork
).
foreach
{
case
(
deqDly
,
deq
)
=>
NewPipelineConnect
(
NewPipelineConnect
(
...
...
src/main/scala/xiangshan/backend/rename/Rename.scala
浏览文件 @
7dc9c096
...
@@ -361,7 +361,7 @@ class Rename(implicit p: Parameters) extends XSModule with HasCircularQueuePtrHe
...
@@ -361,7 +361,7 @@ class Rename(implicit p: Parameters) extends XSModule with HasCircularQueuePtrHe
val
last_is_lui
=
io
.
in
(
i
-
1
).
bits
.
selImm
===
SelImm
.
IMM_U
&&
io
.
in
(
i
-
1
).
bits
.
srcType
(
0
)
=/=
SrcType
.
pc
val
last_is_lui
=
io
.
in
(
i
-
1
).
bits
.
selImm
===
SelImm
.
IMM_U
&&
io
.
in
(
i
-
1
).
bits
.
srcType
(
0
)
=/=
SrcType
.
pc
val
this_is_load
=
io
.
in
(
i
).
bits
.
fuType
===
FuType
.
ldu
.
U
val
this_is_load
=
io
.
in
(
i
).
bits
.
fuType
===
FuType
.
ldu
.
U
val
lui_to_load
=
io
.
in
(
i
-
1
).
valid
&&
io
.
in
(
i
-
1
).
bits
.
ldest
===
io
.
in
(
i
).
bits
.
lsrc
(
0
)
val
lui_to_load
=
io
.
in
(
i
-
1
).
valid
&&
io
.
in
(
i
-
1
).
bits
.
ldest
===
io
.
in
(
i
).
bits
.
lsrc
(
0
)
val
fused_lui_load
=
last_is_lui
&&
this_is_load
&&
lui_to_load
&&
false
.
B
// Todo: enable it
val
fused_lui_load
=
last_is_lui
&&
this_is_load
&&
lui_to_load
when
(
fused_lui_load
)
{
when
(
fused_lui_load
)
{
// The first LOAD operand (base address) is replaced by LUI-imm and stored in {psrc, imm}
// The first LOAD operand (base address) is replaced by LUI-imm and stored in {psrc, imm}
val
lui_imm
=
io
.
in
(
i
-
1
).
bits
.
imm
(
19
,
0
)
val
lui_imm
=
io
.
in
(
i
-
1
).
bits
.
imm
(
19
,
0
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录