tests,arch-gcn3,arch-x86: Changed X86 testlib tests to GCN3_X86

[gem5.git] / tests / gem5 / cpu_tests / test.py

diff --git a/tests/gem5/cpu_tests/test.py b/tests/gem5/cpu_tests/test.py
index 33a9c1278d97c01236855b9fc349ea546e0d1c65..393ff266ff44fd457ce20d731c7c66b5ecac7168 100644 (file)
--- a/tests/gem5/cpu_tests/test.py
+++ b/tests/gem5/cpu_tests/test.py
@@ -46,16 +46,25 @@ from testlib import *
 workloads = ('Bubblesort','FloatMM')
 
 valid_isas = {
-    constants.x86_tag : ('AtomicSimpleCPU', 'TimingSimpleCPU', 'DerivO3CPU'),
+    constants.gcn3_x86_tag :
+        ('AtomicSimpleCPU', 'TimingSimpleCPU', 'DerivO3CPU'),
     constants.arm_tag:
         ('AtomicSimpleCPU', 'TimingSimpleCPU', 'MinorCPU', 'DerivO3CPU'),
     constants.riscv_tag:
         ('AtomicSimpleCPU', 'TimingSimpleCPU', 'MinorCPU', 'DerivO3CPU'),
 }
 
+
 base_path = joinpath(config.bin_path, 'cpu_tests')
 
 base_url = config.resource_url + '/gem5/cpu_tests/benchmarks/bin/'
+
+isa_url = {
+    constants.gcn3_x86_tag : base_url + "x86"
+    constants.arm_tag : base_url + "arm"
+    constants.riscv_tag : base_url + "riscv"
+}
+
 for isa in valid_isas:
     path = joinpath(base_path, isa.lower())
     for workload in workloads:
@@ -64,7 +73,7 @@ for isa in valid_isas:
                 verifier.MatchStdout(ref_path),
         )
 
-        url = base_url + isa.lower() + '/' + workload
+        url = isa_url[isa] + '/' + workload
         workload_binary = DownloadedProgram(url, path, workload)
         binary = joinpath(workload_binary.path, workload)