From 26e3c06e7f6457e302c087b08fb19eeb26861fc0 Mon Sep 17 00:00:00 2001 From: "Bobby R. Bruce" Date: Wed, 12 Aug 2020 17:28:01 -0700 Subject: [PATCH] tests: Dropped the i386 host tag in tests Issue-on: https://gem5.atlassian.net/browse/GEM5-532 Change-Id: Ifee50d59c65f8b460248508688232d9253c040b6 Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/32596 Reviewed-by: Giacomo Travaglini Reviewed-by: Jason Lowe-Power Maintainer: Giacomo Travaglini Tested-by: kokoro --- ext/testlib/configuration.py | 12 ++++---- tests/gem5/.testignore | 57 ------------------------------------ 2 files changed, 5 insertions(+), 64 deletions(-) diff --git a/ext/testlib/configuration.py b/ext/testlib/configuration.py index cebb98f3a..4e2b6951d 100644 --- a/ext/testlib/configuration.py +++ b/ext/testlib/configuration.py @@ -247,7 +247,6 @@ def define_constants(constants): constants.host_isa_tag_type = 'host' constants.host_x86_64_tag = 'x86_64' - constants.host_i386_tag = 'i386' constants.host_arm_tag = 'aarch64' constants.supported_tags = { @@ -271,7 +270,6 @@ def define_constants(constants): ), constants.host_isa_tag_type: ( constants.host_x86_64_tag, - constants.host_i386_tag, constants.host_arm_tag, ), } @@ -280,11 +278,11 @@ def define_constants(constants): # case where host ISA and target ISA need to coincide constants.target_host = { constants.arm_tag : (constants.host_arm_tag,), - constants.x86_tag : (constants.host_x86_64_tag, constants.host_i386_tag), - constants.sparc_tag : (constants.host_x86_64_tag, constants.host_i386_tag), - constants.riscv_tag : (constants.host_x86_64_tag, constants.host_i386_tag), - constants.mips_tag : (constants.host_x86_64_tag, constants.host_i386_tag), - constants.power_tag : (constants.host_x86_64_tag, constants.host_i386_tag), + constants.x86_tag : (constants.host_x86_64_tag,), + constants.sparc_tag : (constants.host_x86_64_tag,), + constants.riscv_tag : (constants.host_x86_64_tag,), + constants.mips_tag : (constants.host_x86_64_tag,), + constants.power_tag : (constants.host_x86_64_tag,), constants.null_tag : (None,) } diff --git a/tests/gem5/.testignore b/tests/gem5/.testignore index 405f005a6..dfca4e977 100644 --- a/tests/gem5/.testignore +++ b/tests/gem5/.testignore @@ -59,39 +59,6 @@ test-insttest-rv64i-linux-TimingSimpleCPU-RISCV-aarch64-fast test-insttest-rv64i-linux-DerivO3CPU-RISCV-aarch64-fast test-insttest-linux-AtomicSimpleCPU-SPARC-aarch64-fast test-insttest-linux-TimingSimpleCPU-SPARC-aarch64-fast -test-insttest-rv64a-linux-MinorCPU-RISCV-i386-opt -test-insttest-rv64c-linux-MinorCPU-RISCV-i386-opt -test-insttest-rv64d-linux-MinorCPU-RISCV-i386-opt -test-insttest-rv64f-linux-MinorCPU-RISCV-i386-opt -test-insttest-rv64i-linux-MinorCPU-RISCV-i386-opt -test-insttest-rv64m-linux-MinorCPU-RISCV-i386-opt -test-insttest-rv64i-linux-AtomicSimpleCPU-RISCV-i386-opt -test-insttest-rv64i-linux-TimingSimpleCPU-RISCV-i386-opt -test-insttest-rv64i-linux-DerivO3CPU-RISCV-i386-opt -test-insttest-linux-AtomicSimpleCPU-SPARC-i386-opt -test-insttest-linux-TimingSimpleCPU-SPARC-i386-opt -test-insttest-rv64a-linux-MinorCPU-RISCV-i386-debug -test-insttest-rv64c-linux-MinorCPU-RISCV-i386-debug -test-insttest-rv64d-linux-MinorCPU-RISCV-i386-debug -test-insttest-rv64f-linux-MinorCPU-RISCV-i386-debug -test-insttest-rv64i-linux-MinorCPU-RISCV-i386-debug -test-insttest-rv64m-linux-MinorCPU-RISCV-i386-debug -test-insttest-rv64i-linux-AtomicSimpleCPU-RISCV-i386-debug -test-insttest-rv64i-linux-TimingSimpleCPU-RISCV-i386-debug -test-insttest-rv64i-linux-DerivO3CPU-RISCV-i386-debug -test-insttest-linux-AtomicSimpleCPU-SPARC-i386-debug -test-insttest-linux-TimingSimpleCPU-SPARC-i386-debug -test-insttest-rv64a-linux-MinorCPU-RISCV-i386-fast -test-insttest-rv64c-linux-MinorCPU-RISCV-i386-fast -test-insttest-rv64d-linux-MinorCPU-RISCV-i386-fast -test-insttest-rv64f-linux-MinorCPU-RISCV-i386-fast -test-insttest-rv64i-linux-MinorCPU-RISCV-i386-fast -test-insttest-rv64m-linux-MinorCPU-RISCV-i386-fast -test-insttest-rv64i-linux-AtomicSimpleCPU-RISCV-i386-fast -test-insttest-rv64i-linux-TimingSimpleCPU-RISCV-i386-fast -test-insttest-rv64i-linux-DerivO3CPU-RISCV-i386-fast -test-insttest-linux-AtomicSimpleCPU-SPARC-i386-fast -test-insttest-linux-TimingSimpleCPU-SPARC-i386-fast test-hello-linux-MinorCPU-RISCV-x86_64-debug test-hello-linux-TimingSimpleCPU-SPARC-x86_64-debug test-hello-linux-AtomicSimpleCPU-SPARC-x86_64-debug @@ -128,24 +95,6 @@ test-hello-linux-AtomicSimpleCPU-SPARC-aarch64-opt test-hello-linux-TimingSimpleCPU-MIPS-aarch64-opt test-hello-linux-AtomicSimpleCPU-MIPS-aarch64-opt test-hello-linux-DerivO3CPU-MIPS-aarch64-opt -test-hello-linux-MinorCPU-RISCV-i386-debug -test-hello-linux-TimingSimpleCPU-SPARC-i386-debug -test-hello-linux-AtomicSimpleCPU-SPARC-i386-debug -test-hello-linux-TimingSimpleCPU-MIPS-i386-debug -test-hello-linux-AtomicSimpleCPU-MIPS-i386-debug -test-hello-linux-DerivO3CPU-MIPS-i386-debug -test-hello-linux-MinorCPU-RISCV-i386-fast -test-hello-linux-TimingSimpleCPU-SPARC-i386-fast -test-hello-linux-AtomicSimpleCPU-SPARC-i386-fast -test-hello-linux-TimingSimpleCPU-MIPS-i386-fast -test-hello-linux-AtomicSimpleCPU-MIPS-i386-fast -test-hello-linux-DerivO3CPU-MIPS-i386-fast -test-hello-linux-MinorCPU-RISCV-i386-opt -test-hello-linux-TimingSimpleCPU-SPARC-i386-opt -test-hello-linux-AtomicSimpleCPU-SPARC-i386-opt -test-hello-linux-TimingSimpleCPU-MIPS-i386-opt -test-hello-linux-AtomicSimpleCPU-MIPS-i386-opt -test-hello-linux-DerivO3CPU-MIPS-i386-opt test-atomic-DerivO3CPU-SPARC-x86_64-opt test-atomic-TimingSimpleCPU-SPARC-x86_64-opt test-atomic-DerivO3CPU-SPARC-x86_64-debug @@ -158,11 +107,5 @@ test-atomic-DerivO3CPU-SPARC-aarch64-debug test-atomic-TimingSimpleCPU-SPARC-aarch64-debug test-atomic-DerivO3CPU-SPARC-aarch64-fast test-atomic-TimingSimpleCPU-SPARC-aarch64-fast -test-atomic-DerivO3CPU-SPARC-i386-opt -test-atomic-TimingSimpleCPU-SPARC-i386-opt -test-atomic-DerivO3CPU-SPARC-i386-debug -test-atomic-TimingSimpleCPU-SPARC-i386-debug -test-atomic-DerivO3CPU-SPARC-i386-fast -test-atomic-TimingSimpleCPU-SPARC-i386-fast realview-o3-checker-ARM-x86_64-opt realview64-o3-checker-ARM-x86_64-opt -- 2.30.2