systemc: Start using the m5.systemc module in the test config.py.

Start using sc_main and sc_main_result from the systemc module, and
stop using the versions of those functions which are attached to the
SystemC_Kernel SimObject.

Change-Id: I802898038c80ed36e6a9176211cffb7e0fde2d7e
Reviewed-on: https://gem5-review.googlesource.com/c/16564
Maintainer: Gabe Black <gabeblack@google.com>
Reviewed-by: Andreas Sandberg <andreas.sandberg@arm.com>
This commit is contained in:
Gabe Black
2019-02-20 16:41:45 -08:00
parent 9bc9b24083
commit 118e16bdfa

View File

@@ -47,13 +47,13 @@ args = parser.parse_args()
if args.working_dir:
os.chdir(args.working_dir)
kernel.sc_main('gem5_systemc_test');
m5.systemc.sc_main('gem5_systemc_test');
m5.instantiate(None)
cause = m5.simulate(m5.MaxTick).getCause()
result = kernel.sc_main_result()
result = m5.systemc.sc_main_result()
if result.code != 0:
# Arguably this should make gem5 fail, but some tests purposefully
# generate errors, and as long as their output matches that's still