git: 65b618794f68 - stable/13 - lib/libc/tests/string: add unit tests for ffs, ffsl, ffsll, fls, flsl, and flsll

From: Robert Clausecker <fuz_at_FreeBSD.org>
Date: Fri, 21 Jul 2023 08:56:20 UTC
The branch stable/13 has been updated by fuz:

URL: https://cgit.FreeBSD.org/src/commit/?id=65b618794f68aadbebbca11de99278c9ec1b2992

commit 65b618794f68aadbebbca11de99278c9ec1b2992
Author:     Robert Clausecker <fuz@FreeBSD.org>
AuthorDate: 2023-06-23 17:26:44 +0000
Commit:     Robert Clausecker <fuz@FreeBSD.org>
CommitDate: 2023-07-21 08:51:54 +0000

    lib/libc/tests/string: add unit tests for ffs, ffsl, ffsll, fls, flsl, and flsll
    
    Also supply CFLAGS+=-fno-builtin to ensure our unit tests
    actually test libc functions and not clang's builtins.
    
    Sponsored by:   FreeBSD Foundation
    Approved by:    kevans
    MFC after:      1 week
    Differential Revision: https://reviews.freebsd.org/D40729
    
    (cherry picked from commit 49390697b9265d08d3f831cf38cdc2f79e216c48)
---
 lib/libc/tests/string/Makefile     |  9 ++++
 lib/libc/tests/string/ffs_test.c   | 88 ++++++++++++++++++++++++++++++++++++++
 lib/libc/tests/string/ffsl_test.c  | 32 ++++++++++++++
 lib/libc/tests/string/ffsll_test.c | 32 ++++++++++++++
 lib/libc/tests/string/fls_test.c   | 88 ++++++++++++++++++++++++++++++++++++++
 lib/libc/tests/string/flsl_test.c  | 32 ++++++++++++++
 lib/libc/tests/string/flsll_test.c | 32 ++++++++++++++
 7 files changed, 313 insertions(+)

diff --git a/lib/libc/tests/string/Makefile b/lib/libc/tests/string/Makefile
index 5d1944113a1a..e0b2db711682 100644
--- a/lib/libc/tests/string/Makefile
+++ b/lib/libc/tests/string/Makefile
@@ -1,5 +1,14 @@
 # $FreeBSD$
 
+# ensure libc functions are tested, not clang's builtins
+CFLAGS+=	-fno-builtin
+
+ATF_TESTS_C+=		ffs_test
+ATF_TESTS_C+=		ffsl_test
+ATF_TESTS_C+=		ffsll_test
+ATF_TESTS_C+=		fls_test
+ATF_TESTS_C+=		flsl_test
+ATF_TESTS_C+=		flsll_test
 ATF_TESTS_C+=		memcmp_test
 ATF_TESTS_C+=		memset_s_test
 ATF_TESTS_C+=		stpncpy_test
