Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src Add ATF tests for __sync_* functions instead of all_sync_ops...



details:   https://anonhg.NetBSD.org/src/rev/3195d7b9ed15
branches:  trunk
changeset: 449203:3195d7b9ed15
user:      isaki <isaki%NetBSD.org@localhost>
date:      Tue Feb 26 10:01:40 2019 +0000

description:
Add ATF tests for __sync_* functions instead of all_sync_ops_linkable.c

diffstat:

 distrib/sets/lists/debug/mi                       |   10 +-
 distrib/sets/lists/tests/mi                       |   10 +-
 tests/lib/libc/atomic/Makefile                    |   19 ++-
 tests/lib/libc/atomic/t___sync_add.c              |  128 ++++++++++++++++
 tests/lib/libc/atomic/t___sync_and.c              |  128 ++++++++++++++++
 tests/lib/libc/atomic/t___sync_compare_and_swap.c |  157 ++++++++++++++++++++
 tests/lib/libc/atomic/t___sync_lock.c             |  137 +++++++++++++++++
 tests/lib/libc/atomic/t___sync_nand.c             |  128 ++++++++++++++++
 tests/lib/libc/atomic/t___sync_or.c               |  128 ++++++++++++++++
 tests/lib/libc/atomic/t___sync_sub.c              |  128 ++++++++++++++++
 tests/lib/libc/atomic/t___sync_xor.c              |  128 ++++++++++++++++
 tests/lib/libc/sync/Makefile                      |    4 +-
 tests/lib/libc/sync/all_sync_ops_linkable.c       |  168 ----------------------
 13 files changed, 1099 insertions(+), 174 deletions(-)

diffs (truncated from 1364 to 300 lines):

diff -r cc1eaa8d3768 -r 3195d7b9ed15 distrib/sets/lists/debug/mi
--- a/distrib/sets/lists/debug/mi       Tue Feb 26 09:43:37 2019 +0000
+++ b/distrib/sets/lists/debug/mi       Tue Feb 26 10:01:40 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.277 2019/02/18 00:42:55 rin Exp $
+# $NetBSD: mi,v 1.278 2019/02/26 10:01:40 isaki Exp $
 ./etc/mtree/set.debug                           comp-sys-root
 ./usr/lib                                      comp-sys-usr            compatdir
 ./usr/lib/i18n/libBIG5_g.a                     comp-c-debuglib         debuglib,compatfile
@@ -1889,6 +1889,14 @@
 ./usr/libdata/debug/usr/tests/lib/libbpfjit/t_bpfjit.debug             tests-lib-debug         debug,atf,sljit,compattestfile
 ./usr/libdata/debug/usr/tests/lib/libbpfjit/t_cop.debug                        tests-lib-debug         debug,atf,sljit,compattestfile
 ./usr/libdata/debug/usr/tests/lib/libbpfjit/t_extmem.debug             tests-lib-debug         debug,atf,sljit,compattestfile
+./usr/libdata/debug/usr/tests/lib/libc/atomic/t___sync_add.debug       tests-lib-tests         debug,atf,compattestfile
+./usr/libdata/debug/usr/tests/lib/libc/atomic/t___sync_and.debug       tests-lib-tests         debug,atf,compattestfile
+./usr/libdata/debug/usr/tests/lib/libc/atomic/t___sync_compare_and_swap.debug  tests-lib-tests debug,atf,compattestfile
+./usr/libdata/debug/usr/tests/lib/libc/atomic/t___sync_lock.debug      tests-lib-tests         debug,atf,compattestfile
+./usr/libdata/debug/usr/tests/lib/libc/atomic/t___sync_nand.debug      tests-lib-tests         debug,atf,compattestfile
+./usr/libdata/debug/usr/tests/lib/libc/atomic/t___sync_or.debug                tests-lib-tests         debug,atf,compattestfile
+./usr/libdata/debug/usr/tests/lib/libc/atomic/t___sync_sub.debug       tests-lib-tests         debug,atf,compattestfile
+./usr/libdata/debug/usr/tests/lib/libc/atomic/t___sync_xor.debug       tests-lib-tests         debug,atf,compattestfile
 ./usr/libdata/debug/usr/tests/lib/libc/atomic/t_atomic_add.debug       tests-lib-debug         debug,atf,compattestfile
 ./usr/libdata/debug/usr/tests/lib/libc/atomic/t_atomic_and.debug       tests-lib-debug         debug,atf,compattestfile
 ./usr/libdata/debug/usr/tests/lib/libc/atomic/t_atomic_cas.debug       tests-lib-debug         debug,atf,compattestfile
