Gabe Black has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/45559 )
Change subject: base: Deprecate the UNIT_* macros.
......................................................................
base: Deprecate the UNIT_* macros.
These macros, like all macros, do not respect namespaces. Using these
macros effectively undoes the benefit of putting the unit classes into a
namespace.
Change-Id: I098a7d6951ccc334ae03a3a2e4da6a0f7c1e2263
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/45559
Tested-by: kokoro <noreply+kok...@google.com>
Reviewed-by: Gabe Black <gabe.bl...@gmail.com>
Maintainer: Gabe Black <gabe.bl...@gmail.com>
---
M src/base/stats/units.hh
1 file changed, 35 insertions(+), 13 deletions(-)
Approvals:
Gabe Black: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/base/stats/units.hh b/src/base/stats/units.hh
index 87e6025..8f15e80 100644
--- a/src/base/stats/units.hh
+++ b/src/base/stats/units.hh
@@ -31,24 +31,46 @@
#include <type_traits>
+#include "base/compiler.hh"
#include "base/cprintf.hh"
/**
* Convenience macros to declare the unit of a stat.
*/
-#define UNIT_CYCLE Stats::Units::Cycle::get()
-#define UNIT_TICK Stats::Units::Tick::get()
-#define UNIT_SECOND Stats::Units::Second::get()
-#define UNIT_BIT Stats::Units::Bit::get()
-#define UNIT_BYTE Stats::Units::Byte::get()
-#define UNIT_JOULE Stats::Units::Joule::get()
-#define UNIT_VOLT Stats::Units::Volt::get()
-#define UNIT_CELSIUS Stats::Units::DegreeCelsius::get()
-#define UNIT_RATE(T1, T2) Stats::Units::Rate<T1, T2>::get()
-#define UNIT_RATIO Stats::Units::Ratio::get()
-#define UNIT_COUNT Stats::Units::Count::get()
-#define UNIT_WATT Stats::Units::Watt::get()
-#define UNIT_UNSPECIFIED Stats::Units::Unspecified::get()
+#define UNIT_CYCLE GEM5_DEPRECATED_MACRO( \
+ UNIT_CYCLE, Stats::Units::Cycle::get(), \
+ "Use Stats::Units::Cycle::get()")
+#define UNIT_TICK GEM5_DEPRECATED_MACRO( \
+ UNIT_TICK, Stats::Units::Tick::get(), "Use
Stats::Units::Tick::get()")
+#define UNIT_SECOND GEM5_DEPRECATED_MACRO( \
+ UNIT_SECOND, Stats::Units::Second::get(), \
+ "Use Stats::Units::Second::get()")
+#define UNIT_BIT GEM5_DEPRECATED_MACRO( \
+ UNIT_BIT, Stats::Units::Bit::get(), "Use Stats::Units::Bit::get()")
+#define UNIT_BYTE GEM5_DEPRECATED_MACRO( \
+ UNIT_BYTE, Stats::Units::Byte::get(), "Use
Stats::Units::Byte::get()")
+#define UNIT_JOULE GEM5_DEPRECATED_MACRO( \
+ UNIT_JOULE, Stats::Units::Joule::get(), \
+ "Use Stats::Units::Joule::get()")
+#define UNIT_VOLT GEM5_DEPRECATED_MACRO( \
+ UNIT_VOLD, Stats::Units::Volt::get(), "Use
Stats::Units::Volt::get()")
+#define UNIT_CELSIUS GEM5_DEPRECATED_MACRO( \
+ UNIT_CELSIUS, Stats::Units::DegreeCelsius::get(), \
+ "Use Stats::Units::DegreeCelsius::get()")
+#define UNIT_RATE(T1, T2) GEM5_DEPRECATED_MACRO( \
+ UNIT_RATE, (Stats::Units::Rate<T1, T2>::get()), \
+ "Use Stats::Units::Rate<T1, T2>::get()")
+#define UNIT_RATIO GEM5_DEPRECATED_MACRO( \
+ UNIT_RATIO, Stats::Units::Ratio::get(), \
+ "Use Stats::Units::Ratio::get()")
+#define UNIT_COUNT GEM5_DEPRECATED_MACRO( \
+ UNIT_COUNT, Stats::Units::Count::get(), \
+ "Use Stats::Units::Count::get()")
+#define UNIT_WATT GEM5_DEPRECATED_MACRO( \
+ UNIT_WATT, Stats::Units::Watt::get(), "Use
Stats::Units::Watt::get()")
+#define UNIT_UNSPECIFIED GEM5_DEPRECATED_MACRO( \
+ UNIT_UNSPECIFIED, Stats::Units::Unspecified::get(), \
+ "Use Stats::Units::Unspecified::get()")
namespace Stats {
5 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the
submitted one.
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/45559
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: I098a7d6951ccc334ae03a3a2e4da6a0f7c1e2263
Gerrit-Change-Number: 45559
Gerrit-PatchSet: 7
Gerrit-Owner: Gabe Black <gabe.bl...@gmail.com>
Gerrit-Reviewer: Bobby R. Bruce <bbr...@ucdavis.edu>
Gerrit-Reviewer: Daniel Carvalho <oda...@yahoo.com.br>
Gerrit-Reviewer: Gabe Black <gabe.bl...@gmail.com>
Gerrit-Reviewer: Hoa Nguyen <hoangu...@ucdavis.edu>
Gerrit-Reviewer: kokoro <noreply+kok...@google.com>
Gerrit-MessageType: merged
_______________________________________________
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
