Skip to content

Commit 585ce62

Browse files
committed
tests: Fix garnet and memcheck tests to use X86
These tests previously used "build/NULL" but due to changes in the "Ruby" and "garnet_synth_traffic.py" scripts, "NULL" fails as the script exists "X86TimingSimple" with MESI_Two_Level. This change fixes the tests by compiling and using the correct compilation of gem5. It shouldn't affect the tests in any negative way. As far as I'm aware it does not matter what ISA is used for these tests. Change-Id: I8ae84b49f65968e97bef4904268de5a455f06f5c
1 parent aadd59b commit 585ce62

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

tests/gem5/memory/test.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
length=constants.long_tag,
7171
)
7272

73-
null_tests = [
73+
x86_tests = [
7474
("garnet_synth_traffic", None, ["--sim-cycles", "5000000"]),
7575
("memcheck", None, ["--maxtick", "2000000000", "--prefetchers"]),
7676
(
@@ -122,7 +122,7 @@
122122
("ruby_direct_test", None, ["--requests", "50000"]),
123123
]
124124

125-
for test_name, basename_noext, args in null_tests:
125+
for test_name, basename_noext, args in x86_tests:
126126
if basename_noext == None:
127127
basename_noext = test_name
128128
gem5_verify_config(
@@ -133,7 +133,8 @@
133133
config.base_dir, "configs", "example", basename_noext + ".py"
134134
),
135135
config_args=args,
136-
valid_isas=(constants.null_tag,),
136+
valid_isas=(constants.x86_tag,),
137+
protocol="MESI_Two_Level",
137138
valid_hosts=constants.supported_hosts,
138139
length=constants.long_tag,
139140
)

0 commit comments

Comments
 (0)