derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

misc,mem-ruby: Fixing unused variable error for fast builds

Browse Source 
This fixes the broken compiler tests for .fast builds:
https://www.mail-archive.com/gem5-dev@gem5.org/msg38412.html

Change-Id: Ibc377a57ce6455ca709003f326b0ca8d4c01377b
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/44086
Reviewed-by: Gabe Black <gabe.black@gmail.com>
Reviewed-by: Tiago Mück <tiago.muck@arm.com>
Reviewed-by: Jason Lowe-Power <power.jg@gmail.com>
Maintainer: Bobby R. Bruce <bbruce@ucdavis.edu>
Tested-by: kokoro <noreply+kokoro@google.com>
This commit is contained in:
Bobby R. Bruce
2021-04-03 21:43:16 -07:00
parent b3af12ccd5
commit 291bc67ef1
3 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/mem/ruby/protocol/chi/CHI-cache-actions.sm
View File

@@ -1844,10 +1844,10 @@ action(UpdateDataState_FromReqDataResp, desc="") {
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 @@ action(CheckCacheFill, desc="") {
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) {

4
src/mem/ruby/protocol/chi/CHI-cache-ports.sm
View File

@@ -96,8 +96,8 @@ in_port(datInPort, CHIDataMsg, datIn, rank=9,
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));
}

4
src/mem/ruby/protocol/chi/CHI-mem.sm
View File

@@ -365,8 +365,8 @@ machine(MachineType:Memory, "Memory controller interface") :
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]);
}
}