diff --git a/lib/libc/tests/string/ffs_test.c b/lib/libc/tests/string/ffs_test.c
new file mode 100644
index 000000000000..aea61254482e
--- /dev/null
+++ b/lib/libc/tests/string/ffs_test.c
@@ -0,0 +1,88 @@
+/*-
+ * Copyright (c) 2023 The FreeBSD Foundation
+ *
+ * This software was developed by Robert Clausecker <fuz@FreeBSD.org>
+ * under sponsorship from the FreeBSD Foundation.
+ *
+ * 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 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 AUTHOR 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
+ */
+#include <sys/cdefs.h>
+
+#include <atf-c.h>
+#include <limits.h>
+#include <stdint.h>
+#include <strings.h>
+
+#ifndef FFS
+# define FFS ffs
+# define TYPE int
+# define TYPE_MIN INT_MIN
+#endif
+
+ATF_TC_WITHOUT_HEAD(zero);
+ATF_TC_BODY(zero, tc)
+{
+	ATF_CHECK_EQ((TYPE)0, FFS(0));
+}
+
+ATF_TC_WITHOUT_HEAD(twobit);
+ATF_TC_BODY(twobit, tc)
+{
+	const TYPE one = 1;
+	TYPE x;
+	const int n = sizeof(TYPE) * CHAR_BIT;
+	int i, j;
+
+	for (i = 0; i < n - 1; i++)
+		for (j = 0; j <= i; j++) {
+			x = one << i | one << j;
+			ATF_CHECK_EQ_MSG(j + 1, FFS(x),
+			    "%s(%#jx) == %d != %d", __STRING(FFS), (intmax_t)x, FFS(x), j + 1);
+		}
+}
+
+ATF_TC_WITHOUT_HEAD(twobitneg);
+ATF_TC_BODY(twobitneg, tc)
+{
+	const TYPE one = 1;
+	TYPE x;
+	const int n = sizeof(TYPE) * CHAR_BIT;
+	int i, j;
+
+	for (i = 0; i < n - 1; i++)
+		for (j = 0; j <= i; j++) {
+			x = one << i | one << j | TYPE_MIN;
+			ATF_CHECK_EQ_MSG(j + 1, FFS(x),
+			    "%s(%#jx) == %d != %d", __STRING(FFS), (intmax_t)x, FFS(x), j + 1);
+		}
+}
+
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, zero);
+	ATF_TP_ADD_TC(tp, twobit);
+	ATF_TP_ADD_TC(tp, twobitneg);
+
+	return (atf_no_error());
+}
diff --git a/lib/libc/tests/string/ffsl_test.c b/lib/libc/tests/string/ffsl_test.c
new file mode 100644
index 000000000000..809cea3d3a93
--- /dev/null
+++ b/lib/libc/tests/string/ffsl_test.c
@@ -0,0 +1,32 @@
+/*-
+ * Copyright (c) 2023 The FreeBSD Foundation
+ *
+ * This software was developed by Robert Clausecker <fuz@FreeBSD.org>
+ * under sponsorship from the FreeBSD Foundation.
+ *
+ * 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 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 AUTHOR 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
+ */
+#define FFS ffsl
+#define TYPE long
+#define TYPE_MIN LONG_MIN
+
+#include "ffs_test.c"
diff --git a/lib/libc/tests/string/ffsll_test.c b/lib/libc/tests/string/ffsll_test.c
new file mode 100644
index 000000000000..1a620cbf9aba
--- /dev/null
+++ b/lib/libc/tests/string/ffsll_test.c
@@ -0,0 +1,32 @@
+/*-
+ * Copyright (c) 2023 The FreeBSD Foundation
+ *
+ * This software was developed by Robert Clausecker <fuz@FreeBSD.org>
+ * under sponsorship from the FreeBSD Foundation.
+ *
+ * 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 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 AUTHOR 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
+ */
+#define FFS ffsll
+#define TYPE long long
+#define TYPE_MIN LLONG_MIN
+
+#include "ffs_test.c"
diff --git a/lib/libc/tests/string/fls_test.c b/lib/libc/tests/string/fls_test.c
new file mode 100644
index 000000000000..847977d260c9
--- /dev/null
+++ b/lib/libc/tests/string/fls_test.c
@@ -0,0 +1,88 @@
+/*-
+ * Copyright (c) 2023 The FreeBSD Foundation
+ *
+ * This software was developed by Robert Clausecker <fuz@FreeBSD.org>
+ * under sponsorship from the FreeBSD Foundation.
+ *
+ * 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 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 AUTHOR 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
+ */
+#include <sys/cdefs.h>
+
+#include <atf-c.h>
+#include <limits.h>
+#include <stdint.h>
+#include <strings.h>
+
+#ifndef FLS
+# define FLS fls
+# define TYPE int
+# define TYPE_MIN INT_MIN
+#endif
+
+ATF_TC_WITHOUT_HEAD(zero);
+ATF_TC_BODY(zero, tc)
+{
+	ATF_CHECK_EQ((TYPE)0, FLS(0));
+}
+
+ATF_TC_WITHOUT_HEAD(twobit);
+ATF_TC_BODY(twobit, tc)
+{
+	const TYPE one = 1;
+	TYPE x;
+	const int n = sizeof(TYPE) * CHAR_BIT;
+	int i, j;
+
+	for (i = 0; i < n - 1; i++)
+		for (j = 0; j <= i; j++) {
+			x = one << i | one << j;
+			ATF_CHECK_EQ_MSG(i + 1, FLS(x),
+			    "%s(%#jx) == %d != %d", __STRING(FLS), (intmax_t)x, FLS(x), i + 1);
+		}
+}
+
+ATF_TC_WITHOUT_HEAD(twobitneg);
+ATF_TC_BODY(twobitneg, tc)
+{
+	const TYPE one = 1;
+	TYPE x;
+	const int n = sizeof(TYPE) * CHAR_BIT;
+	int i, j;
+
+	for (i = 0; i < n - 1; i++)
+		for (j = 0; j <= i; j++) {
+			x = one << i | one << j | TYPE_MIN;
+			ATF_CHECK_EQ_MSG(n, FLS(x),
+			    "%s(%#jx) == %d != %d", __STRING(FLS), (intmax_t)x, FLS(x), n);
+		}
+}
+
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, zero);
+	ATF_TP_ADD_TC(tp, twobit);
+	ATF_TP_ADD_TC(tp, twobitneg);
+
+	return (atf_no_error());
+}
diff --git a/lib/libc/tests/string/flsl_test.c b/lib/libc/tests/string/flsl_test.c
new file mode 100644
index 000000000000..4b1e330d4564
--- /dev/null
+++ b/lib/libc/tests/string/flsl_test.c
@@ -0,0 +1,32 @@
+/*-
+ * Copyright (c) 2023 The FreeBSD Foundation
+ *
+ * This software was developed by Robert Clausecker <fuz@FreeBSD.org>
+ * under sponsorship from the FreeBSD Foundation.
+ *
+ * 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 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 AUTHOR 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
+ */
+#define FLS flsl
+#define TYPE long
+#define TYPE_MIN LONG_MIN
+
+#include "fls_test.c"
diff --git a/lib/libc/tests/string/flsll_test.c b/lib/libc/tests/string/flsll_test.c
new file mode 100644
index 000000000000..23f469b7b5de
--- /dev/null
+++ b/lib/libc/tests/string/flsll_test.c
@@ -0,0 +1,32 @@
+/*-
+ * Copyright (c) 2023 The FreeBSD Foundation
+ *
+ * This software was developed by Robert Clausecker <fuz@FreeBSD.org>
+ * under sponsorship from the FreeBSD Foundation.
+ *
+ * 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 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 AUTHOR 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
+ */
+#define FLS flsll
+#define TYPE long long
+#define TYPE_MIN LLONG_MIN
+
+#include "fls_test.c"