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

systemc: Make suppress_id work like the test expects.

Browse Source 
This is in contrast to how Accellera actually implements it, implying
they would fail their own test.

The specific difference is that suppress_id should only suppress
SC_INFO and SC_WARNING, not all severity levels like the Accellera
implementation will do.

Change-Id: I34f0d2d5912548963433a785cfa6ef88ad818042
Reviewed-on: https://gem5-review.googlesource.com/c/13320
Reviewed-by: Gabe Black <gabeblack@google.com>
Maintainer: Gabe Black <gabeblack@google.com>
This commit is contained in:
Gabe Black
2018-10-06 20:21:31 -07:00
parent 5220003e38
commit 0b49ab94b2
1 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/systemc/utils/sc_report.cc
View File

@@ -102,7 +102,11 @@ sc_report::is_suppressed(int id)
if (it == sc_gem5::reportIdToMsgMap.end())
return false;
return sc_gem5::reportMsgInfoMap[it->second].actions == SC_DO_NOTHING;
auto &msgInfo = sc_gem5::reportMsgInfoMap[it->second];
return (msgInfo.actions == SC_DO_NOTHING ||
(msgInfo.sevActions[SC_INFO] == SC_DO_NOTHING &&
msgInfo.sevActions[SC_WARNING] == SC_DO_NOTHING));
}
void
@@ -139,10 +143,17 @@ sc_report::suppress_id(int id, bool suppress)
if (it == sc_gem5::reportIdToMsgMap.end())
return;
if (suppress)
sc_gem5::reportMsgInfoMap[it->second].actions = SC_DO_NOTHING;
else
sc_gem5::reportMsgInfoMap[it->second].actions = SC_UNSPECIFIED;
if (suppress) {
sc_gem5::reportMsgInfoMap[it->second].
sevActions[SC_INFO] = SC_DO_NOTHING;
sc_gem5::reportMsgInfoMap[it->second].
sevActions[SC_WARNING] = SC_DO_NOTHING;
} else {
sc_gem5::reportMsgInfoMap[it->second].
sevActions[SC_INFO] = SC_UNSPECIFIED;
sc_gem5::reportMsgInfoMap[it->second].
sevActions[SC_WARNING] = SC_UNSPECIFIED;
}
}
void