Gabriel B. has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/67662?usp=email )
Change subject: python: Fix namespaced enums params code generation
......................................................................
python: Fix namespaced enums params code generation
The wrapper_name parameter was not properly handled. Enums were always
generated in the enums namespace even if required differently by
wrapper_name.
Change-Id: I366846ce39dfe10effc2cc145e7772a3fd171b92
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/67662
Tested-by: kokoro <noreply+kok...@google.com>
Reviewed-by: Bobby Bruce <bbr...@ucdavis.edu>
Maintainer: Bobby Bruce <bbr...@ucdavis.edu>
---
M build_tools/enum_cc.py
M src/python/m5/params.py
2 files changed, 4 insertions(+), 4 deletions(-)
Approvals:
kokoro: Regressions pass
Bobby Bruce: Looks good to me, approved; Looks good to me, approved
diff --git a/build_tools/enum_cc.py b/build_tools/enum_cc.py
index 5d82b40..173143f 100644
--- a/build_tools/enum_cc.py
+++ b/build_tools/enum_cc.py
@@ -97,7 +97,7 @@
)
else:
code(
- """namespace enums
+ """namespace ${wrapper_name}
{"""
)
code.indent(1)
@@ -112,7 +112,7 @@
if not enum.wrapper_is_struct and not enum.is_class:
code.dedent(1)
- code("} // namespace enums")
+ code("} // namespace ${wrapper_name}")
code("} // namespace gem5")
diff --git a/src/python/m5/params.py b/src/python/m5/params.py
index 2ca6dfc..2559b55 100644
--- a/src/python/m5/params.py
+++ b/src/python/m5/params.py
@@ -1560,8 +1560,8 @@
if cls.is_class:
cls.cxx_type = f"{name}"
else:
- cls.cxx_type = f"enums::{name}"
-
+ scope = init_dict.get("wrapper_name", "enums")
+ cls.cxx_type = f"{scope}::{name}"
super().__init__(name, bases, init_dict)
--
To view, visit
https://gem5-review.googlesource.com/c/public/gem5/+/67662?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: I366846ce39dfe10effc2cc145e7772a3fd171b92
Gerrit-Change-Number: 67662
Gerrit-PatchSet: 9
Gerrit-Owner: Gabriel B. <gabriel.bus...@arteris.com>
Gerrit-Reviewer: Andreas Sandberg <andreas.sandb...@arm.com>
Gerrit-Reviewer: Bobby Bruce <bbr...@ucdavis.edu>
Gerrit-Reviewer: Gabriel B. <gabriel.bus...@arteris.com>
Gerrit-Reviewer: Jason Lowe-Power <ja...@lowepower.com>
Gerrit-Reviewer: Jason Lowe-Power <power...@gmail.com>
Gerrit-Reviewer: kokoro <noreply+kok...@google.com>
Gerrit-CC: kokoro <noreply+kok...@google.com>
_______________________________________________
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
