Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenXiangShan
XiangShan
提交
c5f31b5b
X
XiangShan
项目概览
OpenXiangShan
/
XiangShan
12 个月 前同步成功
通知
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,发现更多精彩内容 >>
提交
c5f31b5b
编写于
10月 28, 2020
作者:
L
LinJiawei
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
update chiseltest to 0.3.0
上级
106f2817
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
26 addition
and
6 deletion
+26
-6
.gitmodules
.gitmodules
+4
-0
build.sc
build.sc
+21
-6
chiseltest
chiseltest
+1
-0
未找到文件。
.gitmodules
浏览文件 @
c5f31b5b
...
...
@@ -6,3 +6,7 @@
path = block-inclusivecache-sifive
url = https://github.com/RISCVERS/block-inclusivecache-sifive.git
branch = 5491dcc937ed3c6f7722bef9db448653daab75e8
[submodule "chiseltest"]
path = chiseltest
url = https://github.com/ucb-bar/chisel-testers2.git
branch = 3e3ecc5b25b7b6bc48341ec07c7a54b7ad53bcb7
build.sc
浏览文件 @
c5f31b5b
...
...
@@ -25,7 +25,7 @@ trait CommonModule extends ScalaModule {
override
def
scalacPluginIvyDeps
=
Agg
(
macroParadise
)
}
val
rocketC
hisel
=
Agg
(
val
c
hisel
=
Agg
(
ivy
"edu.berkeley.cs::chisel3:3.4.0"
)
...
...
@@ -34,7 +34,7 @@ object `rocket-chip` extends SbtModule with CommonModule {
override
def
ivyDeps
=
super
.
ivyDeps
()
++
Agg
(
ivy
"${scalaOrganization()}:scala-reflect:${scalaVersion()}"
,
ivy
"org.json4s::json4s-jackson:3.6.1"
)
++
rocketC
hisel
)
++
c
hisel
object
`api-config-chipsalliance`
extends
CommonModule
{
...
...
@@ -44,7 +44,7 @@ object `rocket-chip` extends SbtModule with CommonModule {
object
macros
extends
SbtModule
with
CommonModule
object
hardfloat
extends
SbtModule
with
CommonModule
{
override
def
ivyDeps
=
super
.
ivyDeps
()
++
rocketC
hisel
override
def
ivyDeps
=
super
.
ivyDeps
()
++
c
hisel
}
override
def
moduleDeps
=
super
.
moduleDeps
++
Seq
(
...
...
@@ -54,13 +54,25 @@ object `rocket-chip` extends SbtModule with CommonModule {
}
object
`block-inclusivecache-sifive`
extends
CommonModule
{
override
def
ivyDeps
=
super
.
ivyDeps
()
++
rocketC
hisel
override
def
ivyDeps
=
super
.
ivyDeps
()
++
c
hisel
override
def
millSourcePath
=
super
.
millSourcePath
/
'design / '
craft
/
'inclusivecache
override def moduleDeps = super.moduleDeps ++ Seq(`rocket-chip`)
}
object chiseltest extends CommonModule with SbtModule {
override def ivyDeps = super.ivyDeps() ++ Agg(
ivy"edu.berkeley.cs::treadle:1.3.0",
ivy"org.scalatest::scalatest:3.0.8",
ivy"com.lihaoyi::utest:0.7.4"
) ++ chisel
object test extends Tests {
def ivyDeps = Agg(ivy"org.scalacheck::scalacheck:1.14.3")
def testFrameworks = Seq("org.scalatest.tools.Framework")
}
}
object XiangShan extends CommonModule with SbtModule {
override def millSourcePath = millOuterCtx.millSourcePath
...
...
@@ -71,13 +83,16 @@ object XiangShan extends CommonModule with SbtModule {
ivy"edu.berkeley.cs::chisel3:3.4.0-RC3"
)
override def moduleDeps = super.moduleDeps ++ Seq(`rocket-chip`, `block-inclusivecache-sifive`)
override def moduleDeps = super.moduleDeps ++ Seq(
`rocket-chip`,
`block-inclusivecache-sifive`,
chiseltest
)
object test extends Tests {
override def ivyDeps = super.ivyDeps() ++ Agg(
ivy"org.scalatest::scalatest:3.0.4",
ivy"edu.berkeley.cs::chisel-iotesters:1.2+",
ivy"edu.berkeley.cs::chiseltest:0.2.1"
)
def testFrameworks = Seq(
...
...
chiseltest
@
3e3ecc5b
Subproject commit 3e3ecc5b25b7b6bc48341ec07c7a54b7ad53bcb7
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录