diff -r cc1eaa8d3768 -r 3195d7b9ed15 distrib/sets/lists/tests/mi
--- a/distrib/sets/lists/tests/mi       Tue Feb 26 09:43:37 2019 +0000
+++ b/distrib/sets/lists/tests/mi       Tue Feb 26 10:01:40 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.808 2019/02/18 00:42:55 rin Exp $
+# $NetBSD: mi,v 1.809 2019/02/26 10:01:40 isaki Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -2445,6 +2445,14 @@
 ./usr/tests/lib/libc/Kyuafile                  tests-lib-tests         compattestfile,atf,kyua
 ./usr/tests/lib/libc/atomic                    tests-lib-tests compattestfile,atf
 ./usr/tests/lib/libc/atomic/Atffile            tests-lib-tests         compattestfile,atf
+./usr/tests/lib/libc/atomic/t___sync_add       tests-lib-tests         compattestfile,atf
+./usr/tests/lib/libc/atomic/t___sync_and       tests-lib-tests         compattestfile,atf
+./usr/tests/lib/libc/atomic/t___sync_compare_and_swap  tests-lib-tests compattestfile,atf
+./usr/tests/lib/libc/atomic/t___sync_lock      tests-lib-tests         compattestfile,atf
+./usr/tests/lib/libc/atomic/t___sync_nand      tests-lib-tests         compattestfile,atf
+./usr/tests/lib/libc/atomic/t___sync_or                tests-lib-tests         compattestfile,atf
+./usr/tests/lib/libc/atomic/t___sync_sub       tests-lib-tests         compattestfile,atf
+./usr/tests/lib/libc/atomic/t___sync_xor       tests-lib-tests         compattestfile,atf
 ./usr/tests/lib/libc/atomic/t_atomic_add       tests-lib-tests         compattestfile,atf
 ./usr/tests/lib/libc/atomic/t_atomic_and       tests-lib-tests         compattestfile,atf
 ./usr/tests/lib/libc/atomic/t_atomic_cas       tests-lib-tests         compattestfile,atf
diff -r cc1eaa8d3768 -r 3195d7b9ed15 tests/lib/libc/atomic/Makefile
--- a/tests/lib/libc/atomic/Makefile    Tue Feb 26 09:43:37 2019 +0000
+++ b/tests/lib/libc/atomic/Makefile    Tue Feb 26 10:01:40 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2019/02/17 12:24:17 isaki Exp $
+# $NetBSD: Makefile,v 1.2 2019/02/26 10:01:41 isaki Exp $
 
 .include <bsd.own.mk>
 
@@ -12,6 +12,23 @@
 TESTS_C+=      t_atomic_or
 TESTS_C+=      t_atomic_swap
 
+TESTS_C+=      t___sync_add
+TESTS_C+=      t___sync_sub
+TESTS_C+=      t___sync_or
+TESTS_C+=      t___sync_and
+TESTS_C+=      t___sync_xor
+TESTS_C+=      t___sync_nand
+TESTS_C+=      t___sync_compare_and_swap
+TESTS_C+=      t___sync_lock
+
+# The code conforms to new NAND semantics.  So this warning is not
+# necessary here.
+.if "${ACTIVE_CC}" == "gcc"
+CPPFLAGS.t___sync_nand.c+=     -Wno-sync-nand
+.elif "${ACTIVE_CC}" == "clang"
+CPPFLAGS.t___sync_nand.c+=     -Wno-sync-fetch-and-nand-semantics-changed
+.endif
+
 MKMAN=no
 
 BINDIR=                ${TESTSDIR}
