sim: frv: clean up redundant test coverage
The frv-elf subdir contained five tests:
* cache: A cache test of some sort.
* exit47: A program to test exit status of 47 from sim.
* grloop: Some basic limited loop test program.
* hello: Standard "hello world" output program.
* loop: An infinite loop program.
The loop.s test is never referenced anywhere, and is all of 2 lines.
Anyone who really needs a while(1); test case and re-implement it
themselves locally.
The cache.s code isn't referenced anywhere because it requires some
custom args to the run program, and when this testcase was added, we
didn't have any support for that. We do now, so we can add a header
to enable that. Turns out the code crashes even with those, so turn
around and mark it xfail. Maybe someone someday will care.
That leaves the small exit47, grloop, and hello tests. Now that the
sim test harness supports testing for custom exit status, we can move
them all to sim/frv/ to maintain test coverage.
The remaining differences between frv-elf & sim/frv are:
* frv-elf/ runs for frv-*-elf while sim/frv/ runs for frv*-*-*.
* frv-elf/ runs "*.s" files while sim/frv/ only has .cgs and such.
On closer inspection, these are also meaningless distinctions:
* There is nothing specific to the tests that require an *-elf
target. Normally that would mean newlib+libgloss type stuff,
but there's no such requirement in frv-elf/.
* The ".s" suffix is the standard "this is an assembly file" suffix.
Since FRV is a CGEN target, we can reuse the existing convention of
".ms" to mean "miscellaneous .s" as in "this is an assembly file,
and run/bucket its test results in the miscellaneous category".
So moving frv-elf/{cache,exit47,grloop,hello}.s to sim/frv/*.ms makes
sense and simplifies things quite a bit for the target while also
slightly increasing the coverage for some tuples.
This commit is contained in:
parent
7cf91a2481
commit
89bfc2a429
@ -1,3 +1,9 @@
|
||||
2021-01-15 Mike Frysinger <vapier@gentoo.org>
|
||||
|
||||
* configure.ac (target): Delete frv-*-elf case.
|
||||
* configure: Regenerate.
|
||||
* frv-elf/: Delete directory.
|
||||
|
||||
2021-01-15 Mike Frysinger <vapier@gentoo.org>
|
||||
|
||||
* configure.ac (target): Delete m32r-*-elf case.
|
||||
|
||||
5
sim/testsuite/configure
vendored
5
sim/testsuite/configure
vendored
@ -646,7 +646,6 @@ enable_option_checking
|
||||
host_alias
|
||||
target_alias'
|
||||
ac_subdirs_all='d10v-elf
|
||||
frv-elf
|
||||
mips64el-elf'
|
||||
|
||||
# Initialize some variables set by options.
|
||||
@ -1834,10 +1833,6 @@ case ${target} in
|
||||
|
||||
subdirs="$subdirs d10v-elf"
|
||||
|
||||
;;
|
||||
frv-*-elf )
|
||||
subdirs="$subdirs frv-elf"
|
||||
|
||||
;;
|
||||
mips64el-*-elf )
|
||||
subdirs="$subdirs mips64el-elf"
|
||||
|
||||
@ -16,9 +16,6 @@ case ${target} in
|
||||
d10v-*-elf )
|
||||
AC_CONFIG_SUBDIRS(d10v-elf)
|
||||
;;
|
||||
frv-*-elf )
|
||||
AC_CONFIG_SUBDIRS(frv-elf)
|
||||
;;
|
||||
mips64el-*-elf )
|
||||
AC_CONFIG_SUBDIRS(mips64el-elf)
|
||||
;;
|
||||
|
||||
@ -1,48 +0,0 @@
|
||||
2020-10-06 Andrew Burgess <andrew.burgess@embecosm.com>
|
||||
|
||||
* configure: Regnerate.
|
||||
* configure.ac (AC_CONFIG_AUX_DIR): Update.
|
||||
|
||||
2009-08-22 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
|
||||
|
||||
* configure: Regenerate.
|
||||
|
||||
2005-01-07 Andrew Cagney <cagney@gnu.org>
|
||||
|
||||
* configure.ac: Rename configure.in, require autoconf 2.59.
|
||||
* configure: Re-generate.
|
||||
|
||||
2000-07-26 Dave Brolley <brolley@redhat.com>
|
||||
|
||||
* Makefile.in (TESTS): Don't run cache.ok
|
||||
* cache.s: Use softune syntax for jmpl.
|
||||
|
||||
2000-07-19 Dave Brolley <brolley@redhat.com>
|
||||
|
||||
* cache.s (pass): Use softune syntax for tira.
|
||||
* exit47.s (pass): Use softune syntax for tira.
|
||||
* grloop.s (pass): Use softune syntax for tira.
|
||||
* hello.s (pass): Use softune syntax for tira.
|
||||
|
||||
Thu Aug 19 18:00:16 1999 Dave Brolley <brolley@cygnus.com>
|
||||
|
||||
* hello.s: Fix sethi, setlo insn usage.
|
||||
|
||||
Mon Jun 21 17:33:37 1999 Dave Brolley <brolley@cygnus.com>
|
||||
|
||||
* Makefile.in (TESTS): Add grloop.ok.
|
||||
* grloop.s: New testcase.
|
||||
|
||||
Fri Jun 18 17:55:02 1999 Dave Brolley <brolley@cygnus.com>
|
||||
|
||||
* exit47.s: Use proper syscalls interface.
|
||||
* hello.s: Use proper syscalls interface.
|
||||
|
||||
Mon May 31 12:03:38 1999 Dave Brolley <brolley@cygnus.com>
|
||||
|
||||
* hello.s,loop.s,exit47.s: Convert to frv insn set.
|
||||
|
||||
Thu May 6 16:36:30 1999 Dave Brolley <brolley@cygnus.com>
|
||||
|
||||
* Directory created.
|
||||
|
||||
@ -1,158 +0,0 @@
|
||||
# Makefile for regression testing the frv simulator.
|
||||
# Copyright (C) 1998-2021 Free Software Foundation, Inc.
|
||||
|
||||
# This file is part of GDB.
|
||||
|
||||
# This program is free software; you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation; either version 3 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
VPATH = @srcdir@
|
||||
srcdir = @srcdir@
|
||||
srcroot = $(srcdir)/../../..
|
||||
|
||||
prefix = @prefix@
|
||||
exec_prefix = @exec_prefix@
|
||||
|
||||
host_alias = @host_alias@
|
||||
target_alias = @target_alias@
|
||||
program_transform_name = @program_transform_name@
|
||||
build_canonical = @build@
|
||||
host_canonical = @host@
|
||||
target_canonical = @target@
|
||||
target_cpu = @target_cpu@
|
||||
|
||||
|
||||
SHELL = @SHELL@
|
||||
SUBDIRS = @subdirs@
|
||||
RPATH_ENVVAR = @RPATH_ENVVAR@
|
||||
|
||||
EXPECT = `if [ -f ../../../expect/expect ] ; then \
|
||||
echo ../../../expect/expect ; \
|
||||
else echo expect ; fi`
|
||||
|
||||
RUNTEST = $(RUNTEST_FOR_TARGET)
|
||||
|
||||
RUNTESTFLAGS =
|
||||
|
||||
RUNTEST_FOR_TARGET = `\
|
||||
if [ -f $${srcroot}/dejagnu/runtest ]; then \
|
||||
echo $${srcroot}/dejagnu/runtest; \
|
||||
else \
|
||||
if [ "$(host_canonical)" = "$(target_canonical)" ]; then \
|
||||
echo runtest; \
|
||||
else \
|
||||
t='$(program_transform_name)'; echo runtest | sed -e '' $$t; \
|
||||
fi; \
|
||||
fi`
|
||||
|
||||
|
||||
AS_FOR_TARGET = `\
|
||||
if [ -x ../../../gas/as-new ]; then \
|
||||
echo ../../../gas/as-new ; \
|
||||
else \
|
||||
echo $(target_alias)-as ; \
|
||||
fi`
|
||||
|
||||
LD_FOR_TARGET = `\
|
||||
if [ -x ../../../ld/ld-new ]; then \
|
||||
echo ../../../ld/ld-new ; \
|
||||
else \
|
||||
echo $(target_alias)-ld ; \
|
||||
fi`
|
||||
|
||||
RUN_FOR_TARGET = `\
|
||||
if [ -x ../../../sim/${target_cpu}/run ]; then \
|
||||
echo ../../../sim/${target_cpu}/run ; \
|
||||
else \
|
||||
echo $(target_alias)-run ; \
|
||||
fi`
|
||||
|
||||
TESTS = \
|
||||
exit47.ko \
|
||||
grloop.ok \
|
||||
hello.ok
|
||||
|
||||
|
||||
check: sanity $(TESTS)
|
||||
sanity:
|
||||
@eval echo AS_FOR_TARGET = $(AS_FOR_TARGET)
|
||||
@eval echo LD_FOR_TARGET = $(LD_FOR_TARGET)
|
||||
@eval echo RUN_FOR_TARGET = $(RUN_FOR_TARGET)
|
||||
|
||||
|
||||
|
||||
# Rules for running all the tests, put into three types
|
||||
# exit success, exit fail, print "Hello World"
|
||||
|
||||
.u.log:
|
||||
uudecode $*.u
|
||||
$(RUN_FOR_TARGET) $* > $*.log
|
||||
|
||||
|
||||
# Rules for running the tests
|
||||
|
||||
.SUFFIXES: .u .ok .run .hi .ko
|
||||
.run.ok:
|
||||
rm -f tmp-$* $*.hi
|
||||
ulimit -t 5 ; $(RUN_FOR_TARGET) $*.run > tmp-$*
|
||||
mv tmp-$* $*.ok
|
||||
.run.hi:
|
||||
rm -f tmp-$* $*.hi diff-$*
|
||||
ulimit -t 5 ; $(RUN_FOR_TARGET) $*.run > tmp-$*
|
||||
echo "Hello World" | diff - tmp-$* > diff-$*
|
||||
cat tmp-$* diff-$* > $*.hi
|
||||
.run.ko:
|
||||
rm -f tmp-$* $*.ko
|
||||
set +e ; \
|
||||
ulimit -t 5 ; $(RUN_FOR_TARGET) $*.run > tmp-$* ; \
|
||||
if [ $$? -eq 47 ] ; then \
|
||||
exit 0 ; \
|
||||
else \
|
||||
exit 1 ; \
|
||||
fi
|
||||
mv tmp-$* $*.ko
|
||||
|
||||
|
||||
# Rules for building all the tests and packing them into
|
||||
# uuencoded files.
|
||||
|
||||
uuencode: em-pstr.u em-e0.u em-e47.u em-pchr.u
|
||||
|
||||
.SUFFIXES: .u .s .run
|
||||
.s.u:
|
||||
rm -f $*.o $*.run
|
||||
$(AS_FOR_TARGET) $(srcdir)/$*.s -o $*.o
|
||||
$(LD_FOR_TARGET) -o $* $*.o
|
||||
uuencode < $* $* > $*.u
|
||||
rm -f $*.o $*
|
||||
.s.run:
|
||||
rm -f $*.o $*.run
|
||||
$(AS_FOR_TARGET) $(srcdir)/$*.s -o $*.o
|
||||
$(LD_FOR_TARGET) -o $*.run $*.o
|
||||
rm -f $*.o $*
|
||||
|
||||
|
||||
clean mostlyclean:
|
||||
rm -f *~ core *.o a.out
|
||||
rm -f $(TESTS)
|
||||
|
||||
distclean maintainer-clean realclean: clean
|
||||
rm -f *~ core
|
||||
rm -f Makefile config.status *-init.exp
|
||||
rm -fr *.log summary detail *.plog *.sum *.psum site.*
|
||||
|
||||
Makefile : Makefile.in config.status
|
||||
$(SHELL) config.status
|
||||
|
||||
config.status: configure
|
||||
$(SHELL) config.status --recheck
|
||||
2984
sim/testsuite/frv-elf/configure
vendored
2984
sim/testsuite/frv-elf/configure
vendored
File diff suppressed because it is too large
Load Diff
@ -1,18 +0,0 @@
|
||||
dnl Process this file file with autoconf to produce a configure script.
|
||||
dnl This file is a shell script fragment that supplies the information
|
||||
dnl necessary to tailor a template configure script into the configure
|
||||
dnl script appropriate for this directory. For more information, check
|
||||
dnl any existing configure script.
|
||||
|
||||
dnl FIXME - think of a truly uniq file to this directory
|
||||
AC_INIT(Makefile.in)
|
||||
|
||||
CC=${CC-cc}
|
||||
AC_SUBST(CC)
|
||||
AC_CONFIG_AUX_DIR(../../..)
|
||||
AC_CANONICAL_SYSTEM
|
||||
|
||||
AC_SUBST(target_cpu)
|
||||
|
||||
|
||||
AC_OUTPUT(Makefile)
|
||||
@ -1,2 +0,0 @@
|
||||
.global _start
|
||||
_start: bra icc0,0,_start
|
||||
@ -1,3 +1,9 @@
|
||||
2021-01-15 Mike Frysinger <vapier@gentoo.org>
|
||||
|
||||
* cache.ms: New testcase from ../../frv-elf/.
|
||||
* exit47.ms, grloop.ms, hello.ms: Likewise.
|
||||
* misc.exp: New file.
|
||||
|
||||
2004-03-01 Richard Sandiford <rsandifo@redhat.com>
|
||||
|
||||
* allinsn.exp (all_machs): Add fr405 and fr450.
|
||||
|
||||
@ -1,5 +1,9 @@
|
||||
# run with --memory-region 0xff000000,4 --memory-region 0xfe000000,00404000
|
||||
# mach: frv fr500 fr550
|
||||
# sim: --memory-region 0xff000000,4 --memory-region 0xfe000000,00404000
|
||||
# xfail: "crashes with bad write" frv-*
|
||||
|
||||
; Exit with return code
|
||||
|
||||
.macro exit rc
|
||||
setlos.p #1,gr7
|
||||
setlos \rc,gr8
|
||||
@ -1,3 +1,9 @@
|
||||
# mach: all
|
||||
# status: 47
|
||||
# output:
|
||||
|
||||
;; Return with exit code 47.
|
||||
|
||||
.global _start
|
||||
_start:
|
||||
setlos #47,gr8
|
||||
@ -1,3 +1,6 @@
|
||||
# mach: all
|
||||
# output:
|
||||
|
||||
.global _start
|
||||
_start:
|
||||
setlo 0x0400,gr10
|
||||
@ -1,3 +1,6 @@
|
||||
# mach: all
|
||||
# output: Hello World!\n
|
||||
|
||||
.global _start
|
||||
_start:
|
||||
|
||||
19
sim/testsuite/sim/frv/misc.exp
Normal file
19
sim/testsuite/sim/frv/misc.exp
Normal file
@ -0,0 +1,19 @@
|
||||
# Miscellaneous FRV simulator testcases.
|
||||
|
||||
if [istarget frv*-*] {
|
||||
# load support procs (none yet)
|
||||
# load_lib cgen.exp
|
||||
# all machines
|
||||
set all_machs "frv fr500 fr550 fr400 fr405 fr450"
|
||||
set cpu_option -mcpu
|
||||
|
||||
# The .ms suffix is for "miscellaneous .s".
|
||||
foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.ms]] {
|
||||
# If we're only testing specific files and this isn't one of them,
|
||||
# skip it.
|
||||
if ![runtest_file_p $runtests $src] {
|
||||
continue
|
||||
}
|
||||
run_sim_test $src $all_machs
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user