From ab3e6748044516b9b62eeb0191f392133f5f1d48 Mon Sep 17 00:00:00 2001 From: "Bobby R. Bruce" Date: Thu, 20 Aug 2020 12:35:06 -0700 Subject: [PATCH] tests: Removed SPARC Insttests from .testignore Due to the fixing of the SPARC insttest binary, recorded here: https://gem5-review.googlesource.com/c/public/gem5-resources/+/33396, these tests now pass. Change-Id: I4dca4504476f6d388e607a1075d44e9be69b5259 Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/33138 Reviewed-by: Jason Lowe-Power Maintainer: Jason Lowe-Power Tested-by: kokoro --- tests/gem5/.testignore | 12 ---------- .../ref/sparc/linux/insttest/simout | 17 ++++++++++++++ tests/gem5/insttest_se/ref/sparc/linux/simout | 23 ------------------- tests/gem5/insttest_se/test.py | 3 ++- 4 files changed, 19 insertions(+), 36 deletions(-) delete mode 100644 tests/gem5/.testignore create mode 100644 tests/gem5/insttest_se/ref/sparc/linux/insttest/simout delete mode 100755 tests/gem5/insttest_se/ref/sparc/linux/simout diff --git a/tests/gem5/.testignore b/tests/gem5/.testignore deleted file mode 100644 index 40934ff56..000000000 --- a/tests/gem5/.testignore +++ /dev/null @@ -1,12 +0,0 @@ -test-insttest-linux-AtomicSimpleCPU-SPARC-x86_64-opt -test-insttest-linux-TimingSimpleCPU-SPARC-x86_64-opt -test-insttest-linux-AtomicSimpleCPU-SPARC-x86_64-debug -test-insttest-linux-TimingSimpleCPU-SPARC-x86_64-debug -test-insttest-linux-AtomicSimpleCPU-SPARC-x86_64-fast -test-insttest-linux-TimingSimpleCPU-SPARC-x86_64-fast -test-insttest-linux-AtomicSimpleCPU-SPARC-aarch64-opt -test-insttest-linux-TimingSimpleCPU-SPARC-aarch64-opt -test-insttest-linux-AtomicSimpleCPU-SPARC-aarch64-debug -test-insttest-linux-TimingSimpleCPU-SPARC-aarch64-debug -test-insttest-linux-AtomicSimpleCPU-SPARC-aarch64-fast -test-insttest-linux-TimingSimpleCPU-SPARC-aarch64-fast diff --git a/tests/gem5/insttest_se/ref/sparc/linux/insttest/simout b/tests/gem5/insttest_se/ref/sparc/linux/insttest/simout new file mode 100644 index 000000000..466574666 --- /dev/null +++ b/tests/gem5/insttest_se/ref/sparc/linux/insttest/simout @@ -0,0 +1,17 @@ +gem5 Simulator System. http://gem5.org +gem5 is copyrighted software; use the --copyright option for details. + + +Global frequency set at 1000000000000 ticks per second +**** REAL SIMULATION **** +Begining test of difficult SPARC instructions... +LDSTUB: Passed +SWAP: Passed +CAS FAIL: Passed +CAS WORK: Passed +CASX FAIL: Passed +CASX WORK: Passed +LDTX: Passed +LDTW: Passed +STTW: Passed +Done diff --git a/tests/gem5/insttest_se/ref/sparc/linux/simout b/tests/gem5/insttest_se/ref/sparc/linux/simout deleted file mode 100755 index bf2b3f4bd..000000000 --- a/tests/gem5/insttest_se/ref/sparc/linux/simout +++ /dev/null @@ -1,23 +0,0 @@ -Redirecting stdout to build/SPARC/tests/opt/quick/se/02.insttest/sparc/linux/simple-atomic/simout -Redirecting stderr to build/SPARC/tests/opt/quick/se/02.insttest/sparc/linux/simple-atomic/simerr -gem5 Simulator System. http://gem5.org -gem5 is copyrighted software; use the --copyright option for details. - -gem5 compiled Apr 3 2017 18:41:19 -gem5 started Apr 3 2017 18:41:41 -gem5 executing on gabeblack-desktop.mtv.corp.google.com, pid 64897 -command line: /usr/local/google/home/gabeblack/gem5/gem5-public/build/SPARC/gem5.opt -d build/SPARC/tests/opt/quick/se/02.insttest/sparc/linux/simple-atomic --stats-file 'text://stats.txt?desc=False' -re /usr/local/google/home/gabeblack/gem5/gem5-public/tests/testing/../run.py quick/se/02.insttest/sparc/linux/simple-atomic - -Global frequency set at 1000000000000 ticks per second -Begining test of difficult SPARC instructions... -LDSTUB: Passed -SWAP: Passed -CAS FAIL: Passed -CAS WORK: Passed -CASX FAIL: Passed -CASX WORK: Passed -LDTX: Passed -LDTW: Passed -STTW: Passed -Done -Exiting @ tick 7612000 because exiting with last active thread context diff --git a/tests/gem5/insttest_se/test.py b/tests/gem5/insttest_se/test.py index 878d978b9..4009d69f0 100644 --- a/tests/gem5/insttest_se/test.py +++ b/tests/gem5/insttest_se/test.py @@ -34,10 +34,11 @@ from testlib import * test_progs = { 'sparc': ('insttest',) } -#o3-timing simple-atomic simple-timing + cpu_types = { 'sparc' : ('AtomicSimpleCPU', 'TimingSimpleCPU') } + supported_os = { 'sparc' : ('linux',) } -- 2.30.2