diff -r cc1eaa8d3768 -r 3195d7b9ed15 tests/lib/libc/atomic/t___sync_add.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/lib/libc/atomic/t___sync_add.c      Tue Feb 26 10:01:40 2019 +0000
@@ -0,0 +1,128 @@
+/*     $NetBSD: t___sync_add.c,v 1.1 2019/02/26 10:01:41 isaki Exp $   */
+
+/*
+ * Copyright (C) 2019 Tetsuya Isaki. All rights reserved.
+ *
+ * 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.
+ *
+ * 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 <sys/cdefs.h>
+__RCSID("$NetBSD: t___sync_add.c,v 1.1 2019/02/26 10:01:41 isaki Exp $");
+
+#include <atf-c.h>
+#include <inttypes.h>
+#include <machine/types.h>     // for __HAVE_ATOMIC64_OPS
+
+/*
+ * These tests don't examine the atomicity.
+ */
+
+/* XXX
+ * Depending on a combination of arch and compiler, __sync_* is
+ * implemented as compiler's builtin function.  In that case, even
+ * if libc exports the function symbol, it is not used.  As a result
+ * this tests will examine compiler's builtin functions.
+ * It's better to run only when target is actually in libc.
+ */
+
+#define DST    (0x1122334455667788UL)
+#define SRC    (0xf0e0d0c0b0a09081UL)
+#define EXPECT (0x0203040506070809UL)
+
+#define atf_sync_prefetch(NAME, TYPE, FMT) \
+ATF_TC(NAME); \
+ATF_TC_HEAD(NAME, tc) \
+{ \
+       atf_tc_set_md_var(tc, "descr", #NAME); \
+} \
+ATF_TC_BODY(NAME, tc) \
+{ \
+       volatile TYPE val; \
+       TYPE src; \
+       TYPE res; \
+       TYPE expval; \
+       TYPE expres; \
+       val = (TYPE)DST; \
+       src = (TYPE)SRC; \
+       expval = (TYPE)EXPECT; \
+       expres = (TYPE)DST; \
+       res = NAME(&val, src); \
+       ATF_REQUIRE_MSG(val == expval, \
+           "val expects 0x%" FMT " but 0x%" FMT, expval, val); \
+       ATF_REQUIRE_MSG(res == expres, \
+           "res expects 0x%" FMT " but 0x%" FMT, expres, res); \
+}
+
+atf_sync_prefetch(__sync_fetch_and_add_1, uint8_t,  PRIx8);
+atf_sync_prefetch(__sync_fetch_and_add_2, uint16_t, PRIx16);
+atf_sync_prefetch(__sync_fetch_and_add_4, uint32_t, PRIx32);
+#if defined(__HAVE_ATOMIC64_OPS)
+atf_sync_prefetch(__sync_fetch_and_add_8, uint64_t, PRIx64);
+#endif
+
+#define atf_sync_postfetch(NAME, TYPE, FMT) \
+ATF_TC(NAME); \
+ATF_TC_HEAD(NAME, tc) \
+{ \
+       atf_tc_set_md_var(tc, "descr", #NAME); \
+} \
+ATF_TC_BODY(NAME, tc) \
+{ \
+       volatile TYPE val; \
+       TYPE src; \
+       TYPE res; \
+       TYPE exp; \
+       val = (TYPE)DST; \
+       src = (TYPE)SRC; \
+       exp = (TYPE)EXPECT; \
+       res = NAME(&val, src); \
+       ATF_REQUIRE_MSG(val == exp, \
+           "val expects 0x%" FMT " but 0x%" FMT, exp, val); \
+       ATF_REQUIRE_MSG(res == exp, \
+           "res expects 0x%" FMT " but 0x%" FMT, exp, res); \
+}
+
+atf_sync_postfetch(__sync_add_and_fetch_1, uint8_t,  PRIx8);
+atf_sync_postfetch(__sync_add_and_fetch_2, uint16_t, PRIx16);
+atf_sync_postfetch(__sync_add_and_fetch_4, uint32_t, PRIx32);
+#ifdef __HAVE_ATOMIC64_OPS
+atf_sync_postfetch(__sync_add_and_fetch_8, uint64_t, PRIx64);
+#endif
+
+ATF_TP_ADD_TCS(tp)
+{
+       ATF_TP_ADD_TC(tp, __sync_fetch_and_add_1);
+       ATF_TP_ADD_TC(tp, __sync_fetch_and_add_2);
+       ATF_TP_ADD_TC(tp, __sync_fetch_and_add_4);
+#ifdef __HAVE_ATOMIC64_OPS
+       ATF_TP_ADD_TC(tp, __sync_fetch_and_add_8);
+#endif
+
+       ATF_TP_ADD_TC(tp, __sync_add_and_fetch_1);
+       ATF_TP_ADD_TC(tp, __sync_add_and_fetch_2);
+       ATF_TP_ADD_TC(tp, __sync_add_and_fetch_4);
+#ifdef __HAVE_ATOMIC64_OPS
+       ATF_TP_ADD_TC(tp, __sync_add_and_fetch_8);
+#endif
+
+       return atf_no_error();
+}
diff -r cc1eaa8d3768 -r 3195d7b9ed15 tests/lib/libc/atomic/t___sync_and.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/lib/libc/atomic/t___sync_and.c      Tue Feb 26 10:01:40 2019 +0000
@@ -0,0 +1,128 @@
+/*     $NetBSD: t___sync_and.c,v 1.1 2019/02/26 10:01:41 isaki Exp $   */
+
+/*
+ * Copyright (C) 2019 Tetsuya Isaki. All rights reserved.
+ *
+ * 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.
+ *
+ * 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 <sys/cdefs.h>
+__RCSID("$NetBSD: t___sync_and.c,v 1.1 2019/02/26 10:01:41 isaki Exp $");
+
+#include <atf-c.h>
+#include <inttypes.h>
+#include <machine/types.h>     // for __HAVE_ATOMIC64_OPS
+
+/*
+ * These tests don't examine the atomicity.
+ */
+
+/* XXX
+ * Depending on a combination of arch and compiler, __sync_* is
+ * implemented as compiler's builtin function.  In that case, even
+ * if libc exports the function symbol, it is not used.  As a result
+ * this tests will examine compiler's builtin functions.
+ * It's better to run only when target is actually in libc.
+ */
+
+#define DST    (0x1122334455667788UL)
+#define SRC    (0xf0f0f0f0f0f0f0f0UL)
+#define EXPECT (0x1020304050607080UL)
+
+#define atf_sync_prefetch(NAME, TYPE, FMT) \
+ATF_TC(NAME); \
+ATF_TC_HEAD(NAME, tc) \
+{ \
+       atf_tc_set_md_var(tc, "descr", #NAME); \
+} \
+ATF_TC_BODY(NAME, tc) \
+{ \
+       volatile TYPE val; \
+       TYPE src; \
+       TYPE res; \
+       TYPE expval; \
+       TYPE expres; \
+       val = (TYPE)DST; \
+       src = (TYPE)SRC; \
+       expval = (TYPE)EXPECT; \
+       expres = (TYPE)DST; \
+       res = NAME(&val, src); \
+       ATF_REQUIRE_MSG(val == expval, \
+           "val expects 0x%" FMT " but 0x%" FMT, expval, val); \
+       ATF_REQUIRE_MSG(res == expres, \
+           "res expects 0x%" FMT " but 0x%" FMT, expres, res); \
+}
+
+atf_sync_prefetch(__sync_fetch_and_and_1, uint8_t,  PRIx8);
+atf_sync_prefetch(__sync_fetch_and_and_2, uint16_t, PRIx16);
+atf_sync_prefetch(__sync_fetch_and_and_4, uint32_t, PRIx32);
+#if defined(__HAVE_ATOMIC64_OPS)
+atf_sync_prefetch(__sync_fetch_and_and_8, uint64_t, PRIx64);
+#endif
+
+#define atf_sync_postfetch(NAME, TYPE, FMT) \
+ATF_TC(NAME); \



Home | Main Index | Thread Index | Old Index