git-lng-odp

git-lng-odp@lists.linaro.org

1 participants
1207 discussions

[COMMIT] branch master updated. v1.19.0.1_tigermoth-105-g0ebd57ab

by git＠git-us.linaro.org

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, master has been updated via 0ebd57ab0ea8e1a95cdb8a564fcaec4cad6231e7 (commit) from a7c60d702466bc0f9de64993446e8ec39a16de88 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 0ebd57ab0ea8e1a95cdb8a564fcaec4cad6231e7 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Mon Jun 25 11:18:51 2018 +0300 linux-gen: use common posix extensions header Use odp_posix_extensions.h inside ODP implementation to ensure that (when extensions are used) the same level of POSIX extensions is used everywhere. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/odp_traffic_mngr.c b/platform/linux-generic/odp_traffic_mngr.c index abd9cffc..a89c5a2b 100644 --- a/platform/linux-generic/odp_traffic_mngr.c +++ b/platform/linux-generic/odp_traffic_mngr.c @@ -7,10 +7,8 @@ */ #include "config.h" +#include <odp_posix_extensions.h> -#ifndef _GNU_SOURCE -#define _GNU_SOURCE -#endif #include <stdint.h> #include <string.h> #include <malloc.h> diff --git a/platform/linux-generic/pktio/ethtool_rss.c b/platform/linux-generic/pktio/ethtool_rss.c index e1ba33aa..1ad9c970 100644 --- a/platform/linux-generic/pktio/ethtool_rss.c +++ b/platform/linux-generic/pktio/ethtool_rss.c @@ -5,10 +5,7 @@ */ #include "config.h" - -#ifndef _GNU_SOURCE -#define _GNU_SOURCE -#endif +#include <odp_posix_extensions.h> #include <stdio.h> #include <stdlib.h> diff --git a/platform/linux-generic/pktio/socket_common.c b/platform/linux-generic/pktio/socket_common.c index edb4bcf3..f5bf9e00 100644 --- a/platform/linux-generic/pktio/socket_common.c +++ b/platform/linux-generic/pktio/socket_common.c @@ -4,10 +4,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ #include "config.h" - -#ifndef _GNU_SOURCE -#define _GNU_SOURCE -#endif +#include <odp_posix_extensions.h> #include <stdio.h> #include <stdlib.h> diff --git a/platform/linux-generic/pktio/stats/ethtool_stats.c b/platform/linux-generic/pktio/stats/ethtool_stats.c index fc04fd31..bfc2a60c 100644 --- a/platform/linux-generic/pktio/stats/ethtool_stats.c +++ b/platform/linux-generic/pktio/stats/ethtool_stats.c @@ -5,10 +5,8 @@ */ #include "config.h" +#include <odp_posix_extensions.h> -#ifndef _GNU_SOURCE -#define _GNU_SOURCE -#endif #include <sys/ioctl.h> #include <netinet/in.h> #include <linux/sockios.h> ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/odp_traffic_mngr.c | 4 +--- platform/linux-generic/pktio/ethtool_rss.c | 5 +---- platform/linux-generic/pktio/socket_common.c | 5 +---- platform/linux-generic/pktio/stats/ethtool_stats.c | 4 +--- 4 files changed, 4 insertions(+), 14 deletions(-) hooks/post-receive --

7 years, 8 months

[COMMIT] branch master updated. v1.19.0.1_tigermoth-104-ga7c60d70

by git＠git-us.linaro.org

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, master has been updated via a7c60d702466bc0f9de64993446e8ec39a16de88 (commit) from 251fd5805122a257060a9de62a4c26bc1862a544 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit a7c60d702466bc0f9de64993446e8ec39a16de88 Author: Matias Elo <matias.elo(a)nokia.com> Date: Mon Jun 25 15:36:31 2018 +0300 validation: crypto: replace invalid cipher/auth capability tests odp_crypto_cipher_capability() and odp_crypto_auth_capability() functions return the total number of capability structures. Use this information to dynamically allocate required test arrays. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/validation/api/crypto/odp_crypto_test_inp.c b/test/validation/api/crypto/odp_crypto_test_inp.c index 83070290..1e06761c 100644 --- a/test/validation/api/crypto/odp_crypto_test_inp.c +++ b/test/validation/api/crypto/odp_crypto_test_inp.c @@ -11,8 +11,6 @@ #include <odp_cunit_common.h> #include "test_vectors.h" -#define MAX_ALG_CAPA 32 - #define PKT_POOL_NUM 64 #define PKT_POOL_LEN (1 * 1024) @@ -466,15 +464,20 @@ static void check_alg(odp_crypto_op_t op, odp_bool_t ovr_iv) { odp_crypto_capability_t capa; - odp_crypto_cipher_capability_t cipher_capa[MAX_ALG_CAPA]; - odp_crypto_auth_capability_t auth_capa[MAX_ALG_CAPA]; - int rc, cipher_num, auth_num, i; - odp_bool_t cipher_tested[MAX_ALG_CAPA]; - odp_bool_t auth_tested[MAX_ALG_CAPA]; + int rc, i; + int cipher_num = odp_crypto_cipher_capability(cipher_alg, NULL, 0); + int auth_num = odp_crypto_auth_capability(auth_alg, NULL, 0); + odp_crypto_cipher_capability_t cipher_capa[cipher_num]; + odp_crypto_auth_capability_t auth_capa[auth_num]; + odp_bool_t cipher_tested[cipher_num]; + odp_bool_t auth_tested[auth_num]; odp_bool_t cipher_ok = false; odp_bool_t auth_ok = false; size_t idx; + CU_ASSERT_FATAL(cipher_num > 0); + CU_ASSERT_FATAL(auth_num > 0); + rc = odp_crypto_capability(&capa); CU_ASSERT(!rc); @@ -546,21 +549,11 @@ static void check_alg(odp_crypto_op_t op, CU_ASSERT(!rc); CU_ASSERT((~capa.auths.all_bits & capa.hw_auths.all_bits) == 0); - cipher_num = odp_crypto_cipher_capability(cipher_alg, cipher_capa, - MAX_ALG_CAPA); - - CU_ASSERT(cipher_num > 0); - CU_ASSERT(cipher_num <= MAX_ALG_CAPA); - if (cipher_num > MAX_ALG_CAPA) - cipher_num = MAX_ALG_CAPA; - - auth_num = odp_crypto_auth_capability(auth_alg, auth_capa, - MAX_ALG_CAPA); + rc = odp_crypto_cipher_capability(cipher_alg, cipher_capa, cipher_num); + CU_ASSERT_FATAL(rc == cipher_num); - CU_ASSERT(auth_num > 0); - CU_ASSERT(auth_num <= MAX_ALG_CAPA); - if (auth_num > MAX_ALG_CAPA) - auth_num = MAX_ALG_CAPA; + rc = odp_crypto_auth_capability(auth_alg, auth_capa, auth_num); + CU_ASSERT_FATAL(rc == auth_num); memset(cipher_tested, 0, sizeof(cipher_tested)); memset(auth_tested, 0, sizeof(auth_tested)); ----------------------------------------------------------------------- Summary of changes: test/validation/api/crypto/odp_crypto_test_inp.c | 35 ++++++++++-------------- 1 file changed, 14 insertions(+), 21 deletions(-) hooks/post-receive --

7 years, 8 months

[COMMIT] branch master updated. v1.19.0.1_tigermoth-103-g251fd580

