From 5120203d753fe82305a7014706f54d973b8860cd Mon Sep 17 00:00:00 2001 From: Pavan Nikhilesh Date: Tue, 20 Mar 2018 18:54:34 +0530 Subject: [PATCH] eal: add macros to align value to multiple Add macros to align given value to the multiple of the supplied integer. Signed-off-by: Pavan Nikhilesh --- lib/librte_eal/common/include/rte_common.h | 16 ++++++++++++++++ test/test/test_common.c | 12 ++++++++++++ 2 files changed, 28 insertions(+) diff --git a/lib/librte_eal/common/include/rte_common.h b/lib/librte_eal/common/include/rte_common.h index c7803e41c1..4469affb90 100644 --- a/lib/librte_eal/common/include/rte_common.h +++ b/lib/librte_eal/common/include/rte_common.h @@ -190,6 +190,22 @@ static void __attribute__((constructor(prio), used)) func(void) */ #define RTE_ALIGN(val, align) RTE_ALIGN_CEIL(val, align) +/** + * Macro to align a value to the multiple of given value. The resultant + * value will be of the same type as the first parameter and will be no lower + * than the first parameter. + */ +#define RTE_ALIGN_MUL_CEIL(v, mul) \ + (((v + (typeof(v))(mul) - 1) / ((typeof(v))(mul))) * (typeof(v))(mul)) + +/** + * Macro to align a value to the multiple of given value. The resultant + * value will be of the same type as the first parameter and will be no higher + * than the first parameter. + */ +#define RTE_ALIGN_MUL_FLOOR(v, mul) \ + ((v / ((typeof(v))(mul))) * (typeof(v))(mul)) + /** * Checks if a pointer is aligned to a given power-of-two value * diff --git a/test/test/test_common.c b/test/test/test_common.c index d0342430f4..e43cba49b5 100644 --- a/test/test/test_common.c +++ b/test/test/test_common.c @@ -128,6 +128,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; } -- 2.20.1