Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: S-interpolator for assert, assume and printf #41

Merged
merged 2 commits into from
Oct 7, 2022
Merged

fix: S-interpolator for assert, assume and printf #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
923fd56
fix: S-interpolator for assert, assume and printf
SingularityKChen Oct 5, 2022
f50a9e9
Merge branch 'master' into master
SingularityKChen Oct 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions patches/chipyard/1242.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
From 6ffd534e01b0148f83fc05b7dc5a85ce4258c9a0 Mon Sep 17 00:00:00 2001
From: singularity <chency_singularity@163.com>
Date: Fri, 7 Oct 2022 15:53:36 +0800
Subject: [PATCH] fix: S-interpolator for assert, assume and printf

---
generators/tracegen/src/main/scala/Tile.scala | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/generators/tracegen/src/main/scala/Tile.scala b/generators/tracegen/src/main/scala/Tile.scala
index 93d3c2c9f..d83b5b978 100644
--- a/generators/tracegen/src/main/scala/Tile.scala
+++ b/generators/tracegen/src/main/scala/Tile.scala
@@ -251,6 +251,6 @@ class BoomTraceGenTileModuleImp(outer: BoomTraceGenTile)
status.timeout.bits := 0.U
status.error.valid := false.B

- assert(!tracegen.io.timeout, s"TraceGen tile ${outer.tileParams.hartId}: request timed out")
+ assert(!tracegen.io.timeout, cf"TraceGen tile ${outer.tileParams.hartId.toString}: request timed out")

}
2 changes: 1 addition & 1 deletion patches/rocket-chip/3103.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From f2d378ab4e6ed1185f2d3c9e23cb3b26949a5497 Mon Sep 17 00:00:00 2001
From 43b2860ba510928e96808eddd60ad28fc8008f99 Mon Sep 17 00:00:00 2001
From: singularity <chency_singularity@163.com>
Date: Tue, 4 Oct 2022 21:53:32 +0800
Subject: [PATCH] fix: S-interpolator for assert, assume and printf
Expand Down
1 change: 1 addition & 0 deletions readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ This repository always tracks remote developing branches, it may need some patch
<!-- BEGIN-PATCH -->
chipyard https://github.com/ucb-bar/chipyard/pull/1160
chipyard https://github.com/ucb-bar/chipyard/pull/1222
chipyard https://github.com/ucb-bar/chipyard/pull/1242
dsptools https://github.com/ucb-bar/dsptools/pull/240
firesim https://github.com/firesim/firesim/pull/1214
firesim https://github.com/firesim/firesim/pull/1215
Expand Down