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

base,arch,mem: Remove {GE}M5_VAR_USED instances

Browse Source 
`[[maybe_unused]]` is to be used to specify that a variable is used.

Change-Id: Ife2ac96111b3af13e182baba1f3456e48c3a9f9b
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/70397
Reviewed-by: Jason Lowe-Power <power.jg@gmail.com>
Maintainer: Bobby Bruce <bbruce@ucdavis.edu>
Tested-by: kokoro <noreply+kokoro@google.com>
Reviewed-by: Daniel Carvalho <odanrc@yahoo.com.br>
This commit is contained in:
Bobby R. Bruce
2023-05-08 10:54:56 -07:00
committed by Bobby Bruce
parent fcb36458e2
commit 6dd60a6c1a
5 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/arch/arm/isa/insts/sme.isa
View File

@@ -100,12 +100,12 @@ let {{
xc->tcBase());
uint8_t offset = imm & (0xf >> (findMsbSet(sizeof(TPElem))));
M5_VAR_USED uint8_t tile_idx =
[[maybe_unused]] uint8_t tile_idx =
imm >> (4 - findMsbSet(sizeof(TPElem)));
M5_VAR_USED uint8_t vec_idx = (WOp2 + offset) % eCount;
[[maybe_unused]] uint8_t vec_idx = (WOp2 + offset) % eCount;
// Calculate the address
M5_VAR_USED Addr EA = XOp1 + XOp3 * sizeof(TPElem);
[[maybe_unused]] Addr EA = XOp1 + XOp3 * sizeof(TPElem);
// Calculate the read predicate. One boolean per byte,
// initialised to all true.
@@ -164,10 +164,10 @@ let {{
unsigned eCount = ArmStaticInst::getCurSmeVecLen<uint8_t>(
xc->tcBase());
M5_VAR_USED uint8_t vec_index = (WOp2 + imm) % eCount;
[[maybe_unused]] uint8_t vec_index = (WOp2 + imm) % eCount;
// Calculate the address
M5_VAR_USED Addr EA = XOp1 + imm;
[[maybe_unused]] Addr EA = XOp1 + imm;
'''
iop = InstObjParams(name, "Sme" + Name, "SmeLdrStrOp",
@@ -378,12 +378,12 @@ let {{
xc->tcBase());
uint8_t offset = imm & (0xf >> (findMsbSet(sizeof(TPElem))));
M5_VAR_USED uint8_t tile_idx =
[[maybe_unused]] uint8_t tile_idx =
imm >> (4 - findMsbSet(sizeof(TPElem)));
M5_VAR_USED uint8_t vec_idx = (WOp2 + offset) % eCount;
[[maybe_unused]] uint8_t vec_idx = (WOp2 + offset) % eCount;
// Calculate the address
M5_VAR_USED Addr EA = XOp1 + XOp3 * sizeof(TPElem);
[[maybe_unused]] Addr EA = XOp1 + XOp3 * sizeof(TPElem);
// Calculate the write predicate. One boolean per byte,
// initialised to all true.
@@ -446,7 +446,7 @@ let {{
auto row = getTileHSlice<uint8_t>(ZA, 0, vec_index);
// Calculate the address
M5_VAR_USED Addr EA = XOp1 + imm;
[[maybe_unused]] Addr EA = XOp1 + imm;
uint8_t data[MaxSmeVecLenInBytes];

4
src/base/gtest/serialization_fixture.hh
View File

@@ -99,7 +99,7 @@ class SerializationFixture : public ::testing::Test
{
// Create the directory
dirName = generateTempDirName();
M5_VAR_USED int success = mkdir(dirName.c_str(), 0775);
[[maybe_unused]] int success = mkdir(dirName.c_str(), 0775);
assert(!(success == -1 && errno != EEXIST));
}
@@ -110,7 +110,7 @@ class SerializationFixture : public ::testing::Test
// rmdir does not work
std::remove(getCptPath().c_str());
// Remove the directory we created on SetUp
M5_VAR_USED int success = rmdir(dirName.c_str());
[[maybe_unused]] int success = rmdir(dirName.c_str());
assert(success == 0);
}
};

6
src/base/inet.cc
View File

@@ -301,7 +301,7 @@ Ip6Hdr::extensionLength() const
const uint8_t *data = bytes() + IP6_HDR_LEN;
uint8_t nxt = ip6_nxt;
int len = 0;
GEM5_VAR_USED int all = plen();
[[maybe_unused]] int all = plen();
while (ip6Extension(nxt)) {
const Ip6Opt *ext = (const Ip6Opt *)data;
@@ -324,7 +324,7 @@ Ip6Hdr::getExt(uint8_t ext_type) const
const uint8_t *data = bytes() + IP6_HDR_LEN;
uint8_t nxt = ip6_nxt;
Ip6Opt* opt = NULL;
GEM5_VAR_USED int all = plen();
[[maybe_unused]] int all = plen();
while (ip6Extension(nxt)) {
opt = (Ip6Opt *)data;
@@ -349,7 +349,7 @@ Ip6Hdr::proto() const
{
const uint8_t *data = bytes() + IP6_HDR_LEN;
uint8_t nxt = ip6_nxt;
GEM5_VAR_USED int all = plen();
[[maybe_unused]] int all = plen();
while (ip6Extension(nxt)) {
const Ip6Opt *ext = (const Ip6Opt *)data;

3
src/base/stats/group.cc
View File

@@ -72,7 +72,8 @@ Group::regStats()
for (auto &g : statGroups) {
if (debug::Stats) {
M5_VAR_USED const Named *named = dynamic_cast<const Named *>(this);
[[maybe_unused]] const Named *named = \
dynamic_cast<const Named *>(this);
DPRINTF(Stats, "%s: regStats in group %s\n",
named ? named->name() : "?",
g.first);

2
src/mem/ruby/system/Sequencer.cc
View File

@@ -230,7 +230,7 @@ Sequencer::wakeup()
Cycles current_time = curCycle();
// Check across all outstanding requests
GEM5_VAR_USED int total_outstanding = 0;
[[maybe_unused]] int total_outstanding = 0;
for (const auto &table_entry : m_RequestTable) {
for (const auto &seq_req : table_entry.second) {