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

base: Replace M5_UNLIKELY with GEM5_UNLIKELY.

Browse Source 
Change-Id: Id5f01675da5110f6503bd799a7889e8eb73433a1
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/45239
Tested-by: kokoro <noreply+kokoro@google.com>
Maintainer: Gabe Black <gabe.black@gmail.com>
Reviewed-by: Daniel Carvalho <odanrc@yahoo.com.br>
This commit is contained in:
Gabe Black
2021-05-08 20:46:13 -07:00
parent c480558532
commit f1879bdc17
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/base/logging.hh
View File

@@ -199,7 +199,7 @@ class Logger
*/
#define panic_if(cond, ...) \
do { \
if (M5_UNLIKELY(cond)) { \
if (GEM5_UNLIKELY(cond)) { \
panic("panic condition " # cond " occurred: %s", \
csprintf(__VA_ARGS__)); \
} \
@@ -221,7 +221,7 @@ class Logger
*/
#define fatal_if(cond, ...) \
do { \
if (M5_UNLIKELY(cond)) { \
if (GEM5_UNLIKELY(cond)) { \
fatal("fatal condition " # cond " occurred: %s", \
csprintf(__VA_ARGS__)); \
} \
@@ -265,13 +265,13 @@ class Logger
*/
#define warn_if(cond, ...) \
do { \
if (M5_UNLIKELY(cond)) \
if (GEM5_UNLIKELY(cond)) \
warn(__VA_ARGS__); \
} while (0)
#define warn_if_once(cond, ...) \
do { \
if (M5_UNLIKELY(cond)) \
if (GEM5_UNLIKELY(cond)) \
warn_once(__VA_ARGS__); \
} while (0)
/** @} */ // end of api_logger
@@ -294,7 +294,7 @@ class Logger
#else //!NDEBUG
#define chatty_assert(cond, ...) \
do { \
if (M5_UNLIKELY(!(cond))) \
if (GEM5_UNLIKELY(!(cond))) \
panic("assert(" # cond ") failed: %s", csprintf(__VA_ARGS__)); \
} while (0)
#endif // NDEBUG

10
src/base/trace.hh
View File

@@ -174,34 +174,34 @@ const std::string &name();
*/
#define DDUMP(x, data, count) do { \
if (M5_UNLIKELY(TRACING_ON && Debug::x)) \
if (GEM5_UNLIKELY(TRACING_ON && Debug::x)) \
Trace::getDebugLogger()->dump( \
curTick(), name(), data, count, #x); \
} while (0)
#define DPRINTF(x, ...) do { \
if (M5_UNLIKELY(TRACING_ON && Debug::x)) { \
if (GEM5_UNLIKELY(TRACING_ON && Debug::x)) { \
Trace::getDebugLogger()->dprintf_flag( \
curTick(), name(), #x, __VA_ARGS__); \
} \
} while (0)
#define DPRINTFS(x, s, ...) do { \
if (M5_UNLIKELY(TRACING_ON && Debug::x)) { \
if (GEM5_UNLIKELY(TRACING_ON && Debug::x)) { \
Trace::getDebugLogger()->dprintf_flag( \
curTick(), s->name(), #x, __VA_ARGS__); \
} \
} while (0)
#define DPRINTFR(x, ...) do { \
if (M5_UNLIKELY(TRACING_ON && Debug::x)) { \
if (GEM5_UNLIKELY(TRACING_ON && Debug::x)) { \
Trace::getDebugLogger()->dprintf_flag( \
(Tick)-1, std::string(), #x, __VA_ARGS__); \
} \
} while (0)
#define DPRINTFV(x, ...) do { \
if (M5_UNLIKELY(TRACING_ON && (x))) { \
if (GEM5_UNLIKELY(TRACING_ON && (x))) { \
Trace::getDebugLogger()->dprintf_flag( \
curTick(), name(), x.name(), __VA_ARGS__); \
} \