Gabe Black has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/50333 )
(
5 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the
submitted one.
)Change subject: scons: Make debug flags respect tags.
......................................................................
scons: Make debug flags respect tags.
Debug flags can have their own tags which will apply to the .cc file
they create.
Change-Id: I16911252176a5a8df0e56c0e37a3c11b4cf1dd7b
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/50333
Tested-by: kokoro <[email protected]>
Reviewed-by: Andreas Sandberg <[email protected]>
Maintainer: Gabe Black <[email protected]>
---
M src/SConscript
1 file changed, 31 insertions(+), 8 deletions(-)
Approvals:
Andreas Sandberg: Looks good to me, approved
Gabe Black: Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/SConscript b/src/SConscript
index 866e86b..08c4504 100644
--- a/src/SConscript
+++ b/src/SConscript
@@ -374,7 +374,7 @@
#
debug_flags = set()
-def DebugFlagCommon(name, flags, desc, fmt):
+def DebugFlagCommon(name, flags, desc, fmt, tags, add_tags):
if name == "All":
raise AttributeError('The "All" flag name is reserved')
if name in debug_flags:
@@ -397,14 +397,21 @@
MakeAction('"${GEM5PY}" "${DEBUGFLAGCC_PY}" "${TARGET}" "${NAME}"',
Transform("TRACING", 0)),
DEBUGFLAGCC_PY=build_tools.File('debugflagcc.py'), NAME=name)
- Source(cc_file, add_tags='gem5 trace')
+ if not add_tags:
+ add_tags = set()
+ if isinstance(add_tags, str):
+ add_tags = { add_tags }
+ if not isinstance(add_tags, set):
+ add_tags = set(add_tags)
+ add_tags.add('gem5 trace')
+ Source(cc_file, tags=tags, add_tags=add_tags)
-def DebugFlag(name, desc=None, fmt=False):
- DebugFlagCommon(name, (), desc, fmt)
-def CompoundFlag(name, flags, desc=None):
- DebugFlagCommon(name, flags, desc, False)
-def DebugFormatFlag(name, desc=None):
- DebugFlag(name, desc, True)
+def DebugFlag(name, desc=None, fmt=False, tags=None, add_tags=None):
+ DebugFlagCommon(name, (), desc, fmt, tags=tags, add_tags=add_tags)
+def CompoundFlag(name, flags, desc=None, tags=None, add_tags=None):
+ DebugFlagCommon(name, flags, desc, False, tags=tags, add_tags=add_tags)
+def DebugFormatFlag(name, desc=None, tags=None, add_tags=None):
+ DebugFlag(name, desc, True, tags=tags, add_tags=add_tags)
Export('DebugFlag')
Export('CompoundFlag')
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/50333
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: I16911252176a5a8df0e56c0e37a3c11b4cf1dd7b
Gerrit-Change-Number: 50333
Gerrit-PatchSet: 7
Gerrit-Owner: Gabe Black <[email protected]>
Gerrit-Reviewer: Andreas Sandberg <[email protected]>
Gerrit-Reviewer: Gabe Black <[email protected]>
Gerrit-Reviewer: Hoa Nguyen <[email protected]>
Gerrit-Reviewer: Jui-min Lee <[email protected]>
Gerrit-Reviewer: Yu-hsin Wang <[email protected]>
Gerrit-Reviewer: kokoro <[email protected]>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list -- [email protected]
To unsubscribe send an email to [email protected]
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
