From: Anatoly Burakov <anatoly.burakov@intel.com>
To: dev@dpdk.org
Cc: thomas@monjalon.net, jasvinder.singh@intel.com,
cristian.dumitrescu@intel.com, jerin.jacob@caviumnetworks.com
Subject: [dpdk-dev] [PATCH 6/6] test/common: extend autotest to newly added functions
Date: Tue, 11 Dec 2018 17:57:14 +0000 [thread overview]
Message-ID: <271055f8b29eafbf0638fcf63e3eac9ef323bc1e.1544550999.git.anatoly.burakov@intel.com> (raw)
In-Reply-To: <1cf22c82b6ca7561966be674afb8a02add0913b9.1544550999.git.anatoly.burakov@intel.com>
In-Reply-To: <1cf22c82b6ca7561966be674afb8a02add0913b9.1544550999.git.anatoly.burakov@intel.com>
Add a new autotest for bsf32, bsf64, bsf32_safe and bsf64_safe
functions, and extend existing fls and log2 autotests to also
cover 64-bit versions.
Signed-off-by: Anatoly Burakov <anatoly.burakov@intel.com>
---
test/test/test_common.c | 82 +++++++++++++++++++++++++++++++++++++++--
1 file changed, 79 insertions(+), 3 deletions(-)
diff --git a/test/test/test_common.c b/test/test/test_common.c
index c6d17baae..94d367471 100644
--- a/test/test/test_common.c
+++ b/test/test/test_common.c
@@ -50,12 +50,48 @@ test_macros(int __rte_unused unused_parm)
return 0;
}
+static int
+test_bsf(void)
+{
+ uint32_t shift, pos;
+
+ /* safe versions should be able to handle 0 */
+ if (rte_bsf32_safe(0, &pos) != 0)
+ FAIL("rte_bsf32_safe");
+ if (rte_bsf64_safe(0, &pos) != 0)
+ FAIL("rte_bsf64_safe");
+
+ for (shift = 0; shift < 63; shift++) {
+ uint32_t val32;
+ uint64_t val64;
+
+ val64 = 1ULL << shift;
+ if ((uint32_t)rte_bsf64(val64) != shift)
+ FAIL("rte_bsf64");
+ if (rte_bsf64_safe(val64, &pos) != 1)
+ FAIL("rte_bsf64_safe");
+ if (pos != shift)
+ FAIL("rte_bsf64_safe");
+
+ if (shift > 31)
+ continue;
+
+ val32 = 1U << shift;
+ if ((uint32_t)rte_bsf32(val32) != shift)
+ FAIL("rte_bsf32");
+ if (rte_bsf32_safe(val32, &pos) != 1)
+ FAIL("rte_bsf32_safe");
+ if (pos != shift)
+ FAIL("rte_bsf32_safe");
+ }
+
+ return 0;
+}
+
static int
test_misc(void)
{
char memdump[] = "memdump_test";
- if (rte_bsf32(129))
- FAIL("rte_bsf32");
rte_memdump(stdout, "test", memdump, sizeof(memdump));
rte_hexdump(stdout, "test", memdump, sizeof(memdump));
@@ -177,13 +213,31 @@ test_log2(void)
const uint32_t step = 1;
for (i = 0; i < max; i = i + step) {
+ uint64_t i64;
+
+ /* extend range for 64-bit */
+ i64 = (uint64_t)i << 32;
+ base = (uint32_t)ceilf(log2(i64));
+ compare = rte_log2_u64(i64);
+ if (base != compare) {
+ printf("Wrong rte_log2_u64(%" PRIx64 ") val %x, expected %x\n",
+ i64, compare, base);
+ return TEST_FAILED;
+ }
+
base = (uint32_t)ceilf(log2((uint32_t)i));
- compare = rte_log2_u32(i);
+ compare = rte_log2_u32((uint32_t)i);
if (base != compare) {
printf("Wrong rte_log2_u32(%x) val %x, expected %x\n",
i, compare, base);
return TEST_FAILED;
}
+ compare = rte_log2_u64((uint64_t)i);
+ if (base != compare) {
+ printf("Wrong rte_log2_u64(%x) val %x, expected %x\n",
+ i, compare, base);
+ return TEST_FAILED;
+ }
}
return 0;
}
@@ -206,6 +260,8 @@ test_fls(void)
};
for (i = 0; i < RTE_DIM(test); i++) {
+ uint64_t arg64;
+
arg = test[i].arg;
rc = rte_fls_u32(arg);
expected = test[i].rc;
@@ -214,6 +270,25 @@ test_fls(void)
arg, rc, expected);
return TEST_FAILED;
}
+ /* 64-bit version */
+ arg = test[i].arg;
+ rc = rte_fls_u64(arg);
+ expected = test[i].rc;
+ if (rc != expected) {
+ printf("Wrong rte_fls_u64(0x%x) rc=%d, expected=%d\n",
+ arg, rc, expected);
+ return TEST_FAILED;
+ }
+ /* 64-bit version shifted by 32 bits */
+ arg64 = (uint64_t)test[i].arg << 32;
+ rc = rte_fls_u64(arg64);
+ /* don't shift zero */
+ expected = test[i].rc == 0 ? 0 : test[i].rc + 32;
+ if (rc != expected) {
+ printf("Wrong rte_fls_u64(0x%" PRIx64 ") rc=%d, expected=%d\n",
+ arg64, rc, expected);
+ return TEST_FAILED;
+ }
}
return 0;
@@ -226,6 +301,7 @@ test_common(void)
ret |= test_align();
ret |= test_macros(0);
ret |= test_misc();
+ ret |= test_bsf();
ret |= test_log2();
ret |= test_fls();
--
2.17.1
next prev parent reply other threads:[~2018-12-11 17:57 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-11 17:57 [dpdk-dev] [PATCH 1/6] bitmap: remove deprecated bsf64 function Anatoly Burakov
2018-12-11 17:57 ` [dpdk-dev] [PATCH 2/6] common: add bsf64 function similar to existing bsf32 Anatoly Burakov
2018-12-20 9:08 ` Thomas Monjalon
2018-12-11 17:57 ` [dpdk-dev] [PATCH 3/6] common: add missing implementations Anatoly Burakov
2018-12-20 9:09 ` Thomas Monjalon
2018-12-20 9:16 ` Burakov, Anatoly
2018-12-11 17:57 ` [dpdk-dev] [PATCH 4/6] memalloc: use library implementation of 64-bit log2 Anatoly Burakov
2018-12-11 17:57 ` [dpdk-dev] [PATCH 5/6] testpmd: " Anatoly Burakov
2018-12-12 11:22 ` Iremonger, Bernard
2018-12-11 17:57 ` Anatoly Burakov [this message]
2018-12-20 12:07 ` [dpdk-dev] [PATCH v2] common: add 64-bit log2 function Anatoly Burakov
2018-12-20 12:10 ` Burakov, Anatoly
2018-12-20 12:09 ` [dpdk-dev] [PATCH v2 1/4] bitmap: remove deprecated bsf64 function Anatoly Burakov
2018-12-20 23:44 ` Thomas Monjalon
2018-12-20 12:09 ` [dpdk-dev] [PATCH v2 2/4] common: add bsf64 and bsf32_safe functions Anatoly Burakov
2018-12-20 12:09 ` [dpdk-dev] [PATCH v2 3/4] common: add 64-bit fls function Anatoly Burakov
2018-12-20 12:09 ` [dpdk-dev] [PATCH v2 4/4] common: add 64-bit log2 function Anatoly Burakov
2018-12-20 22:37 ` Thomas Monjalon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=271055f8b29eafbf0638fcf63e3eac9ef323bc1e.1544550999.git.anatoly.burakov@intel.com \
--to=anatoly.burakov@intel.com \
--cc=cristian.dumitrescu@intel.com \
--cc=dev@dpdk.org \
--cc=jasvinder.singh@intel.com \
--cc=jerin.jacob@caviumnetworks.com \
--cc=thomas@monjalon.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).