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

arch-arm: Fixed ARM/gem5.fast compilation failures

Browse Source 
The compiler-tests were failing:
https://jenkins.gem5.org/job/compiler-checks/238

This was due to an `error: unused variable` error being thrown in cases
where a variable was declared and used soley in an `assert` within a
SLICC file. Assertions of this kind are stripped during .fast
compilation.

This patch fixes this.

Change-Id: I3a91ac8b1a51de7ddffd6a1cff602a934862b49c
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/59829
Maintainer: Bobby Bruce <bbruce@ucdavis.edu>
Reviewed-by: Jason Lowe-Power <power.jg@gmail.com>
Tested-by: kokoro <noreply+kokoro@google.com>
This commit is contained in:
Bobby R. Bruce
2022-05-19 11:33:55 -07:00
committed by Bobby Bruce
parent 530b389ace
commit 770f470495
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -107,8 +107,7 @@ in_port(datInPort, CHIDataMsg, datIn, rank=9,
peek(datInPort, CHIDataMsg) {
// We don't have any transactions that use data requests
assert(!in_msg.usesTxnId);
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));
}

8
src/mem/ruby/protocol/chi/CHI-dvm-misc-node-ports.sm
View File

@@ -87,8 +87,7 @@ in_port(datInPort, CHIDataMsg, datIn, rank=10,
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));
assert(in_msg.usesTxnId);
trigger(dataToEvent(in_msg.type), in_msg.txnId, getCurrentActiveTBE(in_msg.txnId));
}
@@ -121,8 +120,7 @@ in_port(reqInPort, CHIRequestMsg, reqIn, rank=2,
peek(reqInPort, CHIRequestMsg) {
assert(in_msg.usesTxnId);
// Make sure we aren't already processing this
TBE tbe := getCurrentActiveTBE(in_msg.txnId);
assert(!is_valid(tbe));
assert(!is_valid(getCurrentActiveTBE(in_msg.txnId)));
if (in_msg.allowRetry) {
trigger(Event:AllocRequest, in_msg.txnId, nullTBE());
} else {
@@ -315,4 +313,4 @@ void updatePendingOps(), run_on_input_cycle_end="yes" {
}
}
}
}
}