gem5-dev@gem5.org

The gem5 Developer List

View all threads

[XS] Change in gem5/gem5[develop]: python: Fix broken call to m5.fatal in _check_tracing()

RC
Richard Cooper (Gerrit)
Thu, Apr 13, 2023 9:52 AM

Richard Cooper has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/50447?usp=email )

(

1 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the
submitted one.
)Change subject: python: Fix broken call to m5.fatal in _check_tracing()
......................................................................

python: Fix broken call to m5.fatal in _check_tracing()

The call to m5.fatal in _check_tracing() fails because it has not been
imported at this point.

Change-Id: I60b1de6128d0ffc29e03e9ed98a8f9f679ef0ff9
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/50447
Maintainer: Bobby Bruce bbruce@ucdavis.edu
Reviewed-by: Bobby Bruce bbruce@ucdavis.edu
Tested-by: kokoro noreply+kokoro@google.com

M src/python/m5/main.py
1 file changed, 2 insertions(+), 1 deletion(-)

Approvals:
Bobby Bruce: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass

diff --git a/src/python/m5/main.py b/src/python/m5/main.py
index d8c9951..b4a3472 100644
--- a/src/python/m5/main.py
+++ b/src/python/m5/main.py
@@ -334,12 +334,13 @@

def _check_tracing():

  • import m5
    import _m5.core

    if _m5.core.TRACING_ON:
    return

  • fatal("Tracing is not enabled.  Compile with TRACING_ON")
  • m5.fatal("Tracing is not enabled.  Compile with TRACING_ON")

def main():

--
To view, visit
https://gem5-review.googlesource.com/c/public/gem5/+/50447?usp=email
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: I60b1de6128d0ffc29e03e9ed98a8f9f679ef0ff9
Gerrit-Change-Number: 50447
Gerrit-PatchSet: 3
Gerrit-Owner: Richard Cooper richard.cooper@arm.com
Gerrit-Reviewer: Andreas Sandberg andreas.sandberg@arm.com
Gerrit-Reviewer: Bobby Bruce bbruce@ucdavis.edu
Gerrit-Reviewer: Jason Lowe-Power jason@lowepower.com
Gerrit-Reviewer: Richard Cooper richard.cooper@arm.com
Gerrit-Reviewer: kokoro noreply+kokoro@google.com
Gerrit-CC: Jason Lowe-Power power.jg@gmail.com
Gerrit-MessageType: merged

Richard Cooper has submitted this change. ( https://gem5-review.googlesource.com/c/public/gem5/+/50447?usp=email ) ( 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: python: Fix broken call to m5.fatal in _check_tracing() ...................................................................... python: Fix broken call to m5.fatal in _check_tracing() The call to m5.fatal in _check_tracing() fails because it has not been imported at this point. Change-Id: I60b1de6128d0ffc29e03e9ed98a8f9f679ef0ff9 Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/50447 Maintainer: Bobby Bruce <bbruce@ucdavis.edu> Reviewed-by: Bobby Bruce <bbruce@ucdavis.edu> Tested-by: kokoro <noreply+kokoro@google.com> --- M src/python/m5/main.py 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Bobby Bruce: Looks good to me, approved; Looks good to me, approved kokoro: Regressions pass diff --git a/src/python/m5/main.py b/src/python/m5/main.py index d8c9951..b4a3472 100644 --- a/src/python/m5/main.py +++ b/src/python/m5/main.py @@ -334,12 +334,13 @@ def _check_tracing(): + import m5 import _m5.core if _m5.core.TRACING_ON: return - fatal("Tracing is not enabled. Compile with TRACING_ON") + m5.fatal("Tracing is not enabled. Compile with TRACING_ON") def main(): -- To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/50447?usp=email 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: I60b1de6128d0ffc29e03e9ed98a8f9f679ef0ff9 Gerrit-Change-Number: 50447 Gerrit-PatchSet: 3 Gerrit-Owner: Richard Cooper <richard.cooper@arm.com> Gerrit-Reviewer: Andreas Sandberg <andreas.sandberg@arm.com> Gerrit-Reviewer: Bobby Bruce <bbruce@ucdavis.edu> Gerrit-Reviewer: Jason Lowe-Power <jason@lowepower.com> Gerrit-Reviewer: Richard Cooper <richard.cooper@arm.com> Gerrit-Reviewer: kokoro <noreply+kokoro@google.com> Gerrit-CC: Jason Lowe-Power <power.jg@gmail.com> Gerrit-MessageType: merged