When RTE_EFD_VALUE_NUM_BITS is 32, there was a compilation issue
because of an overflow:
app/test/test_efd.c:157:55: error: overflow in expression;
result is
2147483647 with type 'int' [-Werror,-Winteger-overflow]
data[0] = mrand48() & ((1 << RTE_EFD_VALUE_NUM_BITS) - 1);
This commit fixes the issue by using a setting a different
macro VALUE_BITMASK with a conditional
Fixes:
0e925aef2779 ("app/test: add EFD functional and perf tests")
Reported-by: Yong Liu <yong.liu@intel.com>
Signed-off-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>
#define EFD_TEST_KEY_LEN 8
#define TABLE_SIZE (1 << 21)
#define ITERATIONS 3
#define EFD_TEST_KEY_LEN 8
#define TABLE_SIZE (1 << 21)
#define ITERATIONS 3
+
+#if RTE_EFD_VALUE_NUM_BITS == 32
+#define VALUE_BITMASK 0xffffffff
+#else
+#define VALUE_BITMASK ((1 << RTE_EFD_VALUE_NUM_BITS) - 1)
+#endif
static unsigned int test_socket_id;
/* 5-tuple key type */
static unsigned int test_socket_id;
/* 5-tuple key type */
efd_get_all_sockets_bitmask(), test_socket_id);
TEST_ASSERT_NOT_NULL(handle, "Error creating the EFD table\n");
efd_get_all_sockets_bitmask(), test_socket_id);
TEST_ASSERT_NOT_NULL(handle, "Error creating the EFD table\n");
- data[0] = mrand48() & ((1 << RTE_EFD_VALUE_NUM_BITS) - 1);
+ data[0] = mrand48() & VALUE_BITMASK;
TEST_ASSERT_SUCCESS(rte_efd_update(handle, test_socket_id, &keys[0],
data[0]),
"Error inserting the key");
TEST_ASSERT_SUCCESS(rte_efd_update(handle, test_socket_id, &keys[0],
data[0]),
"Error inserting the key");
printf("Entering %s\n", __func__);
/* test with standard add/lookup/delete functions */
efd_value_t prev_value;
printf("Entering %s\n", __func__);
/* test with standard add/lookup/delete functions */
efd_value_t prev_value;
- data[1] = mrand48() & ((1 << RTE_EFD_VALUE_NUM_BITS) - 1);
+ data[1] = mrand48() & VALUE_BITMASK;
handle = rte_efd_create("test_add_update_delete", TABLE_SIZE,
sizeof(struct flow_key),
handle = rte_efd_create("test_add_update_delete", TABLE_SIZE,
sizeof(struct flow_key),
/* Setup data */
for (i = 0; i < 5; i++)
/* Setup data */
for (i = 0; i < 5; i++)
- data[i] = mrand48() & ((1 << RTE_EFD_VALUE_NUM_BITS) - 1);
+ data[i] = mrand48() & VALUE_BITMASK;
/* Add */
for (i = 0; i < 5; i++) {
/* Add */
for (i = 0; i < 5; i++) {
#include <rte_thash.h>
#include "test.h"
#include <rte_thash.h>
#include "test.h"
#define NUM_KEYSIZES 10
#define NUM_SHUFFLES 10
#define MAX_KEYSIZE 64
#define MAX_ENTRIES (1 << 19)
#define KEYS_TO_ADD (MAX_ENTRIES * 3 / 4) /* 75% table utilization */
#define NUM_LOOKUPS (KEYS_TO_ADD * 5) /* Loop among keys added, several times */
#define NUM_KEYSIZES 10
#define NUM_SHUFFLES 10
#define MAX_KEYSIZE 64
#define MAX_ENTRIES (1 << 19)
#define KEYS_TO_ADD (MAX_ENTRIES * 3 / 4) /* 75% table utilization */
#define NUM_LOOKUPS (KEYS_TO_ADD * 5) /* Loop among keys added, several times */
+
+#if RTE_EFD_VALUE_NUM_BITS == 32
+#define VALUE_BITMASK 0xffffffff
+#else
+#define VALUE_BITMASK ((1 << RTE_EFD_VALUE_NUM_BITS) - 1)
+#endif
static unsigned int test_socket_id;
static inline uint8_t efd_get_all_sockets_bitmask(void)
static unsigned int test_socket_id;
static inline uint8_t efd_get_all_sockets_bitmask(void)
for (j = 0; j < params->key_size; j++)
keys[i][j] = rte_rand() & 0xFF;
for (j = 0; j < params->key_size; j++)
keys[i][j] = rte_rand() & 0xFF;
- data[i] = rte_rand() & ((1 << RTE_EFD_VALUE_NUM_BITS) - 1);
+ data[i] = rte_rand() & VALUE_BITMASK;
}
/* Remove duplicates from the keys array */
}
/* Remove duplicates from the keys array */