Tests: move `test_bitfield` outside lib tests, add `check-no-bitfield` target
authorPhilippe Proulx <eeppeliteloop@gmail.com>
Mon, 8 Jul 2019 20:27:19 +0000 (16:27 -0400)
committerPhilippe Proulx <eeppeliteloop@gmail.com>
Tue, 9 Jul 2019 02:06:12 +0000 (22:06 -0400)
While the bitfield test (`test_bitfield`) is very valuable, it is also
very slow with a typical Babeltrace developer configuration, that is:

    BABELTRACE_DEV_MODE=1 BABELTRACE_DEBUG_MODE=1 \
    BABELTRACE_MINIMAL_LOG_LEVEL=TRACE \
    CFLAGS='-O0 -g3 -Werror -Wall -Wno-error=unused-function'

On my system and with the build configuration above, `test_bitfield`
takes 3:10 to run, while all the other tests, including the Python
bindings tests, but excluding `test_bitfield`, take 0:16.

Because `test_bitfield` exclusively tests the functions in the
`bitfield.h` header, and because they almost never change, I never run
the `test_bitfield` test, removing the line in `tests/Makefile.am` every
time. The CI runs all the tests anyway, so for a first pass, I believe
it's not worth the wait.

This patch moves `test_bitfield` into its own `tests/bitfield`
directory: `bitfield.h` is not part of the library anyway, so I don't
know why it's in `tests/lib` in the first place.

In `tests/Makefile.am`, a new `check-bitfield` target is added to run
just this test, as well as a new `check-no-bitfield` target which runs
all the tests but `test_bitfield`.

Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: Ib9f6a8e7cb9d01e7ef117b1a4d9c84788a4a68d2
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1655
Tested-by: jenkins <jenkins@lttng.org>
.gitignore
configure.ac
tests/Makefile.am
tests/bitfield/Makefile.am [new file with mode: 0644]
tests/bitfield/test_bitfield.c [new file with mode: 0644]
tests/lib/Makefile.am
tests/lib/test_bitfield.c [deleted file]

index 572ac7a995a61f342728154992e9550318e5a0d3..12826fe2224a85a2918b8e1986019db2dfd86946 100644 (file)
@@ -1,6 +1,6 @@
+/tests/bitfield/test_bitfield
 /tests/ctf-writer/ctf_writer
 /tests/lib/plugin
-/tests/lib/test_bitfield
 /tests/lib/test_bt_uuid
 /tests/lib/test_bt_values
 /tests/lib/test_graph_topo
