Gabe Black has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/45239 )
Change subject: base: Replace M5_UNLIKELY with GEM5_UNLIKELY.
......................................................................
base: Replace M5_UNLIKELY with GEM5_UNLIKELY.
Change-Id: Id5f01675da5110f6503bd799a7889e8eb73433a1
---
M src/base/logging.hh
M src/base/trace.hh
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/base/logging.hh b/src/base/logging.hh
index 650aecd..050f2c6 100644
--- a/src/base/logging.hh
+++ b/src/base/logging.hh
@@ -199,7 +199,7 @@
*/
#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 @@
*/
#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 @@
*/
#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 @@
#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
diff --git a/src/base/trace.hh b/src/base/trace.hh
index c1804e8..fff05f7 100644
--- a/src/base/trace.hh
+++ b/src/base/trace.hh
@@ -174,34 +174,34 @@
*/
#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__); \
} \
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/45239
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: Id5f01675da5110f6503bd799a7889e8eb73433a1
Gerrit-Change-Number: 45239
Gerrit-PatchSet: 1
Gerrit-Owner: Gabe Black <gabe.bl...@gmail.com>
Gerrit-MessageType: newchange
_______________________________________________
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
