diff options
Diffstat (limited to 'testsuites/benchmarks')
-rw-r--r-- | testsuites/benchmarks/Makefile.am | 46 | ||||
-rw-r--r-- | testsuites/benchmarks/configure.ac | 31 | ||||
-rw-r--r-- | testsuites/benchmarks/dhrystone/dhry_1.c | 1 | ||||
-rw-r--r-- | testsuites/benchmarks/dhrystone/init.c | 31 | ||||
-rw-r--r-- | testsuites/benchmarks/linpack/init.c | 31 | ||||
-rw-r--r-- | testsuites/benchmarks/linpack/linpack-pc.c | 2 | ||||
-rw-r--r-- | testsuites/benchmarks/whetstone/init.c | 31 | ||||
-rw-r--r-- | testsuites/benchmarks/whetstone/whetstone.c | 2 |
8 files changed, 69 insertions, 106 deletions
diff --git a/testsuites/benchmarks/Makefile.am b/testsuites/benchmarks/Makefile.am deleted file mode 100644 index 8b49c40fa1..0000000000 --- a/testsuites/benchmarks/Makefile.am +++ /dev/null @@ -1,46 +0,0 @@ -# -# Benchmarks -# - -ACLOCAL_AMFLAGS = -I ../aclocal - -include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(top_srcdir)/../automake/compile.am - -benchmarks = -benchmark_screens = -benchmark_docs = - -support_includes = -I$(top_srcdir)/../support/include - -if TEST_dhrystone -benchmarks += dhrystone -benchmark_screens += dhrystone/dhrystone.scn -benchmark_docs += dhrystone/dhrystone.doc -dhrystone_SOURCES = dhrystone/init.c dhrystone/dhry_1.c \ - dhrystone/dhry_2.c -dhrystone_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_dhrystone) \ - $(support_includes) -endif - -if TEST_linpack -benchmarks += linpack -benchmark_screens += linpack/linpack.scn -benchmark_docs += linpack/linpack.doc -linpack_SOURCES = linpack/init.c linpack/linpack-pc.c -linpack_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_linpack) \ - $(support_includes) -linpack_LDADD = -lm $(LDADD) -endif - -if TEST_whetstone -benchmarks += whetstone -benchmark_screens += whetstone/whetstone.scn -benchmark_docs += whetstone/whetstone.doc -whetstone_SOURCES = whetstone/init.c whetstone/whetstone.c -whetstone_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_whetstone) \ - $(support_includes) -whetstone_LDADD = -lm $(LDADD) -endif - -noinst_PROGRAMS = $(benchmarks) diff --git a/testsuites/benchmarks/configure.ac b/testsuites/benchmarks/configure.ac deleted file mode 100644 index 0cdcdda72f..0000000000 --- a/testsuites/benchmarks/configure.ac +++ /dev/null @@ -1,31 +0,0 @@ -## Process this file with autoconf to produce a configure script. - -AC_PREREQ([2.69]) -AC_INIT([rtems-c-src-tests-benchmarks],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) -AC_CONFIG_HEADER([config.h]) -RTEMS_TOP([../..],[..]) -RTEMS_SOURCE_TOP -RTEMS_BUILD_TOP - -RTEMS_CANONICAL_TARGET_CPU - -AM_INIT_AUTOMAKE([no-define foreign subdir-objects 1.12.2]) -AM_MAINTAINER_MODE - -RTEMS_ENV_RTEMSBSP - -RTEMS_PROJECT_ROOT - -RTEMS_PROG_CC_FOR_TARGET - -RTEMS_CANONICALIZE_TOOLS - -RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) - -# BSP Test configuration -RTEMS_TEST_CHECK([dhrystone]) -RTEMS_TEST_CHECK([linpack]) -RTEMS_TEST_CHECK([whetstone]) - -AC_CONFIG_FILES([Makefile]) -AC_OUTPUT diff --git a/testsuites/benchmarks/dhrystone/dhry_1.c b/testsuites/benchmarks/dhrystone/dhry_1.c index 3ad2e7f204..ef6ecf9251 100644 --- a/testsuites/benchmarks/dhrystone/dhry_1.c +++ b/testsuites/benchmarks/dhrystone/dhry_1.c @@ -133,6 +133,7 @@ execution_start: #ifdef __rtems__ /* avoid used uninitialized warning */ + Int_1_Loc = 0; Int_2_Loc = 0; #endif diff --git a/testsuites/benchmarks/dhrystone/init.c b/testsuites/benchmarks/dhrystone/init.c index 9ff4662d16..ba55976d6d 100644 --- a/testsuites/benchmarks/dhrystone/init.c +++ b/testsuites/benchmarks/dhrystone/init.c @@ -1,15 +1,28 @@ +/* SPDX-License-Identifier: BSD-2-Clause */ + /* - * Copyright (c) 2017 embedded brains GmbH. All rights reserved. + * Copyright (c) 2017 embedded brains GmbH & Co. KG * - * embedded brains GmbH - * Dornierstr. 4 - * 82178 Puchheim - * Germany - * <rtems@embedded-brains.de> + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. * - * The license and distribution terms for this file may be - * found in the file LICENSE in this distribution or at - * http://www.rtems.org/license/LICENSE. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. */ #ifdef HAVE_CONFIG_H diff --git a/testsuites/benchmarks/linpack/init.c b/testsuites/benchmarks/linpack/init.c index ce9e0e7448..24922eb93b 100644 --- a/testsuites/benchmarks/linpack/init.c +++ b/testsuites/benchmarks/linpack/init.c @@ -1,15 +1,28 @@ +/* SPDX-License-Identifier: BSD-2-Clause */ + /* - * Copyright (c) 2017 embedded brains GmbH. All rights reserved. + * Copyright (c) 2017 embedded brains GmbH & Co. KG * - * embedded brains GmbH - * Dornierstr. 4 - * 82178 Puchheim - * Germany - * <rtems@embedded-brains.de> + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. * - * The license and distribution terms for this file may be - * found in the file LICENSE in this distribution or at - * http://www.rtems.org/license/LICENSE. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. */ #ifdef HAVE_CONFIG_H diff --git a/testsuites/benchmarks/linpack/linpack-pc.c b/testsuites/benchmarks/linpack/linpack-pc.c index 1fef18eb96..5f00df1d7c 100644 --- a/testsuites/benchmarks/linpack/linpack-pc.c +++ b/testsuites/benchmarks/linpack/linpack-pc.c @@ -224,7 +224,7 @@ #include <math.h> #include <stdlib.h> #ifdef __rtems__ -#include <tmacros.h> +#include <rtems/test-printer.h> #undef print_time #define fprintf(f, ...) rtems_printf(&rtems_test_printer, __VA_ARGS__) #endif /* __rtems__ */ diff --git a/testsuites/benchmarks/whetstone/init.c b/testsuites/benchmarks/whetstone/init.c index 0e8f7a4893..dd4b1a70e0 100644 --- a/testsuites/benchmarks/whetstone/init.c +++ b/testsuites/benchmarks/whetstone/init.c @@ -1,15 +1,28 @@ +/* SPDX-License-Identifier: BSD-2-Clause */ + /* - * Copyright (c) 2017 embedded brains GmbH. All rights reserved. + * Copyright (c) 2017 embedded brains GmbH & Co. KG * - * embedded brains GmbH - * Dornierstr. 4 - * 82178 Puchheim - * Germany - * <rtems@embedded-brains.de> + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. * - * The license and distribution terms for this file may be - * found in the file LICENSE in this distribution or at - * http://www.rtems.org/license/LICENSE. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. */ #ifdef HAVE_CONFIG_H diff --git a/testsuites/benchmarks/whetstone/whetstone.c b/testsuites/benchmarks/whetstone/whetstone.c index e0a93aa88c..aae68af6a6 100644 --- a/testsuites/benchmarks/whetstone/whetstone.c +++ b/testsuites/benchmarks/whetstone/whetstone.c @@ -57,7 +57,7 @@ C********************************************************************** #include <string.h> #include <math.h> #ifdef __rtems__ -#include <tmacros.h> +#include <rtems/test-printer.h> #define fprintf(f, ...) rtems_printf(&rtems_test_printer, __VA_ARGS__) #endif /* __rtems__ */ |