Bobby Bruce has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/59012 )
Change subject: tests,gpu-compute: Replace gcn3 tests with vega testlib
tests
......................................................................
tests,gpu-compute: Replace gcn3 tests with vega testlib tests
Any X86 quick tests were set to use GCN3_86. This was to minimize the
number of gem5 targets to build during the quick tests. Since the
introduction of VEGA, we wish to test VEGA during the quick tests. As
such, this patch will replace all GCN3_X86 tests with VEGA_X86 tests.
Change-Id: Ibdd7832e43a284936db5102d41161388bc721bd1
---
M tests/gem5/cpu_tests/test.py
M tests/gem5/hello_se/test_hello_se.py
M tests/gem5/kvm-fork-tests/test_kvm_fork_run.py
M tests/gem5/kvm-switch-tests/test_kvm_cpu_switch.py
M tests/gem5/learning_gem5/part1_test.py
M tests/gem5/learning_gem5/part2_test.py
M tests/gem5/m5_util/test_exit.py
M tests/gem5/test_build/test_build.py
M tests/gem5/x86-boot-tests/test_linux_boot.py
9 files changed, 29 insertions(+), 15 deletions(-)
diff --git a/tests/gem5/cpu_tests/test.py b/tests/gem5/cpu_tests/test.py
index a962337..c0322b2 100644
--- a/tests/gem5/cpu_tests/test.py
+++ b/tests/gem5/cpu_tests/test.py
@@ -46,7 +46,7 @@
workloads = ('Bubblesort','FloatMM')
valid_isas = {
- constants.gcn3_x86_tag :
+ constants.vega_x86_tag :
('AtomicSimpleCPU', 'TimingSimpleCPU', 'DerivO3CPU'),
constants.arm_tag:
('AtomicSimpleCPU', 'TimingSimpleCPU', 'MinorCPU', 'DerivO3CPU'),
@@ -60,7 +60,7 @@
base_url = config.resource_url + '/test-progs/cpu-tests/bin/'
isa_url = {
- constants.gcn3_x86_tag : base_url + "x86",
+ constants.vega_x86_tag : base_url + "x86",
constants.arm_tag : base_url + "arm",
constants.riscv_tag : base_url + "riscv",
}
diff --git a/tests/gem5/hello_se/test_hello_se.py
b/tests/gem5/hello_se/test_hello_se.py
index ea1f987..db58d1c 100644
--- a/tests/gem5/hello_se/test_hello_se.py
+++ b/tests/gem5/hello_se/test_hello_se.py
@@ -47,7 +47,7 @@
import re
static_progs = {
- constants.gcn3_x86_tag: (
+ constants.vega_x86_tag: (
"x86-hello64-static",
"x86-hello32-static",
),
@@ -60,10 +60,10 @@
constants.sparc_tag: ("sparc-hello",),
}
-dynamic_progs = {constants.gcn3_x86_tag: ("x86-hello64-dynamic",)}
+dynamic_progs = {constants.vega_x86_tag: ("x86-hello64-dynamic",)}
cpu_types = {
- constants.gcn3_x86_tag: ("timing", "atomic", "o3"),
+ constants.vega_x86_tag: ("timing", "atomic", "o3"),
constants.arm_tag: ("timing", "atomic", "o3"),
constants.mips_tag: ("timing", "atomic", "o3"),
constants.riscv_tag: ("timing", "atomic", "o3"),
@@ -73,7 +73,7 @@
# We only want to test x86, arm, and riscv on quick. Mips and sparc will be
# left for long.
os_length = {
- constants.gcn3_x86_tag: constants.quick_tag,
+ constants.vega_x86_tag: constants.quick_tag,
constants.arm_tag: constants.quick_tag,
constants.mips_tag: constants.long_tag,
constants.riscv_tag: constants.quick_tag,
diff --git a/tests/gem5/kvm-fork-tests/test_kvm_fork_run.py
b/tests/gem5/kvm-fork-tests/test_kvm_fork_run.py
index ddb91c1..053532c 100644
--- a/tests/gem5/kvm-fork-tests/test_kvm_fork_run.py
+++ b/tests/gem5/kvm-fork-tests/test_kvm_fork_run.py
@@ -59,7 +59,7 @@
isa_to_use = constants.x86_tag
else:
protocol_to_use = None
- isa_to_use = constants.gcn3_x86_tag
+ isa_to_use = constants.vega_x86_tag
gem5_verify_config(
name=name,
diff --git a/tests/gem5/kvm-switch-tests/test_kvm_cpu_switch.py
b/tests/gem5/kvm-switch-tests/test_kvm_cpu_switch.py
index ffddaa0..f4aade1 100644
--- a/tests/gem5/kvm-switch-tests/test_kvm_cpu_switch.py
+++ b/tests/gem5/kvm-switch-tests/test_kvm_cpu_switch.py
@@ -59,7 +59,7 @@
isa_to_use = constants.x86_tag
else:
protocol_to_use = None
- isa_to_use = constants.gcn3_x86_tag
+ isa_to_use = constants.vega_x86_tag
gem5_verify_config(
name=name,
diff --git a/tests/gem5/learning_gem5/part1_test.py
b/tests/gem5/learning_gem5/part1_test.py
index 4153165..32dc666 100644
--- a/tests/gem5/learning_gem5/part1_test.py
+++ b/tests/gem5/learning_gem5/part1_test.py
@@ -36,7 +36,7 @@
config_args = [],
length = constants.quick_tag,
valid_isas=(
- constants.gcn3_x86_tag,
+ constants.vega_x86_tag,
constants.riscv_tag,
constants.arm_tag,
),
@@ -50,7 +50,7 @@
config_args = [],
length = constants.quick_tag,
valid_isas=(
- constants.gcn3_x86_tag,
+ constants.vega_x86_tag,
constants.riscv_tag,
constants.arm_tag
),
diff --git a/tests/gem5/learning_gem5/part2_test.py
b/tests/gem5/learning_gem5/part2_test.py
index 24d623c..f3658b7 100644
--- a/tests/gem5/learning_gem5/part2_test.py
+++ b/tests/gem5/learning_gem5/part2_test.py
@@ -52,7 +52,7 @@
config=joinpath(config_path, 'simple_memobj.py'),
config_args = [],
# note: by default the above script uses x86
- valid_isas=(constants.gcn3_x86_tag,),
+ valid_isas=(constants.vega_x86_tag,),
)
gem5_verify_config(
@@ -61,7 +61,7 @@
config=joinpath(config_path, 'simple_cache.py'),
config_args = [],
# note: by default the above script uses x86
- valid_isas=(constants.gcn3_x86_tag,),
+ valid_isas=(constants.vega_x86_tag,),
)
# Note: for simple memobj and simple cache I want to use the traffic
generator
diff --git a/tests/gem5/m5_util/test_exit.py
b/tests/gem5/m5_util/test_exit.py
index 48d9645..8913790 100644
--- a/tests/gem5/m5_util/test_exit.py
+++ b/tests/gem5/m5_util/test_exit.py
@@ -69,5 +69,5 @@
"--resource-directory",
resource_path,
],
- valid_isas=(constants.gcn3_x86_tag,),
+ valid_isas=(constants.vega_x86_tag,),
)
diff --git a/tests/gem5/test_build/test_build.py
b/tests/gem5/test_build/test_build.py
index 3a6a534..682de69 100644
--- a/tests/gem5/test_build/test_build.py
+++ b/tests/gem5/test_build/test_build.py
@@ -31,7 +31,7 @@
import os
from testlib import *
-common_isas = [constants.gcn3_x86_tag, constants.arm_tag,
constants.riscv_tag]
+common_isas = [constants.vega_x86_tag, constants.arm_tag,
constants.riscv_tag]
for isa in constants.supported_isas:
if isa is constants.null_tag: continue
diff --git a/tests/gem5/x86-boot-tests/test_linux_boot.py
b/tests/gem5/x86-boot-tests/test_linux_boot.py
index 482cf16..1477434 100644
--- a/tests/gem5/x86-boot-tests/test_linux_boot.py
+++ b/tests/gem5/x86-boot-tests/test_linux_boot.py
@@ -70,7 +70,7 @@
isa_to_use=constants.x86_tag
else:
protocol_to_use=None
- isa_to_use=constants.gcn3_x86_tag
+ isa_to_use=constants.vega_x86_tag
gem5_verify_config(
name=name,
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/59012
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: Ibdd7832e43a284936db5102d41161388bc721bd1
Gerrit-Change-Number: 59012
Gerrit-PatchSet: 1
Gerrit-Owner: Bobby Bruce <bbr...@ucdavis.edu>
Gerrit-MessageType: newchange
_______________________________________________
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
