New upstream version 18.11-rc3

[deb_dpdk.git] / test / test / test_common.c

diff --git a/test/test/test_common.c b/test/test/test_common.c
index d034243..c6d17ba 100644 (file)
--- a/test/test/test_common.c
+++ b/test/test/test_common.c
@@ -3,6 +3,7 @@
  */
 
 #include <stdio.h>
+#include <inttypes.h>
 #include <string.h>
 #include <math.h>
 #include <rte_common.h>
@@ -70,6 +71,9 @@ test_align(void)
 #define FAIL_ALIGN(x, i, p)\
        {printf(x "() test failed: %u %u\n", i, p);\
        return -1;}
+#define FAIL_ALIGN64(x, j, q)\
+       {printf(x "() test failed: %"PRIu64" %"PRIu64"\n", j, q);\
+       return -1; }
 #define ERROR_FLOOR(res, i, pow) \
                (res % pow) ||                                          /* check if not aligned */ \
                ((res / pow) != (i / pow))              /* check if correct alignment */
@@ -80,6 +84,7 @@ test_align(void)
                        val / pow != (i / pow) + 1)             /* if not aligned, hence +1 */
 
        uint32_t i, p, val;
+       uint64_t j, q;
 
        for (i = 1, p = 1; i <= MAX_NUM; i ++) {
                if (rte_align32pow2(i) != p)
@@ -88,6 +93,27 @@ test_align(void)
                        p <<= 1;
        }
 
+       for (i = 1, p = 1; i <= MAX_NUM; i++) {
+               if (rte_align32prevpow2(i) != p)
+                       FAIL_ALIGN("rte_align32prevpow2", i, p);
+               if (rte_is_power_of_2(i + 1))
+                       p = i + 1;
+       }
+
+       for (j = 1, q = 1; j <= MAX_NUM ; j++) {
+               if (rte_align64pow2(j) != q)
+                       FAIL_ALIGN64("rte_align64pow2", j, q);
+               if (j == q)
+                       q <<= 1;
+       }
+
+       for (j = 1, q = 1; j <= MAX_NUM ; j++) {
+               if (rte_align64prevpow2(j) != q)
+                       FAIL_ALIGN64("rte_align64prevpow2", j, q);
+               if (rte_is_power_of_2(j + 1))
+                       q = j + 1;
+       }
+
        for (p = 2; p <= MAX_NUM; p <<= 1) {
 
                if (!rte_is_power_of_2(p))
@@ -128,6 +154,18 @@ test_align(void)
                                FAIL("rte_is_aligned");
                }
        }
+
+       for (p = 1; p <= MAX_NUM / 2; p++) {
+               for (i = 1; i <= MAX_NUM / 2; i++) {
+                       val = RTE_ALIGN_MUL_CEIL(i, p);
+                       if (val % p != 0 || val < i)
+                               FAIL_ALIGN("RTE_ALIGN_MUL_CEIL", i, p);
+                       val = RTE_ALIGN_MUL_FLOOR(i, p);
+                       if (val % p != 0 || val > i)
+                               FAIL_ALIGN("RTE_ALIGN_MUL_FLOOR", i, p);
+               }
+       }
+
        return 0;
 }
 
@@ -150,6 +188,37 @@ test_log2(void)
        return 0;
 }
 
+static int
+test_fls(void)
+{
+       struct fls_test_vector {
+               uint32_t arg;
+               int rc;
+       };
+       int expected, rc;
+       uint32_t i, arg;
+
+       const struct fls_test_vector test[] = {
+               {0x0, 0},
+               {0x1, 1},
+               {0x4000, 15},
+               {0x80000000, 32},
+       };
+
+       for (i = 0; i < RTE_DIM(test); i++) {
+               arg = test[i].arg;
+               rc = rte_fls_u32(arg);
+               expected = test[i].rc;
+               if (rc != expected) {
+                       printf("Wrong rte_fls_u32(0x%x) rc=%d, expected=%d\n",
+                               arg, rc, expected);
+                       return TEST_FAILED;
+               }
+       }
+
+       return 0;
+}
+
 static int
 test_common(void)
 {
@@ -158,6 +227,7 @@ test_common(void)
        ret |= test_macros(0);
        ret |= test_misc();
        ret |= test_log2();
+       ret |= test_fls();
 
        return ret;
 }