Index: uspace/app/tester/Makefile =================================================================== --- uspace/app/tester/Makefile (revision ecd991ac970696b0657f7cc7cfc72c6119259b56) +++ uspace/app/tester/Makefile (revision b6636dc773461c14eb97c06b1348bbbf0b6499b1) @@ -29,6 +29,6 @@ USPACE_PREFIX = ../.. -LIBS = $(LIBEXT2_PREFIX)/libext2.a $(LIBBLOCK_PREFIX)/libblock.a -EXTRA_CFLAGS = -I$(LIBBLOCK_PREFIX) -I$(LIBEXT2_PREFIX) +LIBS = $(LIBEXT2_PREFIX)/libext2.a $(LIBBLOCK_PREFIX)/libblock.a $(LIBSOFTFLOAT_PREFIX)/libsoftfloat.a +EXTRA_CFLAGS = -I$(LIBBLOCK_PREFIX) -I$(LIBEXT2_PREFIX) -I$(LIBSOFTFLOAT_PREFIX) BINARY = tester @@ -48,4 +48,6 @@ fault/fault2.c \ fault/fault3.c \ + float/float1.c \ + float/softfloat1.c \ vfs/vfs1.c \ ipc/ping_pong.c \ @@ -59,5 +61,5 @@ hw/misc/virtchar1.c \ hw/serial/serial1.c \ - libext2/libext2_1.c + ext2/ext2_1.c include $(USPACE_PREFIX)/Makefile.common Index: uspace/app/tester/float/float1.c =================================================================== --- uspace/app/tester/float/float1.c (revision b6636dc773461c14eb97c06b1348bbbf0b6499b1) +++ uspace/app/tester/float/float1.c (revision b6636dc773461c14eb97c06b1348bbbf0b6499b1) @@ -0,0 +1,97 @@ +/* + * Copyright (c) 2005 Jakub Vana + * Copyright (c) 2005 Jakub Jermar + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - 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 name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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. + */ + +#include +#include +#include +#include +#include +#include "../tester.h" + +#define THREADS 150 +#define ATTEMPTS 100 + +#define E_10E8 UINT32_C(271828182) +#define PRECISION 100000000 + +static atomic_t threads_finished; +static atomic_t threads_fault; + +static void e(void *data) +{ + for (unsigned int i = 0; i < ATTEMPTS; i++) { + double le = -1; + double e = 0; + double f = 1; + + for (double d = 1; e != le; d *= f, f += 1) { + le = e; + e = e + 1 / d; + } + + if ((uint32_t) (e * PRECISION) != E_10E8) { + atomic_inc(&threads_fault); + break; + } + } + + atomic_inc(&threads_finished); +} + +const char *test_float1(void) +{ + atomic_count_t total = 0; + + atomic_set(&threads_finished, 0); + atomic_set(&threads_fault, 0); + + TPRINTF("Creating threads"); + for (unsigned int i = 0; i < THREADS; i++) { + if (thread_create(e, NULL, "e", NULL) < 0) { + TPRINTF("\nCould not create thread %u\n", i); + break; + } + + TPRINTF("."); + total++; + } + + TPRINTF("\n"); + + while (atomic_get(&threads_finished) < total) { + TPRINTF("Threads left: %" PRIua "\n", + total - atomic_get(&threads_finished)); + sleep(1); + } + + if (atomic_get(&threads_fault) == 0) + return NULL; + + return "Test failed"; +} Index: uspace/app/tester/float/float1.def =================================================================== --- uspace/app/tester/float/float1.def (revision b6636dc773461c14eb97c06b1348bbbf0b6499b1) +++ uspace/app/tester/float/float1.def (revision b6636dc773461c14eb97c06b1348bbbf0b6499b1) @@ -0,0 +1,6 @@ +{ + "float1", + "Floating point computation", + &test_float1, + true +}, Index: uspace/app/tester/float/softfloat1.c =================================================================== --- uspace/app/tester/float/softfloat1.c (revision b6636dc773461c14eb97c06b1348bbbf0b6499b1) +++ uspace/app/tester/float/softfloat1.c (revision b6636dc773461c14eb97c06b1348bbbf0b6499b1) @@ -0,0 +1,95 @@ +/* + * Copyright (c) 2012 Martin Decky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - 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 name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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. + */ + +#include +#include +#include +#include +#include +#include "../tester.h" + +#define OPERANDS 5 +#define PRECISION 10000 + +#define PRIdCMPTYPE PRId32 + +typedef int32_t cmptype_t; + +static float float_op_a[OPERANDS] = + {3.5, -2.1, 100.0, 50.0, -1024.0}; + +static float float_op_b[OPERANDS] = + {-2.1, 100.0, 50.0, -1024.0, 3.5}; + +static cmptype_t cmpabs(cmptype_t a) +{ + if (a >= 0) + return a; + + return -a; +} + +static bool test_float_add(void) +{ + bool correct = true; + + for (unsigned int i = 0; i < OPERANDS; i++) { + for (unsigned int j = 0; j < OPERANDS; j++) { + float a = float_op_a[i]; + float b = float_op_b[j]; + float c = a + b; + + float_t sa; + float_t sb; + float_t sc; + + sa.val = float_op_a[i]; + sb.val = float_op_b[i]; + sc.data = add_float(sa.data, sb.data); + + cmptype_t ic = (cmptype_t) (c * PRECISION); + cmptype_t isc = (cmptype_t) (sc.val * PRECISION); + cmptype_t diff = cmpabs(ic - isc); + + if (diff != 0) { + TPRINTF("i=%u, j=%u diff=%" PRIdCMPTYPE "\n", i, j, diff); + correct = false; + } + } + } + + return correct; +} + +const char *test_softfloat1(void) +{ + if (!test_float_add()) + return "Float addition failed"; + + return NULL; +} Index: uspace/app/tester/float/softfloat1.def =================================================================== --- uspace/app/tester/float/softfloat1.def (revision b6636dc773461c14eb97c06b1348bbbf0b6499b1) +++ uspace/app/tester/float/softfloat1.def (revision b6636dc773461c14eb97c06b1348bbbf0b6499b1) @@ -0,0 +1,6 @@ +{ + "softfloat1", + "Software floating point computation", + &test_softfloat1, + true +}, Index: uspace/app/tester/tester.c =================================================================== --- uspace/app/tester/tester.c (revision ecd991ac970696b0657f7cc7cfc72c6119259b56) +++ uspace/app/tester/tester.c (revision b6636dc773461c14eb97c06b1348bbbf0b6499b1) @@ -58,4 +58,6 @@ #include "fault/fault2.def" #include "fault/fault3.def" +#include "float/float1.def" +#include "float/softfloat1.def" #include "vfs/vfs1.def" #include "ipc/ping_pong.def" @@ -68,5 +70,5 @@ #include "hw/serial/serial1.def" #include "hw/misc/virtchar1.def" -#include "libext2/libext2_1.def" +#include "ext2/ext2_1.def" {NULL, NULL, NULL, false} }; Index: uspace/app/tester/tester.h =================================================================== --- uspace/app/tester/tester.h (revision ecd991ac970696b0657f7cc7cfc72c6119259b56) +++ uspace/app/tester/tester.h (revision b6636dc773461c14eb97c06b1348bbbf0b6499b1) @@ -91,4 +91,6 @@ extern const char *test_fault2(void); extern const char *test_fault3(void); +extern const char *test_float1(void); +extern const char *test_softfloat1(void); extern const char *test_vfs1(void); extern const char *test_ping_pong(void); @@ -101,5 +103,5 @@ extern const char *test_serial1(void); extern const char *test_virtchar1(void); -extern const char *test_libext2_1(void); +extern const char *test_ext2_1(void); extern const char *test_devman1(void); extern const char *test_devman2(void);