index 4077a03978c08315567db85a672bc01dffd5d67d..5d224371a7f71c9769d47cbe8fdd77ed14a69e4c 100644 (file)
@@ -726,6 +726,7 @@ AC_CONFIG_FILES([
        src/plugins/utils/trimmer/Makefile
        src/py-common/Makefile
        src/python-plugin-provider/Makefile
+       tests/bitfield/Makefile
        tests/ctf-writer/Makefile
        tests/lib/Makefile
        tests/lib/test-plugin-plugins/Makefile
index 877ec1c778bcc8323d2209aa65de8ccef41a3520..aef19a60054e92b919c0f2bbd40003551fdaedcd 100644 (file)
@@ -1,4 +1,4 @@
-SUBDIRS = utils lib ctf-writer plugins
+SUBDIRS = utils lib bitfield ctf-writer plugins
 
 # Directories added to EXTRA_DIST will be recursively copied to the distribution.
 EXTRA_DIST = $(srcdir)/data \
@@ -55,12 +55,14 @@ TESTS_CLI = \
        cli/test_trimmer
 
 TESTS_LIB = \
-       lib/test_bitfield \
        lib/test_bt_values \
        lib/test_bt_uuid \
        lib/test_graph_topo \
        lib/test_trace_ir_ref
 
+TESTS_BITFIELD = \
+       bitfield/test_bitfield
+
 TESTS_CTF_WRITER = \
        ctf-writer/test_ctf_writer
 
@@ -116,8 +118,15 @@ LOG_DRIVER = env AM_TAP_AWK='$(AWK)' \
             BT_TESTS_SED_BIN="$(SED)" \
             $(SHELL) $(top_srcdir)/config/tap-driver.sh
 
-TESTS = $(TESTS_BINDINGS) $(TESTS_CLI) $(TESTS_CTF_WRITER) $(TESTS_LIB) \
-       $(TESTS_PLUGINS) $(TESTS_PYTHON_PLUGIN_PROVIDER)
+TESTS_NO_BITFIELD = \
+       $(TESTS_BINDINGS) \
+       $(TESTS_CLI) \
+       $(TESTS_CTF_WRITER) \
+       $(TESTS_LIB) \
+       $(TESTS_PLUGINS) \
+       $(TESTS_PYTHON_PLUGIN_PROVIDER)
+
+TESTS = $(TESTS_NO_BITFIELD) $(TESTS_BITFIELD)
 
 define check_target
 check-$(1):
@@ -125,8 +134,12 @@ check-$(1):
 endef
 
 $(eval $(call check_target,bindings,$(TESTS_BINDINGS)))
+$(eval $(call check_target,bitfield,$(TESTS_BITFIELD)))
 $(eval $(call check_target,cli,$(TESTS_CLI)))
 $(eval $(call check_target,ctf-writer,$(TESTS_CTF_WRITER)))
 $(eval $(call check_target,lib,$(TESTS_LIB)))
 $(eval $(call check_target,plugins,$(TESTS_PLUGINS)))
 $(eval $(call check_target,python-plugin-provider,$(TESTS_PYTHON_PLUGIN_PROVIDER)))
+
+check-no-bitfield:
+       $(MAKE) $(AM_MAKEFLAGS) TESTS="$(TESTS_NO_BITFIELD)" check
diff --git a/tests/bitfield/Makefile.am b/tests/bitfield/Makefile.am
new file mode 100644 (file)
index 0000000..5f46f28
--- /dev/null
@@ -0,0 +1,8 @@
+AM_CPPFLAGS += -I$(top_srcdir)/tests/utils
+
+test_bitfield_SOURCES = test_bitfield.c
+test_bitfield_LDADD = \
+       $(top_builddir)/tests/utils/tap/libtap.la \
+       $(top_builddir)/tests/utils/libtestcommon.la
+
+noinst_PROGRAMS = test_bitfield
diff --git a/tests/bitfield/test_bitfield.c b/tests/bitfield/test_bitfield.c
new file mode 100644 (file)
index 0000000..b9bd6d4
--- /dev/null
@@ -0,0 +1,719 @@
+/*
+ * test-bitfield.c
+ *
+ * BabelTrace - bitfield test program
+ *
+ * Copyright 2010-2019 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ *
+ * 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; under version 2 of the License.
+ *
+ * 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, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include "compat/bitfield.h"
+#include <time.h>
+#include <stdlib.h>
+#include <stdio.h>
+
+#include <tap/tap.h>
+
+unsigned int glob;
+
+/*
+ * This function is only declared to show the size of a bitfield write in
+ * objdump.
+ */
+void fct(void)
+{
+       bt_bitfield_write(&glob, unsigned int, 12, 15, 0x12345678);
+}
+
+/* Test array size, in bytes */
+#define TEST_LEN 128
+#define NR_TESTS 10
+#define SIGNED_INT_READ_TEST_DESC_FMT_STR "Writing and reading back 0x%X, signed int dest, varying read unit size"
+#define SIGNED_INT_WRITE_TEST_DESC_FMT_STR "Writing and reading back 0x%X, signed int source, varying write unit size"
+#define SIGNED_LONG_LONG_READ_TEST_DESC_FMT_STR "Writing and reading back 0x%llX, signed long long dest, varying read unit size"
+#define SIGNED_LONG_LONG_WRITE_TEST_DESC_FMT_STR "Writing and reading back 0x%llX, signed long long source, varying write unit size"
+#define UNSIGNED_INT_READ_TEST_DESC_FMT_STR "Writing and reading back 0x%X, unsigned int dest, varying read unit size"
+#define UNSIGNED_INT_WRITE_TEST_DESC_FMT_STR "Writing and reading back 0x%X, unsigned int source, varying write unit size"
+#define UNSIGNED_LONG_LONG_READ_TEST_DESC_FMT_STR "Writing and reading back 0x%llX, unsigned long long dest, varying read unit size"
+#define UNSIGNED_LONG_LONG_WRITE_TEST_DESC_FMT_STR "Writing and reading back 0x%llX, unsigned long long source, varying write unit size"
+#define DIAG_FMT_STR "Failed reading value written \"%s\"-wise, with start=%i" \
+       " and length=%i. Read %llX"
+
+static
+unsigned int fls_u64(uint64_t x)
+{
+       unsigned int r = 64;
+
+       if (!x)
+               return 0;
+
+       if (!(x & 0xFFFFFFFF00000000ULL)) {
+               x <<= 32;
+               r -= 32;
+       }
+       if (!(x & 0xFFFF000000000000ULL)) {
+               x <<= 16;
+               r -= 16;
+       }
+       if (!(x & 0xFF00000000000000ULL)) {
+               x <<= 8;
+               r -= 8;
+       }
+       if (!(x & 0xF000000000000000ULL)) {
+               x <<= 4;
+               r -= 4;
+       }
+       if (!(x & 0xC000000000000000ULL)) {
+               x <<= 2;
+               r -= 2;
+       }
+       if (!(x & 0x8000000000000000ULL)) {
+               x <<= 1;
+               r -= 1;
+       }
+       return r;
+}
+
+static
+unsigned int fls_u32(uint32_t x)
+{
+       unsigned int r = 32;
+
+       if (!x)
+               return 0;
+       if (!(x & 0xFFFF0000U)) {
+               x <<= 16;
+               r -= 16;
+       }
+       if (!(x & 0xFF000000U)) {
+               x <<= 8;
+               r -= 8;
+       }
+       if (!(x & 0xF0000000U)) {
+               x <<= 4;
+               r -= 4;
+       }
+       if (!(x & 0xC0000000U)) {
+               x <<= 2;
+               r -= 2;
+       }
+       if (!(x & 0x80000000U)) {
+               x <<= 1;
+               r -= 1;
+       }
+       return r;
+}
+
+#define print_byte_array(c, len)       \
+do {                                   \
+       unsigned long i;                \
+                                       \
+       for (i = 0; i < (len); i++) {   \
+               printf("0x%X", (c)[i]); \
+               if (i != (len) - 1)     \
+                       printf(" ");    \
+       }                               \
+       printf("\n");                   \
+} while (0)
+
+#define init_byte_array(c, len, val)   \
+do {                                   \
+       unsigned long i;                \
+                                       \
+       for (i = 0; i < (len); i++)     \
+               (c)[i] = (val);         \
+} while (0)
+
+#define check_result(ref, val, buffer, typename, start, len,           \
+               desc_fmt_str)                                           \
+({                                                                     \
+       if ((val) != (ref)) {                                           \
+               fail(desc_fmt_str, ref);                                \
+               diag(DIAG_FMT_STR, #typename, start, len, val);         \
+               printf("# ");                                           \
+               print_byte_array(buffer, TEST_LEN);                     \
+       }                                                               \
+       (val) != (ref);                                                 \
+})
+
+void run_test_unsigned_write(unsigned int src_ui, unsigned long long src_ull)
+{
+       unsigned int nrbits_ui, nrbits_ull;
+       union {
+               unsigned char c[TEST_LEN];
+               unsigned short s[TEST_LEN/sizeof(unsigned short)];
+               unsigned int i[TEST_LEN/sizeof(unsigned int)];
+               unsigned long l[TEST_LEN/sizeof(unsigned long)];
+               unsigned long long ll[TEST_LEN/sizeof(unsigned long long)];
+       } target;
+       unsigned long long readval;
+       unsigned int s, l;
+
+       /* The number of bits needed to represent 0 is 0. */
+       nrbits_ui = fls_u32(src_ui);
+
+       /* Write from unsigned integer src input. */
+       for (s = 0; s < CHAR_BIT * TEST_LEN; s++) {
+               for (l = nrbits_ui; l <= (CHAR_BIT * TEST_LEN) - s; l++) {
+                       init_byte_array(target.c, TEST_LEN, 0xFF);
+                       bt_bitfield_write(target.c, unsigned char, s, l, src_ui);
+                       bt_bitfield_read(target.c, unsigned char, s, l, &readval);
+                       if (check_result(src_ui, readval, target.c, unsigned char,
+                                       s, l, UNSIGNED_INT_WRITE_TEST_DESC_FMT_STR)) {
+                               return;
+                       }
+
+                       init_byte_array(target.c, TEST_LEN, 0xFF);
+                       bt_bitfield_write(target.s, unsigned short, s, l, src_ui);
+                       bt_bitfield_read(target.c, unsigned char, s, l, &readval);
+                       if (check_result(src_ui, readval, target.c, unsigned short,
+                                       s, l, UNSIGNED_INT_WRITE_TEST_DESC_FMT_STR)) {
+                               return;
+                       }
+
+                       init_byte_array(target.c, TEST_LEN, 0xFF);
+                       bt_bitfield_write(target.i, unsigned int, s, l, src_ui);
+                       bt_bitfield_read(target.c, unsigned char, s, l, &readval);
+                       if (check_result(src_ui, readval, target.c, unsigned int,
+                                       s, l, UNSIGNED_INT_WRITE_TEST_DESC_FMT_STR)) {
+                               return;
+                       }
+
+                       init_byte_array(target.c, TEST_LEN, 0xFF);
+                       bt_bitfield_write(target.l, unsigned long, s, l, src_ui);
+                       bt_bitfield_read(target.c, unsigned char, s, l, &readval);
+                       if (check_result(src_ui, readval, target.c, unsigned long,
+                                       s, l, UNSIGNED_INT_WRITE_TEST_DESC_FMT_STR)) {
+                               return;
+                       }
+
+                       init_byte_array(target.c, TEST_LEN, 0xFF);
+                       bt_bitfield_write(target.ll, unsigned long long, s, l, src_ui);
+                       bt_bitfield_read(target.c, unsigned char, s, l, &readval);
+                       if (check_result(src_ui, readval, target.c, unsigned long long,
+                                       s, l, UNSIGNED_INT_WRITE_TEST_DESC_FMT_STR)) {
+                               return;
+                       }
+               }
+       }
+       pass(UNSIGNED_INT_WRITE_TEST_DESC_FMT_STR, src_ui);
+
+       /* The number of bits needed to represent 0 is 0. */
+       nrbits_ull = fls_u64(src_ull);
+
+       /* Write from unsigned long long src input. */
+       for (s = 0; s < CHAR_BIT * TEST_LEN; s++) {
+               for (l = nrbits_ull; l <= (CHAR_BIT * TEST_LEN) - s; l++) {
+                       init_byte_array(target.c, TEST_LEN, 0xFF);
+                       bt_bitfield_write(target.c, unsigned char, s, l, src_ull);
+                       bt_bitfield_read(target.c, unsigned char, s, l, &readval);
+                       if (check_result(src_ull, readval, target.c, unsigned char,
+                                       s, l, UNSIGNED_LONG_LONG_WRITE_TEST_DESC_FMT_STR)) {
+                               return;
+                       }
+
+                       init_byte_array(target.c, TEST_LEN, 0xFF);
+                       bt_bitfield_write(target.s, unsigned short, s, l, src_ull);
+                       bt_bitfield_read(target.c, unsigned char, s, l, &readval);
+                       if (check_result(src_ull, readval, target.c, unsigned short,
+                                       s, l, UNSIGNED_LONG_LONG_WRITE_TEST_DESC_FMT_STR)) {
+                               return;
+                       }
+
+                       init_byte_array(target.c, TEST_LEN, 0xFF);
+                       bt_bitfield_write(target.i, unsigned int, s, l, src_ull);
+                       bt_bitfield_read(target.c, unsigned char, s, l, &readval);
+                       if (check_result(src_ull, readval, target.c, unsigned int,
+                                       s, l, UNSIGNED_LONG_LONG_WRITE_TEST_DESC_FMT_STR)) {
+                               return;
+                       }
+
+                       init_byte_array(target.c, TEST_LEN, 0xFF);
+                       bt_bitfield_write(target.l, unsigned long, s, l, src_ull);
+                       bt_bitfield_read(target.c, unsigned char, s, l, &readval);
+                       if (check_result(src_ull, readval, target.c, unsigned long,
+                                       s, l, UNSIGNED_LONG_LONG_WRITE_TEST_DESC_FMT_STR)) {
+                               return;
+                       }
+
+                       init_byte_array(target.c, TEST_LEN, 0xFF);
+                       bt_bitfield_write(target.ll, unsigned long long, s, l, src_ull);
+                       bt_bitfield_read(target.c, unsigned char, s, l, &readval);
+                       if (check_result(src_ull, readval, target.c, unsigned long long,
+                                       s, l, UNSIGNED_LONG_LONG_WRITE_TEST_DESC_FMT_STR)) {
+                               return;
+                       }
+               }
+       }
+       pass(UNSIGNED_LONG_LONG_WRITE_TEST_DESC_FMT_STR, src_ull);
+}
+
+void run_test_unsigned_read(unsigned int src_ui, unsigned long long src_ull)
+{
+       unsigned int nrbits_ui, nrbits_ull, readval_ui;
+       union {
+               unsigned char c[TEST_LEN];
+               unsigned short s[TEST_LEN/sizeof(unsigned short)];
+               unsigned int i[TEST_LEN/sizeof(unsigned int)];
+               unsigned long l[TEST_LEN/sizeof(unsigned long)];
+               unsigned long long ll[TEST_LEN/sizeof(unsigned long long)];
+       } target;
+       unsigned long long readval_ull;
+       unsigned int s, l;
+
+       /* The number of bits needed to represent 0 is 0. */
+       nrbits_ui = fls_u32(src_ui);
+
+       /* Read to unsigned integer readval output. */
+       for (s = 0; s < CHAR_BIT * TEST_LEN; s++) {
+               for (l = nrbits_ui; l <= (CHAR_BIT * TEST_LEN) - s; l++) {
+                       init_byte_array(target.c, TEST_LEN, 0xFF);
+                       bt_bitfield_write(target.c, unsigned char, s, l, src_ui);
+                       bt_bitfield_read(target.c, unsigned char, s, l, &readval_ui);
+                       if (check_result(src_ui, readval_ui, target.c, unsigned char,
+                                       s, l, UNSIGNED_INT_READ_TEST_DESC_FMT_STR)) {
+                               return;
+                       }
+
+                       init_byte_array(target.c, TEST_LEN, 0xFF);
+                       bt_bitfield_write(target.c, unsigned char, s, l, src_ui);
+                       bt_bitfield_read(target.s, unsigned short, s, l, &readval_ui);
+                       if (check_result(src_ui, readval_ui, target.c, unsigned short,
+                                       s, l, UNSIGNED_INT_READ_TEST_DESC_FMT_STR)) {
+                               return;
+                       }
+
+                       init_byte_array(target.c, TEST_LEN, 0xFF);
+                       bt_bitfield_write(target.c, unsigned char, s, l, src_ui);
+                       bt_bitfield_read(target.i, unsigned int, s, l, &readval_ui);
+                       if (check_result(src_ui, readval_ui, target.c, unsigned int,
+                                       s, l, UNSIGNED_INT_READ_TEST_DESC_FMT_STR)) {
+                               return;
+                       }
+
+                       init_byte_array(target.c, TEST_LEN, 0xFF);
+                       bt_bitfield_write(target.c, unsigned char, s, l, src_ui);
+                       bt_bitfield_read(target.l, unsigned long, s, l, &readval_ui);
+                       if (check_result(src_ui, readval_ui, target.c, unsigned long,
+                                       s, l, UNSIGNED_INT_READ_TEST_DESC_FMT_STR)) {
+                               return;
+                       }
+
+                       init_byte_array(target.c, TEST_LEN, 0xFF);
+                       bt_bitfield_write(target.c, unsigned char, s, l, src_ui);
+                       bt_bitfield_read(target.ll, unsigned long long, s, l, &readval_ui);
+                       if (check_result(src_ui, readval_ui, target.c, unsigned long long,
+                                       s, l, UNSIGNED_INT_READ_TEST_DESC_FMT_STR)) {
+                               return;
+                       }
+               }
+       }
+       pass(UNSIGNED_INT_READ_TEST_DESC_FMT_STR, src_ui);
+
+       /* The number of bits needed to represent 0 is 0. */
+       nrbits_ull = fls_u64(src_ull);
+
+       /* Read to unsigned long long readval output. */
+       for (s = 0; s < CHAR_BIT * TEST_LEN; s++) {
+               for (l = nrbits_ull; l <= (CHAR_BIT * TEST_LEN) - s; l++) {
+                       init_byte_array(target.c, TEST_LEN, 0xFF);
+                       bt_bitfield_write(target.c, unsigned char, s, l, src_ull);
+                       bt_bitfield_read(target.c, unsigned char, s, l, &readval_ull);
+                       if (check_result(src_ull, readval_ull, target.c, unsigned char,
+                                       s, l, UNSIGNED_LONG_LONG_READ_TEST_DESC_FMT_STR)) {
+                               return;
+                       }
+
+                       init_byte_array(target.c, TEST_LEN, 0xFF);
+                       bt_bitfield_write(target.c, unsigned char, s, l, src_ull);
+                       bt_bitfield_read(target.s, unsigned short, s, l, &readval_ull);
+                       if (check_result(src_ull, readval_ull, target.c, unsigned short,
+                                       s, l, UNSIGNED_LONG_LONG_READ_TEST_DESC_FMT_STR)) {
+                               return;
+                       }
+
+                       init_byte_array(target.c, TEST_LEN, 0xFF);
+                       bt_bitfield_write(target.c, unsigned char, s, l, src_ull);
+                       bt_bitfield_read(target.i, unsigned int, s, l, &readval_ull);
+                       if (check_result(src_ull, readval_ull, target.c, unsigned int,
+                                       s, l, UNSIGNED_LONG_LONG_READ_TEST_DESC_FMT_STR)) {
+                               return;
+                       }
+
+                       init_byte_array(target.c, TEST_LEN, 0xFF);
+                       bt_bitfield_write(target.c, unsigned char, s, l, src_ull);
+                       bt_bitfield_read(target.l, unsigned long, s, l, &readval_ull);
+                       if (check_result(src_ull, readval_ull, target.c, unsigned long,
+                                       s, l, UNSIGNED_LONG_LONG_READ_TEST_DESC_FMT_STR)) {
+                               return;
+                       }
+
+                       init_byte_array(target.c, TEST_LEN, 0xFF);
+                       bt_bitfield_write(target.c, unsigned char, s, l, src_ull);
+                       bt_bitfield_read(target.ll, unsigned long long, s, l, &readval_ull);
+                       if (check_result(src_ull, readval_ull, target.c, unsigned long long,
+                                       s, l, UNSIGNED_LONG_LONG_READ_TEST_DESC_FMT_STR)) {
+                               return;
+                       }
+               }
+       }
+       pass(UNSIGNED_LONG_LONG_READ_TEST_DESC_FMT_STR, src_ull);
+}
+
+void run_test_unsigned(unsigned int src_ui, unsigned long long src_ull)
+{
+       run_test_unsigned_write(src_ui, src_ull);
+       run_test_unsigned_read(src_ui, src_ull);
+}
+
+void run_test_signed_write(int src_i, long long src_ll)
+{
+       unsigned int nrbits_i, nrbits_ll;
+       union {
+               signed char c[TEST_LEN];
+               short s[TEST_LEN/sizeof(short)];
+               int i[TEST_LEN/sizeof(int)];
+               long l[TEST_LEN/sizeof(long)];
+               long long ll[TEST_LEN/sizeof(long long)];
+       } target;
+       long long readval;
+       unsigned int s, l;
+
+       if (!src_i)
+               nrbits_i = 0;                   /* The number of bits needed to represent 0 is 0. */
+       else if (src_i & 0x80000000U)
+               nrbits_i = fls_u32(~src_i) + 1; /* Find least significant bit conveying sign */
+       else
+               nrbits_i = fls_u32(src_i) + 1;  /* Keep sign at 0 */
+
+       /* Write from signed integer src input. */
+       for (s = 0; s < CHAR_BIT * TEST_LEN; s++) {
+               for (l = nrbits_i; l <= (CHAR_BIT * TEST_LEN) - s; l++) {
+                       init_byte_array(target.c, TEST_LEN, 0x0);
+                       bt_bitfield_write(target.c, signed char, s, l, src_i);
+                       bt_bitfield_read(target.c, signed char, s, l, &readval);
+                       if (check_result(src_i, readval, target.c, signed char,
+                                       s, l, SIGNED_INT_WRITE_TEST_DESC_FMT_STR)) {
+                               return;
+                       }
+
+                       init_byte_array(target.c, TEST_LEN, 0x0);
+                       bt_bitfield_write(target.s, short, s, l, src_i);
+                       bt_bitfield_read(target.c, signed char, s, l, &readval);
+                       if (check_result(src_i, readval, target.c, short,
+                                       s, l, SIGNED_INT_WRITE_TEST_DESC_FMT_STR)) {
+                               return;
+                       }
+
+                       init_byte_array(target.c, TEST_LEN, 0x0);
+                       bt_bitfield_write(target.i, int, s, l, src_i);
+                       bt_bitfield_read(target.c, signed char, s, l, &readval);
+                       if (check_result(src_i, readval, target.c, int,
+                                       s, l, SIGNED_INT_WRITE_TEST_DESC_FMT_STR)) {
+                               return;
+                       }
+
+                       init_byte_array(target.c, TEST_LEN, 0x0);
+                       bt_bitfield_write(target.l, long, s, l, src_i);
+                       bt_bitfield_read(target.c, signed char, s, l, &readval);
+                       if (check_result(src_i, readval, target.c, long,
+                                       s, l, SIGNED_INT_WRITE_TEST_DESC_FMT_STR)) {
+                               return;
+                       }
+
+                       init_byte_array(target.c, TEST_LEN, 0x0);
+                       bt_bitfield_write(target.ll, long long, s, l, src_i);
+                       bt_bitfield_read(target.c, signed char, s, l, &readval);
+                       if (check_result(src_i, readval, target.c, long long,
+                                       s, l, SIGNED_INT_WRITE_TEST_DESC_FMT_STR)) {
+                               return;
+                       }
+               }
+       }
+       pass(SIGNED_INT_WRITE_TEST_DESC_FMT_STR, src_i);
+
+       if (!src_ll)
+               nrbits_ll = 0;                          /* The number of bits needed to represent 0 is 0. */
+       else if (src_ll & 0x8000000000000000ULL)
+               nrbits_ll = fls_u64(~src_ll) + 1;       /* Find least significant bit conveying sign */
+       else
+               nrbits_ll = fls_u64(src_ll) + 1;        /* Keep sign at 0 */
+
+       /* Write from signed long long src input. */
+       for (s = 0; s < CHAR_BIT * TEST_LEN; s++) {
+               for (l = nrbits_ll; l <= (CHAR_BIT * TEST_LEN) - s; l++) {
+                       init_byte_array(target.c, TEST_LEN, 0x0);
+                       bt_bitfield_write(target.c, signed char, s, l, src_ll);
+                       bt_bitfield_read(target.c, signed char, s, l, &readval);
+                       if (check_result(src_ll, readval, target.c, signed char,
+                                       s, l, SIGNED_LONG_LONG_WRITE_TEST_DESC_FMT_STR)) {
+                               return;
+                       }
+
+                       init_byte_array(target.c, TEST_LEN, 0x0);
+                       bt_bitfield_write(target.s, short, s, l, src_ll);
+                       bt_bitfield_read(target.c, signed char, s, l, &readval);
+                       if (check_result(src_ll, readval, target.c, short,
+                                       s, l, SIGNED_LONG_LONG_WRITE_TEST_DESC_FMT_STR)) {
+                               return;
+                       }
+
+                       init_byte_array(target.c, TEST_LEN, 0x0);
+                       bt_bitfield_write(target.i, int, s, l, src_ll);
+                       bt_bitfield_read(target.c, signed char, s, l, &readval);
+                       if (check_result(src_ll, readval, target.c, int,
+                                       s, l, SIGNED_LONG_LONG_WRITE_TEST_DESC_FMT_STR)) {
+                               return;
+                       }
+
+                       init_byte_array(target.c, TEST_LEN, 0x0);
+                       bt_bitfield_write(target.l, long, s, l, src_ll);
+                       bt_bitfield_read(target.c, signed char, s, l, &readval);
+                       if (check_result(src_ll, readval, target.c, long,
+                                       s, l, SIGNED_LONG_LONG_WRITE_TEST_DESC_FMT_STR)) {
+                               return;
+                       }
+
+                       init_byte_array(target.c, TEST_LEN, 0x0);
+                       bt_bitfield_write(target.ll, long long, s, l, src_ll);
+                       bt_bitfield_read(target.c, signed char, s, l, &readval);
+                       if (check_result(src_ll, readval, target.c, long long,
+                                       s, l, SIGNED_LONG_LONG_WRITE_TEST_DESC_FMT_STR)) {
+                               return;
+                       }
+               }
+       }
+       pass(SIGNED_LONG_LONG_WRITE_TEST_DESC_FMT_STR, src_ll);
+}
+
+void run_test_signed_read(int src_i, long long src_ll)
+{
+       unsigned int nrbits_i, nrbits_ll;
+       int readval_i;
+       union {
+               unsigned char c[TEST_LEN];
+               unsigned short s[TEST_LEN/sizeof(unsigned short)];
+               unsigned int i[TEST_LEN/sizeof(unsigned int)];
+               unsigned long l[TEST_LEN/sizeof(unsigned long)];
+               unsigned long long ll[TEST_LEN/sizeof(unsigned long long)];
+       } target;
+       long long readval_ll;
+       unsigned int s, l;
+
+       if (!src_i)
+               nrbits_i = 0;                   /* The number of bits needed to represent 0 is 0. */
+       else if (src_i & 0x80000000U)
+               nrbits_i = fls_u32(~src_i) + 1; /* Find least significant bit conveying sign */
+       else
+               nrbits_i = fls_u32(src_i) + 1;  /* Keep sign at 0 */
+
+       /* Read to signed integer readval output. */
+       for (s = 0; s < CHAR_BIT * TEST_LEN; s++) {
+               for (l = nrbits_i; l <= (CHAR_BIT * TEST_LEN) - s; l++) {
+                       init_byte_array(target.c, TEST_LEN, 0xFF);
+                       bt_bitfield_write(target.c, signed char, s, l, src_i);
+                       bt_bitfield_read(target.c, signed char, s, l, &readval_i);
+                       if (check_result(src_i, readval_i, target.c, signed char,
+                                       s, l, SIGNED_INT_READ_TEST_DESC_FMT_STR)) {
+                               return;
+                       }
+
+                       init_byte_array(target.c, TEST_LEN, 0xFF);
+                       bt_bitfield_write(target.c, signed char, s, l, src_i);
+                       bt_bitfield_read(target.s, short, s, l, &readval_i);
+                       if (check_result(src_i, readval_i, target.c, short,
+                                       s, l, SIGNED_INT_READ_TEST_DESC_FMT_STR)) {
+                               return;
+                       }
+
+                       init_byte_array(target.c, TEST_LEN, 0xFF);
+                       bt_bitfield_write(target.c, signed char, s, l, src_i);
+                       bt_bitfield_read(target.i, int, s, l, &readval_i);
+                       if (check_result(src_i, readval_i, target.c, int,
+                                       s, l, SIGNED_INT_READ_TEST_DESC_FMT_STR)) {
+                               return;
+                       }
+
+                       init_byte_array(target.c, TEST_LEN, 0xFF);
+                       bt_bitfield_write(target.c, signed char, s, l, src_i);
+                       bt_bitfield_read(target.l, long, s, l, &readval_i);
+                       if (check_result(src_i, readval_i, target.c, long,
+                                       s, l, SIGNED_INT_READ_TEST_DESC_FMT_STR)) {
+                               return;
+                       }
+
+                       init_byte_array(target.c, TEST_LEN, 0xFF);
+                       bt_bitfield_write(target.c, signed char, s, l, src_i);
+                       bt_bitfield_read(target.ll, long long, s, l, &readval_i);
+                       if (check_result(src_i, readval_i, target.c, long long,
+                                       s, l, SIGNED_INT_READ_TEST_DESC_FMT_STR)) {
+                               return;
+                       }
+               }
+       }
+       pass(SIGNED_INT_READ_TEST_DESC_FMT_STR, src_i);
+
+       if (!src_ll)
+               nrbits_ll = 0;                          /* The number of bits needed to represent 0 is 0. */
+       if (src_ll & 0x8000000000000000ULL)
+               nrbits_ll = fls_u64(~src_ll) + 1;       /* Find least significant bit conveying sign */
+       else
+               nrbits_ll = fls_u64(src_ll) + 1;        /* Keep sign at 0 */
+
+       /* Read to signed long long readval output. */
+       for (s = 0; s < CHAR_BIT * TEST_LEN; s++) {
+               for (l = nrbits_ll; l <= (CHAR_BIT * TEST_LEN) - s; l++) {
+                       init_byte_array(target.c, TEST_LEN, 0xFF);
+                       bt_bitfield_write(target.c, signed char, s, l, src_ll);
+                       bt_bitfield_read(target.c, signed char, s, l, &readval_ll);
+                       if (check_result(src_ll, readval_ll, target.c, signed char,
+                                       s, l, SIGNED_LONG_LONG_READ_TEST_DESC_FMT_STR)) {
+                               return;
+                       }
+
+                       init_byte_array(target.c, TEST_LEN, 0xFF);
+                       bt_bitfield_write(target.c, signed char, s, l, src_ll);
+                       bt_bitfield_read(target.s, short, s, l, &readval_ll);
+                       if (check_result(src_ll, readval_ll, target.c, short,
+                                       s, l, SIGNED_LONG_LONG_READ_TEST_DESC_FMT_STR)) {
+                               return;
+                       }
+
+                       init_byte_array(target.c, TEST_LEN, 0xFF);
+                       bt_bitfield_write(target.c, signed char, s, l, src_ll);
+                       bt_bitfield_read(target.i, int, s, l, &readval_ll);
+                       if (check_result(src_ll, readval_ll, target.c, int,
+                                       s, l, SIGNED_LONG_LONG_READ_TEST_DESC_FMT_STR)) {
+                               return;
+                       }
+
+                       init_byte_array(target.c, TEST_LEN, 0xFF);
+                       bt_bitfield_write(target.c, signed char, s, l, src_ll);
+                       bt_bitfield_read(target.l, long, s, l, &readval_ll);
+                       if (check_result(src_ll, readval_ll, target.c, long,
+                                       s, l, SIGNED_LONG_LONG_READ_TEST_DESC_FMT_STR)) {
+                               return;
+                       }
+
+                       init_byte_array(target.c, TEST_LEN, 0xFF);
+                       bt_bitfield_write(target.c, signed char, s, l, src_ll);
+                       bt_bitfield_read(target.ll, long long, s, l, &readval_ll);
+                       if (check_result(src_ll, readval_ll, target.c, long long,
+                                       s, l, SIGNED_LONG_LONG_READ_TEST_DESC_FMT_STR)) {
+                               return;
+                       }
+               }
+       }
+       pass(SIGNED_LONG_LONG_READ_TEST_DESC_FMT_STR, src_ll);
+}
+
+void run_test_signed(int src_i, long long src_ll)
+{
+       run_test_signed_write(src_i, src_ll);
+       run_test_signed_read(src_i, src_ll);
+}
+
+void run_test(void)
+{
+       int i;
+
+       plan_tests(NR_TESTS * 8 + 24);
+
+       srand(time(NULL));
+
+       run_test_unsigned(0, 0);
+       run_test_signed(0, 0);
+       run_test_unsigned(1, 1);
+       run_test_unsigned(~0U, ~0ULL);
+       run_test_signed(-1U, -1ULL);
+       run_test_signed(0x80000000U, 0x8000000000000000ULL);
+
+       for (i = 0; i < NR_TESTS; i++) {
+               unsigned int src_ui = rand();
+               unsigned long long src_ull = ((unsigned long long) (unsigned int) rand() << 32) |
+                               (unsigned long long) (unsigned int) rand();
+
+               run_test_unsigned(src_ui, src_ull);
+               run_test_signed((int) src_ui, (long long) src_ull);
+       }
+}
+
+static
+int print_encodings(unsigned long src, unsigned int shift, unsigned int len)
+{
+       union {
+               unsigned char c[8];
+               unsigned short s[4];
+               unsigned int i[2];
+               unsigned long l[2];
+               unsigned long long ll[1];
+       } target;
+       unsigned long long readval;
+
+       init_byte_array(target.c, 8, 0xFF);
+       bt_bitfield_write(target.c, unsigned char, shift, len, src);
+       printf("bytewise\n");
+       print_byte_array(target.c, 8);
+
+       init_byte_array(target.c, 8, 0xFF);
+       bt_bitfield_write(target.s, unsigned short, shift, len, src);
+       printf("shortwise\n");
+       print_byte_array(target.c, 8);
+
+       init_byte_array(target.c, 8, 0xFF);
+       bt_bitfield_write(target.i, unsigned int, shift, len, src);
+       printf("intwise\n");
+       print_byte_array(target.c, 8);
+
+       init_byte_array(target.c, 8, 0xFF);
+       bt_bitfield_write(target.l, unsigned long, shift, len, src);
+       printf("longwise\n");
+       print_byte_array(target.c, 8);
+
+       init_byte_array(target.c, 8, 0xFF);
+       bt_bitfield_write(target.ll, unsigned long long, shift, len, src);
+       printf("lluwise\n");
+       print_byte_array(target.c, 8);
+
+       bt_bitfield_read(target.c, unsigned char, shift, len, &readval);
+       printf("read: %llX\n", readval);
+       print_byte_array(target.c, 8);
+
+       return 0;
+}
+
+int main(int argc, char **argv)
+{
+       if (argc > 1) {
+               /* Print encodings */
+               unsigned long src;
+               unsigned int shift, len;
+
+               src = atoi(argv[1]);
+               if (argc > 2)
+                       shift = atoi(argv[2]);
+               else
+                       shift = 12;
+               if (argc > 3)
+                       len = atoi(argv[3]);
+               else
+                       len = 40;
+               return print_encodings(src, shift, len);
+       }
+
+       /* Run tap-formated tests */
+       run_test();
+       return exit_status();
+}
index ce8d17a72f353c991465e13bb56529e588598956..8974725c9eae16a788991b551063bc2b34f4c067 100644 (file)
@@ -6,8 +6,6 @@ COMMON_TEST_LDADD = \
        $(top_builddir)/tests/utils/tap/libtap.la \
        $(top_builddir)/tests/utils/libtestcommon.la
 
-test_bitfield_LDADD = $(COMMON_TEST_LDADD)
-
 test_bt_values_LDADD = $(COMMON_TEST_LDADD) \
        $(top_builddir)/src/lib/libbabeltrace2.la
 
@@ -22,14 +20,8 @@ test_trace_ir_ref_LDADD = $(COMMON_TEST_LDADD) \
 test_graph_topo_LDADD = $(COMMON_TEST_LDADD) \
        $(top_builddir)/src/lib/libbabeltrace2.la
 
-noinst_PROGRAMS = \
-       test_bitfield \
-       test_bt_values \
-       test_bt_uuid \
-       test_trace_ir_ref \
-       test_graph_topo
+noinst_PROGRAMS = test_bt_values test_bt_uuid test_trace_ir_ref test_graph_topo
 
-test_bitfield_SOURCES = test_bitfield.c
 test_bt_values_SOURCES = test_bt_values.c
 test_bt_uuid_SOURCES = test_bt_uuid.c
 test_trace_ir_ref_SOURCES = test_trace_ir_ref.c
diff --git a/tests/lib/test_bitfield.c b/tests/lib/test_bitfield.c
deleted file mode 100644 (file)
index b9bd6d4..0000000
+++ /dev/null
@@ -1,719 +0,0 @@
-/*
- * test-bitfield.c
- *
- * BabelTrace - bitfield test program
- *
- * Copyright 2010-2019 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
- *
- * 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; under version 2 of the License.
- *
- * 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, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#include "compat/bitfield.h"
-#include <time.h>
-#include <stdlib.h>
-#include <stdio.h>
-
-#include <tap/tap.h>
-
-unsigned int glob;
-
-/*
- * This function is only declared to show the size of a bitfield write in
- * objdump.
- */
-void fct(void)
-{
-       bt_bitfield_write(&glob, unsigned int, 12, 15, 0x12345678);
-}
-
-/* Test array size, in bytes */
-#define TEST_LEN 128
-#define NR_TESTS 10
-#define SIGNED_INT_READ_TEST_DESC_FMT_STR "Writing and reading back 0x%X, signed int dest, varying read unit size"
-#define SIGNED_INT_WRITE_TEST_DESC_FMT_STR "Writing and reading back 0x%X, signed int source, varying write unit size"
-#define SIGNED_LONG_LONG_READ_TEST_DESC_FMT_STR "Writing and reading back 0x%llX, signed long long dest, varying read unit size"
-#define SIGNED_LONG_LONG_WRITE_TEST_DESC_FMT_STR "Writing and reading back 0x%llX, signed long long source, varying write unit size"
-#define UNSIGNED_INT_READ_TEST_DESC_FMT_STR "Writing and reading back 0x%X, unsigned int dest, varying read unit size"
-#define UNSIGNED_INT_WRITE_TEST_DESC_FMT_STR "Writing and reading back 0x%X, unsigned int source, varying write unit size"
-#define UNSIGNED_LONG_LONG_READ_TEST_DESC_FMT_STR "Writing and reading back 0x%llX, unsigned long long dest, varying read unit size"
-#define UNSIGNED_LONG_LONG_WRITE_TEST_DESC_FMT_STR "Writing and reading back 0x%llX, unsigned long long source, varying write unit size"
-#define DIAG_FMT_STR "Failed reading value written \"%s\"-wise, with start=%i" \
-       " and length=%i. Read %llX"
-
-static
-unsigned int fls_u64(uint64_t x)
-{
-       unsigned int r = 64;
-
-       if (!x)
-               return 0;
-
-       if (!(x & 0xFFFFFFFF00000000ULL)) {
-               x <<= 32;
-               r -= 32;
-       }
-       if (!(x & 0xFFFF000000000000ULL)) {
-               x <<= 16;
-               r -= 16;
-       }
-       if (!(x & 0xFF00000000000000ULL)) {
-               x <<= 8;
-               r -= 8;
-       }
-       if (!(x & 0xF000000000000000ULL)) {
-               x <<= 4;
-               r -= 4;
-       }
-       if (!(x & 0xC000000000000000ULL)) {
-               x <<= 2;
-               r -= 2;
-       }
-       if (!(x & 0x8000000000000000ULL)) {
-               x <<= 1;
-               r -= 1;
-       }
-       return r;
-}
-
-static
-unsigned int fls_u32(uint32_t x)
-{
-       unsigned int r = 32;
-
-       if (!x)
-               return 0;
-       if (!(x & 0xFFFF0000U)) {
-               x <<= 16;
-               r -= 16;
-       }
-       if (!(x & 0xFF000000U)) {
-               x <<= 8;
-               r -= 8;
-       }
-       if (!(x & 0xF0000000U)) {
-               x <<= 4;
-               r -= 4;
-       }
-       if (!(x & 0xC0000000U)) {
-               x <<= 2;
-               r -= 2;
-       }
-       if (!(x & 0x80000000U)) {
-               x <<= 1;
-               r -= 1;
-       }
-       return r;
-}
-
-#define print_byte_array(c, len)       \
-do {                                   \
-       unsigned long i;                \
-                                       \
-       for (i = 0; i < (len); i++) {   \
-               printf("0x%X", (c)[i]); \
-               if (i != (len) - 1)     \
-                       printf(" ");    \
-       }                               \
-       printf("\n");                   \
-} while (0)
-
-#define init_byte_array(c, len, val)   \
-do {                                   \
-       unsigned long i;                \
-                                       \
-       for (i = 0; i < (len); i++)     \
-               (c)[i] = (val);         \
-} while (0)
-
-#define check_result(ref, val, buffer, typename, start, len,           \
-               desc_fmt_str)                                           \
-({                                                                     \
-       if ((val) != (ref)) {                                           \
-               fail(desc_fmt_str, ref);                                \
-               diag(DIAG_FMT_STR, #typename, start, len, val);         \
-               printf("# ");                                           \
-               print_byte_array(buffer, TEST_LEN);                     \
-       }                                                               \
-       (val) != (ref);                                                 \
-})
-
-void run_test_unsigned_write(unsigned int src_ui, unsigned long long src_ull)
-{
-       unsigned int nrbits_ui, nrbits_ull;
-       union {
-               unsigned char c[TEST_LEN];
-               unsigned short s[TEST_LEN/sizeof(unsigned short)];
-               unsigned int i[TEST_LEN/sizeof(unsigned int)];
-               unsigned long l[TEST_LEN/sizeof(unsigned long)];
-               unsigned long long ll[TEST_LEN/sizeof(unsigned long long)];
-       } target;
-       unsigned long long readval;
-       unsigned int s, l;
-
-       /* The number of bits needed to represent 0 is 0. */
-       nrbits_ui = fls_u32(src_ui);
-
-       /* Write from unsigned integer src input. */
-       for (s = 0; s < CHAR_BIT * TEST_LEN; s++) {
-               for (l = nrbits_ui; l <= (CHAR_BIT * TEST_LEN) - s; l++) {
-                       init_byte_array(target.c, TEST_LEN, 0xFF);
-                       bt_bitfield_write(target.c, unsigned char, s, l, src_ui);
-                       bt_bitfield_read(target.c, unsigned char, s, l, &readval);
-                       if (check_result(src_ui, readval, target.c, unsigned char,
-                                       s, l, UNSIGNED_INT_WRITE_TEST_DESC_FMT_STR)) {
-                               return;
-                       }
-
-                       init_byte_array(target.c, TEST_LEN, 0xFF);
-                       bt_bitfield_write(target.s, unsigned short, s, l, src_ui);
-                       bt_bitfield_read(target.c, unsigned char, s, l, &readval);
-                       if (check_result(src_ui, readval, target.c, unsigned short,
-                                       s, l, UNSIGNED_INT_WRITE_TEST_DESC_FMT_STR)) {
-                               return;
-                       }
-
-                       init_byte_array(target.c, TEST_LEN, 0xFF);
-                       bt_bitfield_write(target.i, unsigned int, s, l, src_ui);
-                       bt_bitfield_read(target.c, unsigned char, s, l, &readval);
-                       if (check_result(src_ui, readval, target.c, unsigned int,
-                                       s, l, UNSIGNED_INT_WRITE_TEST_DESC_FMT_STR)) {
-                               return;
-                       }
-
-                       init_byte_array(target.c, TEST_LEN, 0xFF);
-                       bt_bitfield_write(target.l, unsigned long, s, l, src_ui);
-                       bt_bitfield_read(target.c, unsigned char, s, l, &readval);
-                       if (check_result(src_ui, readval, target.c, unsigned long,
-                                       s, l, UNSIGNED_INT_WRITE_TEST_DESC_FMT_STR)) {
-                               return;
-                       }
-
-                       init_byte_array(target.c, TEST_LEN, 0xFF);
-                       bt_bitfield_write(target.ll, unsigned long long, s, l, src_ui);
-                       bt_bitfield_read(target.c, unsigned char, s, l, &readval);
-                       if (check_result(src_ui, readval, target.c, unsigned long long,
-                                       s, l, UNSIGNED_INT_WRITE_TEST_DESC_FMT_STR)) {
-                               return;
-                       }
-               }
-       }
-       pass(UNSIGNED_INT_WRITE_TEST_DESC_FMT_STR, src_ui);
-
-       /* The number of bits needed to represent 0 is 0. */
-       nrbits_ull = fls_u64(src_ull);
-
-       /* Write from unsigned long long src input. */
-       for (s = 0; s < CHAR_BIT * TEST_LEN; s++) {
-               for (l = nrbits_ull; l <= (CHAR_BIT * TEST_LEN) - s; l++) {
-                       init_byte_array(target.c, TEST_LEN, 0xFF);
-                       bt_bitfield_write(target.c, unsigned char, s, l, src_ull);
-                       bt_bitfield_read(target.c, unsigned char, s, l, &readval);
-                       if (check_result(src_ull, readval, target.c, unsigned char,
-                                       s, l, UNSIGNED_LONG_LONG_WRITE_TEST_DESC_FMT_STR)) {
-                               return;
-                       }
-
-                       init_byte_array(target.c, TEST_LEN, 0xFF);
-                       bt_bitfield_write(target.s, unsigned short, s, l, src_ull);
-                       bt_bitfield_read(target.c, unsigned char, s, l, &readval);
-                       if (check_result(src_ull, readval, target.c, unsigned short,
-                                       s, l, UNSIGNED_LONG_LONG_WRITE_TEST_DESC_FMT_STR)) {
-                               return;
-                       }
-
-                       init_byte_array(target.c, TEST_LEN, 0xFF);
-                       bt_bitfield_write(target.i, unsigned int, s, l, src_ull);
-                       bt_bitfield_read(target.c, unsigned char, s, l, &readval);
-                       if (check_result(src_ull, readval, target.c, unsigned int,
-                                       s, l, UNSIGNED_LONG_LONG_WRITE_TEST_DESC_FMT_STR)) {
-                               return;
-                       }
-
-                       init_byte_array(target.c, TEST_LEN, 0xFF);
-                       bt_bitfield_write(target.l, unsigned long, s, l, src_ull);
-                       bt_bitfield_read(target.c, unsigned char, s, l, &readval);
-                       if (check_result(src_ull, readval, target.c, unsigned long,
-                                       s, l, UNSIGNED_LONG_LONG_WRITE_TEST_DESC_FMT_STR)) {
-                               return;
-                       }
-
-                       init_byte_array(target.c, TEST_LEN, 0xFF);
-                       bt_bitfield_write(target.ll, unsigned long long, s, l, src_ull);
-                       bt_bitfield_read(target.c, unsigned char, s, l, &readval);
-                       if (check_result(src_ull, readval, target.c, unsigned long long,
-                                       s, l, UNSIGNED_LONG_LONG_WRITE_TEST_DESC_FMT_STR)) {
-                               return;
-                       }
-               }
-       }
-       pass(UNSIGNED_LONG_LONG_WRITE_TEST_DESC_FMT_STR, src_ull);
-}
-
-void run_test_unsigned_read(unsigned int src_ui, unsigned long long src_ull)
-{
-       unsigned int nrbits_ui, nrbits_ull, readval_ui;
-       union {
-               unsigned char c[TEST_LEN];
-               unsigned short s[TEST_LEN/sizeof(unsigned short)];
-               unsigned int i[TEST_LEN/sizeof(unsigned int)];
-               unsigned long l[TEST_LEN/sizeof(unsigned long)];
-               unsigned long long ll[TEST_LEN/sizeof(unsigned long long)];
-       } target;
-       unsigned long long readval_ull;
-       unsigned int s, l;
-
-       /* The number of bits needed to represent 0 is 0. */
-       nrbits_ui = fls_u32(src_ui);
-
-       /* Read to unsigned integer readval output. */
-       for (s = 0; s < CHAR_BIT * TEST_LEN; s++) {
-               for (l = nrbits_ui; l <= (CHAR_BIT * TEST_LEN) - s; l++) {
-                       init_byte_array(target.c, TEST_LEN, 0xFF);
-                       bt_bitfield_write(target.c, unsigned char, s, l, src_ui);
-                       bt_bitfield_read(target.c, unsigned char, s, l, &readval_ui);
-                       if (check_result(src_ui, readval_ui, target.c, unsigned char,
-                                       s, l, UNSIGNED_INT_READ_TEST_DESC_FMT_STR)) {
-                               return;
-                       }
-
-                       init_byte_array(target.c, TEST_LEN, 0xFF);
-                       bt_bitfield_write(target.c, unsigned char, s, l, src_ui);
-                       bt_bitfield_read(target.s, unsigned short, s, l, &readval_ui);
-                       if (check_result(src_ui, readval_ui, target.c, unsigned short,
-                                       s, l, UNSIGNED_INT_READ_TEST_DESC_FMT_STR)) {
-                               return;
-                       }
-
-                       init_byte_array(target.c, TEST_LEN, 0xFF);
-                       bt_bitfield_write(target.c, unsigned char, s, l, src_ui);
-                       bt_bitfield_read(target.i, unsigned int, s, l, &readval_ui);
-                       if (check_result(src_ui, readval_ui, target.c, unsigned int,
-                                       s, l, UNSIGNED_INT_READ_TEST_DESC_FMT_STR)) {
-                               return;
-                       }
-
-                       init_byte_array(target.c, TEST_LEN, 0xFF);
-                       bt_bitfield_write(target.c, unsigned char, s, l, src_ui);
-                       bt_bitfield_read(target.l, unsigned long, s, l, &readval_ui);
-                       if (check_result(src_ui, readval_ui, target.c, unsigned long,
-                                       s, l, UNSIGNED_INT_READ_TEST_DESC_FMT_STR)) {
-                               return;
-                       }
-
-                       init_byte_array(target.c, TEST_LEN, 0xFF);
-                       bt_bitfield_write(target.c, unsigned char, s, l, src_ui);
-                       bt_bitfield_read(target.ll, unsigned long long, s, l, &readval_ui);
-                       if (check_result(src_ui, readval_ui, target.c, unsigned long long,
-                                       s, l, UNSIGNED_INT_READ_TEST_DESC_FMT_STR)) {
-                               return;
-                       }
-               }
-       }
-       pass(UNSIGNED_INT_READ_TEST_DESC_FMT_STR, src_ui);
-
-       /* The number of bits needed to represent 0 is 0. */
-       nrbits_ull = fls_u64(src_ull);
-
-       /* Read to unsigned long long readval output. */
-       for (s = 0; s < CHAR_BIT * TEST_LEN; s++) {
-               for (l = nrbits_ull; l <= (CHAR_BIT * TEST_LEN) - s; l++) {
-                       init_byte_array(target.c, TEST_LEN, 0xFF);
-                       bt_bitfield_write(target.c, unsigned char, s, l, src_ull);
-                       bt_bitfield_read(target.c, unsigned char, s, l, &readval_ull);
-                       if (check_result(src_ull, readval_ull, target.c, unsigned char,
-                                       s, l, UNSIGNED_LONG_LONG_READ_TEST_DESC_FMT_STR)) {
-                               return;
-                       }
-
-                       init_byte_array(target.c, TEST_LEN, 0xFF);
-                       bt_bitfield_write(target.c, unsigned char, s, l, src_ull);
-                       bt_bitfield_read(target.s, unsigned short, s, l, &readval_ull);
-                       if (check_result(src_ull, readval_ull, target.c, unsigned short,
-                                       s, l, UNSIGNED_LONG_LONG_READ_TEST_DESC_FMT_STR)) {
-                               return;
-                       }
-
-                       init_byte_array(target.c, TEST_LEN, 0xFF);
-                       bt_bitfield_write(target.c, unsigned char, s, l, src_ull);
-                       bt_bitfield_read(target.i, unsigned int, s, l, &readval_ull);
-                       if (check_result(src_ull, readval_ull, target.c, unsigned int,
-                                       s, l, UNSIGNED_LONG_LONG_READ_TEST_DESC_FMT_STR)) {
-                               return;
-                       }
-
-                       init_byte_array(target.c, TEST_LEN, 0xFF);
-                       bt_bitfield_write(target.c, unsigned char, s, l, src_ull);
-                       bt_bitfield_read(target.l, unsigned long, s, l, &readval_ull);
-                       if (check_result(src_ull, readval_ull, target.c, unsigned long,
-                                       s, l, UNSIGNED_LONG_LONG_READ_TEST_DESC_FMT_STR)) {
-                               return;
-                       }
-
-                       init_byte_array(target.c, TEST_LEN, 0xFF);
-                       bt_bitfield_write(target.c, unsigned char, s, l, src_ull);
-                       bt_bitfield_read(target.ll, unsigned long long, s, l, &readval_ull);
-                       if (check_result(src_ull, readval_ull, target.c, unsigned long long,
-                                       s, l, UNSIGNED_LONG_LONG_READ_TEST_DESC_FMT_STR)) {
-                               return;
-                       }
-               }
-       }
-       pass(UNSIGNED_LONG_LONG_READ_TEST_DESC_FMT_STR, src_ull);
-}
-
-void run_test_unsigned(unsigned int src_ui, unsigned long long src_ull)
-{
-       run_test_unsigned_write(src_ui, src_ull);
-       run_test_unsigned_read(src_ui, src_ull);
-}
-
-void run_test_signed_write(int src_i, long long src_ll)
-{
-       unsigned int nrbits_i, nrbits_ll;
-       union {
-               signed char c[TEST_LEN];
-               short s[TEST_LEN/sizeof(short)];
-               int i[TEST_LEN/sizeof(int)];
-               long l[TEST_LEN/sizeof(long)];
-               long long ll[TEST_LEN/sizeof(long long)];
-       } target;
-       long long readval;
-       unsigned int s, l;
-
-       if (!src_i)
-               nrbits_i = 0;                   /* The number of bits needed to represent 0 is 0. */
-       else if (src_i & 0x80000000U)
-               nrbits_i = fls_u32(~src_i) + 1; /* Find least significant bit conveying sign */
-       else
-               nrbits_i = fls_u32(src_i) + 1;  /* Keep sign at 0 */
-
-       /* Write from signed integer src input. */
-       for (s = 0; s < CHAR_BIT * TEST_LEN; s++) {
-               for (l = nrbits_i; l <= (CHAR_BIT * TEST_LEN) - s; l++) {
-                       init_byte_array(target.c, TEST_LEN, 0x0);
-                       bt_bitfield_write(target.c, signed char, s, l, src_i);
-                       bt_bitfield_read(target.c, signed char, s, l, &readval);
-                       if (check_result(src_i, readval, target.c, signed char,
-                                       s, l, SIGNED_INT_WRITE_TEST_DESC_FMT_STR)) {
-                               return;
-                       }
-
-                       init_byte_array(target.c, TEST_LEN, 0x0);
-                       bt_bitfield_write(target.s, short, s, l, src_i);
-                       bt_bitfield_read(target.c, signed char, s, l, &readval);
-                       if (check_result(src_i, readval, target.c, short,
-                                       s, l, SIGNED_INT_WRITE_TEST_DESC_FMT_STR)) {
-                               return;
-                       }
-
-                       init_byte_array(target.c, TEST_LEN, 0x0);
-                       bt_bitfield_write(target.i, int, s, l, src_i);
-                       bt_bitfield_read(target.c, signed char, s, l, &readval);
-                       if (check_result(src_i, readval, target.c, int,
-                                       s, l, SIGNED_INT_WRITE_TEST_DESC_FMT_STR)) {
-                               return;
-                       }
-
-                       init_byte_array(target.c, TEST_LEN, 0x0);
-                       bt_bitfield_write(target.l, long, s, l, src_i);
-                       bt_bitfield_read(target.c, signed char, s, l, &readval);
-                       if (check_result(src_i, readval, target.c, long,
-                                       s, l, SIGNED_INT_WRITE_TEST_DESC_FMT_STR)) {
-                               return;
-                       }
-
-                       init_byte_array(target.c, TEST_LEN, 0x0);
-                       bt_bitfield_write(target.ll, long long, s, l, src_i);
-                       bt_bitfield_read(target.c, signed char, s, l, &readval);
-                       if (check_result(src_i, readval, target.c, long long,
-                                       s, l, SIGNED_INT_WRITE_TEST_DESC_FMT_STR)) {
-                               return;
-                       }
-               }
-       }
-       pass(SIGNED_INT_WRITE_TEST_DESC_FMT_STR, src_i);
-
-       if (!src_ll)
-               nrbits_ll = 0;                          /* The number of bits needed to represent 0 is 0. */
-       else if (src_ll & 0x8000000000000000ULL)
-               nrbits_ll = fls_u64(~src_ll) + 1;       /* Find least significant bit conveying sign */
-       else
-               nrbits_ll = fls_u64(src_ll) + 1;        /* Keep sign at 0 */
-
-       /* Write from signed long long src input. */
-       for (s = 0; s < CHAR_BIT * TEST_LEN; s++) {
-               for (l = nrbits_ll; l <= (CHAR_BIT * TEST_LEN) - s; l++) {
-                       init_byte_array(target.c, TEST_LEN, 0x0);
-                       bt_bitfield_write(target.c, signed char, s, l, src_ll);
-                       bt_bitfield_read(target.c, signed char, s, l, &readval);
-                       if (check_result(src_ll, readval, target.c, signed char,
-                                       s, l, SIGNED_LONG_LONG_WRITE_TEST_DESC_FMT_STR)) {
-                               return;
-                       }
-
-                       init_byte_array(target.c, TEST_LEN, 0x0);
-                       bt_bitfield_write(target.s, short, s, l, src_ll);
-                       bt_bitfield_read(target.c, signed char, s, l, &readval);
-                       if (check_result(src_ll, readval, target.c, short,
-                                       s, l, SIGNED_LONG_LONG_WRITE_TEST_DESC_FMT_STR)) {
-                               return;
-                       }
-
-                       init_byte_array(target.c, TEST_LEN, 0x0);
-                       bt_bitfield_write(target.i, int, s, l, src_ll);
-                       bt_bitfield_read(target.c, signed char, s, l, &readval);
-                       if (check_result(src_ll, readval, target.c, int,
-                                       s, l, SIGNED_LONG_LONG_WRITE_TEST_DESC_FMT_STR)) {
-                               return;
-                       }
-
-                       init_byte_array(target.c, TEST_LEN, 0x0);
-                       bt_bitfield_write(target.l, long, s, l, src_ll);
-                       bt_bitfield_read(target.c, signed char, s, l, &readval);
-                       if (check_result(src_ll, readval, target.c, long,
-                                       s, l, SIGNED_LONG_LONG_WRITE_TEST_DESC_FMT_STR)) {
-                               return;
-                       }
-
-                       init_byte_array(target.c, TEST_LEN, 0x0);
-                       bt_bitfield_write(target.ll, long long, s, l, src_ll);
-                       bt_bitfield_read(target.c, signed char, s, l, &readval);
-                       if (check_result(src_ll, readval, target.c, long long,
-                                       s, l, SIGNED_LONG_LONG_WRITE_TEST_DESC_FMT_STR)) {
-                               return;
-                       }
-               }
-       }
-       pass(SIGNED_LONG_LONG_WRITE_TEST_DESC_FMT_STR, src_ll);
-}
-
-void run_test_signed_read(int src_i, long long src_ll)
-{
-       unsigned int nrbits_i, nrbits_ll;
-       int readval_i;
-       union {
-               unsigned char c[TEST_LEN];
-               unsigned short s[TEST_LEN/sizeof(unsigned short)];
-               unsigned int i[TEST_LEN/sizeof(unsigned int)];
-               unsigned long l[TEST_LEN/sizeof(unsigned long)];
-               unsigned long long ll[TEST_LEN/sizeof(unsigned long long)];
-       } target;
-       long long readval_ll;
-       unsigned int s, l;
-
-       if (!src_i)
-               nrbits_i = 0;                   /* The number of bits needed to represent 0 is 0. */
-       else if (src_i & 0x80000000U)
-               nrbits_i = fls_u32(~src_i) + 1; /* Find least significant bit conveying sign */
-       else
-               nrbits_i = fls_u32(src_i) + 1;  /* Keep sign at 0 */
-
-       /* Read to signed integer readval output. */
-       for (s = 0; s < CHAR_BIT * TEST_LEN; s++) {
-               for (l = nrbits_i; l <= (CHAR_BIT * TEST_LEN) - s; l++) {
-                       init_byte_array(target.c, TEST_LEN, 0xFF);
-                       bt_bitfield_write(target.c, signed char, s, l, src_i);
-                       bt_bitfield_read(target.c, signed char, s, l, &readval_i);
-                       if (check_result(src_i, readval_i, target.c, signed char,
-                                       s, l, SIGNED_INT_READ_TEST_DESC_FMT_STR)) {
-                               return;
-                       }
-
-                       init_byte_array(target.c, TEST_LEN, 0xFF);
-                       bt_bitfield_write(target.c, signed char, s, l, src_i);
-                       bt_bitfield_read(target.s, short, s, l, &readval_i);
-                       if (check_result(src_i, readval_i, target.c, short,
-                                       s, l, SIGNED_INT_READ_TEST_DESC_FMT_STR)) {
-                               return;
-                       }
-
-                       init_byte_array(target.c, TEST_LEN, 0xFF);
-                       bt_bitfield_write(target.c, signed char, s, l, src_i);
-                       bt_bitfield_read(target.i, int, s, l, &readval_i);
-                       if (check_result(src_i, readval_i, target.c, int,
-                                       s, l, SIGNED_INT_READ_TEST_DESC_FMT_STR)) {
-                               return;
-                       }
-
-                       init_byte_array(target.c, TEST_LEN, 0xFF);
-                       bt_bitfield_write(target.c, signed char, s, l, src_i);
-                       bt_bitfield_read(target.l, long, s, l, &readval_i);
-                       if (check_result(src_i, readval_i, target.c, long,
-                                       s, l, SIGNED_INT_READ_TEST_DESC_FMT_STR)) {
-                               return;
-                       }
-
-                       init_byte_array(target.c, TEST_LEN, 0xFF);
-                       bt_bitfield_write(target.c, signed char, s, l, src_i);
-                       bt_bitfield_read(target.ll, long long, s, l, &readval_i);
-                       if (check_result(src_i, readval_i, target.c, long long,
-                                       s, l, SIGNED_INT_READ_TEST_DESC_FMT_STR)) {
-                               return;
-                       }
-               }
-       }
-       pass(SIGNED_INT_READ_TEST_DESC_FMT_STR, src_i);
-
-       if (!src_ll)
-               nrbits_ll = 0;                          /* The number of bits needed to represent 0 is 0. */
-       if (src_ll & 0x8000000000000000ULL)
-               nrbits_ll = fls_u64(~src_ll) + 1;       /* Find least significant bit conveying sign */
-       else
-               nrbits_ll = fls_u64(src_ll) + 1;        /* Keep sign at 0 */
-
-       /* Read to signed long long readval output. */
-       for (s = 0; s < CHAR_BIT * TEST_LEN; s++) {
-               for (l = nrbits_ll; l <= (CHAR_BIT * TEST_LEN) - s; l++) {
-                       init_byte_array(target.c, TEST_LEN, 0xFF);
-                       bt_bitfield_write(target.c, signed char, s, l, src_ll);
-                       bt_bitfield_read(target.c, signed char, s, l, &readval_ll);
-                       if (check_result(src_ll, readval_ll, target.c, signed char,
-                                       s, l, SIGNED_LONG_LONG_READ_TEST_DESC_FMT_STR)) {
-                               return;
-                       }
-
-                       init_byte_array(target.c, TEST_LEN, 0xFF);
-                       bt_bitfield_write(target.c, signed char, s, l, src_ll);
-                       bt_bitfield_read(target.s, short, s, l, &readval_ll);
-                       if (check_result(src_ll, readval_ll, target.c, short,
-                                       s, l, SIGNED_LONG_LONG_READ_TEST_DESC_FMT_STR)) {
-                               return;
-                       }
-
-                       init_byte_array(target.c, TEST_LEN, 0xFF);
-                       bt_bitfield_write(target.c, signed char, s, l, src_ll);
-                       bt_bitfield_read(target.i, int, s, l, &readval_ll);
-                       if (check_result(src_ll, readval_ll, target.c, int,
-                                       s, l, SIGNED_LONG_LONG_READ_TEST_DESC_FMT_STR)) {
-                               return;
-                       }
-
-                       init_byte_array(target.c, TEST_LEN, 0xFF);
-                       bt_bitfield_write(target.c, signed char, s, l, src_ll);
-                       bt_bitfield_read(target.l, long, s, l, &readval_ll);
-                       if (check_result(src_ll, readval_ll, target.c, long,
-                                       s, l, SIGNED_LONG_LONG_READ_TEST_DESC_FMT_STR)) {
-                               return;
-                       }
-
-                       init_byte_array(target.c, TEST_LEN, 0xFF);
-                       bt_bitfield_write(target.c, signed char, s, l, src_ll);
-                       bt_bitfield_read(target.ll, long long, s, l, &readval_ll);
-                       if (check_result(src_ll, readval_ll, target.c, long long,
-                                       s, l, SIGNED_LONG_LONG_READ_TEST_DESC_FMT_STR)) {
-                               return;
-                       }
-               }
-       }
-       pass(SIGNED_LONG_LONG_READ_TEST_DESC_FMT_STR, src_ll);
-}
-
-void run_test_signed(int src_i, long long src_ll)
-{
-       run_test_signed_write(src_i, src_ll);
-       run_test_signed_read(src_i, src_ll);
-}
-
-void run_test(void)
-{
-       int i;
-
-       plan_tests(NR_TESTS * 8 + 24);
-
-       srand(time(NULL));
-
-       run_test_unsigned(0, 0);
-       run_test_signed(0, 0);
-       run_test_unsigned(1, 1);
-       run_test_unsigned(~0U, ~0ULL);
-       run_test_signed(-1U, -1ULL);
-       run_test_signed(0x80000000U, 0x8000000000000000ULL);
-
-       for (i = 0; i < NR_TESTS; i++) {
-               unsigned int src_ui = rand();
-               unsigned long long src_ull = ((unsigned long long) (unsigned int) rand() << 32) |
-                               (unsigned long long) (unsigned int) rand();
-
-               run_test_unsigned(src_ui, src_ull);
-               run_test_signed((int) src_ui, (long long) src_ull);
-       }
-}
-
-static
-int print_encodings(unsigned long src, unsigned int shift, unsigned int len)
-{
-       union {
-               unsigned char c[8];
-               unsigned short s[4];
-               unsigned int i[2];
-               unsigned long l[2];
-               unsigned long long ll[1];
-       } target;
-       unsigned long long readval;
-
-       init_byte_array(target.c, 8, 0xFF);
-       bt_bitfield_write(target.c, unsigned char, shift, len, src);
-       printf("bytewise\n");
-       print_byte_array(target.c, 8);
-
-       init_byte_array(target.c, 8, 0xFF);
-       bt_bitfield_write(target.s, unsigned short, shift, len, src);
-       printf("shortwise\n");
-       print_byte_array(target.c, 8);
-
-       init_byte_array(target.c, 8, 0xFF);
-       bt_bitfield_write(target.i, unsigned int, shift, len, src);
-       printf("intwise\n");
-       print_byte_array(target.c, 8);
-
-       init_byte_array(target.c, 8, 0xFF);
-       bt_bitfield_write(target.l, unsigned long, shift, len, src);
-       printf("longwise\n");
-       print_byte_array(target.c, 8);
-
-       init_byte_array(target.c, 8, 0xFF);
-       bt_bitfield_write(target.ll, unsigned long long, shift, len, src);
-       printf("lluwise\n");
-       print_byte_array(target.c, 8);
-
-       bt_bitfield_read(target.c, unsigned char, shift, len, &readval);
-       printf("read: %llX\n", readval);
-       print_byte_array(target.c, 8);
-
-       return 0;
-}
-
-int main(int argc, char **argv)
-{
-       if (argc > 1) {
-               /* Print encodings */
-               unsigned long src;
-               unsigned int shift, len;
-
-               src = atoi(argv[1]);
-               if (argc > 2)
-                       shift = atoi(argv[2]);
-               else
-                       shift = 12;
-               if (argc > 3)
-                       len = atoi(argv[3]);
-               else
-                       len = 40;
-               return print_encodings(src, shift, len);
-       }
-
-       /* Run tap-formated tests */
-       run_test();
-       return exit_status();
-}
This page took 0.042605 seconds and 4 git commands to generate.