Bobby R. Bruce has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/44086 )
Change subject: misc,mem-ruby: Fixing unused variable error for fast builds
......................................................................
misc,mem-ruby: Fixing unused variable error for fast builds
This fixes the broken compiler tests for .fast builds:
https://www.mail-archive.com/[email protected]/msg38412.html
Change-Id: Ibc377a57ce6455ca709003f326b0ca8d4c01377b
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/44086
Reviewed-by: Gabe Black <[email protected]>
Reviewed-by: Tiago Mück <[email protected]>
Reviewed-by: Jason Lowe-Power <[email protected]>
Maintainer: Bobby R. Bruce <[email protected]>
Tested-by: kokoro <[email protected]>
---
M src/mem/ruby/protocol/chi/CHI-cache-actions.sm
M src/mem/ruby/protocol/chi/CHI-cache-ports.sm
M src/mem/ruby/protocol/chi/CHI-mem.sm
3 files changed, 10 insertions(+), 8 deletions(-)
Approvals:
Jason Lowe-Power: Looks good to me, approved
Tiago Mück: Looks good to me, but someone else must approve
Gabe Black: Looks good to me, but someone else must approve
Bobby R. Bruce: Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/mem/ruby/protocol/chi/CHI-cache-actions.sm
b/src/mem/ruby/protocol/chi/CHI-cache-actions.sm
index ea5eaff..b1a7d99 100644
--- a/src/mem/ruby/protocol/chi/CHI-cache-actions.sm
+++ b/src/mem/ruby/protocol/chi/CHI-cache-actions.sm
@@ -1844,10 +1844,10 @@
action(UpdateDataState_FromWUDataResp, desc="") {
assert(is_valid(tbe));
- int offset := addressOffset(tbe.accAddr, tbe.addr);
if (tbe.expected_req_resp.hasReceivedData()) {
- assert(tbe.dataBlkValid.test(offset));
- assert(tbe.dataBlkValid.test(offset + tbe.accSize - 1));
+ assert(tbe.dataBlkValid.test(addressOffset(tbe.accAddr, tbe.addr)));
+ assert(tbe.dataBlkValid.test(addressOffset(tbe.accAddr, tbe.addr)
+ + tbe.accSize - 1));
peek(datInPort, CHIDataMsg) {
assert(in_msg.type == CHIDataType:NCBWrData);
tbe.dataDirty := true;
@@ -2682,7 +2682,9 @@
assert(is_valid(victim_entry));
TBE victim_tbe := getCurrentActiveTBE(victim_addr);
- if (is_invalid(victim_tbe)) {
+ // The `is_valid(victim_entry)` condition here is to avoid an unused
+ // variable error when compiling to gem5.fast.
+ if (is_invalid(victim_tbe) && is_valid(victim_entry)) {
DPRINTF(RubySlicc, "Eviction for %#x victim: %#x state=%s\n",
address, victim_addr, victim_entry.state);
enqueue(replTriggerOutPort, ReplacementMsg, 0) {
diff --git a/src/mem/ruby/protocol/chi/CHI-cache-ports.sm
b/src/mem/ruby/protocol/chi/CHI-cache-ports.sm
index 6a4fe5b..efba9bc 100644
--- a/src/mem/ruby/protocol/chi/CHI-cache-ports.sm
+++ b/src/mem/ruby/protocol/chi/CHI-cache-ports.sm
@@ -96,8 +96,8 @@
if (datInPort.isReady(clockEdge())) {
printResources();
peek(datInPort, CHIDataMsg) {
- int received := in_msg.bitMask.count();
- assert((received <= data_channel_size) && (received > 0));
+ assert((in_msg.bitMask.count() <= data_channel_size)
+ && (in_msg.bitMask.count() > 0));
trigger(dataToEvent(in_msg.type), in_msg.addr,
getCacheEntry(in_msg.addr),
getCurrentActiveTBE(in_msg.addr));
}
diff --git a/src/mem/ruby/protocol/chi/CHI-mem.sm
b/src/mem/ruby/protocol/chi/CHI-mem.sm
index 954a449..08f8b8e 100644
--- a/src/mem/ruby/protocol/chi/CHI-mem.sm
+++ b/src/mem/ruby/protocol/chi/CHI-mem.sm
@@ -365,8 +365,8 @@
if (datInPort.isReady(clockEdge())) {
printResources();
peek(datInPort, CHIDataMsg) {
- int received := in_msg.bitMask.count();
- assert((received <= data_channel_size) && (received > 0));
+ assert((in_msg.bitMask.count() <= data_channel_size)
+ && (in_msg.bitMask.count() > 0));
trigger(dataToEvent(in_msg.type), in_msg.addr, TBEs[in_msg.addr]);
}
}
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/44086
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: Ibc377a57ce6455ca709003f326b0ca8d4c01377b
Gerrit-Change-Number: 44086
Gerrit-PatchSet: 5
Gerrit-Owner: Bobby R. Bruce <[email protected]>
Gerrit-Reviewer: Bobby R. Bruce <[email protected]>
Gerrit-Reviewer: Gabe Black <[email protected]>
Gerrit-Reviewer: Jason Lowe-Power <[email protected]>
Gerrit-Reviewer: Jason Lowe-Power <[email protected]>
Gerrit-Reviewer: Tiago Mück <[email protected]>
Gerrit-Reviewer: kokoro <[email protected]>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list -- [email protected]
To unsubscribe send an email to [email protected]
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