by git＠git-us.linaro.org

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, master has been updated via 251fd5805122a257060a9de62a4c26bc1862a544 (commit) via 8813bda68dac4f6ff448cf783b43e6deafff75ae (commit) via 3d79b95543b6043a9df9f523f81416a30052a9ce (commit) via 3c335400833959b9a96674984c797e8ec4734566 (commit) from dd7bcc7dead9bceba895ad877ad3ac7642d4e717 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 251fd5805122a257060a9de62a4c26bc1862a544 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Wed Jun 20 13:31:59 2018 +0300 validation: queue: improve queue pair checks Output erroneous sequence number. Check that no events were lost. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/validation/api/queue/queue.c b/test/validation/api/queue/queue.c index f8e0314f..0bd1a06a 100644 --- a/test/validation/api/queue/queue.c +++ b/test/validation/api/queue/queue.c @@ -428,7 +428,11 @@ static int queue_pair_work_loop(void *arg) retry = 0; buf = odp_buffer_from_event(ev); data = odp_buffer_addr(buf); - CU_ASSERT(*data == i); + if (*data != i) { + printf("Seq error: expected %u, recv %u\n", i, *data); + CU_FAIL("Sequence number error"); + } + i++; if (i == burst) i = 0; @@ -458,7 +462,7 @@ static void test_pair(odp_nonblocking_t nonblocking, odp_queue_param_t param; odp_queue_t queue; odp_queue_capability_t capa; - uint32_t max_burst; + uint32_t max_burst, num; odp_pool_t pool; odp_event_t ev; odp_shm_t shm; @@ -526,12 +530,21 @@ static void test_pair(odp_nonblocking_t nonblocking, CU_ASSERT(globals->pair.passed_a); CU_ASSERT(globals->pair.passed_b); - while ((ev = dequeue_event(globals->pair.queue_a)) != ODP_EVENT_INVALID) + num = 0; + + while ((ev = dequeue_event(globals->pair.queue_a)) + != ODP_EVENT_INVALID) { + num++; odp_event_free(ev); + } - while ((ev = dequeue_event(globals->pair.queue_b)) != ODP_EVENT_INVALID) + while ((ev = dequeue_event(globals->pair.queue_b)) + != ODP_EVENT_INVALID) { + num++; odp_event_free(ev); + } + CU_ASSERT(num == max_burst); CU_ASSERT(odp_queue_destroy(globals->pair.queue_a) == 0); CU_ASSERT(odp_queue_destroy(globals->pair.queue_b) == 0); } commit 8813bda68dac4f6ff448cf783b43e6deafff75ae Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Wed Jun 20 10:05:05 2018 +0300 validation: queue: add pair tests for lock-free queues Add queue pair test cases for lock-free queues. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/validation/api/queue/queue.c b/test/validation/api/queue/queue.c index f009a24b..f8e0314f 100644 --- a/test/validation/api/queue/queue.c +++ b/test/validation/api/queue/queue.c @@ -556,6 +556,21 @@ static void queue_test_pair_spsc(void) test_pair(ODP_BLOCKING, ODP_QUEUE_OP_MT_UNSAFE, ODP_QUEUE_OP_MT_UNSAFE); } +static void queue_test_pair_lf(void) +{ + test_pair(ODP_NONBLOCKING_LF, ODP_QUEUE_OP_MT, ODP_QUEUE_OP_MT); +} + +static void queue_test_pair_lf_spmc(void) +{ + test_pair(ODP_NONBLOCKING_LF, ODP_QUEUE_OP_MT_UNSAFE, ODP_QUEUE_OP_MT); +} + +static void queue_test_pair_lf_mpsc(void) +{ + test_pair(ODP_NONBLOCKING_LF, ODP_QUEUE_OP_MT, ODP_QUEUE_OP_MT_UNSAFE); +} + static void queue_test_pair_lf_spsc(void) { test_pair(ODP_NONBLOCKING_LF, ODP_QUEUE_OP_MT_UNSAFE, @@ -944,6 +959,9 @@ odp_testinfo_t queue_suite[] = { ODP_TEST_INFO(queue_test_pair_spmc), ODP_TEST_INFO(queue_test_pair_mpsc), ODP_TEST_INFO(queue_test_pair_spsc), + ODP_TEST_INFO(queue_test_pair_lf), + ODP_TEST_INFO(queue_test_pair_lf_spmc), + ODP_TEST_INFO(queue_test_pair_lf_mpsc), ODP_TEST_INFO(queue_test_pair_lf_spsc), ODP_TEST_INFO(queue_test_param), ODP_TEST_INFO(queue_test_info), commit 3d79b95543b6043a9df9f523f81416a30052a9ce Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Wed Jun 20 13:03:18 2018 +0300 linux-gen: queue_lf: fix event ordering issue New enqueues may happen during a dequeue operation is searching for the lowest counter value. If the first enqueue (with lower counter value) added a node before the current dequeue search index and the second enqueue after the index, dequeue returned these events in wrong order. After finding the lowest counter value, dequeue needs to search nodes before that node again. Also change CAS operation memory model to acq-rel, so that the first enqueue from a thread is always visible before the second enqueue (from the same thread). Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/odp_queue_lf.c b/platform/linux-generic/odp_queue_lf.c index e4902a3f..3ec32524 100644 --- a/platform/linux-generic/odp_queue_lf.c +++ b/platform/linux-generic/odp_queue_lf.c @@ -36,25 +36,14 @@ static inline void atomic_zero_u128(u128_t *atomic) */ #include <odp_cpu.h> -static inline int atomic_cas_rel_u128(u128_t *atomic, u128_t old_val, - u128_t new_val) +static inline int atomic_cas_acq_rel_u128(u128_t *atomic, u128_t old_val, + u128_t new_val) { return __lockfree_compare_exchange_16((__int128 *)atomic, (__int128 *)&old_val, new_val, 0, - __ATOMIC_RELEASE, - __ATOMIC_RELAXED); -} - -static inline int atomic_cas_acq_u128(u128_t *atomic, u128_t old_val, - u128_t new_val) -{ - return __lockfree_compare_exchange_16((__int128 *)atomic, - (__int128 *)&old_val, - new_val, - 0, - __ATOMIC_ACQUIRE, + __ATOMIC_ACQ_REL, __ATOMIC_RELAXED); } @@ -75,21 +64,12 @@ static inline u128_t atomic_load_u128(u128_t *atomic) return __atomic_load_n(atomic, __ATOMIC_RELAXED); } -static inline int atomic_cas_rel_u128(u128_t *atomic, u128_t old_val, - u128_t new_val) +static inline int atomic_cas_acq_rel_u128(u128_t *atomic, u128_t old_val, + u128_t new_val) { return __atomic_compare_exchange_n(atomic, &old_val, new_val, 0 /* strong */, - __ATOMIC_RELEASE, - __ATOMIC_RELAXED); -} - -static inline int atomic_cas_acq_u128(u128_t *atomic, u128_t old_val, - u128_t new_val) -{ - return __atomic_compare_exchange_n(atomic, &old_val, new_val, - 0 /* strong */, - __ATOMIC_ACQUIRE, + __ATOMIC_ACQ_REL, __ATOMIC_RELAXED); } @@ -120,18 +100,17 @@ static inline void atomic_zero_u128(u128_t *atomic) atomic->u64[1] = 0; } -static inline int atomic_cas_rel_u128(u128_t *atomic, u128_t old_val, - u128_t new_val) +static inline int atomic_cas_acq_rel_u128(u128_t *atomic, u128_t old_val, + u128_t new_val) { - (void)old_val; - *atomic = new_val; - return 1; -} + if (atomic->u64[0] == old_val.u64[0] && + atomic->u64[1] == old_val.u64[1]) { + atomic->u64[0] = new_val.u64[0]; + atomic->u64[1] = new_val.u64[1]; + return 1; + } -static inline int atomic_cas_acq_u128(u128_t *atomic, u128_t old_val, - u128_t new_val) -{ - return atomic_cas_rel_u128(atomic, old_val, new_val); + return 0; } static inline int atomic_is_lockfree_u128(void) @@ -146,15 +125,12 @@ typedef union { u128_t u128; struct { - /* 0: empty, 1: data */ - uint64_t mark: 1; + /* Data with lowest counter value is the head. Empty node has + * counter value 0. */ + uint64_t counter; - /* A cache aligned pointer fits into 63 bits, since the least - * significant bits are zero. */ - uint64_t ptr: 63; - - /* Data with lowest counter value is the head. */ - uint64_t count; + /* Data pointer */ + uint64_t ptr; } s; } ring_lf_node_t; @@ -190,30 +166,31 @@ static int queue_lf_enq(void *q_int, odp_buffer_hdr_t *buf_hdr) { queue_entry_t *queue; queue_lf_t *queue_lf; - int i, j, i_node; + int i, j, idx; int found; ring_lf_node_t node_val; ring_lf_node_t new_val; ring_lf_node_t *node; - uint64_t counter; queue = q_int; queue_lf = queue->s.queue_lf; - i_node = 0; + new_val.s.ptr = (uintptr_t)buf_hdr; + new_val.s.counter = odp_atomic_fetch_inc_u64(&queue_lf->enq_counter); - counter = odp_atomic_fetch_inc_u64(&queue_lf->enq_counter); + idx = 0; for (j = 0; j < ENQ_RETRIES; j++) { found = 0; /* Find empty node */ for (i = 0; i < RING_LF_SIZE; i++) { - i_node = next_idx(i_node); - node = &queue_lf->node[i_node]; + node = &queue_lf->node[idx]; + idx = next_idx(idx); + node_val.u128 = atomic_load_u128(&node->u128); - if (node_val.s.mark == 0) { + if (node_val.s.counter == 0) { found = 1; break; } @@ -224,12 +201,8 @@ static int queue_lf_enq(void *q_int, odp_buffer_hdr_t *buf_hdr) return -1; /* Try to insert data */ - new_val.s.mark = 1; - new_val.s.count = counter; - new_val.s.ptr = ((uintptr_t)buf_hdr) >> 1; - - if (atomic_cas_rel_u128(&node->u128, node_val.u128, - new_val.u128)) + if (atomic_cas_acq_rel_u128(&node->u128, node_val.u128, + new_val.u128)) return 0; } @@ -251,15 +224,18 @@ static odp_buffer_hdr_t *queue_lf_deq(void *q_int) { queue_entry_t *queue; queue_lf_t *queue_lf; - int i, j, i_node; + int i, j, i_lowest; int found; ring_lf_node_t node_val, old_val, new_val; ring_lf_node_t *node, *old; - uint64_t lowest; + uint64_t lowest, counter; + odp_buffer_hdr_t *buf_hdr; queue = q_int; queue_lf = queue->s.queue_lf; - i_node = 0; + new_val.s.counter = 0; + new_val.s.ptr = 0; + old = NULL; for (j = 0; j < DEQ_RETRIES; j++) { found = 0; @@ -268,14 +244,15 @@ static odp_buffer_hdr_t *queue_lf_deq(void *q_int) /* Find the head node. The one with data and * the lowest counter. */ for (i = 0; i < RING_LF_SIZE; i++) { - i_node = next_idx(i_node); - node = &queue_lf->node[i_node]; + node = &queue_lf->node[i]; node_val.u128 = atomic_load_u128(&node->u128); + counter = node_val.s.counter; - if (node_val.s.mark == 1 && node_val.s.count < lowest) { + if (counter && counter < lowest) { old = node; old_val.u128 = node_val.u128; - lowest = node_val.s.count; + lowest = counter; + i_lowest = i; found = 1; } } @@ -284,13 +261,27 @@ static odp_buffer_hdr_t *queue_lf_deq(void *q_int) if (found == 0) return NULL; - /* Try to remove data */ - new_val.u128 = old_val.u128; - new_val.s.mark = 0; + /* New data may have been written to the area we searched before + * finding the current lowest. Check that there are no lower + * values. */ + for (i = 0; i < i_lowest; i++) { + node = &queue_lf->node[i]; + node_val.u128 = atomic_load_u128(&node->u128); + counter = node_val.s.counter; + + if (counter && counter < lowest) { + old = node; + old_val.u128 = node_val.u128; + lowest = counter; + } + } - if (atomic_cas_acq_u128(&old->u128, old_val.u128, - new_val.u128)) - return (void *)(((uintptr_t)old_val.s.ptr) << 1); + buf_hdr = (void *)(uintptr_t)old_val.s.ptr; + + /* Try to remove data */ + if (atomic_cas_acq_rel_u128(&old->u128, old_val.u128, + new_val.u128)) + return buf_hdr; } return NULL; @@ -363,7 +354,7 @@ static void init_queue(queue_lf_t *queue_lf) { int i; - odp_atomic_init_u64(&queue_lf->enq_counter, 0); + odp_atomic_init_u64(&queue_lf->enq_counter, 1); for (i = 0; i < RING_LF_SIZE; i++) atomic_zero_u128(&queue_lf->node[i].u128); commit 3c335400833959b9a96674984c797e8ec4734566 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Tue Jun 19 16:58:08 2018 +0300 linux-gen: queue: fix queue empty check SPSC and normal queues use different rings. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/odp_queue_basic.c b/platform/linux-generic/odp_queue_basic.c index f592ef6c..39e2d59c 100644 --- a/platform/linux-generic/odp_queue_basic.c +++ b/platform/linux-generic/odp_queue_basic.c @@ -383,6 +383,7 @@ void sched_cb_queue_set_status(uint32_t queue_index, int status) static int queue_destroy(odp_queue_t handle) { + int empty; queue_entry_t *queue; queue = qentry_from_handle(handle); @@ -400,7 +401,13 @@ static int queue_destroy(odp_queue_t handle) ODP_ERR("queue \"%s\" already destroyed\n", queue->s.name); return -1; } - if (ring_st_is_empty(&queue->s.ring_st) == 0) { + + if (queue->s.spsc) + empty = ring_spsc_is_empty(&queue->s.ring_spsc); + else + empty = ring_st_is_empty(&queue->s.ring_st); + + if (!empty) { UNLOCK(queue); ODP_ERR("queue \"%s\" not empty\n", queue->s.name); return -1; ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/odp_queue_basic.c | 9 ++- platform/linux-generic/odp_queue_lf.c | 133 ++++++++++++++----------------- test/validation/api/queue/queue.c | 39 ++++++++- 3 files changed, 105 insertions(+), 76 deletions(-) hooks/post-receive --

7 years, 8 months

[COMMIT] branch master updated. v1.19.0.1_tigermoth-99-gdd7bcc7d

by git＠git-us.linaro.org

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, master has been updated via dd7bcc7dead9bceba895ad877ad3ac7642d4e717 (commit) from 7c33f29d51082d693c0653df84cb13f2b946eec8 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit dd7bcc7dead9bceba895ad877ad3ac7642d4e717 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Thu Jun 21 14:01:25 2018 +0300 .travis.yml: upgrade DPDK to 17.11.3 -- latest stable release Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/.travis.yml b/.travis.yml index 886e40f0..3dca855c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -49,7 +49,7 @@ env: # for individual commit validation. But you you want to track tests history # you need generated new one at https://codecov.io specific for your repo. - CODECOV_TOKEN=a733c34c-5f5c-4ff1-af4b-e9f5edb1ab5e - - DPDK_VERS="17.11.2" + - DPDK_VERS="17.11.3" matrix: - CONF="" - CONF="--disable-abi-compat" ----------------------------------------------------------------------- Summary of changes: .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive --

7 years, 8 months

[COMMIT] branch master updated. v1.19.0.1_tigermoth-98-g7c33f29d

by git＠git-us.linaro.org

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, master has been updated via 7c33f29d51082d693c0653df84cb13f2b946eec8 (commit) from 9ab55a834226a8ae9faea3491f23aa065303cb41 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 7c33f29d51082d693c0653df84cb13f2b946eec8 Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Tue Jun 19 22:01:40 2018 +0300 test: cunit: tm fix tm execution under CI Some test like this can fail under not clear environment. Make CI env detection more general with implementing helper function. Test: traffic_mngr_test_shaper ... traffic_mngr.c:2531:test_shaper_bw():min=0 avg_rcv_gap=180 max=249 std_dev_gap=109 traffic_mngr.c:2534:test_shaper_bw(): expected_rcv_gap=250 acceptable rcv_gap range=198..314 FAILED 1. traffic_mngr.c:2549 - (min_rcv_gap <= avg_rcv_gap) && (avg_rcv_gap <= max_rcv_gap) 2. traffic_mngr.c:3842 - test_shaper_bw("bw40", "node_1_1_1", 3, 40 * MBPS) == 0 Test: traffic_mngr_test_scheduler ...passed Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> diff --git a/test/common/odp_cunit_common.c b/test/common/odp_cunit_common.c index f7c9af43..6b9ded4a 100644 --- a/test/common/odp_cunit_common.c +++ b/test/common/odp_cunit_common.c @@ -11,6 +11,7 @@ #include <unistd.h> #include <odp_api.h> #include "odp_cunit_common.h" +#include "test_debug.h" #include <odp/helper/odph_api.h> #include <CUnit/TestDB.h> @@ -27,6 +28,7 @@ #endif /* Globals */ +static int allow_skip_result; static odph_odpthread_t thread_tbl[MAX_WORKERS]; static odp_instance_t instance; static char *progname; @@ -393,7 +395,21 @@ int odp_cunit_register(odp_suiteinfo_t testsuites[]) */ int odp_cunit_parse_options(int argc, char *argv[]) { + const char *env = getenv("CI"); + progname = argv[0]; odph_parse_options(argc, argv); + + if (env && !strcmp(env, "true")) { + allow_skip_result = 1; + LOG_DBG("\nWARNING: test result can be used for code coverage only.\n" + "CI=true env variable is set!\n"); + } + return 0; } + +int odp_cunit_ret(int val) +{ + return allow_skip_result ? 0 : val; +} diff --git a/test/common/odp_cunit_common.h b/test/common/odp_cunit_common.h index a4bfa357..52a8c189 100644 --- a/test/common/odp_cunit_common.h +++ b/test/common/odp_cunit_common.h @@ -102,4 +102,6 @@ void odp_cunit_register_global_init(int (*func_init_ptr)(odp_instance_t *inst)); void odp_cunit_register_global_term(int (*func_term_ptr)(odp_instance_t inst)); +int odp_cunit_ret(int val); + #endif /* ODP_CUNICT_COMMON_H */ diff --git a/test/validation/api/traffic_mngr/traffic_mngr.c b/test/validation/api/traffic_mngr/traffic_mngr.c index 4d78c31c..db6a16af 100644 --- a/test/validation/api/traffic_mngr/traffic_mngr.c +++ b/test/validation/api/traffic_mngr/traffic_mngr.c @@ -2545,9 +2545,20 @@ static int test_shaper_bw(const char *shaper_name, ret_code = 0; } - CU_ASSERT((min_rcv_gap <= avg_rcv_gap) && - (avg_rcv_gap <= max_rcv_gap)); - CU_ASSERT(rcv_stats.std_dev_gap <= expected_rcv_gap_us); + if ((avg_rcv_gap < min_rcv_gap) || + (avg_rcv_gap > max_rcv_gap)) { + LOG_ERR("agv_rcv_gap=%" PRIu32 " acceptable " + "rcv_gap range=%" PRIu32 "..%" PRIu32 "\n", + avg_rcv_gap, min_rcv_gap, max_rcv_gap); + ret_code = -1; + } + + if (rcv_stats.std_dev_gap > expected_rcv_gap_us) { + LOG_ERR("std_dev_gap=%" PRIu32 " > " + "expected_rcv_gap_us=%" PRIu64 "\n", + rcv_stats.std_dev_gap, expected_rcv_gap_us); + ret_code = -1; + } } /* Disable the shaper, so as to get the pkts out quicker. */ @@ -3836,11 +3847,26 @@ static void traffic_mngr_test_tm_create(void) static void traffic_mngr_test_shaper(void) { - CU_ASSERT(test_shaper_bw("bw1", "node_1_1_1", 0, 1 * MBPS) == 0); - CU_ASSERT(test_shaper_bw("bw4", "node_1_1_1", 1, 4 * MBPS) == 0); - CU_ASSERT(test_shaper_bw("bw10", "node_1_1_1", 2, 10 * MBPS) == 0); - CU_ASSERT(test_shaper_bw("bw40", "node_1_1_1", 3, 40 * MBPS) == 0); - CU_ASSERT(test_shaper_bw("bw100", "node_1_1_2", 0, 100 * MBPS) == 0); + CU_ASSERT(!odp_cunit_ret(test_shaper_bw("bw1", + "node_1_1_1", + 0, + MBPS * 1))); + CU_ASSERT(!odp_cunit_ret(test_shaper_bw("bw4", + "node_1_1_1", + 1, + 4 * MBPS))); + CU_ASSERT(!odp_cunit_ret(test_shaper_bw("bw10", + "node_1_1_1", + 2, + 10 * MBPS))); + CU_ASSERT(!odp_cunit_ret(test_shaper_bw("bw40", + "node_1_1_1", + 3, + 40 * MBPS))); + CU_ASSERT(!odp_cunit_ret(test_shaper_bw("bw100", + "node_1_1_2", + 0, + 100 * MBPS))); } static void traffic_mngr_test_scheduler(void) @@ -3896,14 +3922,6 @@ static void traffic_mngr_test_byte_wred(void) static void traffic_mngr_test_pkt_wred(void) { int rc; - const char *env = getenv("CI"); - int allow_skip_result = 0; - - if (env && !strcmp(env, "true")) { - allow_skip_result = 1; - LOG_DBG("\nWARNING: test result can be used for code coverage only.\n" - "CI=true env variable is set!\n"); - } if (!tm_capabilities.tm_queue_wred_supported) { LOG_DBG("\ntest_pkt_wred was not run because tm_capabilities " @@ -3914,7 +3932,7 @@ static void traffic_mngr_test_pkt_wred(void) rc = test_pkt_wred("pkt_wred_40G", "pkt_bw_40G", "pkt_thresh_40G", "node_1_3_2", 1, ODP_PACKET_GREEN, TM_PERCENT(30), false); - if (rc != 0 && !allow_skip_result) + if (odp_cunit_ret(rc) != 0) CU_FAIL("40G test failed\n"); if (!tm_capabilities.tm_queue_dual_slope_supported) { @@ -3926,20 +3944,19 @@ static void traffic_mngr_test_pkt_wred(void) rc = test_pkt_wred("pkt_wred_30G", "pkt_bw_30G", "pkt_thresh_30G", "node_1_3_2", 1, ODP_PACKET_GREEN, TM_PERCENT(30), true); - if (rc != 0 && !allow_skip_result) + if (odp_cunit_ret(rc) != 0) CU_FAIL("30G test failed\n"); rc = test_pkt_wred("pkt_wred_50Y", "pkt_bw_50Y", "pkt_thresh_50Y", "node_1_3_2", 2, ODP_PACKET_YELLOW, TM_PERCENT(50), true); - if (rc != 0 && !allow_skip_result) + if (odp_cunit_ret(rc) != 0) CU_FAIL("50Y test failed\n"); - rc = test_pkt_wred("pkt_wred_70R", "pkt_bw_70R", "pkt_thresh_70R", "node_1_3_2", 3, ODP_PACKET_RED, TM_PERCENT(70), true); - if (rc != 0 && !allow_skip_result) + if (odp_cunit_ret(rc) != 0) CU_FAIL("70Y test failed\n"); } ----------------------------------------------------------------------- Summary of changes: test/common/odp_cunit_common.c | 16 +++++++ test/common/odp_cunit_common.h | 2 + test/validation/api/traffic_mngr/traffic_mngr.c | 59 ++++++++++++++++--------- 3 files changed, 56 insertions(+), 21 deletions(-) hooks/post-receive --

7 years, 8 months

[COMMIT] branch master updated. v1.19.0.1_tigermoth-97-g9ab55a83

by git＠git-us.linaro.org

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, master has been updated via 9ab55a834226a8ae9faea3491f23aa065303cb41 (commit) via 4e99631dda78212103dc7d6bc9b165f89079e60e (commit) via 3565cdd101fae3d0ed5aacde80b7d49d8c4c4af8 (commit) from 719ac4509920bad7d5c8d563426d21f2a0c9e80e (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 9ab55a834226a8ae9faea3491f23aa065303cb41 Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Fri Jun 15 15:00:11 2018 +0300 configure: m4: simplify pthread detection Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> diff --git a/m4/ax_pthread.m4 b/m4/ax_pthread.m4 deleted file mode 100644 index c78b87de..00000000 --- a/m4/ax_pthread.m4 +++ /dev/null @@ -1,332 +0,0 @@ -# =========================================================================== -# http://www.gnu.org/software/autoconf-archive/ax_pthread.html -# =========================================================================== -# -# SYNOPSIS -# -# AX_PTHREAD([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) -# -# DESCRIPTION -# -# This macro figures out how to build C programs using POSIX threads. It -# sets the PTHREAD_LIBS output variable to the threads library and linker -# flags, and the PTHREAD_CFLAGS output variable to any special C compiler -# flags that are needed. (The user can also force certain compiler -# flags/libs to be tested by setting these environment variables.) -# -# Also sets PTHREAD_CC to any special C compiler that is needed for -# multi-threaded programs (defaults to the value of CC otherwise). (This -# is necessary on AIX to use the special cc_r compiler alias.) -# -# NOTE: You are assumed to not only compile your program with these flags, -# but also link it with them as well. e.g. you should link with -# $PTHREAD_CC $CFLAGS $PTHREAD_CFLAGS $LDFLAGS ... $PTHREAD_LIBS $LIBS -# -# If you are only building threads programs, you may wish to use these -# variables in your default LIBS, CFLAGS, and CC: -# -# LIBS="$PTHREAD_LIBS $LIBS" -# CFLAGS="$CFLAGS $PTHREAD_CFLAGS" -# CC="$PTHREAD_CC" -# -# In addition, if the PTHREAD_CREATE_JOINABLE thread-attribute constant -# has a nonstandard name, defines PTHREAD_CREATE_JOINABLE to that name -# (e.g. PTHREAD_CREATE_UNDETACHED on AIX). -# -# Also HAVE_PTHREAD_PRIO_INHERIT is defined if pthread is found and the -# PTHREAD_PRIO_INHERIT symbol is defined when compiling with -# PTHREAD_CFLAGS. -# -# ACTION-IF-FOUND is a list of shell commands to run if a threads library -# is found, and ACTION-IF-NOT-FOUND is a list of commands to run it if it -# is not found. If ACTION-IF-FOUND is not specified, the default action -# will define HAVE_PTHREAD. -# -# Please let the authors know if this macro fails on any platform, or if -# you have any other suggestions or comments. This macro was based on work -# by SGJ on autoconf scripts for FFTW (http://www.fftw.org/) (with help -# from M. Frigo), as well as ac_pthread and hb_pthread macros posted by -# Alejandro Forero Cuervo to the autoconf macro repository. We are also -# grateful for the helpful feedback of numerous users. -# -# Updated for Autoconf 2.68 by Daniel Richard G. -# -# LICENSE -# -# Copyright (c) 2008 Steven G. Johnson <stevenj(a)alum.mit.edu> -# Copyright (c) 2011 Daniel Richard G. <skunk(a)iSKUNK.ORG> -# -# 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, either version 3 of the License, or (at your -# option) any later version. -# -# 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, see <http://www.gnu.org/licenses/>. -# -# As a special exception, the respective Autoconf Macro's copyright owner -# gives unlimited permission to copy, distribute and modify the configure -# scripts that are the output of Autoconf when processing the Macro. You -# need not follow the terms of the GNU General Public License when using -# or distributing such scripts, even though portions of the text of the -# Macro appear in them. The GNU General Public License (GPL) does govern -# all other use of the material that constitutes the Autoconf Macro. -# -# This special exception to the GPL applies to versions of the Autoconf -# Macro released by the Autoconf Archive. When you make and distribute a -# modified version of the Autoconf Macro, you may extend this special -# exception to the GPL to apply to your modified version as well. - -#serial 21 - -AU_ALIAS([ACX_PTHREAD], [AX_PTHREAD]) -AC_DEFUN([AX_PTHREAD], [ -AC_REQUIRE([AC_CANONICAL_HOST]) -AC_LANG_PUSH([C]) -ax_pthread_ok=no - -# We used to check for pthread.h first, but this fails if pthread.h -# requires special compiler flags (e.g. on True64 or Sequent). -# It gets checked for in the link test anyway. - -# First of all, check if the user has set any of the PTHREAD_LIBS, -# etcetera environment variables, and if threads linking works using -# them: -if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then - save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $PTHREAD_CFLAGS" - save_LIBS="$LIBS" - LIBS="$PTHREAD_LIBS $LIBS" - AC_MSG_CHECKING([for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS]) - AC_TRY_LINK_FUNC([pthread_join], [ax_pthread_ok=yes]) - AC_MSG_RESULT([$ax_pthread_ok]) - if test x"$ax_pthread_ok" = xno; then - PTHREAD_LIBS="" - PTHREAD_CFLAGS="" - fi - LIBS="$save_LIBS" - CFLAGS="$save_CFLAGS" -fi - -# We must check for the threads library under a number of different -# names; the ordering is very important because some systems -# (e.g. DEC) have both -lpthread and -lpthreads, where one of the -# libraries is broken (non-POSIX). - -# Create a list of thread flags to try. Items starting with a "-" are -# C compiler flags, and other items are library names, except for "none" -# which indicates that we try without any flags at all, and "pthread-config" -# which is a program returning the flags for the Pth emulation library. - -ax_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config" - -# The ordering *is* (sometimes) important. Some notes on the -# individual items follow: - -# pthreads: AIX (must check this before -lpthread) -# none: in case threads are in libc; should be tried before -Kthread and -# other compiler flags to prevent continual compiler warnings -# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h) -# -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able) -# lthread: LinuxThreads port on FreeBSD (also preferred to -pthread) -# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads) -# -pthreads: Solaris/gcc -# -mthreads: Mingw32/gcc, Lynx/gcc -# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it -# doesn't hurt to check since this sometimes defines pthreads too; -# also defines -D_REENTRANT) -# ... -mt is also the pthreads flag for HP/aCC -# pthread: Linux, etcetera -# --thread-safe: KAI C++ -# pthread-config: use pthread-config program (for GNU Pth library) - -case ${host_os} in - solaris*) - - # On Solaris (at least, for some versions), libc contains stubbed - # (non-functional) versions of the pthreads routines, so link-based - # tests will erroneously succeed. (We need to link with -pthreads/-mt/ - # -lpthread.) (The stubs are missing pthread_cleanup_push, or rather - # a function called by this macro, so we could check for that, but - # who knows whether they'll stub that too in a future libc.) So, - # we'll just look for -pthreads and -lpthread first: - - ax_pthread_flags="-pthreads pthread -mt -pthread $ax_pthread_flags" - ;; - - darwin*) - ax_pthread_flags="-pthread $ax_pthread_flags" - ;; -esac - -# Clang doesn't consider unrecognized options an error unless we specify -# -Werror. We throw in some extra Clang-specific options to ensure that -# this doesn't happen for GCC, which also accepts -Werror. - -AC_MSG_CHECKING([if compiler needs -Werror to reject unknown flags]) -save_CFLAGS="$CFLAGS" -ax_pthread_extra_flags="-Werror" -CFLAGS="$CFLAGS $ax_pthread_extra_flags -Wunknown-warning-option -Wsizeof-array-argument" -AC_COMPILE_IFELSE([AC_LANG_PROGRAM([int foo(void);],[foo()])], - [AC_MSG_RESULT([yes])], - [ax_pthread_extra_flags= - AC_MSG_RESULT([no])]) -CFLAGS="$save_CFLAGS" - -if test x"$ax_pthread_ok" = xno; then -for flag in $ax_pthread_flags; do - - case $flag in - none) - AC_MSG_CHECKING([whether pthreads work without any flags]) - ;; - - -*) - AC_MSG_CHECKING([whether pthreads work with $flag]) - PTHREAD_CFLAGS="$flag" - ;; - - pthread-config) - AC_CHECK_PROG([ax_pthread_config], [pthread-config], [yes], [no]) - if test x"$ax_pthread_config" = xno; then continue; fi - PTHREAD_CFLAGS="`pthread-config --cflags`" - PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`" - ;; - - *) - AC_MSG_CHECKING([for the pthreads library -l$flag]) - PTHREAD_LIBS="-l$flag" - ;; - esac - - save_LIBS="$LIBS" - save_CFLAGS="$CFLAGS" - LIBS="$PTHREAD_LIBS $LIBS" - CFLAGS="$CFLAGS $PTHREAD_CFLAGS $ax_pthread_extra_flags" - - # Check for various functions. We must include pthread.h, - # since some functions may be macros. (On the Sequent, we - # need a special flag -Kthread to make this header compile.) - # We check for pthread_join because it is in -lpthread on IRIX - # while pthread_create is in libc. We check for pthread_attr_init - # due to DEC craziness with -lpthreads. We check for - # pthread_cleanup_push because it is one of the few pthread - # functions on Solaris that doesn't have a non-functional libc stub. - # We try pthread_create on general principles. - AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h> - static void routine(void *a) { if(a) a = 0; } - static void *start_routine(void *a) { return a; }], - [pthread_t th; pthread_attr_t attr; - pthread_create(&th, 0, start_routine, 0); - pthread_join(th, 0); - pthread_attr_init(&attr); - pthread_cleanup_push(routine, 0); - pthread_cleanup_pop(0) /* ; */])], - [ax_pthread_ok=yes], - []) - - LIBS="$save_LIBS" - CFLAGS="$save_CFLAGS" - - AC_MSG_RESULT([$ax_pthread_ok]) - if test "x$ax_pthread_ok" = xyes; then - break; - fi - - PTHREAD_LIBS="" - PTHREAD_CFLAGS="" -done -fi - -# Various other checks: -if test "x$ax_pthread_ok" = xyes; then - save_LIBS="$LIBS" - LIBS="$PTHREAD_LIBS $LIBS" - save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $PTHREAD_CFLAGS" - - # Detect AIX lossage: JOINABLE attribute is called UNDETACHED. - AC_MSG_CHECKING([for joinable pthread attribute]) - attr_name=unknown - for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do - AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>], - [int attr = $attr; return attr /* ; */])], - [attr_name=$attr; break], - []) - done - AC_MSG_RESULT([$attr_name]) - if test "$attr_name" != PTHREAD_CREATE_JOINABLE; then - AC_DEFINE_UNQUOTED([PTHREAD_CREATE_JOINABLE], [$attr_name], - [Define to necessary symbol if this constant - uses a non-standard name on your system.]) - fi - - AC_MSG_CHECKING([if more special flags are required for pthreads]) - flag=no - case ${host_os} in - aix* | freebsd* | darwin*) flag="-D_THREAD_SAFE";; - osf* | hpux*) flag="-D_REENTRANT";; - solaris*) - if test "$GCC" = "yes"; then - flag="-D_REENTRANT" - else - # TODO: What about Clang on Solaris? - flag="-mt -D_REENTRANT" - fi - ;; - esac - AC_MSG_RESULT([$flag]) - if test "x$flag" != xno; then - PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS" - fi - - AC_CACHE_CHECK([for PTHREAD_PRIO_INHERIT], - [ax_cv_PTHREAD_PRIO_INHERIT], [ - AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <pthread.h>]], - [[int i = PTHREAD_PRIO_INHERIT;]])], - [ax_cv_PTHREAD_PRIO_INHERIT=yes], - [ax_cv_PTHREAD_PRIO_INHERIT=no]) - ]) - AS_IF([test "x$ax_cv_PTHREAD_PRIO_INHERIT" = "xyes"], - [AC_DEFINE([HAVE_PTHREAD_PRIO_INHERIT], [1], [Have PTHREAD_PRIO_INHERIT.])]) - - LIBS="$save_LIBS" - CFLAGS="$save_CFLAGS" - - # More AIX lossage: compile with *_r variant - if test "x$GCC" != xyes; then - case $host_os in - aix*) - AS_CASE(["x/$CC"], - [x*/c89|x*/c89_128|x*/c99|x*/c99_128|x*/cc|x*/cc128|x*/xlc|x*/xlc_v6|x*/xlc128|x*/xlc128_v6], - [#handle absolute path differently from PATH based program lookup - AS_CASE(["x$CC"], - [x/*], - [AS_IF([AS_EXECUTABLE_P([${CC}_r])],[PTHREAD_CC="${CC}_r"])], - [AC_CHECK_PROGS([PTHREAD_CC],[${CC}_r],[$CC])])]) - ;; - esac - fi -fi - -test -n "$PTHREAD_CC" || PTHREAD_CC="$CC" - -AC_SUBST([PTHREAD_LIBS]) -AC_SUBST([PTHREAD_CFLAGS]) -AC_SUBST([PTHREAD_CC]) - -# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND: -if test x"$ax_pthread_ok" = xyes; then - ifelse([$1],,[AC_DEFINE([HAVE_PTHREAD],[1],[Define if you have POSIX threads libraries and header files.])],[$1]) - : -else - ax_pthread_ok=no - $2 -fi -AC_LANG_POP -])dnl AX_PTHREAD diff --git a/m4/odp_pthread.m4 b/m4/odp_pthread.m4 index f2654ac4..0e3485e3 100644 --- a/m4/odp_pthread.m4 +++ b/m4/odp_pthread.m4 @@ -1,7 +1,24 @@ +# Copyright (c) 2018, Linaro Limited +# All rights reserved. +# +# SPDX-License-Identifier: BSD-3-Clause +# # ODP_PTHREAD # ----------- # Check for pthreads availability -AC_DEFUN([ODP_PTHREAD], [dnl -AX_PTHREAD([CC="$PTHREAD_CC"], - [AC_MSG_FAILURE([We require pthreads to be available])]) +AC_DEFUN([ODP_PTHREAD], [ + AC_MSG_CHECKING([for pthread support in -pthread]) + AC_LANG_PUSH([C]) + PTHEAD_CFLAGS="-pthread" + CFLAGS="$CFLAGS $PTHEAD_CFLAGS" + PTHEAD_LIBS="-pthread" + LDFLAGS="$LDFLAGS $PTHREAD_LIBS" + AC_TRY_LINK_FUNC([pthread_create], [pthread=yes]) + if test x"$pthread" != "xyes"; then + AC_MSG_FAILURE([pthread is not supported]) + fi + AC_MSG_RESULT([yes]) + AC_LANG_POP([C]) ]) +AC_SUBST([PTHREAD_LIBS]) +AC_SUBST([PTHREAD_CFLAGS]) commit 4e99631dda78212103dc7d6bc9b165f89079e60e Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Thu Jun 14 16:49:33 2018 +0300 configure: do not use GPL AX_CHECK_COMPILE_FLAG remove dependency of GPL AX_CHECK_COMPILE_FLAG macro. Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> diff --git a/m4/ax_check_compile_flag.m4 b/m4/ax_check_compile_flag.m4 deleted file mode 100644 index ca363971..00000000 --- a/m4/ax_check_compile_flag.m4 +++ /dev/null @@ -1,74 +0,0 @@ -# =========================================================================== -# http://www.gnu.org/software/autoconf-archive/ax_check_compile_flag.html -# =========================================================================== -# -# SYNOPSIS -# -# AX_CHECK_COMPILE_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS], [INPUT]) -# -# DESCRIPTION -# -# Check whether the given FLAG works with the current language's compiler -# or gives an error. (Warnings, however, are ignored) -# -# ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on -# success/failure. -# -# If EXTRA-FLAGS is defined, it is added to the current language's default -# flags (e.g. CFLAGS) when the check is done. The check is thus made with -# the flags: "CFLAGS EXTRA-FLAGS FLAG". This can for example be used to -# force the compiler to issue an error when a bad flag is given. -# -# INPUT gives an alternative input source to AC_COMPILE_IFELSE. -# -# NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this -# macro in sync with AX_CHECK_{PREPROC,LINK}_FLAG. -# -# LICENSE -# -# Copyright (c) 2008 Guido U. Draheim <guidod(a)gmx.de> -# Copyright (c) 2011 Maarten Bosmans <mkbosmans(a)gmail.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, either version 3 of the License, or (at your -# option) any later version. -# -# 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, see <http://www.gnu.org/licenses/>. -# -# As a special exception, the respective Autoconf Macro's copyright owner -# gives unlimited permission to copy, distribute and modify the configure -# scripts that are the output of Autoconf when processing the Macro. You -# need not follow the terms of the GNU General Public License when using -# or distributing such scripts, even though portions of the text of the -# Macro appear in them. The GNU General Public License (GPL) does govern -# all other use of the material that constitutes the Autoconf Macro. -# -# This special exception to the GPL applies to versions of the Autoconf -# Macro released by the Autoconf Archive. When you make and distribute a -# modified version of the Autoconf Macro, you may extend this special -# exception to the GPL to apply to your modified version as well. - -#serial 4 - -AC_DEFUN([AX_CHECK_COMPILE_FLAG], -[AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_IF -AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_[]_AC_LANG_ABBREV[]flags_$4_$1])dnl -AC_CACHE_CHECK([whether _AC_LANG compiler accepts $1], CACHEVAR, [ - ax_check_save_flags=$[]_AC_LANG_PREFIX[]FLAGS - _AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS $4 $1" - AC_COMPILE_IFELSE([m4_default([$5],[AC_LANG_PROGRAM()])], - [AS_VAR_SET(CACHEVAR,[yes])], - [AS_VAR_SET(CACHEVAR,[no])]) - _AC_LANG_PREFIX[]FLAGS=$ax_check_save_flags]) -AS_VAR_IF(CACHEVAR,yes, - [m4_default([$2], :)], - [m4_default([$3], :)]) -AS_VAR_POPDEF([CACHEVAR])dnl -])dnl AX_CHECK_COMPILE_FLAGS diff --git a/m4/odp_check_flag.m4 b/m4/odp_check_flag.m4 index 827f9f01..37667d4e 100644 --- a/m4/odp_check_flag.m4 +++ b/m4/odp_check_flag.m4 @@ -1,3 +1,9 @@ +# Copyright (c) 2018, Linaro Limited +# All rights reserved. +# +# SPDX-License-Identifier: BSD-3-Clause +# + dnl Use -Werror in the checks below since Clang emits a warning instead of dnl an error when it encounters an unknown warning option. @@ -5,22 +11,28 @@ dnl an error when it encounters an unknown warning option. # --------------------- # Add FLAG to ODP_CFLAGS if compiler supports that option AC_DEFUN([ODP_CHECK_CFLAG], - [AC_LANG_PUSH([C]) - AX_CHECK_COMPILE_FLAG([$1], - [ODP_CFLAGS="$ODP_CFLAGS $1"], - [], [-W -Wall -Werror], - [AC_LANG_SOURCE([int main(void) - {return 0;}])]) +[ + AC_MSG_CHECKING([if $CC supports $1]) + AC_LANG_PUSH([C]) + saved_cflags="$CFLAGS" + CFLAGS="-W -Wall -Werror $ODP_CFLAGS $1" + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])], + [AC_MSG_RESULT([yes]) + ODP_CFLAGS="$ODP_CFLAGS $1"], + [AC_MSG_RESULT([no])]) + CFLAGS="$saved_cflags" AC_LANG_POP([C])]) # ODP_CHECK_CXXFLAG(FLAG) # --------------------- -# Add FLAG to ODP_CFLAGS if compiler supports that option AC_DEFUN([ODP_CHECK_CXXFLAG], - [AC_LANG_PUSH([C++]) - AX_CHECK_COMPILE_FLAG([$1], - [ODP_CXXFLAGS="$ODP_CXXFLAGS $1"], - [], [-W -Wall -Werror], - [AC_LANG_SOURCE([int main(void) - {return 0;}])]) +[ AC_MSG_CHECKING([if $CXX supports $1]) + AC_LANG_PUSH([C++]) + saved_cxxflags="$CXXFLAGS" + CXXFLAGS="-W -Wall -Werror $ODP_CXXFLAGS $1" + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])], + [AC_MSG_RESULT([yes]) + ODP_CXXFLAGS="$ODP_CXXFLAGS $1"], + [AC_MSG_RESULT([no])]) + CXXFLAGS="$saved_cxxflags" AC_LANG_POP([C++])]) commit 3565cdd101fae3d0ed5aacde80b7d49d8c4c4af8 Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Thu Jun 14 16:41:23 2018 +0300 configure: do check of -mcx16 more simple do not use GPL ax_compiler_vendor.m4 from autotools inside out project. Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> diff --git a/configure.ac b/configure.ac index f13525de..d52c419d 100644 --- a/configure.ac +++ b/configure.ac @@ -81,17 +81,6 @@ AC_TYPE_INT32_T AC_TYPE_UINT32_T AC_TYPE_UINT64_T -######################################################################### -# Get GCC version -######################################################################### - -AX_COMPILER_VERSION -CC_VERSION=$ax_cv_c_compiler_version - -CC_VERSION_MAJOR=$(echo $CC_VERSION | cut -d'.' -f1) -CC_VERSION_MINOR=$(echo $CC_VERSION | cut -d'.' -f2) -CC_VERSION_PATCH=$(echo $CC_VERSION | cut -d'.' -f3) - ########################################################################## # Default warning setup ########################################################################## @@ -122,13 +111,7 @@ ODP_CFLAGS="$ODP_CFLAGS $ODP_CFLAGS_EXTRA" ########################################################################## # Check if compiler supports cmpxchng16 on x86-based architectures ########################################################################## -case "${host}" in - i?86* | x86*) - if test "${CC}" != "gcc" -o ${CC_VERSION_MAJOR} -ge 5; then - ODP_CHECK_CFLAG([-mcx16]) - fi - ;; -esac +ODP_CHECK_CFLAG([-mcx16]) ########################################################################## # Allow valgrind suite to run against the defined tests @@ -377,6 +360,8 @@ AC_SUBST([CFLAGS]) AC_SUBST([LDFLAGS]) AC_SUBST([EXEEXT]) +CC_VERSION=$($CC --version | head -n 1) + AC_OUTPUT AC_MSG_RESULT([ $PACKAGE $VERSION diff --git a/m4/ax_compiler_vendor.m4 b/m4/ax_compiler_vendor.m4 deleted file mode 100644 index 39ca3c0f..00000000 --- a/m4/ax_compiler_vendor.m4 +++ /dev/null @@ -1,87 +0,0 @@ -# =========================================================================== -# http://www.gnu.org/software/autoconf-archive/ax_compiler_vendor.html -# =========================================================================== -# -# SYNOPSIS -# -# AX_COMPILER_VENDOR -# -# DESCRIPTION -# -# Determine the vendor of the C/C++ compiler, e.g., gnu, intel, ibm, sun, -# hp, borland, comeau, dec, cray, kai, lcc, metrowerks, sgi, microsoft, -# watcom, etc. The vendor is returned in the cache variable -# $ax_cv_c_compiler_vendor for C and $ax_cv_cxx_compiler_vendor for C++. -# -# LICENSE -# -# Copyright (c) 2008 Steven G. Johnson <stevenj(a)alum.mit.edu> -# Copyright (c) 2008 Matteo Frigo -# -# 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, either version 3 of the License, or (at your -# option) any later version. -# -# 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, see <http://www.gnu.org/licenses/>. -# -# As a special exception, the respective Autoconf Macro's copyright owner -# gives unlimited permission to copy, distribute and modify the configure -# scripts that are the output of Autoconf when processing the Macro. You -# need not follow the terms of the GNU General Public License when using -# or distributing such scripts, even though portions of the text of the -# Macro appear in them. The GNU General Public License (GPL) does govern -# all other use of the material that constitutes the Autoconf Macro. -# -# This special exception to the GPL applies to versions of the Autoconf -# Macro released by the Autoconf Archive. When you make and distribute a -# modified version of the Autoconf Macro, you may extend this special -# exception to the GPL to apply to your modified version as well. - -#serial 15 - -AC_DEFUN([AX_COMPILER_VENDOR], -[AC_CACHE_CHECK([for _AC_LANG compiler vendor], ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor, - dnl Please add if possible support to ax_compiler_version.m4 - [# note: don't check for gcc first since some other compilers define __GNUC__ - vendors="intel: __ICC,__ECC,__INTEL_COMPILER - ibm: __xlc__,__xlC__,__IBMC__,__IBMCPP__ - pathscale: __PATHCC__,__PATHSCALE__ - clang: __clang__ - cray: _CRAYC - fujitsu: __FUJITSU - gnu: __GNUC__ - sun: __SUNPRO_C,__SUNPRO_CC - hp: __HP_cc,__HP_aCC - dec: __DECC,__DECCXX,__DECC_VER,__DECCXX_VER - borland: __BORLANDC__,__CODEGEARC__,__TURBOC__ - comeau: __COMO__ - kai: __KCC - lcc: __LCC__ - sgi: __sgi,sgi - microsoft: _MSC_VER - metrowerks: __MWERKS__ - watcom: __WATCOMC__ - portland: __PGI - tcc: __TINYC__ - unknown: UNKNOWN" - for ventest in $vendors; do - case $ventest in - *:) vendor=$ventest; continue ;; - *) vencpp="defined("`echo $ventest | sed 's/,/) || defined(/g'`")" ;; - esac - AC_COMPILE_IFELSE([AC_LANG_PROGRAM(,[ - #if !($vencpp) - thisisanerror; - #endif - ])], [break]) - done - ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor=`echo $vendor | cut -d: -f1` - ]) -]) diff --git a/m4/ax_compiler_version.m4 b/m4/ax_compiler_version.m4 deleted file mode 100644 index 0863118c..00000000 --- a/m4/ax_compiler_version.m4 +++ /dev/null @@ -1,492 +0,0 @@ -# =========================================================================== -# http://www.gnu.org/software/autoconf-archive/ax_compiler_version.html -# =========================================================================== -# -# SYNOPSIS -# -# AX_COMPILER_VERSION -# -# DESCRIPTION -# -# This macro retrieves the compiler version and returns it in the cache -# variable $ax_cv_c_compiler_version for C and $ax_cv_cxx_compiler_version -# for C++. -# -# Version is returned as epoch:major.minor.patchversion -# -# Epoch is used in order to have an increasing version number in case of -# marketing change. -# -# Epoch use: * borland compiler use chronologically 0turboc for turboc -# era, -# -# 1borlanc BORLANC++ before 5, 2cppbuilder for cppbuilder era, -# 3borlancpp for return of BORLANC++ (after version 5.5), -# 4cppbuilder for cppbuilder with year version, -# and 5xe for XE era. -# -# An empty string is returned otherwise. -# -# LICENSE -# -# Copyright (c) 2014 Bastien ROUCARIES <roucaries.bastien+autoconf(a)gmail.com> -# -# Copying and distribution of this file, with or without modification, are -# permitted in any medium without royalty provided the copyright notice -# and this notice are preserved. This file is offered as-is, without any -# warranty. - -#serial 4 - -# for intel -AC_DEFUN([_AX_COMPILER_VERSION_INTEL], - [ dnl - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, - [__INTEL_COMPILER/100],, - AC_MSG_FAILURE([[[$0]] unknown intel compiler version])) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, - [(__INTEL_COMPILER%100)/10],, - AC_MSG_FAILURE([[[$0]] unknown intel compiler version])) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, - [(__INTEL_COMPILER%10)],, - AC_MSG_FAILURE([[[$0]] unknown intel compiler version])) - ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch" - ]) - -# for IBM -AC_DEFUN([_AX_COMPILER_VERSION_IBM], - [ dnl - dnl check between z/OS C/C++ and XL C/C++ - AC_COMPILE_IFELSE([ - AC_LANG_PROGRAM([], - [ - #if defined(__COMPILER_VER__) - choke me; - #endif - ])], - [ - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, - [__xlC__/100],, - AC_MSG_FAILURE([[[$0]] unknown IBM compiler major version])) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, - [__xlC__%100],, - AC_MSG_FAILURE([[[$0]] unknown IBM compiler minor version])) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, - [__xlC_ver__/0x100],, - AC_MSG_FAILURE([[[$0]] unknown IBM compiler patch version])) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_build, - [__xlC_ver__%0x100],, - AC_MSG_FAILURE([[[$0]] unknown IBM compiler build version])) - ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_build" - ], - [ - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, - [__xlC__%1000],, - AC_MSG_FAILURE([[[$0]] unknown IBM compiler patch version])) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, - [(__xlC__/10000)%10],, - AC_MSG_FAILURE([[[$0]] unknown IBM compiler minor version])) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, - [(__xlC__/100000)%10],, - AC_MSG_FAILURE([[[$0]] unknown IBM compiler major version])) - ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch" - ]) -]) - -# for pathscale -AC_DEFUN([_AX_COMPILER_VERSION_PATHSCALE],[ - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, - __PATHCC__,, - AC_MSG_FAILURE([[[$0]] unknown pathscale major])) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, - __PATHCC_MINOR__,, - AC_MSG_FAILURE([[[$0]] unknown pathscale minor])) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, - [__PATHCC_PATCHLEVEL__],, - AC_MSG_FAILURE([[[$0]] unknown pathscale patch level])) - ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch" - ]) - -# for clang -AC_DEFUN([_AX_COMPILER_VERSION_CLANG],[ - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, - __clang_major__,, - AC_MSG_FAILURE([[[$0]] unknown clang major])) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, - __clang_minor__,, - AC_MSG_FAILURE([[[$0]] unknown clang minor])) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, - [__clang_patchlevel__],,0) - ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch" - ]) - -# for crayc -AC_DEFUN([_AX_COMPILER_VERSION_CRAY],[ - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, - _RELEASE,, - AC_MSG_FAILURE([[[$0]] unknown crayc release])) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, - _RELEASE_MINOR,, - AC_MSG_FAILURE([[[$0]] unknown crayc minor])) - ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor" - ]) - -# for fujitsu -AC_DEFUN([_AX_COMPILER_VERSION_FUJITSU],[ - AC_COMPUTE_INT(ax_cv_[]_AC_LANG_ABBREV[]_compiler_version, - __FCC_VERSION,, - AC_MSG_FAILURE([[[$0]]unknown fujitsu release])) - ]) - -# for GNU -AC_DEFUN([_AX_COMPILER_VERSION_GNU],[ - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, - __GNUC__,, - AC_MSG_FAILURE([[[$0]] unknown gcc major])) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, - __GNUC_MINOR__,, - AC_MSG_FAILURE([[[$0]] unknown gcc minor])) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, - [__GNUC_PATCHLEVEL__],, - AC_MSG_FAILURE([[[$0]] unknown gcc patch level])) - ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch" - ]) - -# For sun -AC_DEFUN([_AX_COMPILER_VERSION_SUN],[ - m4_define([_AX_COMPILER_VERSION_SUN_NUMBER], - [ - #if defined(__SUNPRO_CC) - __SUNPRO_CC - #else - __SUNPRO_C - #endif - ]) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_until59, - !!(_AX_COMPILER_VERSION_SUN_NUMBER < 0x1000),, - AC_MSG_FAILURE([[[$0]] unknown sun release version])) - AS_IF([test "X$_ax_[]_AC_LANG_ABBREV[]_compiler_version_until59" = X1], - [dnl - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, - _AX_COMPILER_VERSION_SUN_NUMBER % 0x10,, - AC_MSG_FAILURE([[[$0]] unknown sun patch version])) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, - (_AX_COMPILER_VERSION_SUN_NUMBER / 0x10) % 0x10,, - AC_MSG_FAILURE([[[$0]] unknown sun minor version])) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, - (_AX_COMPILER_VERSION_SUN_NUMBER / 0x100),, - AC_MSG_FAILURE([[[$0]] unknown sun major version])) - ], - [dnl - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, - _AX_COMPILER_VERSION_SUN_NUMBER % 0x10,, - AC_MSG_FAILURE([[[$0]] unknown sun patch version])) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, - (_AX_COMPILER_VERSION_SUN_NUMBER / 0x100) % 0x100,, - AC_MSG_FAILURE([[[$0]] unknown sun minor version])) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, - (_AX_COMPILER_VERSION_SUN_NUMBER / 0x1000),, - AC_MSG_FAILURE([[[$0]] unknown sun major version])) - ]) - ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch" -]) - -AC_DEFUN([_AX_COMPILER_VERSION_HP],[ - m4_define([_AX_COMPILER_VERSION_HP_NUMBER], - [ - #if defined(__HP_cc) - __HP_cc - #else - __HP_aCC - #endif - ]) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_untilA0121, - !!(_AX_COMPILER_VERSION_HP_NUMBER <= 1),, - AC_MSG_FAILURE([[[$0]] unknown hp release version])) - AS_IF([test "X$_ax_[]_AC_LANG_ABBREV[]_compiler_version_untilA0121" = X1], - [dnl By default output last version with this behavior. - dnl it is so old - ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="01.21.00" - ], - [dnl - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, - (_AX_COMPILER_VERSION_HP_NUMBER % 100),, - AC_MSG_FAILURE([[[$0]] unknown hp release version])) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, - ((_AX_COMPILER_VERSION_HP_NUMBER / 100)%100),, - AC_MSG_FAILURE([[[$0]] unknown hp minor version])) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, - ((_AX_COMPILER_VERSION_HP_NUMBER / 10000)%100),, - AC_MSG_FAILURE([[[$0]] unknown hp major version])) - ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch" - ]) -]) - -AC_DEFUN([_AX_COMPILER_VERSION_DEC],[dnl - m4_define([_AX_COMPILER_VERSION_DEC_NUMBER], - [ - #if defined(__DECC_VER) - __DECC_VER - #else - __DECCXX_VER - #endif - ]) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, - (_AX_COMPILER_VERSION_DEC_NUMBER % 10000),, - AC_MSG_FAILURE([[[$0]] unknown dec release version])) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, - ((_AX_COMPILER_VERSION_DEC_NUMBER / 100000UL)%100),, - AC_MSG_FAILURE([[[$0]] unknown dec minor version])) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, - ((_AX_COMPILER_VERSION_DEC_NUMBER / 10000000UL)%100),, - AC_MSG_FAILURE([[[$0]] unknown dec major version])) - ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch" - ]) - -# borland -AC_DEFUN([_AX_COMPILER_VERSION_BORLAND],[dnl - m4_define([_AX_COMPILER_VERSION_TURBOC_NUMBER], - [ - #if defined(__TURBOC__) - __TURBOC__ - #else - choke me - #endif - ]) - m4_define([_AX_COMPILER_VERSION_BORLANDC_NUMBER], - [ - #if defined(__BORLANDC__) - __BORLANDC__ - #else - __CODEGEARC__ - #endif - ]) - AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM(, - _AX_COMPILER_VERSION_TURBOC_NUMBER)], - [dnl TURBOC - AC_COMPUTE_INT( - _ax_[]_AC_LANG_ABBREV[]_compiler_version_turboc_raw, - _AX_COMPILER_VERSION_TURBOC_NUMBER,, - AC_MSG_FAILURE([[[$0]] unknown turboc version])) - AS_IF( - [test $_ax_[]_AC_LANG_ABBREV[]_compiler_version_turboc_raw -lt 661 || test $_ax_[]_AC_LANG_ABBREV[]_compiler_version_turboc_raw -gt 1023], - [dnl compute normal version - AC_COMPUTE_INT( - _ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, - _AX_COMPILER_VERSION_TURBOC_NUMBER % 0x100,, - AC_MSG_FAILURE([[[$0]] unknown turboc minor version])) - AC_COMPUTE_INT( - _ax_[]_AC_LANG_ABBREV[]_compiler_version_major, - (_AX_COMPILER_VERSION_TURBOC_NUMBER/0x100)%0x100,, - AC_MSG_FAILURE([[[$0]] unknown turboc major version])) - ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="0turboc:$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor"], - [dnl special version - AS_CASE([$_ax_[]_AC_LANG_ABBREV[]_compiler_version_turboc_raw], - [661],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="0turboc:1.00"], - [662],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="0turboc:1.01"], - [663],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="0turboc:2.00"], - [ - AC_MSG_WARN([[[$0]] unknown turboc version between 0x295 and 0x400 please report bug]) - ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="" - ]) - ]) - ], - # borlandc - [ - AC_COMPUTE_INT( - _ax_[]_AC_LANG_ABBREV[]_compiler_version_borlandc_raw, - _AX_COMPILER_VERSION_BORLANDC_NUMBER,, - AC_MSG_FAILURE([[[$0]] unknown borlandc version])) - AS_CASE([$_ax_[]_AC_LANG_ABBREV[]_compiler_version_borlandc_raw], - dnl BORLANC++ before 5.5 - [512] ,[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="1borlanc:2.00"], - [1024],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="1borlanc:3.00"], - [1024],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="1borlanc:3.00"], - [1040],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="1borlanc:3.1"], - [1106],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="1borlanc:4.0"], - [1280],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="1borlanc:5.0"], - [1312],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="1borlanc:5.02"], - dnl C++ Builder era - [1328],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="2cppbuilder:3.0"], - [1344],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="2cppbuilder:4.0"], - dnl BORLANC++ after 5.5 - [1360],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="3borlancpp:5.5"], - [1361],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="3borlancpp:5.51"], - [1378],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="3borlancpp:5.6.4"], - dnl C++ Builder with year number - [1392],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="4cppbuilder:2006"], - [1424],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="4cppbuilder:2007"], - [1555],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="4cppbuilder:2009"], - [1569],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="4cppbuilder:2010"], - dnl XE version - [1584],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="5xe"], - [1600],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="5xe:2"], - [1616],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="5xe:3"], - [1632],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="5xe:4"], - [ - AC_MSG_WARN([[[$0]] Unknown borlanc compiler version $_ax_[]_AC_LANG_ABBREV[]_compiler_version_borlandc_raw please report bug]) - ]) - ]) - ]) - -# COMO -AC_DEFUN([_AX_COMPILER_VERSION_COMEAU], - [ dnl - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, - [__COMO_VERSION__%100],, - AC_MSG_FAILURE([[[$0]] unknown comeau compiler minor version])) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, - [(__COMO_VERSION__/100)%10],, - AC_MSG_FAILURE([[[$0]] unknown comeau compiler major version])) - ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor" - ]) - -# KAI -AC_DEFUN([_AX_COMPILER_VERSION_KAI],[ - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, - [__KCC_VERSION%100],, - AC_MSG_FAILURE([[[$0]] unknown kay compiler patch version])) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, - [(__KCC_VERSION/100)%10],, - AC_MSG_FAILURE([[[$0]] unknown kay compiler minor version])) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, - [(__KCC_VERSION/1000)%10],, - AC_MSG_FAILURE([[[$0]] unknown kay compiler major version])) - ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch" - ]) - -dnl LCC -dnl LCC does not output version... - -# SGI -AC_DEFUN([_AX_COMPILER_VERSION_SGI],[ - m4_define([_AX_COMPILER_VERSION_SGI_NUMBER], - [ - #if defined(_COMPILER_VERSION) - _COMPILER_VERSION - #else - _SGI_COMPILER_VERSION - #endif - ]) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, - [_AX_COMPILER_VERSION_SGI_NUMBER%10],, - AC_MSG_FAILURE([[[$0]] unknown SGI compiler patch version])) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, - [(_AX_COMPILER_VERSION_SGI_NUMBER/10)%10],, - AC_MSG_FAILURE([[[$0]] unknown SGI compiler minor version])) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, - [(_AX_COMPILER_VERSION_SGI_NUMBER/100)%10],, - AC_MSG_FAILURE([[[$0]] unknown SGI compiler major version])) - ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch" - ]) - -# microsoft -AC_DEFUN([_AX_COMPILER_VERSION_MICROSOFT],[ - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, - _MSC_VER%100,, - AC_MSG_FAILURE([[[$0]] unknown microsoft compiler minor version])) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, - (_MSC_VER/100)%100,, - AC_MSG_FAILURE([[[$0]] unknown microsoft compiler major version])) - dnl could be overridden - _ax_[]_AC_LANG_ABBREV[]_compiler_version_patch=0 - _ax_[]_AC_LANG_ABBREV[]_compiler_version_build=0 - # special case for version 6 - AS_IF([test "X$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major" = "X12"], - [AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, - _MSC_FULL_VER%1000,, - _ax_[]_AC_LANG_ABBREV[]_compiler_version_patch=0)]) - # for version 7 - AS_IF([test "X$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major" = "X13"], - [AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, - _MSC_FULL_VER%1000,, - AC_MSG_FAILURE([[[$0]] unknown microsoft compiler patch version])) - ]) - # for version > 8 - AS_IF([test $_ax_[]_AC_LANG_ABBREV[]_compiler_version_major -ge 14], - [AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, - _MSC_FULL_VER%10000,, - AC_MSG_FAILURE([[[$0]] unknown microsoft compiler patch version])) - ]) - AS_IF([test $_ax_[]_AC_LANG_ABBREV[]_compiler_version_major -ge 15], - [AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_build, - _MSC_BUILD,, - AC_MSG_FAILURE([[[$0]] unknown microsoft compiler build version])) - ]) - ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_build" - ]) - -# for metrowerks -AC_DEFUN([_AX_COMPILER_VERSION_METROWERKS],[dnl - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, - __MWERKS__%0x100,, - AC_MSG_FAILURE([[[$0]] unknown metrowerks compiler patch version])) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, - (__MWERKS__/0x100)%0x10,, - AC_MSG_FAILURE([[[$0]] unknown metrowerks compiler minor version])) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, - (__MWERKS__/0x1000)%0x10,, - AC_MSG_FAILURE([[[$0]] unknown metrowerks compiler major version])) - ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch" - ]) - -# for watcom -AC_DEFUN([_AX_COMPILER_VERSION_WATCOM],[dnl - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, - __WATCOMC__%100,, - AC_MSG_FAILURE([[[$0]] unknown watcom compiler minor version])) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, - (__WATCOMC__/100)%100,, - AC_MSG_FAILURE([[[$0]] unknown watcom compiler major version])) - ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor" - ]) - -# for PGI -AC_DEFUN([_AX_COMPILER_VERSION_PORTLAND],[ - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, - __PGIC__,, - AC_MSG_FAILURE([[[$0]] unknown pgi major])) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, - __PGIC_MINOR__,, - AC_MSG_FAILURE([[[$0]] unknown pgi minor])) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, - [__PGIC_PATCHLEVEL__],, - AC_MSG_FAILURE([[[$0]] unknown pgi patch level])) - ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch" - ]) - -# tcc -AC_DEFUN([_AX_COMPILER_VERSION_TCC],[ - ax_cv_[]_AC_LANG_ABBREV[]_compiler_version=[`tcc -v | $SED 's/^[ ]*tcc[ ]\+version[ ]\+$[0-9.]\+$.*/\1/g'`] - ]) -# main entry point -AC_DEFUN([AX_COMPILER_VERSION],[dnl - AC_REQUIRE([AX_COMPILER_VENDOR]) - AC_REQUIRE([AC_PROG_SED]) - AC_CACHE_CHECK([for _AC_LANG compiler version], - ax_cv_[]_AC_LANG_ABBREV[]_compiler_version, - [ dnl - AS_CASE([$ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor], - [intel],[_AX_COMPILER_VERSION_INTEL], - [ibm],[_AX_COMPILER_VERSION_IBM], - [pathscale],[_AX_COMPILER_VERSION_PATHSCALE], - [clang],[_AX_COMPILER_VERSION_CLANG], - [cray],[_AX_COMPILER_VERSION_CRAY], - [fujitsu],[_AX_COMPILER_VERSION_FUJITSU], - [gnu],[_AX_COMPILER_VERSION_GNU], - [sun],[_AX_COMPILER_VERSION_SUN], - [hp],[_AX_COMPILER_VERSION_HP], - [dec],[_AX_COMPILER_VERSION_DEC], - [borland],[_AX_COMPILER_VERSION_BORLAND], - [comeau],[_AX_COMPILER_VERSION_COMEAU], - [kai],[_AX_COMPILER_VERSION_KAI], - [sgi],[_AX_COMPILER_VERSION_SGI], - [microsoft],[_AX_COMPILER_VERSION_MICROSOFT], - [metrowerks],[_AX_COMPILER_VERSION_METROWERKS], - [watcom],[_AX_COMPILER_VERSION_WATCOM], - [portland],[_AX_COMPILER_VERSION_PORTLAND], - [tcc],[_AX_COMPILER_VERSION_TCC], - [ax_cv_[]_AC_LANG_ABBREV[]_compiler_version=""]) - ]) -]) ----------------------------------------------------------------------- Summary of changes: configure.ac | 21 +- m4/ax_check_compile_flag.m4 | 74 ------- m4/ax_compiler_vendor.m4 | 87 -------- m4/ax_compiler_version.m4 | 492 -------------------------------------------- m4/ax_pthread.m4 | 332 ------------------------------ m4/odp_check_flag.m4 | 38 ++-- m4/odp_pthread.m4 | 23 ++- 7 files changed, 48 insertions(+), 1019 deletions(-) delete mode 100644 m4/ax_check_compile_flag.m4 delete mode 100644 m4/ax_compiler_vendor.m4 delete mode 100644 m4/ax_compiler_version.m4 delete mode 100644 m4/ax_pthread.m4 hooks/post-receive --

7 years, 8 months

[COMMIT] branch master updated. v1.19.0.1_tigermoth-94-g719ac450

by git＠git-us.linaro.org

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, master has been updated via 719ac4509920bad7d5c8d563426d21f2a0c9e80e (commit) via b1eadcb681dbe7a3d7db4d3ddb18528ebd15211b (commit) via ac851856893867331ab9f692a135a40677daa351 (commit) from 492390a79f20c7aaaf16f232fbd5ecf0d9b700e7 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 719ac4509920bad7d5c8d563426d21f2a0c9e80e Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Mon Jun 11 14:57:51 2018 +0300 validation: hash: add generic CRC test cases Added test cases for odp_hash_crc_gen64(). Test cases are defined for 32, 24 and 16 bit CRCs. Tests include various polynoms, init, output XOR and reflection values. Test data is "123456789" for most of the test cases, since that is used commonly as the CRC "check" data. Used CRC names, parameters and check values are listed e.g. here: http://reveng.sourceforge.net/crc-catalogue Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/validation/api/hash/hash.c b/test/validation/api/hash/hash.c index d3b01548..4edcb08a 100644 --- a/test/validation/api/hash/hash.c +++ b/test/validation/api/hash/hash.c @@ -9,6 +9,10 @@ #include <odp_api.h> #include <odp_cunit_common.h> +/* Commonly used CRC check string */ +#define CHECK_STR "123456789" +#define CHECK_LEN 9 + #define CRC32C_INIT 0xffffffff #define CRC32C_XOR 0xffffffff #define CRC32_INIT 0xffffffff @@ -84,8 +88,7 @@ static const uint8_t test_data_11[] = "abcdefg"; static const uint8_t test_data_12[] = "The five boxing wizards jump quickly."; -/* String of the common "check" value. */ -static const uint8_t test_data_13[] = "123456789"; +static const uint8_t test_data_13[] = CHECK_STR; static const hash_test_vector_t crc32c_test_vector[] = { { .data = test_data_0, @@ -237,9 +240,421 @@ static void hash_test_crc32(void) } } +/* + * Test various commonly used 32 bit CRCs. Used CRC names, parameters and + * check values can be found e.g. here: + * http://reveng.sourceforge.net/crc-catalogue + */ +static void hash_test_crc32_generic(void) +{ + uint64_t result_u64; + uint32_t result_u32, result; + int i, num; + odp_hash_crc_param_t crc_param; + + memset(&crc_param, 0, sizeof(odp_hash_crc_param_t)); + crc_param.width = 32; + crc_param.xor_out = 0; + + /* CRC-32 */ + crc_param.poly = 0x04c11db7; + crc_param.reflect_in = 1; + crc_param.reflect_out = 1; + num = sizeof(crc32_test_vector) / sizeof(hash_test_vector_t); + + for (i = 0; i < num; i++) { + if (odp_hash_crc_gen64(crc32_test_vector[i].data, + crc32_test_vector[i].len, + CRC32_INIT, + &crc_param, &result_u64)) { + printf("CRC-32 not supported\n."); + break; + } + + result_u32 = CRC32_XOR ^ result_u64; + CU_ASSERT(result_u32 == crc32_test_vector[i].result.u32); + } + + /* CRC-32C */ + crc_param.poly = 0x1edc6f41; + crc_param.reflect_in = 1; + crc_param.reflect_out = 1; + num = sizeof(crc32c_test_vector) / sizeof(hash_test_vector_t); + + for (i = 0; i < num; i++) { + if (odp_hash_crc_gen64(crc32c_test_vector[i].data, + crc32c_test_vector[i].len, + CRC32C_INIT, + &crc_param, &result_u64)) { + printf("CRC-32C not supported\n."); + break; + } + + result_u32 = CRC32C_XOR ^ result_u64; + CU_ASSERT(result_u32 == crc32c_test_vector[i].result.u32); + } + + /* CRC-32/AUTOSAR */ + crc_param.poly = 0xf4acfb13; + crc_param.reflect_in = 1; + crc_param.reflect_out = 1; + result = 0x1697d06a; + + if (odp_hash_crc_gen64(CHECK_STR, CHECK_LEN, 0xffffffff, + &crc_param, &result_u64) == 0) { + result_u32 = 0xffffffff ^ result_u64; + CU_ASSERT(result_u32 == result); + } else { + printf("CRC-32/AUTOSAR not supported\n."); + } + + /* CRC-32/BZIP2 */ + crc_param.poly = 0x04c11db7; + crc_param.reflect_in = 0; + crc_param.reflect_out = 0; + result = 0xfc891918; + + if (odp_hash_crc_gen64(CHECK_STR, CHECK_LEN, 0xffffffff, + &crc_param, &result_u64) == 0) { + result_u32 = 0xffffffff ^ result_u64; + CU_ASSERT(result_u32 == result); + } else { + printf("CRC-32/BZIP2 not supported\n."); + } + + /* CRC-32D */ + crc_param.poly = 0xa833982b; + crc_param.reflect_in = 1; + crc_param.reflect_out = 1; + result = 0x87315576; + + if (odp_hash_crc_gen64(CHECK_STR, CHECK_LEN, 0xffffffff, + &crc_param, &result_u64) == 0) { + result_u32 = 0xffffffff ^ result_u64; + CU_ASSERT(result_u32 == result); + } else { + printf("CRC-32D not supported\n."); + } + + /* CRC-32/MPEG-2 */ + crc_param.poly = 0x04c11db7; + crc_param.reflect_in = 0; + crc_param.reflect_out = 0; + result = 0x0376e6e7; + + if (odp_hash_crc_gen64(CHECK_STR, CHECK_LEN, 0xffffffff, + &crc_param, &result_u64) == 0) { + result_u32 = 0x0 ^ result_u64; + CU_ASSERT(result_u32 == result); + } else { + printf("CRC-32/MPEG-2 not supported\n."); + } + + /* CRC-32/POSIX */ + crc_param.poly = 0x04c11db7; + crc_param.reflect_in = 0; + crc_param.reflect_out = 0; + result = 0x765e7680; + + if (odp_hash_crc_gen64(CHECK_STR, CHECK_LEN, 0x0, + &crc_param, &result_u64) == 0) { + result_u32 = 0xffffffff ^ result_u64; + CU_ASSERT(result_u32 == result); + } else { + printf("CRC-32/POSIX not supported\n."); + } + + /* CRC-32/POSIX - with XOR parameter used */ + crc_param.xor_out = 0xffffffff; + + if (odp_hash_crc_gen64(CHECK_STR, CHECK_LEN, 0x0, + &crc_param, &result_u64) == 0) { + result_u32 = result_u64; + CU_ASSERT(result_u32 == result); + } else { + printf("CRC-32/POSIX (with XOR) not supported\n."); + } + + crc_param.xor_out = 0; + + /* CRC-32Q */ + crc_param.poly = 0x814141ab; + crc_param.reflect_in = 0; + crc_param.reflect_out = 0; + result = 0x3010bf7f; + + if (odp_hash_crc_gen64(CHECK_STR, CHECK_LEN, 0x0, + &crc_param, &result_u64) == 0) { + result_u32 = 0x0 ^ result_u64; + CU_ASSERT(result_u32 == result); + } else { + printf("CRC-32Q not supported\n."); + } + + /* CRC-32/JAMCRC */ + crc_param.poly = 0x04c11db7; + crc_param.reflect_in = 1; + crc_param.reflect_out = 1; + result = 0x340bc6d9; + + if (odp_hash_crc_gen64(CHECK_STR, CHECK_LEN, 0xffffffff, + &crc_param, &result_u64) == 0) { + result_u32 = 0x0 ^ result_u64; + CU_ASSERT(result_u32 == result); + } else { + printf("CRC-32/JAMCRC not supported\n."); + } + + /* CRC-32/XFER */ + crc_param.poly = 0x000000af; + crc_param.reflect_in = 0; + crc_param.reflect_out = 0; + result = 0xbd0be338; + + if (odp_hash_crc_gen64(CHECK_STR, CHECK_LEN, 0x0, + &crc_param, &result_u64) == 0) { + result_u32 = 0x0 ^ result_u64; + CU_ASSERT(result_u32 == result); + } else { + printf("CRC-32/XFER not supported\n."); + } +} + +static void hash_test_crc24_generic(void) +{ + uint64_t result_u64; + uint32_t result_u32, result; + odp_hash_crc_param_t crc_param; + + memset(&crc_param, 0, sizeof(odp_hash_crc_param_t)); + crc_param.width = 24; + crc_param.xor_out = 0; + + /* CRC-24 */ + crc_param.poly = 0x864cfb; + crc_param.reflect_in = 0; + crc_param.reflect_out = 0; + result = 0x21cf02; + + if (odp_hash_crc_gen64(CHECK_STR, CHECK_LEN, 0xb704ce, + &crc_param, &result_u64) == 0) { + result_u32 = 0x0 ^ result_u64; + CU_ASSERT(result_u32 == result); + } else { + printf("CRC-24 not supported\n."); + } + + /* CRC-24/FLEXRAY-A */ + crc_param.poly = 0x5d6dcb; + crc_param.reflect_in = 0; + crc_param.reflect_out = 0; + result = 0x7979bd; + + if (odp_hash_crc_gen64(CHECK_STR, CHECK_LEN, 0xfedcba, + &crc_param, &result_u64) == 0) { + result_u32 = 0x0 ^ result_u64; + CU_ASSERT(result_u32 == result); + } else { + printf("CRC-24/FLEXRAY-A not supported\n."); + } + + /* CRC-24/FLEXRAY-B */ + result = 0x1f23b8; + + if (odp_hash_crc_gen64(CHECK_STR, CHECK_LEN, 0xabcdef, + &crc_param, &result_u64) == 0) { + result_u32 = 0x0 ^ result_u64; + CU_ASSERT(result_u32 == result); + } else { + printf("CRC-24/FLEXRAY-B not supported\n."); + } + + /* CRC-24/INTERLAKEN */ + crc_param.poly = 0x328b63; + crc_param.reflect_in = 0; + crc_param.reflect_out = 0; + result = 0xb4f3e6; + + if (odp_hash_crc_gen64(CHECK_STR, CHECK_LEN, 0xffffff, + &crc_param, &result_u64) == 0) { + result_u32 = 0xffffff ^ result_u64; + CU_ASSERT(result_u32 == result); + } else { + printf("CRC-24/INTERLAKEN not supported\n."); + } + + /* CRC-24/LTE-A */ + crc_param.poly = 0x864cfb; + crc_param.reflect_in = 0; + crc_param.reflect_out = 0; + result = 0xcde703; + + if (odp_hash_crc_gen64(CHECK_STR, CHECK_LEN, 0x0, + &crc_param, &result_u64) == 0) { + result_u32 = 0x0 ^ result_u64; + CU_ASSERT(result_u32 == result); + } else { + printf("CRC-24/LTE-A not supported\n."); + } + + /* CRC-24/LTE-B */ + crc_param.poly = 0x800063; + crc_param.reflect_in = 0; + crc_param.reflect_out = 0; + result = 0x23ef52; + + if (odp_hash_crc_gen64(CHECK_STR, CHECK_LEN, 0x0, + &crc_param, &result_u64) == 0) { + result_u32 = 0x0 ^ result_u64; + CU_ASSERT(result_u32 == result); + } else { + printf("CRC-24/LTE-B not supported\n."); + } + + /* CRC-24/BLE */ + crc_param.poly = 0x00065b; + crc_param.reflect_in = 1; + crc_param.reflect_out = 1; + result = 0xc25a56; + + if (odp_hash_crc_gen64(CHECK_STR, CHECK_LEN, 0x555555, + &crc_param, &result_u64) == 0) { + result_u32 = 0x0 ^ result_u64; + CU_ASSERT(result_u32 == result); + } else { + printf("CRC-24/BLE not supported\n."); + } +} + +static void hash_test_crc16_generic(void) +{ + uint64_t result_u64; + uint16_t result_u16, result; + odp_hash_crc_param_t crc_param; + + memset(&crc_param, 0, sizeof(odp_hash_crc_param_t)); + crc_param.width = 16; + crc_param.xor_out = 0; + + /* CRC-16/ARC */ + crc_param.poly = 0x8005; + crc_param.reflect_in = 1; + crc_param.reflect_out = 1; + result = 0xbb3d; + + if (odp_hash_crc_gen64(CHECK_STR, CHECK_LEN, 0x0, + &crc_param, &result_u64) == 0) { + result_u16 = 0x0 ^ result_u64; + CU_ASSERT(result_u16 == result); + } else { + printf("CRC-16/ARC not supported\n."); + } + + /* CRC-16/UMTS */ + crc_param.poly = 0x8005; + crc_param.reflect_in = 0; + crc_param.reflect_out = 0; + result = 0xfee8; + + if (odp_hash_crc_gen64(CHECK_STR, CHECK_LEN, 0x0, + &crc_param, &result_u64) == 0) { + result_u16 = 0x0 ^ result_u64; + CU_ASSERT(result_u16 == result); + } else { + printf("CRC-16/UMTS not supported\n."); + } + + /* CRC-16/CDMA2000 */ + crc_param.poly = 0xc867; + crc_param.reflect_in = 0; + crc_param.reflect_out = 0; + result = 0x4c06; + + if (odp_hash_crc_gen64(CHECK_STR, CHECK_LEN, 0xffff, + &crc_param, &result_u64) == 0) { + result_u16 = 0x0 ^ result_u64; + CU_ASSERT(result_u16 == result); + } else { + printf("CRC-16/CDMA2000 not supported\n."); + } + + /* CRC-16/GENIBUS */ + crc_param.poly = 0x1021; + crc_param.reflect_in = 0; + crc_param.reflect_out = 0; + result = 0xd64e; + + if (odp_hash_crc_gen64(CHECK_STR, CHECK_LEN, 0xffff, + &crc_param, &result_u64) == 0) { + result_u16 = 0xffff ^ result_u64; + CU_ASSERT(result_u16 == result); + } else { + printf("CRC-16/GENIBUS not supported\n."); + } + + /* CRC-16/T10-DIF */ + crc_param.poly = 0x8bb7; + crc_param.reflect_in = 0; + crc_param.reflect_out = 0; + result = 0xd0db; + + if (odp_hash_crc_gen64(CHECK_STR, CHECK_LEN, 0x0, + &crc_param, &result_u64) == 0) { + result_u16 = 0x0 ^ result_u64; + CU_ASSERT(result_u16 == result); + } else { + printf("CRC-16/T10-DIF not supported\n."); + } + + /* CRC-16/USB */ + crc_param.poly = 0x8005; + crc_param.reflect_in = 1; + crc_param.reflect_out = 1; + result = 0xb4c8; + + if (odp_hash_crc_gen64(CHECK_STR, CHECK_LEN, 0xffff, + &crc_param, &result_u64) == 0) { + result_u16 = 0xffff ^ result_u64; + CU_ASSERT(result_u16 == result); + } else { + printf("CRC-16/USB not supported\n."); + } + + /* CRC-16/CCITT */ + crc_param.poly = 0x1021; + crc_param.reflect_in = 1; + crc_param.reflect_out = 1; + result = 0x2189; + + if (odp_hash_crc_gen64(CHECK_STR, CHECK_LEN, 0x0, + &crc_param, &result_u64) == 0) { + result_u16 = 0x0 ^ result_u64; + CU_ASSERT(result_u16 == result); + } else { + printf("CRC-16/CCITT not supported\n."); + } + + /* CRC-16/X-25 */ + crc_param.poly = 0x1021; + crc_param.reflect_in = 1; + crc_param.reflect_out = 1; + result = 0x906e; + + if (odp_hash_crc_gen64(CHECK_STR, CHECK_LEN, 0xffff, + &crc_param, &result_u64) == 0) { + result_u16 = 0xffff ^ result_u64; + CU_ASSERT(result_u16 == result); + } else { + printf("CRC-16/X25 not supported\n."); + } +} + odp_testinfo_t hash_suite[] = { ODP_TEST_INFO(hash_test_crc32c), ODP_TEST_INFO(hash_test_crc32), + ODP_TEST_INFO(hash_test_crc32_generic), + ODP_TEST_INFO(hash_test_crc24_generic), + ODP_TEST_INFO(hash_test_crc16_generic), ODP_TEST_INFO_NULL, }; commit b1eadcb681dbe7a3d7db4d3ddb18528ebd15211b Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Mon Jun 11 15:41:18 2018 +0300 validation: hash: change result to 32 bit word Set results as 32 bit words. Also polynom is represented as 32 bit word in cpu endian. Majority of references list CRC values in this form (as an exception RFC 7143 lists those in big endian). Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/validation/api/hash/hash.c b/test/validation/api/hash/hash.c index 080201af..d3b01548 100644 --- a/test/validation/api/hash/hash.c +++ b/test/validation/api/hash/hash.c @@ -90,118 +90,118 @@ static const uint8_t test_data_13[] = "123456789"; static const hash_test_vector_t crc32c_test_vector[] = { { .data = test_data_0, .len = sizeof(test_data_0), - .result.u8 = {0xaa, 0x36, 0x91, 0x8a} + .result.u32 = 0x8a9136aa }, { .data = test_data_1, .len = sizeof(test_data_1), - .result.u8 = {0x43, 0xab, 0xa8, 0x62} + .result.u32 = 0x62a8ab43 }, { .data = test_data_2, .len = sizeof(test_data_2), - .result.u8 = {0x4e, 0x79, 0xdd, 0x46} + .result.u32 = 0x46dd794e }, { .data = test_data_3, .len = sizeof(test_data_3), - .result.u8 = {0x5c, 0xdb, 0x3f, 0x11} + .result.u32 = 0x113fdb5c }, { .data = test_data_4, .len = sizeof(test_data_4), - .result.u8 = {0x56, 0x3a, 0x96, 0xd9} + .result.u32 = 0xd9963a56 }, { .data = test_data_5, .len = sizeof(test_data_5) - 1, - .result.u8 = {0x31, 0x0a, 0xc8, 0x92} + .result.u32 = 0x92c80a31 }, { .data = test_data_6, .len = sizeof(test_data_6) - 1, - .result.u8 = {0xb7, 0x21, 0x94, 0x0a} + .result.u32 = 0x0a9421b7 }, { .data = test_data_7, .len = sizeof(test_data_7) - 1, - .result.u8 = {0xb3, 0x97, 0x00, 0x19} + .result.u32 = 0x190097b3 }, { .data = test_data_8, .len = sizeof(test_data_8) - 1, - .result.u8 = {0x30, 0x43, 0xd0, 0xc1} + .result.u32 = 0xc1d04330 }, { .data = test_data_9, .len = sizeof(test_data_9) - 1, - .result.u8 = {0x36, 0x29, 0xa2, 0xe2} + .result.u32 = 0xe2a22936 }, { .data = test_data_10, .len = sizeof(test_data_10) - 1, - .result.u8 = {0xb7, 0x3f, 0x4b, 0x36} + .result.u32 = 0x364b3fb7 }, { .data = test_data_11, .len = sizeof(test_data_11) - 1, - .result.u8 = {0x41, 0xf4, 0x27, 0xe6} + .result.u32 = 0xe627f441 }, { .data = test_data_12, .len = sizeof(test_data_12) - 1, - .result.u8 = {0x9a, 0x05, 0xd3, 0xde} + .result.u32 = 0xded3059a }, { .data = test_data_13, .len = sizeof(test_data_13) - 1, - .result.u8 = {0x83, 0x92, 0x06, 0xe3} + .result.u32 = 0xe3069283 } }; static const hash_test_vector_t crc32_test_vector[] = { { .data = test_data_0, .len = sizeof(test_data_0), - .result.u8 = {0xad, 0x55, 0x0a, 0x19} + .result.u32 = 0x190a55ad }, { .data = test_data_1, .len = sizeof(test_data_1), - .result.u8 = {0x0b, 0xab, 0x6c, 0xff} + .result.u32 = 0xff6cab0b }, { .data = test_data_2, .len = sizeof(test_data_2), - .result.u8 = {0x8a, 0x7e, 0x26, 0x91} + .result.u32 = 0x91267e8a }, { .data = test_data_3, .len = sizeof(test_data_3), - .result.u8 = {0x72, 0xef, 0xb0, 0x9a} + .result.u32 = 0x9ab0ef72 }, { .data = test_data_4, .len = sizeof(test_data_4), - .result.u8 = {0x12, 0x74, 0xe1, 0x51} + .result.u32 = 0x51e17412 }, { .data = test_data_5, .len = sizeof(test_data_5) - 1, - .result.u8 = {0x11, 0xcd, 0x82, 0xed} + .result.u32 = 0xed82cd11 }, { .data = test_data_6, .len = sizeof(test_data_6) - 1, - .result.u8 = {0x50, 0x2a, 0xef, 0xae} + .result.u32 = 0xaeef2a50 }, { .data = test_data_7, .len = sizeof(test_data_7) - 1, - .result.u8 = {0xe9, 0x25, 0x90, 0x51} + .result.u32 = 0x519025e9 }, { .data = test_data_8, .len = sizeof(test_data_8) - 1, - .result.u8 = {0x43, 0xbe, 0xb7, 0xe8} + .result.u32 = 0xe8b7be43 }, { .data = test_data_9, .len = sizeof(test_data_9) - 1, - .result.u8 = {0x6d, 0x48, 0x83, 0x9e} + .result.u32 = 0x9e83486d }, { .data = test_data_10, .len = sizeof(test_data_10) - 1, - .result.u8 = {0xc2, 0x41, 0x24, 0x35} + .result.u32 = 0x352441c2 }, { .data = test_data_11, .len = sizeof(test_data_11) - 1, - .result.u8 = {0xa6, 0x6a, 0x2a, 0x31} + .result.u32 = 0x312a6aa6 }, { .data = test_data_12, .len = sizeof(test_data_12) - 1, - .result.u8 = {0xcd, 0x2a, 0x91, 0xde} + .result.u32 = 0xde912acd }, { .data = test_data_13, .len = sizeof(test_data_13) - 1, - .result.u8 = {0x26, 0x39, 0xf4, 0xcb} + .result.u32 = 0xcbf43926 } }; commit ac851856893867331ab9f692a135a40677daa351 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Mon Jun 11 14:41:54 2018 +0300 linux-gen: hash: generic crc implementation Added implementation of odp_hash_crc_gen64(). CRC widths of 32, 24 and 16 bits are supported. Only symmetric reflection setting (in/out: false/false or true/true) is supported. Currently, 24 bit width with reflection does not work and is marked as not supported. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 1e617cc3..4d2ea9c4 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -163,6 +163,7 @@ __LIB__libodp_linux_la_SOURCES = \ odp_fdserver.c \ odp_hash_crc32.c \ odp_hash_crc32c.c \ + odp_hash_crc_gen.c \ odp_impl.c \ odp_init.c \ odp_ipsec.c \ diff --git a/platform/linux-generic/include/odp_init_internal.h b/platform/linux-generic/include/odp_init_internal.h index 3619d777..f585ceff 100644 --- a/platform/linux-generic/include/odp_init_internal.h +++ b/platform/linux-generic/include/odp_init_internal.h @@ -83,6 +83,8 @@ int _odp_ipsec_events_term_global(void); int _odp_cpu_cycles_init_global(void); +int _odp_hash_init_global(void); + #ifdef __cplusplus } #endif diff --git a/platform/linux-generic/odp_hash_crc_gen.c b/platform/linux-generic/odp_hash_crc_gen.c new file mode 100644 index 00000000..1ea6d8cd --- /dev/null +++ b/platform/linux-generic/odp_hash_crc_gen.c @@ -0,0 +1,222 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <stdio.h> +#include <stdint.h> +#include <inttypes.h> +#include <string.h> + +#include <odp/api/hash.h> +#include <odp/api/hints.h> +#include <odp/api/rwlock.h> + +#include <odp_debug_internal.h> +#include <odp_init_internal.h> + +typedef struct crc_table_t { + uint32_t crc[256]; + uint32_t width; + uint32_t poly; + int reflect; + odp_rwlock_t rwlock; + +} crc_table_t; + +static crc_table_t crc_table; + +int _odp_hash_init_global(void) +{ + memset(&crc_table, 0, sizeof(crc_table_t)); + + odp_rwlock_init(&crc_table.rwlock); + + return 0; +} + +/* Reflect bits in a byte */ +static inline uint8_t reflect_u8(uint8_t byte) +{ + uint8_t u8[8]; + + u8[0] = (byte & (0x1 << 7)) >> 7; + u8[1] = (byte & (0x1 << 6)) >> 5; + u8[2] = (byte & (0x1 << 5)) >> 3; + u8[3] = (byte & (0x1 << 4)) >> 1; + + u8[4] = (byte & (0x1 << 3)) << 1; + u8[5] = (byte & (0x1 << 2)) << 3; + u8[6] = (byte & (0x1 << 1)) << 5; + u8[7] = (byte & 0x1) << 7; + + return u8[0] | u8[1] | u8[2] | u8[3] | u8[4] | u8[5] | u8[6] | u8[7]; +} + +/* Reflect 32 bits */ +static inline uint32_t reflect_u32(uint32_t u32) +{ + uint8_t u8[4]; + + u8[0] = reflect_u8((u32 & 0xff000000) >> 24); + u8[1] = reflect_u8((u32 & 0x00ff0000) >> 16); + u8[2] = reflect_u8((u32 & 0x0000ff00) >> 8); + u8[3] = reflect_u8(u32 & 0xff); + + return (u8[3] << 24) | (u8[2] << 16) | (u8[1] << 8) | u8[0]; +} + +/* Reflect 24 bits */ +static inline uint32_t reflect_u24(uint32_t u32) +{ + uint8_t u8[4]; + + u8[0] = reflect_u8((u32 & 0xff0000) >> 16); + u8[1] = reflect_u8((u32 & 0x00ff00) >> 8); + u8[2] = reflect_u8(u32 & 0xff); + + return (u8[2] << 16) | (u8[1] << 8) | u8[0]; +} + +/* Reflect 16 bits */ +static inline uint32_t reflect_u16(uint32_t u32) +{ + uint8_t u8[4]; + + u8[0] = reflect_u8((u32 & 0xff00) >> 8); + u8[1] = reflect_u8(u32 & 0xff); + + return (u8[1] << 8) | u8[0]; +} + +/* Generate table for a 32/24/16 bit CRCs. + * + * Based on an example in RFC 1952. + */ +static inline void crc_table_gen(uint32_t poly, int reflect, int width) +{ + uint32_t i, crc, bit, shift, msb, mask; + + crc_table.width = width; + crc_table.poly = poly; + crc_table.reflect = reflect; + + shift = width - 8; + mask = 0xffffffff >> (32 - width); + msb = 0x1 << (width - 1); + + if (reflect) { + if (width == 32) + poly = reflect_u32(poly); + else if (width == 24) + poly = reflect_u24(poly); + else + poly = reflect_u16(poly); + } + + for (i = 0; i < 256; i++) { + if (reflect) { + crc = i; + + for (bit = 0; bit < 8; bit++) { + if (crc & 0x1) + crc = poly ^ (crc >> 1); + else + crc = crc >> 1; + } + } else { + crc = i << shift; + + for (bit = 0; bit < 8; bit++) { + if (crc & msb) + crc = poly ^ (crc << 1); + else + crc = crc << 1; + } + } + + crc_table.crc[i] = crc & mask; + } +} + +static inline uint32_t crc_calc(const uint8_t *data, uint32_t data_len, + uint32_t init_val, int reflect, int width) +{ + uint32_t i, crc, shift; + uint8_t byte; + uint32_t mask; + + shift = width - 8; + mask = 0xffffffff >> (32 - width); + + crc = init_val; + + for (i = 0; i < data_len; i++) { + byte = data[i]; + + if (reflect) { + crc = crc_table.crc[(crc ^ byte) & 0xff] ^ (crc >> 8); + } else { + crc = crc_table.crc[(crc >> shift) ^ byte] ^ (crc << 8); + crc = crc & mask; + } + } + + return crc; +} + +int odp_hash_crc_gen64(const void *data_ptr, uint32_t data_len, + uint64_t init_val, odp_hash_crc_param_t *crc_param, + uint64_t *crc_out) +{ + uint32_t crc; + int update_table; + uint32_t poly = crc_param->poly; + uint32_t width = crc_param->width; + int reflect = crc_param->reflect_in; + + if (odp_unlikely(crc_param->reflect_in != crc_param->reflect_out)) { + ODP_ERR("Odd reflection setting not supported.\n"); + return -1; + } + + if (odp_unlikely(width != 32 && width != 24 && width != 16)) { + ODP_ERR("CRC width %" PRIu32 " bits not supported.\n", width); + return -1; + } + + /* TODO: fix implementation of 24 bit CRC with reflection */ + if (odp_unlikely(width == 24 && reflect)) { + ODP_ERR("24 bit CRC with reflection not supported.\n"); + return -1; + } + + odp_rwlock_read_lock(&crc_table.rwlock); + + update_table = (crc_table.width != width) || + (crc_table.poly != poly) || + (crc_table.reflect != reflect); + + /* Generate CRC table if not yet generated. */ + if (odp_unlikely(update_table)) { + odp_rwlock_read_unlock(&crc_table.rwlock); + odp_rwlock_write_lock(&crc_table.rwlock); + + crc_table_gen(poly, reflect, width); + } + + crc = crc_calc(data_ptr, data_len, init_val, reflect, width); + + if (odp_unlikely(update_table)) + odp_rwlock_write_unlock(&crc_table.rwlock); + else + odp_rwlock_read_unlock(&crc_table.rwlock); + + if (crc_param->xor_out) + crc = crc ^ (uint32_t)crc_param->xor_out; + + *crc_out = crc; + + return 0; +} diff --git a/platform/linux-generic/odp_init.c b/platform/linux-generic/odp_init.c index b2b75f12..61f99e4d 100644 --- a/platform/linux-generic/odp_init.c +++ b/platform/linux-generic/odp_init.c @@ -22,6 +22,7 @@ enum init_stage { LIBCONFIG_INIT, CPUMASK_INIT, CPU_CYCLES_INIT, + HASH_INIT, TIME_INIT, SYSINFO_INIT, ISHM_INIT, @@ -174,6 +175,8 @@ static int term_global(enum init_stage stage) } /* Fall through */ + case HASH_INIT: + /* Fall through */ case CPU_CYCLES_INIT: /* Fall through */ case CPUMASK_INIT: @@ -233,6 +236,12 @@ int odp_init_global(odp_instance_t *instance, } stage = CPU_CYCLES_INIT; + if (_odp_hash_init_global()) { + ODP_ERR("ODP hash init failed.\n"); + goto init_failed; + } + stage = HASH_INIT; + if (odp_time_init_global()) { ODP_ERR("ODP time init failed.\n"); goto init_failed; ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/Makefile.am | 1 + platform/linux-generic/include/odp_init_internal.h | 2 + platform/linux-generic/odp_hash_crc_gen.c | 222 ++++++++++ platform/linux-generic/odp_init.c | 9 + test/validation/api/hash/hash.c | 475 +++++++++++++++++++-- 5 files changed, 679 insertions(+), 30 deletions(-) create mode 100644 platform/linux-generic/odp_hash_crc_gen.c hooks/post-receive --

7 years, 8 months

[COMMIT] branch api-next updated. v1.19.0.1_tigermoth-91-g492390a7

by git＠git-us.linaro.org

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, api-next has been updated via 492390a79f20c7aaaf16f232fbd5ecf0d9b700e7 (commit) via 53f3baf58256c085fa230992eb03c896276fc874 (commit) via 7266ca2e44705e550ba7c8c1a71fa373eabd7b99 (commit) via eb021ca3cba9635b861205b2fc94da2a3cdf37bc (commit) via f8136babc5601068ac0f3ab30414a5cbd99388c3 (commit) via a01d17348d6c34457a415935e702a24257adcf8a (commit) via 3e3f0f51da0af53d6161ffa270e1b1c13c88e3e4 (commit) via 61989fee80f613970445e9658979a7b9f58fe9fb (commit) via 30114714f7740b3ee309e0be05e679c7e03816ba (commit) via 40ac22bb63526e9a935d804513204a85a665d13a (commit) via 3239dd418ff3f02924fa71c0b805e709b6b6db63 (commit) via bfc31d006406481c26aa851257d643d480507e2c (commit) via 273fc3e2e0c92bbf22019ea7d686b061d640da78 (commit) via ff723f791449a5ba156a997459844b4be2e2ab82 (commit) via 3daf62015014e70b09ea6fc59d20a5facff4fe6d (commit) via bc2ca16611bdaac49e2ec22ecebe6ba67dd73812 (commit) via d511479f529fa71e76ff0d2941585f7467276982 (commit) via dc3746ac97c0dbb8e7b85de909c7356cc05ee8b9 (commit) via 4a6e7f9c28fe9ad0f90bbfd6d45bcd65b14d15e7 (commit) via ff0e06546eb8fb49f495c819efec984b70d29102 (commit) via 3c449bd75224b543de394bf6444c09cfbc6e104f (commit) via c3c447c96ab63092461dee2bac607f59a21bf8de (commit) via c7bf6a71fe08f3ba8228eced708c9d05496a825a (commit) via a832529f5430e0f60fee792a95a35ce7b2bed25d (commit) via 277cbcf414448fb7fd3fa8171a7cb8ffdcb6262b (commit) via 953246794f041282cb1a59ccf47f9bde6c369069 (commit) via 780d15ced4188a38984c656a9fca58fdd5226735 (commit) via afef45861d081c0722fff71992d45854923c0d0f (commit) via 75a996cfa0f3e2fa8530ea41ea3857eb86ab4b84 (commit) via 482da37abf31dc87fbe9bb28258122fa178cec45 (commit) via 07201e1277cfeb885c7ee2a666575ec9dc8c8d7c (commit) via 617d56864581c2c26dd03158aa5b60c7f845da4c (commit) via ff8eea5c2a9f5283a46376d3bb1bbedd8dd034a4 (commit) via 7cc7193c74553b5f46db482b6d8c7af599d0464a (commit) via 27de124db6343381c25335e611853b487880e9fc (commit) via a3e0a9ddf57e165e682700263f1e0a6e65037c04 (commit) via 9dd6633189cf15ca554cc4ae21996f7db91c6901 (commit) via bcb01a637648278bbbefcd6cdc3014a98de8ed4f (commit) via 8460c9c1b5afab84f4279e6e04cfb1e012965c14 (commit) via 09406916470553a85f30fc14889127443cc4a09b (commit) via ffc3f2bd0059664273425eb0c34411ac5cd88c3e (commit) via 6582ff6158b7e8380536f83da9b0fc25659e3c36 (commit) via fe280bface8fd28a8d0baa3ca95a71f221187fe8 (commit) via bd5112acbb750723958463cf0328ebb15855f7ab (commit) via 06b3650b581bf05ea2f015a02635382fb7c38fda (commit) via 678c2a149a3e7d48c4462fb2e6cc531a3cfed780 (commit) via c6cc6d3a79976bfe96cbb9ff192cf22daffc18c4 (commit) via 2a9d3323537d030c1b3385ed14b496bf9e2b20b3 (commit) via a2fb09b3a4178398a5528eeab2c119cc9a107629 (commit) via b5982d00b9e2ff6fbcb86d8602ca249236c1f06c (commit) via 78b552f62a65c6a873ed021d5579675b4fd84e3a (commit) via 68f26e2a86eb206dcdda9324b20afa208067e6c2 (commit) via 42a8b2f0dbaee653953170cbd0a7fa659bc32b38 (commit) via f4f4dcee96e534c0badc28258ad09ef50b35ec76 (commit) via d6e4b3df266ee1c847763ba50fa802d9e9e62b5e (commit) via bdc44eae6bac8aed26170d21cf05fe99ba9d84d6 (commit) via 170e93051d25ac491811f1ed66cd5552a0b26ec8 (commit) via 744d466a0fe5530bb6c036664413d799a3aeb871 (commit) via 4eb5acde3012effceaaf9af4318d95b02551fffa (commit) via 2315e146e19c937ff407f0a5aa0be1f8de655abf (commit) via 46064619d9bd9d2733089dcff044a9a86277dbdd (commit) via ec41adeed9884621f242c8153612a3f2eaa5bcee (commit) via 758fdf094deae51597b5e9f5f70584c3dba92ff1 (commit) via c5b855df5b9e4388efd387810959b0f81f072fc9 (commit) via 7299adcc939a3d55b2c694744037ea9ea1dd7835 (commit) via 455230a4331e25a1bb68e6fe1c0058bd790c9d9b (commit) via a4d31373e5a0f72d028ff73ca9eae0fd6671f350 (commit) via 37390a88fd35d972a8e399fc934c612c1043ad77 (commit) via 4b895826e62b9b6e7512d76d05999752ffc93432 (commit) via 3ee54c088ec06a65b1ae7ece2dae8cfabfe90d12 (commit) via 9e1aad1fbffad60e849c9cac613e282fd3f80646 (commit) via 1da9bcf69a3f2c364eb1674b44ede4c0cf280f06 (commit) via d61545b5b2ad42d7e9fca34d3b077942fcc04c01 (commit) via f426dbf3b4dc5be7a1b56d9cc3c0dab00eb9787c (commit) via 40699694b24cceb86ed441308309393de84c3478 (commit) via 215069d156f3612ff9e140a7e47232047c6870e6 (commit) via a459233d0ac535d67e3141e21dee3e805c4e906f (commit) via 0e81876e6119fd76282f3de4bb50dad9e67ec6f2 (commit) via 713f9d5dee94b6eb81cdbbb929bf875f414d339c (commit) via 0034b0c0c63194bd7aa227364b381d6b049631dc (commit) via 933a59910b2b95f579dbb11729192ccfcc26bcd7 (commit) via 894b80ee113440037b7899459eeb1c0f5c14b124 (commit) via 0ee8255c2555ed68721ea5e7679f26a2e53bd8b8 (commit) via ad3417a6fd2ba93616b937f9a2d8642eceeb0bf8 (commit) via db62337f2c0a3add91bbdbaa096f2a3c04162c60 (commit) via df1c292ed40d4c2c480917f1eab06a046c93c3b1 (commit) via 49c671e80fd2c88b6f36337ebd1cd4748eb8bae1 (commit) via 11207ff1e211658bfb44c635423ae818a0654239 (commit) via 3abbe8b729310d29b9a2c84a7d7a11771513908d (commit) via f49289a7f621ffe5c981caa8531623d9e0a4abd9 (commit) via cc6d68e1dcf0f4f9b8b7442a4739288892fcb345 (commit) via 332877d51e773a584d272a03f08446d18cbe1634 (commit) via bed462d28fa081a0d66dd29a8034f188256c7d04 (commit) via 2b27f75b587cf23d2687dd37897cbb26ed915890 (commit) via 79781031e28dee010425f575d1bf5de5b18af0d6 (commit) via 7d91fbd6c1a40e378b06f9be6dd3ef260c66dba9 (commit) via d189d704a29f490583057ccb5c762432a4e4b7a7 (commit) via 122b74c0074329f1758b2ed5d241e0e9a790087b (commit) via bd37df82b49faefef078558cdb2a54477bec6c5a (commit) via dea03d0a24117764ea9b8763e640a4836031e82b (commit) via 5c745f55a160b0a72d8e493604917a0d63dd71a5 (commit) via 15a30694560ba62160fa3a8ffddeb51b800e351a (commit) via 27a84cdfc0dfb82e3b86067e473658c091377892 (commit) via 3600304c30c4a345538f6c06ca50183b14cd12b1 (commit) via 4ec4a756c7607e3a78878e6699a82ccf6d0a1461 (commit) via 0f700e1a4b8e66c269081eba64eb5be8c37de868 (commit) via f0d0fd91978a8127ed270b03853ac0e04492a333 (commit) via 2ee48570ed824d5caff4f8cb121b7c293a481820 (commit) via 82499a9a4c80670de20825992478ccd4d764e28c (commit) via c164ad605422f90f3566e4c4ebed0ea3c2adb3a8 (commit) via 53dca8426775ed5bf40f2c2708915f02b2dccc74 (commit) via f69f033da3b6900acdd170668cae07ac6cd959f3 (commit) via 8d957f16105fa44d483478b2c05bae735680c007 (commit) via 5028177e4e795305b514d7164ff882dcf1d3622b (commit) via 24262a9aae62290dfd1a041d0bd5c6943270251d (commit) via 7e355890905a9195ff1027377991b4134e285a03 (commit) via 6947621e1b3a3c73c3ee351325f505e5e191474f (commit) from 29cb860583cb906bc16eddf9a4c98d6bb37333e5 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: .codecov.yml | 4 +- .travis.yml | 23 +- CHANGELOG | 124 +++++ Makefile.inc | 1 + configure.ac | 3 +- doc/Makefile.inc | 3 +- doc/users-guide/Makefile.am | 3 +- .../users-guide-utilities-examples.adoc | 19 + doc/users-guide/users-guide.adoc | 2 + example/classifier/odp_classifier.c | 4 +- example/generator/odp_generator.c | 117 ++++- example/ipsec/odp_ipsec.c | 4 +- example/ipsec_api/odp_ipsec.c | 4 +- example/l2fwd_simple/l2fwd_simple_run.sh | 16 +- example/l2fwd_simple/odp_l2fwd_simple.c | 53 +- example/packet/odp_pktio.c | 4 +- example/switch/odp_switch.c | 4 +- example/time/time_global_test.c | 2 +- example/timer/.gitignore | 1 + example/timer/Makefile.am | 13 +- example/timer/odp_timer_accuracy.c | 461 +++++++++++++++++ example/timer/odp_timer_test.c | 4 +- helper/include/odp/helper/threads.h | 75 +-- helper/test/odpthreads.c | 2 +- helper/threads.c | 131 +---- include/odp/api/spec/cpu.h | 3 +- include/odp/arch/x86_32-linux/odp/api/abi/cpu.h | 9 - include/odp/arch/x86_64-linux/odp/api/abi/cpu.h | 5 - m4/odp_dpdk.m4 | 6 + platform/linux-generic/Makefile.am | 80 ++- .../linux-generic/arch/aarch64/odp_global_time.c | 44 +- .../arch/default/odp/api/abi/cpu_inlines.h | 15 + .../arch/default/odp/api/abi/cpu_time.h | 24 + .../linux-generic/arch/default/odp_cpu_cycles.c | 6 + .../linux-generic/arch/default/odp_global_time.c | 12 +- .../linux-generic/arch/default/odp_sysinfo_parse.c | 2 +- .../linux-generic/arch/mips64/odp_cpu_cycles.c | 6 + .../linux-generic/arch/mips64/odp_sysinfo_parse.c | 2 +- .../linux-generic/arch/odp_arch_time_internal.h | 24 - .../linux-generic/arch/powerpc/odp_sysinfo_parse.c | 2 +- platform/linux-generic/arch/x86/cpu_flags.c | 12 +- platform/linux-generic/arch/x86/cpu_flags.h | 1 + platform/linux-generic/arch/x86/odp/api/abi/cpu.h | 10 +- .../arch/x86/odp/api/abi/cpu_inlines.h | 37 ++ .../{odp_cpu_cycles.c => odp/api/abi/cpu_rdtsc.h} | 19 +- .../linux-generic/arch/x86/odp/api/abi/cpu_time.h | 29 ++ platform/linux-generic/arch/x86/odp_cpu_cycles.c | 31 +- platform/linux-generic/arch/x86/odp_global_time.c | 14 +- .../linux-generic/arch/x86/odp_sysinfo_parse.c | 2 +- .../include-abi/odp/api/abi/byteorder.h | 2 - .../linux-generic/include-abi/odp/api/abi/event.h | 3 + .../linux-generic/include-abi/odp/api/abi/packet.h | 2 - .../include-abi/odp/api/abi/packet_flags.h | 1 - .../include-abi/odp/api/abi/packet_io.h | 2 - .../linux-generic/include-abi/odp/api/abi/queue.h | 3 + .../linux-generic/include-abi/odp/api/abi/thread.h | 2 - .../include-abi/odp/api/abi/ticketlock.h | 2 - .../linux-generic/include-abi/odp/api/abi/time.h | 3 + .../include/odp/api/plat/atomic_inlines.h | 75 +++ .../include/odp/api/plat/buffer_inline_types.h | 35 ++ .../include/odp/api/plat/byteorder_inlines.h | 51 +- .../include/odp/api/plat/byteorder_inlines_api.h | 88 ---- .../include/odp/api/plat/cpu_inlines.h | 38 ++ .../include/odp/api/plat/event_inlines.h | 37 ++ .../include/odp/api/plat/packet_flag_inlines.h | 40 +- .../include/odp/api/plat/packet_flag_inlines_api.h | 41 -- .../include/odp/api/plat/packet_inline_types.h | 1 + .../include/odp/api/plat/packet_inlines.h | 155 +++--- .../include/odp/api/plat/packet_inlines_api.h | 186 ------- .../include/odp/api/plat/pktio_inlines.h | 11 +- .../include/odp/api/plat/pktio_inlines_api.h | 31 -- .../include/odp/api/plat/queue_inline_types.h | 35 ++ .../include/odp/api/plat/queue_inlines.h | 36 ++ .../include/odp/api/plat/std_clib_inlines.h | 18 +- .../include/odp/api/plat/sync_inlines.h | 18 +- .../include/odp/api/plat/thread_inlines.h | 16 +- .../include/odp/api/plat/thread_inlines_api.h | 41 -- .../include/odp/api/plat/ticketlock_inlines.h | 67 ++- .../include/odp/api/plat/ticketlock_inlines_api.h | 42 -- .../include/odp/api/plat/time_inlines.h | 101 ++++ .../linux-generic/include/odp_buffer_inlines.h | 40 -- .../linux-generic/include/odp_buffer_internal.h | 14 + .../include/odp_classification_inlines.h | 28 +- .../include/odp_classification_internal.h | 2 +- .../linux-generic/include/odp_debug_internal.h | 2 +- platform/linux-generic/include/odp_ethtool_rss.h | 65 +++ platform/linux-generic/include/odp_ethtool_stats.h | 25 + platform/linux-generic/include/odp_global_data.h | 68 +++ .../{odp_internal.h => odp_init_internal.h} | 86 +--- platform/linux-generic/include/odp_packet_dpdk.h | 82 +-- .../linux-generic/include/odp_packet_internal.h | 24 +- .../linux-generic/include/odp_packet_io_internal.h | 113 +---- .../include/odp_packet_io_ipc_internal.h | 1 - .../linux-generic/include/odp_packet_io_stats.h | 30 ++ .../include/odp_packet_io_stats_common.h | 23 + platform/linux-generic/include/odp_packet_netmap.h | 73 --- platform/linux-generic/include/odp_packet_null.h | 16 - platform/linux-generic/include/odp_packet_socket.h | 113 ----- platform/linux-generic/include/odp_packet_tap.h | 21 - platform/linux-generic/include/odp_pcapng.h | 56 +++ platform/linux-generic/include/odp_queue_if.h | 29 +- .../linux-generic/include/odp_queue_internal.h | 36 +- .../include/odp_queue_scalable_internal.h | 10 +- platform/linux-generic/include/odp_ring_internal.h | 3 + .../linux-generic/include/odp_ring_spsc_internal.h | 124 +++++ platform/linux-generic/include/odp_schedule_if.h | 2 +- .../include/odp_schedule_scalable_ordered.h | 1 - platform/linux-generic/include/odp_socket_common.h | 57 +++ platform/linux-generic/include/odp_sysfs_stats.h | 23 + .../linux-generic/include/odp_sysinfo_internal.h | 26 + .../include/odp_traffic_mngr_internal.h | 3 +- platform/linux-generic/include/protocols/thash.h | 8 +- platform/linux-generic/m4/configure.m4 | 1 + platform/linux-generic/m4/odp_dpdk.m4 | 8 + platform/linux-generic/m4/odp_pcapng.m4 | 18 + platform/linux-generic/odp_atomic_api.c | 2 +- platform/linux-generic/odp_barrier.c | 3 + platform/linux-generic/odp_buffer.c | 12 +- .../{odp_byteorder.c => odp_byteorder_api.c} | 3 +- platform/linux-generic/odp_classification.c | 17 +- platform/linux-generic/odp_cpu.c | 18 - platform/linux-generic/odp_cpu_api.c | 13 + platform/linux-generic/odp_cpumask.c | 2 + platform/linux-generic/odp_crypto.c | 6 +- platform/linux-generic/odp_errno.c | 1 - platform/linux-generic/odp_event.c | 7 +- platform/linux-generic/odp_event_api.c | 13 + platform/linux-generic/odp_fdserver.c | 52 +- platform/linux-generic/odp_hash.c | 491 ------------------ platform/linux-generic/odp_hash_crc32.c | 92 ++++ platform/linux-generic/odp_hash_crc32c.c | 409 +++++++++++++++ platform/linux-generic/odp_init.c | 390 ++++++++------- platform/linux-generic/odp_ipsec.c | 58 +-- platform/linux-generic/odp_ipsec_events.c | 5 +- platform/linux-generic/odp_ipsec_sad.c | 4 + platform/linux-generic/odp_ishm.c | 7 +- platform/linux-generic/odp_ishmphy.c | 3 +- platform/linux-generic/odp_ishmpool.c | 1 - platform/linux-generic/odp_libconfig.c | 4 +- platform/linux-generic/odp_packet.c | 254 ++++++++-- platform/linux-generic/odp_packet_api.c | 8 +- platform/linux-generic/odp_packet_flags.c | 5 - platform/linux-generic/odp_packet_flags_api.c | 5 +- platform/linux-generic/odp_packet_io.c | 108 ++-- platform/linux-generic/odp_pcapng.c | 434 ++++++++++++++++ platform/linux-generic/odp_pktio_api.c | 5 +- platform/linux-generic/odp_pool.c | 8 +- platform/linux-generic/odp_queue_api.c | 13 + platform/linux-generic/odp_queue_basic.c | 168 ++++--- platform/linux-generic/odp_queue_if.c | 16 +- platform/linux-generic/odp_queue_lf.c | 78 ++- platform/linux-generic/odp_queue_scalable.c | 91 ++-- platform/linux-generic/odp_queue_spsc.c | 131 +++++ platform/linux-generic/odp_random.c | 2 +- platform/linux-generic/odp_rwlock.c | 3 + platform/linux-generic/odp_rwlock_recursive.c | 10 +- platform/linux-generic/odp_schedule_basic.c | 17 +- platform/linux-generic/odp_schedule_if.c | 2 +- platform/linux-generic/odp_schedule_iquery.c | 9 +- platform/linux-generic/odp_schedule_scalable.c | 14 +- .../linux-generic/odp_schedule_scalable_ordered.c | 2 + platform/linux-generic/odp_schedule_sp.c | 4 +- platform/linux-generic/odp_shared_memory.c | 3 +- platform/linux-generic/odp_spinlock.c | 2 + platform/linux-generic/odp_spinlock_recursive.c | 6 +- .../{odp_std_clib.c => odp_std_clib_api.c} | 2 +- .../linux-generic/{odp_sync.c => odp_sync_api.c} | 2 +- platform/linux-generic/odp_system_info.c | 4 +- platform/linux-generic/odp_thread.c | 2 +- platform/linux-generic/odp_thread_api.c | 5 +- .../{odp_ticketlock.c => odp_ticketlock_api.c} | 6 +- platform/linux-generic/odp_time.c | 138 ++--- platform/linux-generic/odp_time_api.c | 13 + platform/linux-generic/odp_timer.c | 107 ++-- platform/linux-generic/odp_traffic_mngr.c | 61 ++- platform/linux-generic/odp_weak.c | 1 - platform/linux-generic/pktio/dpdk.c | 260 +++++----- platform/linux-generic/pktio/dpdk_parse.c | 492 ++++++++++++++++++ platform/linux-generic/pktio/ethtool_rss.c | 257 ++++++++++ platform/linux-generic/pktio/ipc.c | 231 +++++---- platform/linux-generic/pktio/loop.c | 49 +- platform/linux-generic/pktio/netmap.c | 169 +++++-- platform/linux-generic/pktio/null.c | 19 +- platform/linux-generic/pktio/pcap.c | 40 +- platform/linux-generic/pktio/pktio_common.c | 73 --- platform/linux-generic/pktio/ring.c | 4 +- platform/linux-generic/pktio/socket.c | 421 ++-------------- platform/linux-generic/pktio/socket_common.c | 143 ++++++ platform/linux-generic/pktio/socket_mmap.c | 85 ++-- .../pktio/{ethtool.c => stats/ethtool_stats.c} | 3 +- .../linux-generic/pktio/stats/packet_io_stats.c | 97 ++++ .../pktio/{sysfs.c => stats/sysfs_stats.c} | 3 +- platform/linux-generic/pktio/tap.c | 59 ++- .../test/mmap_vlan_ins/mmap_vlan_ins.c | 38 +- .../test/mmap_vlan_ins/mmap_vlan_ins.sh | 4 +- platform/linux-generic/test/ring/ring_basic.c | 1 + test/common/odp_cunit_common.c | 3 +- test/performance/.gitignore | 1 + test/performance/Makefile.am | 4 +- test/performance/odp_bench_packet.c | 4 +- test/performance/odp_crypto.c | 30 +- test/performance/odp_ipsec.c | 4 +- test/performance/odp_l2fwd.c | 4 +- test/performance/odp_pktio_ordered.c | 4 +- test/performance/odp_pktio_perf.c | 4 +- test/performance/odp_queue_perf.c | 377 ++++++++++++++ test/performance/odp_sched_latency.c | 3 +- test/performance/odp_sched_pktio.c | 553 +++++++++++++++++---- test/performance/odp_scheduling.c | 40 +- test/validation/api/Makefile.am | 2 +- test/validation/api/crypto/odp_crypto_test_inp.c | 2 + test/validation/api/hash/hash.c | 230 ++++++++- test/validation/api/ipsec/Makefile.am | 2 +- test/validation/api/queue/queue.c | 305 +++++++++++- test/validation/api/scheduler/scheduler.c | 104 ++-- test/validation/api/timer/timer.c | 90 +++- test/validation/api/traffic_mngr/Makefile.am | 5 - test/validation/api/traffic_mngr/traffic_mngr.c | 74 ++- test/validation/api/traffic_mngr/traffic_mngr.sh | 39 -- 219 files changed, 7674 insertions(+), 3896 deletions(-) create mode 100644 doc/users-guide/users-guide-utilities-examples.adoc create mode 100644 example/timer/odp_timer_accuracy.c create mode 100644 platform/linux-generic/arch/default/odp/api/abi/cpu_inlines.h create mode 100644 platform/linux-generic/arch/default/odp/api/abi/cpu_time.h delete mode 100644 platform/linux-generic/arch/odp_arch_time_internal.h create mode 100644 platform/linux-generic/arch/x86/odp/api/abi/cpu_inlines.h copy platform/linux-generic/arch/x86/{odp_cpu_cycles.c => odp/api/abi/cpu_rdtsc.h} (58%) create mode 100644 platform/linux-generic/arch/x86/odp/api/abi/cpu_time.h create mode 100644 platform/linux-generic/include/odp/api/plat/buffer_inline_types.h delete mode 100644 platform/linux-generic/include/odp/api/plat/byteorder_inlines_api.h create mode 100644 platform/linux-generic/include/odp/api/plat/cpu_inlines.h create mode 100644 platform/linux-generic/include/odp/api/plat/event_inlines.h delete mode 100644 platform/linux-generic/include/odp/api/plat/packet_flag_inlines_api.h delete mode 100644 platform/linux-generic/include/odp/api/plat/packet_inlines_api.h delete mode 100644 platform/linux-generic/include/odp/api/plat/pktio_inlines_api.h create mode 100644 platform/linux-generic/include/odp/api/plat/queue_inline_types.h create mode 100644 platform/linux-generic/include/odp/api/plat/queue_inlines.h delete mode 100644 platform/linux-generic/include/odp/api/plat/thread_inlines_api.h delete mode 100644 platform/linux-generic/include/odp/api/plat/ticketlock_inlines_api.h create mode 100644 platform/linux-generic/include/odp/api/plat/time_inlines.h delete mode 100644 platform/linux-generic/include/odp_buffer_inlines.h create mode 100644 platform/linux-generic/include/odp_ethtool_rss.h create mode 100644 platform/linux-generic/include/odp_ethtool_stats.h create mode 100644 platform/linux-generic/include/odp_global_data.h rename platform/linux-generic/include/{odp_internal.h => odp_init_internal.h} (52%) create mode 100644 platform/linux-generic/include/odp_packet_io_stats.h create mode 100644 platform/linux-generic/include/odp_packet_io_stats_common.h delete mode 100644 platform/linux-generic/include/odp_packet_netmap.h delete mode 100644 platform/linux-generic/include/odp_packet_null.h delete mode 100644 platform/linux-generic/include/odp_packet_tap.h create mode 100644 platform/linux-generic/include/odp_pcapng.h create mode 100644 platform/linux-generic/include/odp_ring_spsc_internal.h create mode 100644 platform/linux-generic/include/odp_socket_common.h create mode 100644 platform/linux-generic/include/odp_sysfs_stats.h create mode 100644 platform/linux-generic/include/odp_sysinfo_internal.h create mode 100644 platform/linux-generic/m4/odp_pcapng.m4 rename platform/linux-generic/{odp_byteorder.c => odp_byteorder_api.c} (79%) delete mode 100644 platform/linux-generic/odp_cpu.c create mode 100644 platform/linux-generic/odp_cpu_api.c create mode 100644 platform/linux-generic/odp_event_api.c delete mode 100644 platform/linux-generic/odp_hash.c create mode 100644 platform/linux-generic/odp_hash_crc32.c create mode 100644 platform/linux-generic/odp_hash_crc32c.c create mode 100644 platform/linux-generic/odp_pcapng.c create mode 100644 platform/linux-generic/odp_queue_api.c create mode 100644 platform/linux-generic/odp_queue_spsc.c rename platform/linux-generic/{odp_std_clib.c => odp_std_clib_api.c} (92%) rename platform/linux-generic/{odp_sync.c => odp_sync_api.c} (91%) rename platform/linux-generic/{odp_ticketlock.c => odp_ticketlock_api.c} (64%) create mode 100644 platform/linux-generic/odp_time_api.c create mode 100644 platform/linux-generic/pktio/dpdk_parse.c create mode 100644 platform/linux-generic/pktio/ethtool_rss.c create mode 100644 platform/linux-generic/pktio/socket_common.c rename platform/linux-generic/pktio/{ethtool.c => stats/ethtool_stats.c} (98%) create mode 100644 platform/linux-generic/pktio/stats/packet_io_stats.c rename platform/linux-generic/pktio/{sysfs.c => stats/sysfs_stats.c} (97%) create mode 100644 test/performance/odp_queue_perf.c delete mode 100755 test/validation/api/traffic_mngr/traffic_mngr.sh hooks/post-receive --

7 years, 8 months

[COMMIT] branch master updated. v1.19.0.1_tigermoth-91-g492390a7

by git＠git-us.linaro.org

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, master has been updated via 492390a79f20c7aaaf16f232fbd5ecf0d9b700e7 (commit) via 53f3baf58256c085fa230992eb03c896276fc874 (commit) via 7266ca2e44705e550ba7c8c1a71fa373eabd7b99 (commit) via eb021ca3cba9635b861205b2fc94da2a3cdf37bc (commit) via f8136babc5601068ac0f3ab30414a5cbd99388c3 (commit) from a01d17348d6c34457a415935e702a24257adcf8a (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 492390a79f20c7aaaf16f232fbd5ecf0d9b700e7 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Fri Jun 15 16:48:26 2018 +0300 validation: queue: pair test Test a pair of queues with two threads. This simple multi-thread test can be executed in all enqueue/dequeue modes, also in single-producer / single-consumer mode. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/validation/api/queue/queue.c b/test/validation/api/queue/queue.c index 20408da5..f009a24b 100644 --- a/test/validation/api/queue/queue.c +++ b/test/validation/api/queue/queue.c @@ -24,6 +24,17 @@ typedef struct { odp_queue_t queue; odp_atomic_u32_t num_event; + struct { + odp_queue_t queue_a; + odp_queue_t queue_b; + int passed_a; + int passed_b; + int burst; + odp_pool_t pool; + odp_barrier_t barrier; + odp_atomic_u32_t counter; + } pair; + struct { uint32_t num_event; } thread[ODP_THREAD_COUNT_MAX]; @@ -349,6 +360,208 @@ static void queue_test_burst_lf_spsc(void) ODP_QUEUE_OP_MT_UNSAFE); } +static int queue_pair_work_loop(void *arg) +{ + uint32_t i, events, burst, retry, max_retry; + odp_buffer_t buf; + odp_event_t ev; + uint32_t *data; + odp_queue_t src_queue, dst_queue; + odp_pool_t pool; + int passed; + int thread_a; + test_globals_t *globals = arg; + + burst = globals->pair.burst; + pool = globals->pair.pool; + + /* Select which thread is A */ + thread_a = odp_atomic_fetch_inc_u32(&globals->pair.counter); + + if (thread_a) { + src_queue = globals->pair.queue_a; + dst_queue = globals->pair.queue_b; + } else { + src_queue = globals->pair.queue_b; + dst_queue = globals->pair.queue_a; + } + + for (i = 0; i < burst; i++) { + buf = odp_buffer_alloc(pool); + CU_ASSERT(buf != ODP_BUFFER_INVALID); + + if (buf == ODP_BUFFER_INVALID) + return -1; + + data = odp_buffer_addr(buf); + *data = i; + ev = odp_buffer_to_event(buf); + CU_ASSERT(odp_queue_enq(dst_queue, ev) == 0); + } + + /* Wait until both threads are ready */ + odp_barrier_wait(&globals->pair.barrier); + events = 0; + retry = 0; + max_retry = 0; + i = 0; + while (events < 10000 && retry < 300) { + ev = odp_queue_deq(src_queue); + if (ev == ODP_EVENT_INVALID) { + retry++; + /* Slow down polling period after 100 retries. This + * gives time for the other thread to answer, if it + * was e.g. interrupted by the OS. We give up if + * the source queue stays empty for about 100ms. */ + if (retry > 200) + odp_time_wait_ns(ODP_TIME_MSEC_IN_NS); + else if (retry > 100) + odp_time_wait_ns(ODP_TIME_USEC_IN_NS); + + if (retry > max_retry) + max_retry = retry; + + continue; + } + + events++; + retry = 0; + buf = odp_buffer_from_event(ev); + data = odp_buffer_addr(buf); + CU_ASSERT(*data == i); + i++; + if (i == burst) + i = 0; + + CU_ASSERT(odp_queue_enq(dst_queue, ev) == 0); + } + + passed = (events == 10000); + + if (thread_a) { + globals->pair.passed_a = passed; + if (max_retry > 100) + printf("\n thread_a max_retry %u\n", max_retry); + } else { + globals->pair.passed_b = passed; + if (max_retry > 100) + printf("\n thread_b max_retry %u\n", max_retry); + } + + return 0; +} + +static void test_pair(odp_nonblocking_t nonblocking, + odp_queue_op_mode_t enq_mode, + odp_queue_op_mode_t deq_mode) +{ + odp_queue_param_t param; + odp_queue_t queue; + odp_queue_capability_t capa; + uint32_t max_burst; + odp_pool_t pool; + odp_event_t ev; + odp_shm_t shm; + test_globals_t *globals; + + shm = odp_shm_lookup(GLOBALS_NAME); + CU_ASSERT_FATAL(shm != ODP_SHM_INVALID); + globals = odp_shm_addr(shm); + + CU_ASSERT_FATAL(odp_queue_capability(&capa) == 0); + + max_burst = 2 * BURST_SIZE; + + if (nonblocking == ODP_NONBLOCKING_LF) { + if (capa.plain.lockfree.max_num == 0) { + printf(" NO LOCKFREE QUEUES. Test skipped.\n"); + return; + } + + if (capa.plain.lockfree.max_size < max_burst) + max_burst = capa.plain.lockfree.max_size; + } else { + if (capa.plain.max_size && capa.plain.max_size < max_burst) + max_burst = capa.plain.max_size; + } + + globals->pair.burst = max_burst / 2; + + pool = odp_pool_lookup("msg_pool"); + CU_ASSERT_FATAL(pool != ODP_POOL_INVALID); + globals->pair.pool = pool; + + odp_queue_param_init(&param); + param.type = ODP_QUEUE_TYPE_PLAIN; + param.nonblocking = nonblocking; + param.size = max_burst; + param.enq_mode = enq_mode; + param.deq_mode = deq_mode; + + queue = odp_queue_create("queue_a", &param); + CU_ASSERT_FATAL(queue != ODP_QUEUE_INVALID); + globals->pair.queue_a = queue; + CU_ASSERT(odp_queue_deq(queue) == ODP_EVENT_INVALID); + + queue = odp_queue_create("queue_b", &param); + CU_ASSERT_FATAL(queue != ODP_QUEUE_INVALID); + globals->pair.queue_b = queue; + CU_ASSERT(odp_queue_deq(queue) == ODP_EVENT_INVALID); + + odp_barrier_init(&globals->pair.barrier, 2); + globals->pair.passed_a = 0; + globals->pair.passed_b = 0; + odp_atomic_init_u32(&globals->pair.counter, 0); + + /* Create one worker thread */ + globals->cu_thr.numthrds = 1; + odp_cunit_thread_create(queue_pair_work_loop, (pthrd_arg *)globals); + + /* Run this thread as the second thread */ + CU_ASSERT(queue_pair_work_loop(globals) == 0); + + /* Wait worker to terminate */ + odp_cunit_thread_exit((pthrd_arg *)globals); + + CU_ASSERT(globals->pair.passed_a); + CU_ASSERT(globals->pair.passed_b); + + while ((ev = dequeue_event(globals->pair.queue_a)) != ODP_EVENT_INVALID) + odp_event_free(ev); + + while ((ev = dequeue_event(globals->pair.queue_b)) != ODP_EVENT_INVALID) + odp_event_free(ev); + + CU_ASSERT(odp_queue_destroy(globals->pair.queue_a) == 0); + CU_ASSERT(odp_queue_destroy(globals->pair.queue_b) == 0); +} + +static void queue_test_pair(void) +{ + test_pair(ODP_BLOCKING, ODP_QUEUE_OP_MT, ODP_QUEUE_OP_MT); +} + +static void queue_test_pair_spmc(void) +{ + test_pair(ODP_BLOCKING, ODP_QUEUE_OP_MT_UNSAFE, ODP_QUEUE_OP_MT); +} + +static void queue_test_pair_mpsc(void) +{ + test_pair(ODP_BLOCKING, ODP_QUEUE_OP_MT, ODP_QUEUE_OP_MT_UNSAFE); +} + +static void queue_test_pair_spsc(void) +{ + test_pair(ODP_BLOCKING, ODP_QUEUE_OP_MT_UNSAFE, ODP_QUEUE_OP_MT_UNSAFE); +} + +static void queue_test_pair_lf_spsc(void) +{ + test_pair(ODP_NONBLOCKING_LF, ODP_QUEUE_OP_MT_UNSAFE, + ODP_QUEUE_OP_MT_UNSAFE); +} + static void queue_test_param(void) { odp_queue_t queue, null_queue; @@ -727,6 +940,11 @@ odp_testinfo_t queue_suite[] = { ODP_TEST_INFO(queue_test_burst_lf_spmc), ODP_TEST_INFO(queue_test_burst_lf_mpsc), ODP_TEST_INFO(queue_test_burst_lf_spsc), + ODP_TEST_INFO(queue_test_pair), + ODP_TEST_INFO(queue_test_pair_spmc), + ODP_TEST_INFO(queue_test_pair_mpsc), + ODP_TEST_INFO(queue_test_pair_spsc), + ODP_TEST_INFO(queue_test_pair_lf_spsc), ODP_TEST_INFO(queue_test_param), ODP_TEST_INFO(queue_test_info), ODP_TEST_INFO(queue_test_mt_plain_block), commit 53f3baf58256c085fa230992eb03c896276fc874 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Fri Jun 15 13:22:01 2018 +0300 validation: queue: test enq/deq mode combinations Changed the single thread, lock-free queue test to generic single thread burst enq/deq test. Test all combination enq/deq mode combination with blocking and lock-free queues. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/validation/api/queue/queue.c b/test/validation/api/queue/queue.c index 304de021..20408da5 100644 --- a/test/validation/api/queue/queue.c +++ b/test/validation/api/queue/queue.c @@ -224,7 +224,9 @@ static odp_event_t dequeue_event(odp_queue_t queue) return ev; } -static void queue_test_lockfree(void) +static void test_burst(odp_nonblocking_t nonblocking, + odp_queue_op_mode_t enq_mode, + odp_queue_op_mode_t deq_mode) { odp_queue_param_t param; odp_queue_t queue; @@ -237,12 +239,16 @@ static void queue_test_lockfree(void) CU_ASSERT_FATAL(odp_queue_capability(&capa) == 0); - if (capa.plain.lockfree.max_num == 0) { - printf(" NO LOCKFREE QUEUES. Test skipped.\n"); - return; - } + max_burst = capa.plain.max_size; + + if (nonblocking == ODP_NONBLOCKING_LF) { + if (capa.plain.lockfree.max_num == 0) { + printf(" NO LOCKFREE QUEUES. Test skipped.\n"); + return; + } - max_burst = capa.plain.lockfree.max_size; + max_burst = capa.plain.lockfree.max_size; + } if (max_burst == 0 || max_burst > MAX_NUM_EVENT) max_burst = MAX_NUM_EVENT; @@ -252,10 +258,12 @@ static void queue_test_lockfree(void) odp_queue_param_init(&param); param.type = ODP_QUEUE_TYPE_PLAIN; - param.nonblocking = ODP_NONBLOCKING_LF; + param.nonblocking = nonblocking; param.size = max_burst; + param.enq_mode = enq_mode; + param.deq_mode = deq_mode; - queue = odp_queue_create("lockfree_queue", &param); + queue = odp_queue_create("burst test", &param); CU_ASSERT_FATAL(queue != ODP_QUEUE_INVALID); CU_ASSERT(odp_queue_deq(queue) == ODP_EVENT_INVALID); @@ -299,6 +307,48 @@ static void queue_test_lockfree(void) CU_ASSERT(odp_queue_destroy(queue) == 0); } +static void queue_test_burst(void) +{ + test_burst(ODP_BLOCKING, ODP_QUEUE_OP_MT, ODP_QUEUE_OP_MT); +} + +static void queue_test_burst_spmc(void) +{ + test_burst(ODP_BLOCKING, ODP_QUEUE_OP_MT_UNSAFE, ODP_QUEUE_OP_MT); +} + +static void queue_test_burst_mpsc(void) +{ + test_burst(ODP_BLOCKING, ODP_QUEUE_OP_MT, ODP_QUEUE_OP_MT_UNSAFE); +} + +static void queue_test_burst_spsc(void) +{ + test_burst(ODP_BLOCKING, ODP_QUEUE_OP_MT_UNSAFE, + ODP_QUEUE_OP_MT_UNSAFE); +} + +static void queue_test_burst_lf(void) +{ + test_burst(ODP_NONBLOCKING_LF, ODP_QUEUE_OP_MT, ODP_QUEUE_OP_MT); +} + +static void queue_test_burst_lf_spmc(void) +{ + test_burst(ODP_NONBLOCKING_LF, ODP_QUEUE_OP_MT_UNSAFE, ODP_QUEUE_OP_MT); +} + +static void queue_test_burst_lf_mpsc(void) +{ + test_burst(ODP_NONBLOCKING_LF, ODP_QUEUE_OP_MT, ODP_QUEUE_OP_MT_UNSAFE); +} + +static void queue_test_burst_lf_spsc(void) +{ + test_burst(ODP_NONBLOCKING_LF, ODP_QUEUE_OP_MT_UNSAFE, + ODP_QUEUE_OP_MT_UNSAFE); +} + static void queue_test_param(void) { odp_queue_t queue, null_queue; @@ -669,7 +719,14 @@ static void queue_test_mt_plain_nonblock_lf(void) odp_testinfo_t queue_suite[] = { ODP_TEST_INFO(queue_test_capa), ODP_TEST_INFO(queue_test_mode), - ODP_TEST_INFO(queue_test_lockfree), + ODP_TEST_INFO(queue_test_burst), + ODP_TEST_INFO(queue_test_burst_spmc), + ODP_TEST_INFO(queue_test_burst_mpsc), + ODP_TEST_INFO(queue_test_burst_spsc), + ODP_TEST_INFO(queue_test_burst_lf), + ODP_TEST_INFO(queue_test_burst_lf_spmc), + ODP_TEST_INFO(queue_test_burst_lf_mpsc), + ODP_TEST_INFO(queue_test_burst_lf_spsc), ODP_TEST_INFO(queue_test_param), ODP_TEST_INFO(queue_test_info), ODP_TEST_INFO(queue_test_mt_plain_block), commit 7266ca2e44705e550ba7c8c1a71fa373eabd7b99 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Fri Jun 15 13:19:49 2018 +0300 test: queue_perf: single producer/consumer option Added option to test queues with single producer/consumer mode set. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/performance/odp_queue_perf.c b/test/performance/odp_queue_perf.c index 521b7271..d5ff254d 100644 --- a/test/performance/odp_queue_perf.c +++ b/test/performance/odp_queue_perf.c @@ -18,6 +18,7 @@ typedef struct test_options_t { uint32_t num_event; uint32_t num_round; odp_nonblocking_t nonblock; + int single; } test_options_t; @@ -33,6 +34,7 @@ static void print_usage(void) " -r, --num_round Number of rounds\n" " -l, --lockfree Lockfree queues\n" " -w, --waitfree Waitfree queues\n" + " -s, --single Single producer, single consumer\n" " -h, --help This help\n" "\n"); } @@ -49,16 +51,18 @@ static int parse_options(int argc, char *argv[], test_options_t *test_options) {"num_round", required_argument, NULL, 'r'}, {"lockfree", no_argument, NULL, 'l'}, {"waitfree", no_argument, NULL, 'w'}, + {"single", no_argument, NULL, 's'}, {"help", no_argument, NULL, 'h'}, {NULL, 0, NULL, 0} }; - static const char *shortopts = "+q:e:r:lwh"; + static const char *shortopts = "+q:e:r:lwsh"; test_options->num_queue = 1; test_options->num_event = 1; test_options->num_round = 1000; test_options->nonblock = ODP_BLOCKING; + test_options->single = 0; while (1) { opt = getopt_long(argc, argv, shortopts, longopts, &long_index); @@ -82,6 +86,9 @@ static int parse_options(int argc, char *argv[], test_options_t *test_options) case 'w': test_options->nonblock = ODP_NONBLOCKING_WF; break; + case 's': + test_options->single = 1; + break; case 'h': /* fall through */ default: @@ -210,6 +217,11 @@ static int test_queue(test_options_t *test_options) queue_param.nonblocking = nonblock; queue_param.size = num_event; + if (test_options->single) { + queue_param.enq_mode = ODP_QUEUE_OP_MT_UNSAFE; + queue_param.deq_mode = ODP_QUEUE_OP_MT_UNSAFE; + } + for (i = 0; i < num_queue; i++) { queue[i] = odp_queue_create(NULL, &queue_param); commit eb021ca3cba9635b861205b2fc94da2a3cdf37bc Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Fri Jun 15 10:06:38 2018 +0300 linux-gen: queue_spsc: single-producer, single-consumer queue Simple and lock-free implementation of plain queues when there are only single producer and consumer. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index eca2ad17..1e617cc3 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -182,6 +182,7 @@ __LIB__libodp_linux_la_SOURCES = \ odp_queue_if.c \ odp_queue_lf.c \ odp_queue_scalable.c \ + odp_queue_spsc.c \ odp_random.c \ odp_rwlock.c \ odp_rwlock_recursive.c \ diff --git a/platform/linux-generic/include/odp_queue_internal.h b/platform/linux-generic/include/odp_queue_internal.h index 6cc6ed28..bb74f729 100644 --- a/platform/linux-generic/include/odp_queue_internal.h +++ b/platform/linux-generic/include/odp_queue_internal.h @@ -23,6 +23,7 @@ extern "C" { #include <odp/api/ticketlock.h> #include <odp_config_internal.h> #include <odp_ring_st_internal.h> +#include <odp_ring_spsc_internal.h> #include <odp_queue_lf.h> #define QUEUE_STATUS_FREE 0 @@ -33,7 +34,10 @@ extern "C" { struct queue_entry_s { odp_ticketlock_t ODP_ALIGNED_CACHE lock; - ring_st_t ring_st; + union { + ring_st_t ring_st; + ring_spsc_t ring_spsc; + }; int status; queue_enq_fn_t ODP_ALIGNED_CACHE enqueue; @@ -48,6 +52,7 @@ struct queue_entry_s { odp_pktin_queue_t pktin; odp_pktout_queue_t pktout; void *queue_lf; + int spsc; char name[ODP_QUEUE_NAME_LEN]; }; @@ -91,6 +96,8 @@ static inline odp_queue_t queue_from_index(uint32_t queue_id) return (odp_queue_t)qentry_from_index(queue_id); } +void queue_spsc_init(queue_entry_t *queue, uint32_t queue_size); + #ifdef __cplusplus } #endif diff --git a/platform/linux-generic/odp_queue_basic.c b/platform/linux-generic/odp_queue_basic.c index f7715bc5..f592ef6c 100644 --- a/platform/linux-generic/odp_queue_basic.c +++ b/platform/linux-generic/odp_queue_basic.c @@ -308,7 +308,8 @@ static odp_queue_t queue_create(const char *name, return ODP_QUEUE_INVALID; } - if (param->nonblocking == ODP_NONBLOCKING_LF) { + if (!queue->s.spsc && + param->nonblocking == ODP_NONBLOCKING_LF) { queue_lf_func_t *lf_func; lf_func = &queue_glb->queue_lf_func; @@ -421,7 +422,7 @@ static int queue_destroy(odp_queue_t handle) ODP_ABORT("Unexpected queue status\n"); } - if (queue->s.param.nonblocking == ODP_NONBLOCKING_LF) + if (queue->s.queue_lf) queue_lf_destroy(queue->s.queue_lf); UNLOCK(queue); @@ -658,6 +659,7 @@ static int queue_init(queue_entry_t *queue, const char *name, { uint64_t offset; uint32_t queue_size; + int spsc; if (name == NULL) { queue->s.name[0] = 0; @@ -674,11 +676,6 @@ static int queue_init(queue_entry_t *queue, const char *name, queue->s.type = queue->s.param.type; - queue->s.enqueue = queue_int_enq; - queue->s.dequeue = queue_int_deq; - queue->s.enqueue_multi = queue_int_enq_multi; - queue->s.dequeue_multi = queue_int_deq_multi; - queue->s.pktin = PKTIN_INVALID; queue->s.pktout = PKTOUT_INVALID; @@ -698,8 +695,26 @@ static int queue_init(queue_entry_t *queue, const char *name, offset = queue->s.index * (uint64_t)queue_glb->config.max_queue_size; - ring_st_init(&queue->s.ring_st, &queue_glb->ring_data[offset], - queue_size); + /* Single-producer / single-consumer plain queue has simple and + * lock-free implementation */ + spsc = (param->type == ODP_QUEUE_TYPE_PLAIN) && + (param->enq_mode == ODP_QUEUE_OP_MT_UNSAFE) && + (param->deq_mode == ODP_QUEUE_OP_MT_UNSAFE); + + queue->s.spsc = spsc; + queue->s.queue_lf = NULL; + + if (spsc) { + queue_spsc_init(queue, queue_size); + } else { + queue->s.enqueue = queue_int_enq; + queue->s.dequeue = queue_int_deq; + queue->s.enqueue_multi = queue_int_enq_multi; + queue->s.dequeue_multi = queue_int_deq_multi; + + ring_st_init(&queue->s.ring_st, &queue_glb->ring_data[offset], + queue_size); + } return 0; } diff --git a/platform/linux-generic/odp_queue_spsc.c b/platform/linux-generic/odp_queue_spsc.c new file mode 100644 index 00000000..f8b04ca2 --- /dev/null +++ b/platform/linux-generic/odp_queue_spsc.c @@ -0,0 +1,131 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ +#include <string.h> +#include <stdio.h> + +#include <odp_queue_internal.h> +#include <odp_pool_internal.h> + +#include "config.h" +#include <odp_debug_internal.h> + +static inline void buffer_index_from_buf(uint32_t buffer_index[], + odp_buffer_hdr_t *buf_hdr[], int num) +{ + int i; + + for (i = 0; i < num; i++) + buffer_index[i] = buf_hdr[i]->index.u32; +} + +static inline void buffer_index_to_buf(odp_buffer_hdr_t *buf_hdr[], + uint32_t buffer_index[], int num) +{ + int i; + + for (i = 0; i < num; i++) { + buf_hdr[i] = buf_hdr_from_index_u32(buffer_index[i]); + odp_prefetch(buf_hdr[i]); + } +} + +static inline int spsc_enq_multi(void *q_int, odp_buffer_hdr_t *buf_hdr[], + int num) +{ + queue_entry_t *queue; + ring_spsc_t *ring_spsc; + uint32_t buf_idx[num]; + + queue = q_int; + ring_spsc = &queue->s.ring_spsc; + + buffer_index_from_buf(buf_idx, buf_hdr, num); + + if (odp_unlikely(queue->s.status < QUEUE_STATUS_READY)) { + ODP_ERR("Bad queue status\n"); + return -1; + } + + return ring_spsc_enq_multi(ring_spsc, buf_idx, num); +} + +static inline int spsc_deq_multi(void *q_int, odp_buffer_hdr_t *buf_hdr[], + int num) +{ + queue_entry_t *queue; + int num_deq; + ring_spsc_t *ring_spsc; + uint32_t buf_idx[num]; + + queue = q_int; + ring_spsc = &queue->s.ring_spsc; + + if (odp_unlikely(queue->s.status < QUEUE_STATUS_READY)) { + /* Bad queue, or queue has been destroyed. */ + return -1; + } + + num_deq = ring_spsc_deq_multi(ring_spsc, buf_idx, num); + + if (num_deq == 0) + return 0; + + buffer_index_to_buf(buf_hdr, buf_idx, num_deq); + + return num_deq; +} + +static int queue_spsc_enq_multi(void *q_int, odp_buffer_hdr_t *buf_hdr[], + int num) +{ + return spsc_enq_multi(q_int, buf_hdr, num); +} + +static int queue_spsc_enq(void *q_int, odp_buffer_hdr_t *buf_hdr) +{ + int ret; + + ret = spsc_enq_multi(q_int, &buf_hdr, 1); + + if (ret == 1) + return 0; + else + return -1; +} + +static int queue_spsc_deq_multi(void *q_int, odp_buffer_hdr_t *buf_hdr[], + int num) +{ + return spsc_deq_multi(q_int, buf_hdr, num); +} + +static odp_buffer_hdr_t *queue_spsc_deq(void *q_int) +{ + odp_buffer_hdr_t *buf_hdr = NULL; + int ret; + + ret = spsc_deq_multi(q_int, &buf_hdr, 1); + + if (ret == 1) + return buf_hdr; + else + return NULL; +} + +void queue_spsc_init(queue_entry_t *queue, uint32_t queue_size) +{ + uint64_t offset; + + queue->s.enqueue = queue_spsc_enq; + queue->s.dequeue = queue_spsc_deq; + queue->s.enqueue_multi = queue_spsc_enq_multi; + queue->s.dequeue_multi = queue_spsc_deq_multi; + + offset = queue->s.index * (uint64_t)queue_glb->config.max_queue_size; + + ring_spsc_init(&queue->s.ring_spsc, &queue_glb->ring_data[offset], + queue_size); +} commit f8136babc5601068ac0f3ab30414a5cbd99388c3 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Thu Jun 14 13:51:39 2018 +0300 linux-gen: ring_spsc: single-producer, single-consumer ring This ring can be used to implement (lock-free) queues when there is only single (concurrent) producer and consumer. SP/SC limitation enables very simple synchronization and thus good performance. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 6ccc284f..eca2ad17 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -127,6 +127,7 @@ noinst_HEADERS = \ include/odp_queue_lf.h \ include/odp_queue_scalable_internal.h \ include/odp_ring_internal.h \ + include/odp_ring_spsc_internal.h \ include/odp_ring_st_internal.h \ include/odp_schedule_if.h \ include/odp_schedule_scalable_config.h \ diff --git a/platform/linux-generic/include/odp_ring_spsc_internal.h b/platform/linux-generic/include/odp_ring_spsc_internal.h new file mode 100644 index 00000000..e38bda1d --- /dev/null +++ b/platform/linux-generic/include/odp_ring_spsc_internal.h @@ -0,0 +1,124 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#ifndef ODP_RING_SPSC_INTERNAL_H_ +#define ODP_RING_SPSC_INTERNAL_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +#include <stdint.h> + +#include <odp/api/atomic.h> +#include <odp/api/plat/atomic_inlines.h> + +/* Lock-free ring for single-producer / single-consumer usage. + * + * Thread doing an operation may be different each time, but the same operation + * (enq- or dequeue) must not be called concurrently. The next thread may call + * the same operation only when it's sure that the previous thread have returned + * from the call, or will never return back to finish the call when interrupted + * during the call. + * + * Enqueue and dequeue operations can be done concurrently. + */ +typedef struct { + odp_atomic_u32_t head; + odp_atomic_u32_t tail; + uint32_t mask; + uint32_t *data; + +} ring_spsc_t; + +/* Initialize ring. Ring size must be a power of two. */ +static inline void ring_spsc_init(ring_spsc_t *ring, uint32_t *data, + uint32_t size) +{ + odp_atomic_init_u32(&ring->head, 0); + odp_atomic_init_u32(&ring->tail, 0); + ring->mask = size - 1; + ring->data = data; +} + +/* Dequeue data from the ring head. Max_num is smaller than ring size.*/ +static inline uint32_t ring_spsc_deq_multi(ring_spsc_t *ring, uint32_t data[], + uint32_t max_num) +{ + uint32_t head, tail, mask, idx; + uint32_t num, i; + + tail = odp_atomic_load_acq_u32(&ring->tail); + head = odp_atomic_load_u32(&ring->head); + mask = ring->mask; + num = tail - head; + + /* Empty */ + if (num == 0) + return 0; + + if (num > max_num) + num = max_num; + + idx = head & mask; + + for (i = 0; i < num; i++) { + data[i] = ring->data[idx]; + idx = (idx + 1) & mask; + } + + odp_atomic_store_rel_u32(&ring->head, head + num); + + return num; +} + +/* Enqueue data into the ring tail. Num_data is smaller than ring size. */ +static inline uint32_t ring_spsc_enq_multi(ring_spsc_t *ring, + const uint32_t data[], + uint32_t num_data) +{ + uint32_t head, tail, mask, size, idx; + uint32_t num, i; + + head = odp_atomic_load_acq_u32(&ring->head); + tail = odp_atomic_load_u32(&ring->tail); + mask = ring->mask; + size = mask + 1; + num = size - (tail - head); + + /* Full */ + if (num == 0) + return 0; + + if (num > num_data) + num = num_data; + + idx = tail & mask; + + for (i = 0; i < num; i++) { + ring->data[idx] = data[i]; + idx = (idx + 1) & mask; + } + + odp_atomic_store_rel_u32(&ring->tail, tail + num); + + return num; +} + +/* Check if ring is empty */ +static inline int ring_spsc_is_empty(ring_spsc_t *ring) +{ + uint32_t head = odp_atomic_load_u32(&ring->head); + uint32_t tail = odp_atomic_load_u32(&ring->tail); + + return head == tail; +} + +#ifdef __cplusplus +} +#endif + +#endif ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/Makefile.am | 2 + .../linux-generic/include/odp_queue_internal.h | 9 +- .../linux-generic/include/odp_ring_spsc_internal.h | 124 +++++++++ platform/linux-generic/odp_queue_basic.c | 33 ++- platform/linux-generic/odp_queue_spsc.c | 131 +++++++++ test/performance/odp_queue_perf.c | 14 +- test/validation/api/queue/queue.c | 293 ++++++++++++++++++++- 7 files changed, 586 insertions(+), 20 deletions(-) create mode 100644 platform/linux-generic/include/odp_ring_spsc_internal.h create mode 100644 platform/linux-generic/odp_queue_spsc.c hooks/post-receive --

7 years, 8 months

[COMMIT] branch master updated. v1.19.0.1_tigermoth-86-ga01d1734

by git＠git-us.linaro.org

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, master has been updated via a01d17348d6c34457a415935e702a24257adcf8a (commit) from 3e3f0f51da0af53d6161ffa270e1b1c13c88e3e4 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit a01d17348d6c34457a415935e702a24257adcf8a Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Fri Jun 15 10:41:54 2018 +0300 example: timer_accuracy: convert full nsec time to ticks Calculate timeout values in nsec instead of ticks to avoid (accumulating) rounding error caused by nsec to tick conversion. Fixes bug https://bugs.linaro.org/show_bug.cgi?id=3787, timeouts are received consistently with different resolution values. Suggested-by: Josep Puigdemont <josep.puigdemont(a)linaro.org> Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/example/timer/odp_timer_accuracy.c b/example/timer/odp_timer_accuracy.c index f1a088cb..3b0d7e38 100644 --- a/example/timer/odp_timer_accuracy.c +++ b/example/timer/odp_timer_accuracy.c @@ -111,8 +111,8 @@ static int start_timers(test_global_t *test_global) odp_timer_t timer; odp_queue_t queue; odp_queue_param_t queue_param; - uint64_t tick, first_tick, period_tick, offset_tick; - uint64_t period_ns, res_ns, first_ns, res_capa; + uint64_t tick, start_tick; + uint64_t period_ns, res_ns, start_ns, time_ns, res_capa; odp_event_t event; odp_timeout_t timeout; odp_timer_set_t ret; @@ -204,9 +204,6 @@ static int start_timers(test_global_t *test_global) odp_timer_pool_start(); test_global->timer_pool = timer_pool; - first_tick = 0; - offset_tick = odp_timer_ns_to_tick(timer_pool, START_OFFSET_NS); - period_tick = odp_timer_ns_to_tick(timer_pool, period_ns); for (i = 0; i < num; i++) { timer = odp_timer_alloc(timer_pool, queue, NULL); @@ -219,6 +216,8 @@ static int start_timers(test_global_t *test_global) test_global->timer[i] = timer; } + start_tick = 0; + for (i = 0; i < num; i++) { timer = test_global->timer[i]; @@ -231,13 +230,14 @@ static int start_timers(test_global_t *test_global) event = odp_timeout_to_event(timeout); if (i == 0) { - first_tick = odp_timer_current_tick(timer_pool); + start_tick = odp_timer_current_tick(timer_pool); time = odp_time_local(); - first_ns = odp_time_to_ns(time); - test_global->first_ns = first_ns + START_OFFSET_NS; + start_ns = odp_time_to_ns(time); + test_global->first_ns = start_ns + START_OFFSET_NS; } - tick = first_tick + offset_tick + (i * period_tick); + time_ns = test_global->first_ns + (i * period_ns); + tick = start_tick + odp_timer_ns_to_tick(timer_pool, time_ns); ret = odp_timer_set_abs(timer, tick, &event); if (ret != ODP_TIMER_SUCCESS) { ----------------------------------------------------------------------- Summary of changes: example/timer/odp_timer_accuracy.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) hooks/post-receive --

7 years, 8 months

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

git-lng-odp