July 2016 - git-lng-odp - lists.linaro.org

[COMMIT] branch api-next updated. v1.10.1.0-110-gbbb10c2

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 bbb10c23626657723466a42b94612b554858ce1d (commit) via 5c4d38e42aa63c3d8b30b243f0b58f2cab04a466 (commit) via 870ef79d2dae0ad94a5079d0ca1e222493937aef (commit) via 4329099f32dc7e097eac6ec263264bc0f31d042c (commit) via b5354ade4337447d2914e5ffa4bdeb36dd689113 (commit) via ec0d570b8f762ea79960d54cf8c4f36efdea2528 (commit) from ca7d1dd9372957732fc1dc95d0ffe36cf34c23ba (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 bbb10c23626657723466a42b94612b554858ce1d Author: Christophe Milard <christophe.milard(a)linaro.org> Date: Fri Jul 22 15:19:17 2016 +0200 helper: test: gitignore add iplookuptable Obviously a miss from commit: c4aefb88d31452b3add8cf16f9eef152525c3e93 Signed-off-by: Christophe Milard <christophe.milard(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/helper/test/.gitignore b/helper/test/.gitignore index 482fdb5..e5b6a0f 100644 --- a/helper/test/.gitignore +++ b/helper/test/.gitignore @@ -2,6 +2,7 @@ *.log chksum cuckootable +iplookuptable odpthreads parse process commit 5c4d38e42aa63c3d8b30b243f0b58f2cab04a466 Merge: ca7d1dd 870ef79 Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Tue Jul 26 17:21:24 2016 +0300 Merge branch 'master' into api-next Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> ----------------------------------------------------------------------- Summary of changes: helper/test/.gitignore | 1 + .../linux-generic/include/odp_buffer_inlines.h | 26 +- .../linux-generic/include/odp_buffer_internal.h | 5 +- platform/linux-generic/include/odp_internal.h | 2 - .../linux-generic/include/odp_packet_internal.h | 4 +- platform/linux-generic/include/odp_packet_netmap.h | 6 + platform/linux-generic/include/odp_packet_socket.h | 1 + platform/linux-generic/include/odp_pool_internal.h | 143 +------ platform/linux-generic/odp_buffer.c | 3 - platform/linux-generic/odp_packet.c | 68 +-- platform/linux-generic/odp_pool.c | 465 ++++++++++++++++++--- platform/linux-generic/pktio/dpdk.c | 24 +- platform/linux-generic/pktio/netmap.c | 127 +++--- platform/linux-generic/pktio/pcap.c | 26 +- platform/linux-generic/pktio/socket.c | 21 +- platform/linux-generic/pktio/socket_mmap.c | 7 +- platform/linux-generic/pktio/tap.c | 7 +- test/common_plat/performance/odp_scheduling.c | 50 ++- 18 files changed, 622 insertions(+), 364 deletions(-) hooks/post-receive --

7 years, 9 months

1
0
0 0

[COMMIT] branch master updated. v1.10.1.0-66-g870ef79

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 870ef79d2dae0ad94a5079d0ca1e222493937aef (commit) via 4329099f32dc7e097eac6ec263264bc0f31d042c (commit) via b5354ade4337447d2914e5ffa4bdeb36dd689113 (commit) via ec0d570b8f762ea79960d54cf8c4f36efdea2528 (commit) from 20f14c1e726c97cb675c26627c073b730bcb58e6 (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 870ef79d2dae0ad94a5079d0ca1e222493937aef Author: Matias Elo <matias.elo(a)nokia.com> Date: Fri Jul 22 13:04:57 2016 +0300 performance: odp_scheduling: use multi alloc/free buffer functions Use odp_buffer_alloc_multi() and odp_buffer_free_multi() functions where appropriate for improved performance. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-and-tested-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/common_plat/performance/odp_scheduling.c b/test/common_plat/performance/odp_scheduling.c index 5a2997f..1d1bf01 100644 --- a/test/common_plat/performance/odp_scheduling.c +++ b/test/common_plat/performance/odp_scheduling.c @@ -29,7 +29,7 @@ #include <getopt.h> #define MSG_POOL_SIZE (4 * 1024 * 1024) /**< Message pool size */ -#define MAX_ALLOCS 35 /**< Alloc burst size */ +#define MAX_ALLOCS 32 /**< Alloc burst size */ #define QUEUES_PER_PRIO 64 /**< Queue per priority */ #define NUM_PRIOS 2 /**< Number of tested priorities */ #define QUEUE_ROUNDS (512 * 1024) /**< Queue test rounds */ @@ -131,9 +131,10 @@ static void clear_sched_queues(void) static int enqueue_events(int thr, int prio, int num_queues, int num_events, test_globals_t *globals) { - odp_buffer_t buf; + odp_buffer_t buf[num_events]; + odp_event_t ev[num_events]; odp_queue_t queue; - int i, j, k; + int i, j, k, ret; if (prio == ODP_SCHED_PRIO_HIGHEST) i = 0; @@ -144,19 +145,28 @@ static int enqueue_events(int thr, int prio, int num_queues, int num_events, for (j = 0; j < num_queues; j++) { queue = globals->queue[i][j]; + ret = odp_buffer_alloc_multi(globals->pool, buf, num_events); + if (ret != num_events) { + LOG_ERR(" [%i] buffer alloc failed\n", thr); + ret = ret < 0 ? 0 : ret; + odp_buffer_free_multi(buf, ret); + return -1; + } for (k = 0; k < num_events; k++) { - buf = odp_buffer_alloc(globals->pool); - - if (!odp_buffer_is_valid(buf)) { + if (!odp_buffer_is_valid(buf[k])) { LOG_ERR(" [%i] buffer alloc failed\n", thr); + odp_buffer_free_multi(buf, num_events); return -1; } + ev[k] = odp_buffer_to_event(buf[k]); + } - if (odp_queue_enq(queue, odp_buffer_to_event(buf))) { - LOG_ERR(" [%i] Queue enqueue failed.\n", thr); - odp_buffer_free(buf); - return -1; - } + ret = odp_queue_enq_multi(queue, ev, num_events); + if (ret != num_events) { + LOG_ERR(" [%i] Queue enqueue failed.\n", thr); + ret = ret < 0 ? 0 : ret; + odp_buffer_free_multi(&buf[ret], num_events - ret); + return -1; } } @@ -210,24 +220,30 @@ static int test_alloc_single(int thr, test_globals_t *globals) */ static int test_alloc_multi(int thr, test_globals_t *globals) { - int i, j; + int i, j, ret; odp_buffer_t temp_buf[MAX_ALLOCS]; uint64_t c1, c2, cycles; c1 = odp_cpu_cycles(); for (i = 0; i < ALLOC_ROUNDS; i++) { - for (j = 0; j < MAX_ALLOCS; j++) { - temp_buf[j] = odp_buffer_alloc(globals->pool); + ret = odp_buffer_alloc_multi(globals->pool, temp_buf, + MAX_ALLOCS); + if (ret != MAX_ALLOCS) { + LOG_ERR(" [%i] buffer alloc failed\n", thr); + ret = ret < 0 ? 0 : ret; + odp_buffer_free_multi(temp_buf, ret); + return -1; + } + for (j = 0; j < MAX_ALLOCS; j++) { if (!odp_buffer_is_valid(temp_buf[j])) { LOG_ERR(" [%i] alloc_multi failed\n", thr); + odp_buffer_free_multi(temp_buf, MAX_ALLOCS); return -1; } } - - for (; j > 0; j--) - odp_buffer_free(temp_buf[j - 1]); + odp_buffer_free_multi(temp_buf, MAX_ALLOCS); } c2 = odp_cpu_cycles(); commit 4329099f32dc7e097eac6ec263264bc0f31d042c Author: Matias Elo <matias.elo(a)nokia.com> Date: Fri Jul 22 13:04:56 2016 +0300 linux-gen: netmap: use multi alloc/free Modify netmap pktio to take advantage of multi-alloc/free. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-and-tested-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/include/odp_packet_netmap.h b/platform/linux-generic/include/odp_packet_netmap.h index 0e6c0dc..2aadbed 100644 --- a/platform/linux-generic/include/odp_packet_netmap.h +++ b/platform/linux-generic/include/odp_packet_netmap.h @@ -35,6 +35,12 @@ typedef union { uint8_t pad[ODP_CACHE_LINE_SIZE_ROUNDUP(sizeof(struct netmap_ring_t))]; } netmap_ring_t ODP_ALIGNED_CACHE; +/** Netmap ring slot */ +typedef struct { + char *buf; /**< Slot buffer pointer */ + uint16_t len; /**< Slot length */ +} netmap_slot_t; + /** Packet socket using netmap mmaped rings for both Rx and Tx */ typedef struct { odp_pool_t pool; /**< pool to alloc packets from */ diff --git a/platform/linux-generic/pktio/netmap.c b/platform/linux-generic/pktio/netmap.c index 6498429..412beec 100644 --- a/platform/linux-generic/pktio/netmap.c +++ b/platform/linux-generic/pktio/netmap.c @@ -580,67 +580,85 @@ static int netmap_stop(pktio_entry_t *pktio_entry ODP_UNUSED) } /** - * Create ODP packet from netmap packet + * Create ODP packets from netmap packets * * @param pktio_entry Packet IO entry - * @param pkt_out Storage for new ODP packet handle - * @param buf Netmap buffer address - * @param len Netmap buffer length + * @param pkt_tbl Array for new ODP packet handles + * @param slot_tbl Array of netmap ring slots + * @param slot_num Number of netmap ring slots * @param ts Pointer to pktin timestamp * * @retval Number of created packets - * @retval <0 on failure */ static inline int netmap_pkt_to_odp(pktio_entry_t *pktio_entry, - odp_packet_t *pkt_out, const char *buf, - uint16_t len, odp_time_t *ts) + odp_packet_t pkt_tbl[], + netmap_slot_t slot_tbl[], int16_t slot_num, + odp_time_t *ts) { odp_packet_t pkt; odp_pool_t pool = pktio_entry->s.pkt_nm.pool; odp_packet_hdr_t *pkt_hdr; odp_packet_hdr_t parsed_hdr; + int i; int num; + int alloc_len; - if (odp_unlikely(len > pktio_entry->s.pkt_nm.max_frame_len)) { - ODP_ERR("RX: frame too big %" PRIu16 " %zu!\n", len, - pktio_entry->s.pkt_nm.max_frame_len); - return -1; - } + /* Allocate maximum sized packets */ + alloc_len = pktio_entry->s.pkt_nm.mtu; - if (odp_unlikely(len < _ODP_ETH_LEN_MIN)) { - ODP_ERR("RX: Frame truncated: %" PRIu16 "\n", len); - return -1; - } + num = packet_alloc_multi(pool, alloc_len, pkt_tbl, slot_num); - if (pktio_cls_enabled(pktio_entry)) { - if (cls_classify_packet(pktio_entry, (const uint8_t *)buf, len, - len, &pool, &parsed_hdr)) - return -1; - } - num = packet_alloc_multi(pool, len, &pkt, 1); - if (num != 1) - return -1; + for (i = 0; i < num; i++) { + netmap_slot_t slot; + uint16_t len; - pkt_hdr = odp_packet_hdr(pkt); + slot = slot_tbl[i]; + len = slot.len; - /* For now copy the data in the mbuf, - worry about zero-copy later */ - if (odp_packet_copy_from_mem(pkt, 0, len, buf) != 0) { - odp_packet_free(pkt); - return -1; - } - pkt_hdr->input = pktio_entry->s.handle; + odp_prefetch(slot.buf); - if (pktio_cls_enabled(pktio_entry)) - copy_packet_cls_metadata(&parsed_hdr, pkt_hdr); - else - packet_parse_l2(&pkt_hdr->p, len); + if (odp_unlikely(len > pktio_entry->s.pkt_nm.max_frame_len)) { + ODP_ERR("RX: frame too big %" PRIu16 " %zu!\n", len, + pktio_entry->s.pkt_nm.max_frame_len); + goto fail; + } + + if (odp_unlikely(len < _ODP_ETH_LEN_MIN)) { + ODP_ERR("RX: Frame truncated: %" PRIu16 "\n", len); + goto fail; + } + + if (pktio_cls_enabled(pktio_entry)) { + if (cls_classify_packet(pktio_entry, + (const uint8_t *)slot.buf, len, + len, &pool, &parsed_hdr)) + goto fail; + } + + pkt = pkt_tbl[i]; + pkt_hdr = odp_packet_hdr(pkt); + pull_tail(pkt_hdr, alloc_len - len); - packet_set_ts(pkt_hdr, ts); + /* For now copy the data in the mbuf, + worry about zero-copy later */ + if (odp_packet_copy_from_mem(pkt, 0, len, slot.buf) != 0) + goto fail; - *pkt_out = pkt; + pkt_hdr->input = pktio_entry->s.handle; - return 1; + if (pktio_cls_enabled(pktio_entry)) + copy_packet_cls_metadata(&parsed_hdr, pkt_hdr); + else + packet_parse_l2(&pkt_hdr->p, len); + + packet_set_ts(pkt_hdr, ts); + } + + return i; + +fail: + odp_packet_free_multi(&pkt_tbl[i], num - i); + return i; } static inline int netmap_recv_desc(pktio_entry_t *pktio_entry, @@ -650,10 +668,10 @@ static inline int netmap_recv_desc(pktio_entry_t *pktio_entry, struct netmap_ring *ring; odp_time_t ts_val; odp_time_t *ts = NULL; + netmap_slot_t slot_tbl[num]; char *buf; uint32_t slot_id; int i; - int ret; int ring_id = desc->cur_rx_ring; int num_rx = 0; int num_rings = desc->last_rx_ring - desc->first_rx_ring + 1; @@ -668,29 +686,28 @@ static inline int netmap_recv_desc(pktio_entry_t *pktio_entry, ring = NETMAP_RXRING(desc->nifp, ring_id); - /* Take timestamp beforehand per ring to improve performance */ - if (ts != NULL) - ts_val = odp_time_global(); - while (!nm_ring_empty(ring) && num_rx != num) { slot_id = ring->cur; buf = NETMAP_BUF(ring, ring->slot[slot_id].buf_idx); - odp_prefetch(buf); - - ret = netmap_pkt_to_odp(pktio_entry, &pkt_table[num_rx], - buf, ring->slot[slot_id].len, - ts); - if (ret > 0) - num_rx += ret; + slot_tbl[num_rx].buf = buf; + slot_tbl[num_rx].len = ring->slot[slot_id].len; + num_rx++; ring->cur = nm_ring_next(ring, slot_id); - ring->head = ring->cur; } + ring->head = ring->cur; ring_id++; } desc->cur_rx_ring = ring_id; - return num_rx; + + if (num_rx) { + if (ts != NULL) + ts_val = odp_time_global(); + return netmap_pkt_to_odp(pktio_entry, pkt_table, slot_tbl, + num_rx, ts); + } + return 0; } static int netmap_recv(pktio_entry_t *pktio_entry, int index, @@ -806,7 +823,6 @@ static int netmap_send(pktio_entry_t *pktio_entry, int index, } if (i == NM_INJECT_RETRIES) break; - odp_packet_free(pkt); } /* Send pending packets */ poll(&polld, 1, 0); @@ -814,6 +830,8 @@ static int netmap_send(pktio_entry_t *pktio_entry, int index, if (!pkt_nm->lockless_tx) odp_ticketlock_unlock(&pkt_nm->tx_desc_ring[index].s.lock); + odp_packet_free_multi(pkt_table, nb_tx); + if (odp_unlikely(nb_tx == 0 && __odp_errno != 0)) return -1; commit b5354ade4337447d2914e5ffa4bdeb36dd689113 Author: Matias Elo <matias.elo(a)nokia.com> Date: Fri Jul 22 13:04:55 2016 +0300 linux-gen: pktio: use multi alloc Modify dpdk pktio to take advantage of multi-alloc/free. Others pktios do alloc/free still one packet at a time. For example, l2fwd test application packet throughput is increased about 10% (with dpdk pktio). Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-and-tested-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/include/odp_packet_internal.h b/platform/linux-generic/include/odp_packet_internal.h index 4c4e36c..392d670 100644 --- a/platform/linux-generic/include/odp_packet_internal.h +++ b/platform/linux-generic/include/odp_packet_internal.h @@ -306,7 +306,9 @@ static inline int packet_parse_not_complete(odp_packet_hdr_t *pkt_hdr) /* Forward declarations */ int _odp_packet_copy_md_to_packet(odp_packet_t srcpkt, odp_packet_t dstpkt); -odp_packet_t packet_alloc(odp_pool_t pool_hdl, uint32_t len, int parse); +/* Packet alloc of pktios */ +int packet_alloc_multi(odp_pool_t pool_hdl, uint32_t len, + odp_packet_t pkt[], int max_num); /* Fill in parser metadata for L2 */ void packet_parse_l2(packet_parser_t *prs, uint32_t frame_len); diff --git a/platform/linux-generic/include/odp_packet_socket.h b/platform/linux-generic/include/odp_packet_socket.h index ccff69a..dbfc9f1 100644 --- a/platform/linux-generic/include/odp_packet_socket.h +++ b/platform/linux-generic/include/odp_packet_socket.h @@ -45,6 +45,7 @@ typedef struct { int sockfd; /**< socket descriptor */ odp_pool_t pool; /**< pool to alloc packets from */ + uint32_t mtu; /**< maximum transmission unit */ unsigned char if_mac[ETH_ALEN]; /**< IF eth mac addr */ uint8_t *cache_ptr[ODP_PACKET_SOCKET_MAX_BURST_RX]; odp_shm_t shm; diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c index 474fa81..c4cf324 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -76,35 +76,46 @@ static void packet_init(pool_entry_t *pool, odp_packet_hdr_t *pkt_hdr, pkt_hdr->input = ODP_PKTIO_INVALID; } -odp_packet_t packet_alloc(odp_pool_t pool_hdl, uint32_t len, int parse) +int packet_alloc_multi(odp_pool_t pool_hdl, uint32_t len, + odp_packet_t pkt[], int max_num) { - odp_packet_t pkt; odp_packet_hdr_t *pkt_hdr; pool_entry_t *pool = odp_pool_to_entry(pool_hdl); + int num, i; - if (pool->s.params.type != ODP_POOL_PACKET) - return ODP_PACKET_INVALID; - - /* Handle special case for zero-length packets */ - if (len == 0) { - len = pool->s.params.buf.size; + num = buffer_alloc_multi(pool_hdl, len, (odp_buffer_t *)pkt, max_num); - pkt = (odp_packet_t)buffer_alloc(pool_hdl, len); + for (i = 0; i < num; i++) { + pkt_hdr = odp_packet_hdr(pkt[i]); + packet_init(pool, pkt_hdr, len, 1 /* do parse */); - if (pkt == ODP_PACKET_INVALID) - return ODP_PACKET_INVALID; + if (pkt_hdr->tailroom >= pkt_hdr->buf_hdr.segsize) + pull_tail_seg(pkt_hdr); + } - pull_tail(odp_packet_hdr(pkt), len); + return num; +} - } else { - pkt = (odp_packet_t)buffer_alloc(pool_hdl, len); +odp_packet_t odp_packet_alloc(odp_pool_t pool_hdl, uint32_t len) +{ + pool_entry_t *pool = odp_pool_to_entry(pool_hdl); + size_t pkt_size = len ? len : pool->s.params.buf.size; + odp_packet_t pkt; + odp_packet_hdr_t *pkt_hdr; - if (pkt == ODP_PACKET_INVALID) - return ODP_PACKET_INVALID; + if (pool->s.params.type != ODP_POOL_PACKET) { + __odp_errno = EINVAL; + return ODP_PACKET_INVALID; } + pkt = (odp_packet_t)buffer_alloc(pool_hdl, pkt_size); + if (pkt == ODP_PACKET_INVALID) + return ODP_PACKET_INVALID; + pkt_hdr = odp_packet_hdr(pkt); - packet_init(pool, pkt_hdr, len, parse); + packet_init(pool, pkt_hdr, pkt_size, 0 /* do not parse */); + if (len == 0) + pull_tail(pkt_hdr, pkt_size); if (pkt_hdr->tailroom >= pkt_hdr->buf_hdr.segsize) pull_tail_seg(pkt_hdr); @@ -112,11 +123,6 @@ odp_packet_t packet_alloc(odp_pool_t pool_hdl, uint32_t len, int parse) return pkt; } -odp_packet_t odp_packet_alloc(odp_pool_t pool_hdl, uint32_t len) -{ - return packet_alloc(pool_hdl, len, 0); -} - int odp_packet_alloc_multi(odp_pool_t pool_hdl, uint32_t len, odp_packet_t pkt[], int num) { @@ -135,9 +141,12 @@ int odp_packet_alloc_multi(odp_pool_t pool_hdl, uint32_t len, for (i = 0; i < count; ++i) { odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt[i]); - packet_init(pool, pkt_hdr, pkt_size, 0); + packet_init(pool, pkt_hdr, pkt_size, 0 /* do not parse */); if (len == 0) pull_tail(pkt_hdr, pkt_size); + + if (pkt_hdr->tailroom >= pkt_hdr->buf_hdr.segsize) + pull_tail_seg(pkt_hdr); } return count; @@ -145,12 +154,16 @@ int odp_packet_alloc_multi(odp_pool_t pool_hdl, uint32_t len, void odp_packet_free(odp_packet_t pkt) { - odp_buffer_free((odp_buffer_t)pkt); + uint32_t pool_id = pool_id_from_buf((odp_buffer_t)pkt); + + buffer_free(pool_id, (odp_buffer_t)pkt); } void odp_packet_free_multi(const odp_packet_t pkt[], int num) { - odp_buffer_free_multi((const odp_buffer_t *)pkt, num); + uint32_t pool_id = pool_id_from_buf((odp_buffer_t)pkt[0]); + + buffer_free_multi(pool_id, (const odp_buffer_t * const)pkt, num); } int odp_packet_reset(odp_packet_t pkt, uint32_t len) diff --git a/platform/linux-generic/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c index a5934a5..1fad8a9 100644 --- a/platform/linux-generic/pktio/dpdk.c +++ b/platform/linux-generic/pktio/dpdk.c @@ -706,7 +706,7 @@ static int dpdk_stop(pktio_entry_t *pktio_entry) static inline int mbuf_to_pkt(pktio_entry_t *pktio_entry, odp_packet_t pkt_table[], struct rte_mbuf *mbuf_table[], - uint16_t num, odp_time_t *ts) + uint16_t mbuf_num, odp_time_t *ts) { odp_packet_t pkt; odp_packet_hdr_t *pkt_hdr; @@ -715,9 +715,15 @@ static inline int mbuf_to_pkt(pktio_entry_t *pktio_entry, void *buf; int i, j; int nb_pkts = 0; + int alloc_len, num; + odp_pool_t pool = pktio_entry->s.pkt_dpdk.pool; + + /* Allocate maximum sized packets */ + alloc_len = pktio_entry->s.pkt_dpdk.data_room; + + num = packet_alloc_multi(pool, alloc_len, pkt_table, mbuf_num); for (i = 0; i < num; i++) { - odp_pool_t pool = pktio_entry->s.pkt_dpdk.pool; odp_packet_hdr_t parsed_hdr; mbuf = mbuf_table[i]; @@ -738,18 +744,16 @@ static inline int mbuf_to_pkt(pktio_entry_t *pktio_entry, &parsed_hdr)) goto fail; } - pkt = packet_alloc(pool, pkt_len, 1); - if (pkt == ODP_PACKET_INVALID) - goto fail; + pkt = pkt_table[i]; pkt_hdr = odp_packet_hdr(pkt); + pull_tail(pkt_hdr, alloc_len - pkt_len); /* For now copy the data in the mbuf, worry about zero-copy later */ - if (odp_packet_copy_from_mem(pkt, 0, pkt_len, buf) != 0) { - odp_packet_free(pkt); + if (odp_packet_copy_from_mem(pkt, 0, pkt_len, buf) != 0) goto fail; - } + pkt_hdr->input = pktio_entry->s.handle; if (pktio_cls_enabled(pktio_entry)) @@ -770,7 +774,9 @@ static inline int mbuf_to_pkt(pktio_entry_t *pktio_entry, return nb_pkts; fail: - for (j = i; j < num; j++) + odp_packet_free_multi(&pkt_table[i], mbuf_num - i); + + for (j = i; j < mbuf_num; j++) rte_pktmbuf_free(mbuf_table[j]); return (i > 0 ? i : -1); diff --git a/platform/linux-generic/pktio/netmap.c b/platform/linux-generic/pktio/netmap.c index 3017e40..6498429 100644 --- a/platform/linux-generic/pktio/netmap.c +++ b/platform/linux-generic/pktio/netmap.c @@ -599,6 +599,7 @@ static inline int netmap_pkt_to_odp(pktio_entry_t *pktio_entry, odp_pool_t pool = pktio_entry->s.pkt_nm.pool; odp_packet_hdr_t *pkt_hdr; odp_packet_hdr_t parsed_hdr; + int num; if (odp_unlikely(len > pktio_entry->s.pkt_nm.max_frame_len)) { ODP_ERR("RX: frame too big %" PRIu16 " %zu!\n", len, @@ -616,8 +617,8 @@ static inline int netmap_pkt_to_odp(pktio_entry_t *pktio_entry, len, &pool, &parsed_hdr)) return -1; } - pkt = packet_alloc(pool, len, 1); - if (pkt == ODP_PACKET_INVALID) + num = packet_alloc_multi(pool, len, &pkt, 1); + if (num != 1) return -1; pkt_hdr = odp_packet_hdr(pkt); diff --git a/platform/linux-generic/pktio/pcap.c b/platform/linux-generic/pktio/pcap.c index e501858..e54a56f 100644 --- a/platform/linux-generic/pktio/pcap.c +++ b/platform/linux-generic/pktio/pcap.c @@ -224,19 +224,9 @@ static int pcapif_recv_pkt(pktio_entry_t *pktio_entry, int index ODP_UNUSED, pktio_entry->s.config.pktin.bit.ts_ptp) ts = &ts_val; - pkt = ODP_PACKET_INVALID; - pkt_len = 0; - for (i = 0; i < len; ) { int ret; - if (pkt == ODP_PACKET_INVALID) { - pkt = packet_alloc(pcap->pool, 0 /*default len*/, 1); - if (odp_unlikely(pkt == ODP_PACKET_INVALID)) - break; - pkt_len = odp_packet_len(pkt); - } - ret = pcap_next_ex(pcap->rx, &hdr, &data); /* end of file, attempt to reopen if within loop limit */ @@ -246,17 +236,17 @@ static int pcapif_recv_pkt(pktio_entry_t *pktio_entry, int index ODP_UNUSED, if (ret != 1) break; + pkt_len = hdr->caplen; + + ret = packet_alloc_multi(pcap->pool, pkt_len, &pkt, 1); + if (odp_unlikely(ret != 1)) + break; + if (ts != NULL) ts_val = odp_time_global(); pkt_hdr = odp_packet_hdr(pkt); - if (!odp_packet_pull_tail(pkt, pkt_len - hdr->caplen)) { - ODP_ERR("failed to pull tail: pkt_len: %d caplen: %d\n", - pkt_len, hdr->caplen); - break; - } - if (odp_packet_copy_from_mem(pkt, 0, hdr->caplen, data) != 0) { ODP_ERR("failed to copy packet data\n"); break; @@ -269,7 +259,6 @@ static int pcapif_recv_pkt(pktio_entry_t *pktio_entry, int index ODP_UNUSED, pkt_hdr->input = pktio_entry->s.handle; pkts[i] = pkt; - pkt = ODP_PACKET_INVALID; i++; } @@ -277,9 +266,6 @@ static int pcapif_recv_pkt(pktio_entry_t *pktio_entry, int index ODP_UNUSED, odp_ticketlock_unlock(&pktio_entry->s.rxl); - if (pkt != ODP_PACKET_INVALID) - odp_packet_free(pkt); - return i; } diff --git a/platform/linux-generic/pktio/socket.c b/platform/linux-generic/pktio/socket.c index 0309b0d..e01b0a5 100644 --- a/platform/linux-generic/pktio/socket.c +++ b/platform/linux-generic/pktio/socket.c @@ -527,6 +527,10 @@ static int sock_setup_pkt(pktio_entry_t *pktio_entry, const char *netdev, if (err != 0) goto error; + pkt_sock->mtu = mtu_get_fd(sockfd, netdev); + if (!pkt_sock->mtu) + goto error; + /* bind socket to if */ memset(&sa_ll, 0, sizeof(sa_ll)); sa_ll.sll_family = AF_PACKET; @@ -659,6 +663,7 @@ static int sock_mmsg_recv(pktio_entry_t *pktio_entry, int index ODP_UNUSED, void *base = msgvec[i].msg_hdr.msg_iov->iov_base; struct ethhdr *eth_hdr = base; uint16_t pkt_len = msgvec[i].msg_len; + int num; /* Don't receive packets sent by ourselves */ if (odp_unlikely(ethaddrs_equal(pkt_sock->if_mac, @@ -668,8 +673,8 @@ static int sock_mmsg_recv(pktio_entry_t *pktio_entry, int index ODP_UNUSED, if (cls_classify_packet(pktio_entry, base, pkt_len, pkt_len, &pool, &parsed_hdr)) continue; - pkt = packet_alloc(pool, pkt_len, 1); - if (pkt == ODP_PACKET_INVALID) + num = packet_alloc_multi(pool, pkt_len, &pkt, 1); + if (num != 1) continue; pkt_hdr = odp_packet_hdr(pkt); @@ -690,10 +695,14 @@ static int sock_mmsg_recv(pktio_entry_t *pktio_entry, int index ODP_UNUSED, [ODP_BUFFER_MAX_SEG]; for (i = 0; i < (int)len; i++) { - pkt_table[i] = packet_alloc(pkt_sock->pool, - 0 /*default*/, 1); - if (odp_unlikely(pkt_table[i] == ODP_PACKET_INVALID)) + int num; + + num = packet_alloc_multi(pkt_sock->pool, pkt_sock->mtu, + &pkt_table[i], 1); + if (odp_unlikely(num != 1)) { + pkt_table[i] = ODP_PACKET_INVALID; break; + } msgvec[i].msg_hdr.msg_iovlen = _rx_pkt_to_iovec(pkt_table[i], iovecs[i]); @@ -818,7 +827,7 @@ static int sock_mmsg_send(pktio_entry_t *pktio_entry, int index ODP_UNUSED, */ static uint32_t sock_mtu_get(pktio_entry_t *pktio_entry) { - return mtu_get_fd(pktio_entry->s.pkt_sock.sockfd, pktio_entry->s.name); + return pktio_entry->s.pkt_sock.mtu; } /* diff --git a/platform/linux-generic/pktio/socket_mmap.c b/platform/linux-generic/pktio/socket_mmap.c index b6be81a..8b24c99 100644 --- a/platform/linux-generic/pktio/socket_mmap.c +++ b/platform/linux-generic/pktio/socket_mmap.c @@ -171,6 +171,7 @@ static inline unsigned pkt_mmap_v2_rx(pktio_entry_t *pktio_entry, odp_packet_hdr_t *hdr; odp_packet_hdr_t parsed_hdr; odp_pool_t pool = pkt_sock->pool; + int num; if (!mmap_rx_kernel_ready(ring->rd[frame_num].iov_base)) break; @@ -208,8 +209,10 @@ static inline unsigned pkt_mmap_v2_rx(pktio_entry_t *pktio_entry, } } - pkt_table[nb_rx] = packet_alloc(pool, pkt_len, 1); - if (odp_unlikely(pkt_table[nb_rx] == ODP_PACKET_INVALID)) { + num = packet_alloc_multi(pool, pkt_len, &pkt_table[nb_rx], 1); + + if (odp_unlikely(num != 1)) { + pkt_table[nb_rx] = ODP_PACKET_INVALID; mmap_rx_user_ready(ppd.raw); /* drop */ frame_num = next_frame_num; continue; diff --git a/platform/linux-generic/pktio/tap.c b/platform/linux-generic/pktio/tap.c index a9a8886..d758a39 100644 --- a/platform/linux-generic/pktio/tap.c +++ b/platform/linux-generic/pktio/tap.c @@ -185,11 +185,12 @@ static odp_packet_t pack_odp_pkt(pktio_entry_t *pktio_entry, const void *data, { odp_packet_t pkt; odp_packet_hdr_t *pkt_hdr; + int num; - pkt = packet_alloc(pktio_entry->s.pkt_tap.pool, len, 1); + num = packet_alloc_multi(pktio_entry->s.pkt_tap.pool, len, &pkt, 1); - if (pkt == ODP_PACKET_INVALID) - return pkt; + if (num != 1) + return ODP_PACKET_INVALID; if (odp_packet_copy_from_mem(pkt, 0, len, data) < 0) { ODP_ERR("failed to copy packet data\n"); commit ec0d570b8f762ea79960d54cf8c4f36efdea2528 Author: Matias Elo <matias.elo(a)nokia.com> Date: Fri Jul 22 13:04:54 2016 +0300 linux-gen: pool: optimize thread local buffer cache Optimize local buffer cache performance which is critical to many use cases - including packet IO. Main parts of the optimization are: * Local cache implemented as an array of buf_hdr pointers, instead of a linked list (which causes a lot of cache misses) * Alloc and free N buffers per operation All above steps are needed to demonstrate the performance upgrade. Some related pool functions (get_buf(), ret_buf(), etc) were moved from pool header to c source file, since those were actual local to the c source file. Also some unused pool variables are removed also. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-and-tested-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/include/odp_buffer_inlines.h b/platform/linux-generic/include/odp_buffer_inlines.h index 3f4d9fd..2b1ab42 100644 --- a/platform/linux-generic/include/odp_buffer_inlines.h +++ b/platform/linux-generic/include/odp_buffer_inlines.h @@ -56,30 +56,12 @@ static inline odp_buffer_hdr_t *odp_buf_to_hdr(odp_buffer_t buf) (pool->pool_mdata_addr + (index * ODP_CACHE_LINE_SIZE)); } -static inline uint32_t odp_buffer_refcount(odp_buffer_hdr_t *buf) +static inline uint32_t pool_id_from_buf(odp_buffer_t buf) { - return odp_atomic_load_u32(&buf->ref_count); -} - -static inline uint32_t odp_buffer_incr_refcount(odp_buffer_hdr_t *buf, - uint32_t val) -{ - return odp_atomic_fetch_add_u32(&buf->ref_count, val) + val; -} - -static inline uint32_t odp_buffer_decr_refcount(odp_buffer_hdr_t *buf, - uint32_t val) -{ - uint32_t tmp; - - tmp = odp_atomic_fetch_sub_u32(&buf->ref_count, val); + odp_buffer_bits_t handle; - if (tmp < val) { - odp_atomic_fetch_add_u32(&buf->ref_count, val - tmp); - return 0; - } else { - return tmp - val; - } + handle.handle = buf; + return handle.pool_id; } static inline odp_buffer_hdr_t *validate_buf(odp_buffer_t buf) diff --git a/platform/linux-generic/include/odp_buffer_internal.h b/platform/linux-generic/include/odp_buffer_internal.h index f21364c..7b0ef8b 100644 --- a/platform/linux-generic/include/odp_buffer_internal.h +++ b/platform/linux-generic/include/odp_buffer_internal.h @@ -114,7 +114,6 @@ struct odp_buffer_hdr_t { union { uint32_t all; struct { - uint32_t zeroized:1; /* Zeroize buf data on free */ uint32_t hdrdata:1; /* Data is in buffer hdr */ uint32_t sustain:1; /* Sustain order */ }; @@ -123,7 +122,6 @@ struct odp_buffer_hdr_t { int8_t type; /* buffer type */ odp_event_type_t event_type; /* for reuse as event */ uint32_t size; /* max data size */ - odp_atomic_u32_t ref_count; /* reference count */ odp_pool_t pool_hdl; /* buffer pool handle */ union { uint64_t buf_u64; /* user u64 */ @@ -174,6 +172,9 @@ typedef struct { odp_buffer_t buffer_alloc(odp_pool_t pool, size_t size); int buffer_alloc_multi(odp_pool_t pool_hdl, size_t size, odp_buffer_t buf[], int num); +void buffer_free(uint32_t pool_id, const odp_buffer_t buf); +void buffer_free_multi(uint32_t pool_id, + const odp_buffer_t buf[], int num_free); int seg_alloc_head(odp_buffer_hdr_t *buf_hdr, int segcount); void seg_free_head(odp_buffer_hdr_t *buf_hdr, int segcount); int seg_alloc_tail(odp_buffer_hdr_t *buf_hdr, int segcount); diff --git a/platform/linux-generic/include/odp_internal.h b/platform/linux-generic/include/odp_internal.h index d12f850..8bad450 100644 --- a/platform/linux-generic/include/odp_internal.h +++ b/platform/linux-generic/include/odp_internal.h @@ -119,8 +119,6 @@ int odp_tm_term_global(void); int _odp_int_name_tbl_init_global(void); int _odp_int_name_tbl_term_global(void); -void _odp_flush_caches(void); - int cpuinfo_parser(FILE *file, system_info_t *sysinfo); uint64_t odp_cpu_hz_current(int id); diff --git a/platform/linux-generic/include/odp_pool_internal.h b/platform/linux-generic/include/odp_pool_internal.h index 3317bd0..d6717ff 100644 --- a/platform/linux-generic/include/odp_pool_internal.h +++ b/platform/linux-generic/include/odp_pool_internal.h @@ -51,15 +51,25 @@ typedef struct _odp_buffer_pool_init_t { void *buf_init_arg; /**< Argument to be passed to buf_init() */ } _odp_buffer_pool_init_t; /**< Type of buffer initialization struct */ +#define POOL_MAX_LOCAL_CHUNKS 4 +#define POOL_CHUNK_SIZE 32 +#define POOL_MAX_LOCAL_BUFS (POOL_MAX_LOCAL_CHUNKS * POOL_CHUNK_SIZE) + +struct local_cache_s { + uint64_t bufallocs; /* Local buffer alloc count */ + uint64_t buffrees; /* Local buffer free count */ + + uint32_t num_buf; + odp_buffer_hdr_t *buf[POOL_MAX_LOCAL_BUFS]; +}; + /* Local cache for buffer alloc/free acceleration */ typedef struct local_cache_t { union { - struct { - odp_buffer_hdr_t *buf_freelist; /* The local cache */ - uint64_t bufallocs; /* Local buffer alloc count */ - uint64_t buffrees; /* Local buffer free count */ - }; - uint8_t pad[ODP_CACHE_LINE_SIZE_ROUNDUP(sizeof(uint64_t))]; + struct local_cache_s s; + + uint8_t pad[ODP_CACHE_LINE_SIZE_ROUNDUP( + sizeof(struct local_cache_s))]; }; } local_cache_t; @@ -214,127 +224,6 @@ static inline void ret_blk(struct pool_entry_s *pool, void *block) odp_atomic_inc_u64(&pool->poolstats.blkfrees); } -static inline odp_buffer_hdr_t *get_buf(struct pool_entry_s *pool) -{ - odp_buffer_hdr_t *myhead; - POOL_LOCK(&pool->buf_lock); - - myhead = pool->buf_freelist; - - if (odp_unlikely(myhead == NULL)) { - POOL_UNLOCK(&pool->buf_lock); - odp_atomic_inc_u64(&pool->poolstats.bufempty); - } else { - pool->buf_freelist = myhead->next; - POOL_UNLOCK(&pool->buf_lock); - uint64_t bufcount = - odp_atomic_fetch_sub_u32(&pool->bufcount, 1) - 1; - - /* Check for low watermark condition */ - if (bufcount == pool->buf_low_wm && !pool->buf_low_wm_assert) { - pool->buf_low_wm_assert = 1; - odp_atomic_inc_u64(&pool->poolstats.buf_low_wm_count); - } - - odp_atomic_inc_u64(&pool->poolstats.bufallocs); - } - - return (void *)myhead; -} - -static inline void ret_buf(struct pool_entry_s *pool, odp_buffer_hdr_t *buf) -{ - if (!buf->flags.hdrdata && buf->type != ODP_EVENT_BUFFER) { - while (buf->segcount > 0) { - if (buffer_is_secure(buf) || pool_is_secure(pool)) - memset(buf->addr[buf->segcount - 1], - 0, buf->segsize); - ret_blk(pool, buf->addr[--buf->segcount]); - } - buf->size = 0; - } - - buf->allocator = ODP_FREEBUF; /* Mark buffer free */ - POOL_LOCK(&pool->buf_lock); - buf->next = pool->buf_freelist; - pool->buf_freelist = buf; - POOL_UNLOCK(&pool->buf_lock); - - uint64_t bufcount = odp_atomic_fetch_add_u32(&pool->bufcount, 1) + 1; - - /* Check if low watermark condition should be deasserted */ - if (bufcount == pool->buf_high_wm && pool->buf_low_wm_assert) { - pool->buf_low_wm_assert = 0; - odp_atomic_inc_u64(&pool->poolstats.buf_high_wm_count); - } - - odp_atomic_inc_u64(&pool->poolstats.buffrees); -} - -static inline void *get_local_buf(local_cache_t *buf_cache, - struct pool_entry_s *pool, - size_t totsize) -{ - odp_buffer_hdr_t *buf = buf_cache->buf_freelist; - - if (odp_likely(buf != NULL)) { - buf_cache->buf_freelist = buf->next; - - if (odp_unlikely(buf->size < totsize)) { - intmax_t needed = totsize - buf->size; - - do { - void *blk = get_blk(pool); - if (odp_unlikely(blk == NULL)) { - ret_buf(pool, buf); - buf_cache->buffrees--; - return NULL; - } - buf->addr[buf->segcount++] = blk; - needed -= pool->seg_size; - } while (needed > 0); - - buf->size = buf->segcount * pool->seg_size; - } - - buf_cache->bufallocs++; - } - - return buf; -} - -static inline void ret_local_buf(local_cache_t *buf_cache, - odp_buffer_hdr_t *buf) -{ - buf->allocator = ODP_FREEBUF; - buf->next = buf_cache->buf_freelist; - buf_cache->buf_freelist = buf; - - buf_cache->buffrees++; -} - -static inline void flush_cache(local_cache_t *buf_cache, - struct pool_entry_s *pool) -{ - odp_buffer_hdr_t *buf = buf_cache->buf_freelist; - uint32_t flush_count = 0; - - while (buf != NULL) { - odp_buffer_hdr_t *next = buf->next; - ret_buf(pool, buf); - buf = next; - flush_count++; - } - - odp_atomic_add_u64(&pool->poolstats.bufallocs, buf_cache->bufallocs); - odp_atomic_add_u64(&pool->poolstats.buffrees, - buf_cache->buffrees - flush_count); - - buf_cache->buf_freelist = NULL; - buf_cache->bufallocs = 0; - buf_cache->buffrees = 0; -} - static inline odp_pool_t pool_index_to_handle(uint32_t pool_id) { return _odp_cast_scalar(odp_pool_t, pool_id); diff --git a/platform/linux-generic/odp_buffer.c b/platform/linux-generic/odp_buffer.c index e7e4d58..ce2fdba 100644 --- a/platform/linux-generic/odp_buffer.c +++ b/platform/linux-generic/odp_buffer.c @@ -67,9 +67,6 @@ int odp_buffer_snprint(char *str, uint32_t n, odp_buffer_t buf) len += snprintf(&str[len], n-len, " size %" PRIu32 "\n", hdr->size); len += snprintf(&str[len], n-len, - " ref_count %" PRIu32 "\n", - odp_atomic_load_u32(&hdr->ref_count)); - len += snprintf(&str[len], n-len, " type %i\n", hdr->type); return len; diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c index 0e319d2..474fa81 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -972,10 +972,7 @@ int _odp_packet_copy_md_to_packet(odp_packet_t srcpkt, odp_packet_t dstpkt) srchdr->buf_hdr.uarea_size ? dsthdr->buf_hdr.uarea_size : srchdr->buf_hdr.uarea_size); - odp_atomic_store_u32( - &dsthdr->buf_hdr.ref_count, - odp_atomic_load_u32( - &srchdr->buf_hdr.ref_count)); + copy_packet_parser_metadata(srchdr, dsthdr); /* Metadata copied, but return indication of whether the packet diff --git a/platform/linux-generic/odp_pool.c b/platform/linux-generic/odp_pool.c index 419f03f..0a427ed 100644 --- a/platform/linux-generic/odp_pool.c +++ b/platform/linux-generic/odp_pool.c @@ -57,8 +57,15 @@ static const char SHM_DEFAULT_NAME[] = "odp_buffer_pools"; /* Pool entry pointers (for inlining) */ void *pool_entry_ptr[ODP_CONFIG_POOLS]; -/* Cache thread id locally for local cache performance */ -static __thread int local_id; +/* Thread local variables */ +typedef struct pool_local_t { + local_cache_t *cache[ODP_CONFIG_POOLS]; + int thr_id; +} pool_local_t; + +static __thread pool_local_t local; + +static void flush_cache(local_cache_t *buf_cache, struct pool_entry_s *pool); int odp_pool_init_global(void) { @@ -111,7 +118,19 @@ int odp_pool_init_global(void) int odp_pool_init_local(void) { - local_id = odp_thread_id(); + pool_entry_t *pool; + int i; + int thr_id = odp_thread_id(); + + memset(&local, 0, sizeof(pool_local_t)); + + for (i = 0; i < ODP_CONFIG_POOLS; i++) { + pool = get_pool_entry(i); + local.cache[i] = &pool->s.local_cache[thr_id]; + local.cache[i]->s.num_buf = 0; + } + + local.thr_id = thr_id; return 0; } @@ -144,7 +163,14 @@ int odp_pool_term_global(void) int odp_pool_term_local(void) { - _odp_flush_caches(); + int i; + + for (i = 0; i < ODP_CONFIG_POOLS; i++) { + pool_entry_t *pool = get_pool_entry(i); + + flush_cache(local.cache[i], &pool->s); + } + return 0; } @@ -179,10 +205,53 @@ int odp_pool_capability(odp_pool_capability_t *capa) return 0; } -/** +static inline odp_buffer_hdr_t *get_buf(struct pool_entry_s *pool) +{ + odp_buffer_hdr_t *myhead; + + POOL_LOCK(&pool->buf_lock); + + myhead = pool->buf_freelist; + + if (odp_unlikely(myhead == NULL)) { + POOL_UNLOCK(&pool->buf_lock); + odp_atomic_inc_u64(&pool->poolstats.bufempty); + } else { + pool->buf_freelist = myhead->next; + POOL_UNLOCK(&pool->buf_lock); + + odp_atomic_fetch_sub_u32(&pool->bufcount, 1); + odp_atomic_inc_u64(&pool->poolstats.bufallocs); + } + + return (void *)myhead; +} + +static inline void ret_buf(struct pool_entry_s *pool, odp_buffer_hdr_t *buf) +{ + if (!buf->flags.hdrdata && buf->type != ODP_EVENT_BUFFER) { + while (buf->segcount > 0) { + if (buffer_is_secure(buf) || pool_is_secure(pool)) + memset(buf->addr[buf->segcount - 1], + 0, buf->segsize); + ret_blk(pool, buf->addr[--buf->segcount]); + } + buf->size = 0; + } + + buf->allocator = ODP_FREEBUF; /* Mark buffer free */ + POOL_LOCK(&pool->buf_lock); + buf->next = pool->buf_freelist; + pool->buf_freelist = buf; + POOL_UNLOCK(&pool->buf_lock); + + odp_atomic_fetch_add_u32(&pool->bufcount, 1); + odp_atomic_inc_u64(&pool->poolstats.buffrees); +} + +/* * Pool creation */ - odp_pool_t _pool_create(const char *name, odp_pool_param_t *params, uint32_t shmflags) @@ -208,9 +277,6 @@ odp_pool_t _pool_create(const char *name, /* Restriction for v1.0: All non-packet buffers are unsegmented */ int unseg = 1; - /* Restriction for v1.0: No zeroization support */ - const int zeroized = 0; - uint32_t blk_size, buf_stride, buf_num, blk_num, seg_len = 0; uint32_t buf_align = params->type == ODP_POOL_BUFFER ? params->buf.align : 0; @@ -350,7 +416,6 @@ odp_pool_t _pool_create(const char *name, POOL_UNLOCK(&pool->s.lock); pool->s.flags.unsegmented = unseg; - pool->s.flags.zeroized = zeroized; pool->s.seg_size = unseg ? blk_size : seg_len; pool->s.blk_size = blk_size; @@ -383,9 +448,7 @@ odp_pool_t _pool_create(const char *name, /* Iniitalize buffer metadata */ tmp->allocator = ODP_FREEBUF; tmp->flags.all = 0; - tmp->flags.zeroized = zeroized; tmp->size = 0; - odp_atomic_init_u32(&tmp->ref_count, 0); tmp->type = params->type; tmp->event_type = params->type; tmp->pool_hdl = pool->s.pool_hdl; @@ -503,6 +566,41 @@ int odp_pool_info(odp_pool_t pool_hdl, odp_pool_info_t *info) return 0; } +static inline void get_local_cache_bufs(local_cache_t *buf_cache, uint32_t idx, + odp_buffer_hdr_t *buf_hdr[], + uint32_t num) +{ + uint32_t i; + + for (i = 0; i < num; i++) { + buf_hdr[i] = buf_cache->s.buf[idx + i]; + odp_prefetch(buf_hdr[i]); + odp_prefetch_store(buf_hdr[i]); + } +} + +static void flush_cache(local_cache_t *buf_cache, struct pool_entry_s *pool) +{ + uint32_t flush_count = 0; + uint32_t num; + + while ((num = buf_cache->s.num_buf)) { + odp_buffer_hdr_t *buf; + + buf = buf_cache->s.buf[num - 1]; + ret_buf(pool, buf); + flush_count++; + buf_cache->s.num_buf--; + } + + odp_atomic_add_u64(&pool->poolstats.bufallocs, buf_cache->s.bufallocs); + odp_atomic_add_u64(&pool->poolstats.buffrees, + buf_cache->s.buffrees - flush_count); + + buf_cache->s.bufallocs = 0; + buf_cache->s.buffrees = 0; +} + int odp_pool_destroy(odp_pool_t pool_hdl) { uint32_t pool_id = pool_handle_to_index(pool_hdl); @@ -621,71 +719,207 @@ void seg_free_tail(odp_buffer_hdr_t *buf_hdr, int segcount) buf_hdr->size = buf_hdr->segcount * pool->s.seg_size; } -odp_buffer_t buffer_alloc(odp_pool_t pool_hdl, size_t size) +static inline int get_local_bufs(local_cache_t *buf_cache, + odp_buffer_hdr_t *buf_hdr[], uint32_t max_num) +{ + uint32_t num_buf = buf_cache->s.num_buf; + uint32_t num = num_buf; + + if (odp_unlikely(num_buf == 0)) + return 0; + + if (odp_likely(max_num < num)) + num = max_num; + + get_local_cache_bufs(buf_cache, num_buf - num, buf_hdr, num); + buf_cache->s.num_buf -= num; + buf_cache->s.bufallocs += num; + + return num; +} + +static inline void ret_local_buf(local_cache_t *buf_cache, uint32_t idx, + odp_buffer_hdr_t *buf) +{ + buf_cache->s.buf[idx] = buf; + buf_cache->s.num_buf++; + buf_cache->s.buffrees++; +} + +static inline void ret_local_bufs(local_cache_t *buf_cache, uint32_t idx, + odp_buffer_hdr_t *buf[], int num_buf) +{ + int i; + + for (i = 0; i < num_buf; i++) + buf_cache->s.buf[idx + i] = buf[i]; + + buf_cache->s.num_buf += num_buf; + buf_cache->s.buffrees += num_buf; +} + +int buffer_alloc_multi(odp_pool_t pool_hdl, size_t size, + odp_buffer_t buf[], int max_num) { uint32_t pool_id = pool_handle_to_index(pool_hdl); pool_entry_t *pool = get_pool_entry(pool_id); uintmax_t totsize = pool->s.headroom + size + pool->s.tailroom; - odp_anybuf_t *buf; + odp_buffer_hdr_t *buf_tbl[max_num]; + odp_buffer_hdr_t *buf_hdr; + int num, i; + intmax_t needed; + void *blk; /* Reject oversized allocation requests */ if ((pool->s.flags.unsegmented && totsize > pool->s.seg_size) || (!pool->s.flags.unsegmented && totsize > pool->s.seg_size * ODP_BUFFER_MAX_SEG)) - return ODP_BUFFER_INVALID; + return 0; /* Try to satisfy request from the local cache */ - buf = (odp_anybuf_t *) - (void *)get_local_buf(&pool->s.local_cache[local_id], - &pool->s, totsize); + num = get_local_bufs(local.cache[pool_id], buf_tbl, max_num); /* If cache is empty, satisfy request from the pool */ - if (odp_unlikely(buf == NULL)) { - buf = (odp_anybuf_t *)(void *)get_buf(&pool->s); + if (odp_unlikely(num < max_num)) { + for (; num < max_num; num++) { + buf_hdr = get_buf(&pool->s); + + if (odp_unlikely(buf_hdr == NULL)) + goto pool_empty; + + /* Get blocks for this buffer, if pool uses + * application data */ + if (buf_hdr->size < totsize) { + uint32_t segcount; + + needed = totsize - buf_hdr->size; + do { + blk = get_blk(&pool->s); + if (odp_unlikely(blk == NULL)) { + ret_buf(&pool->s, buf_hdr); + goto pool_empty; + } + + segcount = buf_hdr->segcount++; + buf_hdr->addr[segcount] = blk; + needed -= pool->s.seg_size; + } while (needed > 0); + buf_hdr->size = buf_hdr->segcount * + pool->s.seg_size; + } - if (odp_unlikely(buf == NULL)) - return ODP_BUFFER_INVALID; + buf_tbl[num] = buf_hdr; + } + } - /* Get blocks for this buffer, if pool uses application data */ - if (buf->buf.size < totsize) { - intmax_t needed = totsize - buf->buf.size; +pool_empty: + for (i = 0; i < num; i++) { + buf_hdr = buf_tbl[i]; + + /* Mark buffer as allocated */ + buf_hdr->allocator = local.thr_id; + + /* By default, buffers are not associated with + * an ordered queue */ + buf_hdr->origin_qe = NULL; + + buf[i] = odp_hdr_to_buf(buf_hdr); + + /* Add more segments if buffer from local cache is too small */ + if (odp_unlikely(buf_hdr->size < totsize)) { + needed = totsize - buf_hdr->size; do { - uint8_t *blk = get_blk(&pool->s); - if (blk == NULL) { - ret_buf(&pool->s, &buf->buf); - return ODP_BUFFER_INVALID; + blk = get_blk(&pool->s); + if (odp_unlikely(blk == NULL)) { + int j; + + ret_buf(&pool->s, buf_hdr); + buf_hdr = NULL; + local.cache[pool_id]->s.buffrees--; + + /* move remaining bufs up one step + * and update loop counters */ + num--; + for (j = i; j < num; j++) + buf_tbl[j] = buf_tbl[j + 1]; + + i--; + break; } - buf->buf.addr[buf->buf.segcount++] = blk; needed -= pool->s.seg_size; + buf_hdr->addr[buf_hdr->segcount++] = blk; + buf_hdr->size = buf_hdr->segcount * + pool->s.seg_size; } while (needed > 0); - buf->buf.size = buf->buf.segcount * pool->s.seg_size; } } - /* Mark buffer as allocated */ - buf->buf.allocator = local_id; + return num; +} - /* By default, buffers inherit their pool's zeroization setting */ - buf->buf.flags.zeroized = pool->s.flags.zeroized; +odp_buffer_t buffer_alloc(odp_pool_t pool_hdl, size_t size) +{ + uint32_t pool_id = pool_handle_to_index(pool_hdl); + pool_entry_t *pool = get_pool_entry(pool_id); + uintmax_t totsize = pool->s.headroom + size + pool->s.tailroom; + odp_buffer_hdr_t *buf_hdr; + intmax_t needed; + void *blk; - /* By default, buffers are not associated with an ordered queue */ - buf->buf.origin_qe = NULL; + /* Reject oversized allocation requests */ + if ((pool->s.flags.unsegmented && totsize > pool->s.seg_size) || + (!pool->s.flags.unsegmented && + totsize > pool->s.seg_size * ODP_BUFFER_MAX_SEG)) + return 0; - return odp_hdr_to_buf(&buf->buf); -} + /* Try to satisfy request from the local cache. If cache is empty, + * satisfy request from the pool */ + if (odp_unlikely(!get_local_bufs(local.cache[pool_id], &buf_hdr, 1))) { + buf_hdr = get_buf(&pool->s); -int buffer_alloc_multi(odp_pool_t pool_hdl, size_t size, - odp_buffer_t buf[], int num) -{ - int count; + if (odp_unlikely(buf_hdr == NULL)) + return ODP_BUFFER_INVALID; + + /* Get blocks for this buffer, if pool uses application data */ + if (buf_hdr->size < totsize) { + needed = totsize - buf_hdr->size; + do { + blk = get_blk(&pool->s); + if (odp_unlikely(blk == NULL)) { + ret_buf(&pool->s, buf_hdr); + return ODP_BUFFER_INVALID; + } + buf_hdr->addr[buf_hdr->segcount++] = blk; + needed -= pool->s.seg_size; + } while (needed > 0); + buf_hdr->size = buf_hdr->segcount * pool->s.seg_size; + } + } + /* Mark buffer as allocated */ + buf_hdr->allocator = local.thr_id; - for (count = 0; count < num; ++count) { - buf[count] = buffer_alloc(pool_hdl, size); - if (buf[count] == ODP_BUFFER_INVALID) - break; + /* By default, buffers are not associated with + * an ordered queue */ + buf_hdr->origin_qe = NULL; + + /* Add more segments if buffer from local cache is too small */ + if (odp_unlikely(buf_hdr->size < totsize)) { + needed = totsize - buf_hdr->size; + do { + blk = get_blk(&pool->s); + if (odp_unlikely(blk == NULL)) { + ret_buf(&pool->s, buf_hdr); + buf_hdr = NULL; + local.cache[pool_id]->s.buffrees--; + return ODP_BUFFER_INVALID; + } + buf_hdr->addr[buf_hdr->segcount++] = blk; + needed -= pool->s.seg_size; + } while (needed > 0); + buf_hdr->size = buf_hdr->segcount * pool->s.seg_size; } - return count; + return odp_hdr_to_buf(buf_hdr); } odp_buffer_t odp_buffer_alloc(odp_pool_t pool_hdl) @@ -701,35 +935,132 @@ int odp_buffer_alloc_multi(odp_pool_t pool_hdl, odp_buffer_t buf[], int num) return buffer_alloc_multi(pool_hdl, buf_size, buf, num); } -void odp_buffer_free(odp_buffer_t buf) +static void multi_pool_free(odp_buffer_hdr_t *buf_hdr[], int num_buf) { - odp_buffer_hdr_t *buf_hdr = odp_buf_to_hdr(buf); - pool_entry_t *pool = odp_buf_to_pool(buf_hdr); + uint32_t pool_id, num; + local_cache_t *buf_cache; + pool_entry_t *pool; + int i, j, idx; - ODP_ASSERT(buf_hdr->allocator != ODP_FREEBUF); + for (i = 0; i < num_buf; i++) { + pool_id = pool_handle_to_index(buf_hdr[i]->pool_hdl); + buf_cache = local.cache[pool_id]; + num = buf_cache->s.num_buf; + + if (num < POOL_MAX_LOCAL_BUFS) { + ret_local_buf(buf_cache, num, buf_hdr[i]); + continue; + } + + idx = POOL_MAX_LOCAL_BUFS - POOL_CHUNK_SIZE; + pool = get_pool_entry(pool_id); + + /* local cache full, return a chunk */ + for (j = 0; j < POOL_CHUNK_SIZE; j++) { + odp_buffer_hdr_t *tmp; + + tmp = buf_cache->s.buf[idx + i]; + ret_buf(&pool->s, tmp); + } - if (odp_unlikely(pool->s.buf_low_wm_assert || pool->s.blk_low_wm_assert)) - ret_buf(&pool->s, buf_hdr); - else - ret_local_buf(&pool->s.local_cache[local_id], buf_hdr); + num = POOL_MAX_LOCAL_BUFS - POOL_CHUNK_SIZE; + buf_cache->s.num_buf = num; + ret_local_buf(buf_cache, num, buf_hdr[i]); + } } -void odp_buffer_free_multi(const odp_buffer_t buf[], int num) +void buffer_free_multi(uint32_t pool_id, + const odp_buffer_t buf[], int num_free) { - int i; + local_cache_t *buf_cache = local.cache[pool_id]; + uint32_t num; + int i, idx; + pool_entry_t *pool; + odp_buffer_hdr_t *buf_hdr[num_free]; + int multi_pool = 0; + + for (i = 0; i < num_free; i++) { + uint32_t id; + + buf_hdr[i] = odp_buf_to_hdr(buf[i]); + ODP_ASSERT(buf_hdr[i]->allocator != ODP_FREEBUF); + buf_hdr[i]->allocator = ODP_FREEBUF; + id = pool_handle_to_index(buf_hdr[i]->pool_hdl); + multi_pool |= (pool_id != id); + } + + if (odp_unlikely(multi_pool)) { + multi_pool_free(buf_hdr, num_free); + return; + } + + num = buf_cache->s.num_buf; - for (i = 0; i < num; ++i) - odp_buffer_free(buf[i]); + if (odp_likely((num + num_free) < POOL_MAX_LOCAL_BUFS)) { + ret_local_bufs(buf_cache, num, buf_hdr, num_free); + return; + } + + pool = get_pool_entry(pool_id); + + /* Return at least one chunk into the global pool */ + if (odp_unlikely(num_free > POOL_CHUNK_SIZE)) { + for (i = 0; i < num_free; i++) + ret_buf(&pool->s, buf_hdr[i]); + + return; + } + + idx = num - POOL_CHUNK_SIZE; + for (i = 0; i < POOL_CHUNK_SIZE; i++) + ret_buf(&pool->s, buf_cache->s.buf[idx + i]); + + num -= POOL_CHUNK_SIZE; + buf_cache->s.num_buf = num; + ret_local_bufs(buf_cache, num, buf_hdr, num_free); } -void _odp_flush_caches(void) +void buffer_free(uint32_t pool_id, const odp_buffer_t buf) { + local_cache_t *buf_cache = local.cache[pool_id]; + uint32_t num; int i; + pool_entry_t *pool; + odp_buffer_hdr_t *buf_hdr; - for (i = 0; i < ODP_CONFIG_POOLS; i++) { - pool_entry_t *pool = get_pool_entry(i); - flush_cache(&pool->s.local_cache[local_id], &pool->s); + buf_hdr = odp_buf_to_hdr(buf); + ODP_ASSERT(buf_hdr->allocator != ODP_FREEBUF); + buf_hdr->allocator = ODP_FREEBUF; + + num = buf_cache->s.num_buf; + + if (odp_likely((num + 1) < POOL_MAX_LOCAL_BUFS)) { + ret_local_bufs(buf_cache, num, &buf_hdr, 1); + return; } + + pool = get_pool_entry(pool_id); + + num -= POOL_CHUNK_SIZE; + for (i = 0; i < POOL_CHUNK_SIZE; i++) + ret_buf(&pool->s, buf_cache->s.buf[num + i]); + + buf_cache->s.num_buf = num; + ret_local_bufs(buf_cache, num, &buf_hdr, 1); +} + +void odp_buffer_free(odp_buffer_t buf) +{ + uint32_t pool_id = pool_id_from_buf(buf); + + buffer_free(pool_id, buf); +} + +void odp_buffer_free_multi(const odp_buffer_t buf[], int num) +{ + uint32_t pool_id = pool_id_from_buf(buf[0]); + + buffer_free_multi(pool_id, buf, num); } void odp_pool_print(odp_pool_t pool_hdl) @@ -774,7 +1105,6 @@ void odp_pool_print(odp_pool_t pool_hdl) pool->s.quiesced ? "quiesced" : "active"); ODP_DBG(" pool opts %s, %s, %s\n", pool->s.flags.unsegmented ? "unsegmented" : "segmented", - pool->s.flags.zeroized ? "zeroized" : "non-zeroized", pool->s.flags.predefined ? "predefined" : "created"); ODP_DBG(" pool base %p\n", pool->s.pool_base_addr); ODP_DBG(" pool size %zu (%zu pages)\n", @@ -817,10 +1147,11 @@ void odp_pool_print(odp_pool_t pool_hdl) ODP_DBG(" blk low wm count %lu\n", blklowmct); } - odp_pool_t odp_buffer_pool(odp_buffer_t buf) { - return odp_buf_to_hdr(buf)->pool_hdl; + uint32_t pool_id = pool_id_from_buf(buf); + + return pool_index_to_handle(pool_id); } void odp_pool_param_init(odp_pool_param_t *params) ----------------------------------------------------------------------- Summary of changes: .../linux-generic/include/odp_buffer_inlines.h | 26 +- .../linux-generic/include/odp_buffer_internal.h | 5 +- platform/linux-generic/include/odp_internal.h | 2 - .../linux-generic/include/odp_packet_internal.h | 4 +- platform/linux-generic/include/odp_packet_netmap.h | 6 + platform/linux-generic/include/odp_packet_socket.h | 1 + platform/linux-generic/include/odp_pool_internal.h | 143 +------ platform/linux-generic/odp_buffer.c | 3 - platform/linux-generic/odp_packet.c | 68 +-- platform/linux-generic/odp_pool.c | 465 ++++++++++++++++++--- platform/linux-generic/pktio/dpdk.c | 24 +- platform/linux-generic/pktio/netmap.c | 127 +++--- platform/linux-generic/pktio/pcap.c | 26 +- platform/linux-generic/pktio/socket.c | 21 +- platform/linux-generic/pktio/socket_mmap.c | 7 +- platform/linux-generic/pktio/tap.c | 7 +- test/common_plat/performance/odp_scheduling.c | 50 ++- 17 files changed, 621 insertions(+), 364 deletions(-) hooks/post-receive --

7 years, 9 months

1
0
0 0

[COMMIT] branch api-next updated. v1.10.1.0-104-gca7d1dd

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 ca7d1dd9372957732fc1dc95d0ffe36cf34c23ba (commit) from 064cdece468e83bb72ef9ece63e8f0e05856eeb7 (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 ca7d1dd9372957732fc1dc95d0ffe36cf34c23ba Author: Mike Holmes <mike.holmes(a)linaro.org> Date: Mon Jul 11 12:46:50 2016 -0400 doc: driver-guide: initial revision Add an initial driver interface document structure for the existing driver framework. Signed-off-by: Mike Holmes <mike.holmes(a)linaro.org> Reviewed-and-tested-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Christophe Milard <christophe.milard(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/configure.ac b/configure.ac index c0f0f21..3f2209b 100644 --- a/configure.ac +++ b/configure.ac @@ -188,7 +188,9 @@ DX_INIT_DOXYGEN($PACKAGE_NAME, ${srcdir}/doc/helper-guide/Doxyfile, ${builddir}/doc/helper-guide/output, ${srcdir}/doc/platform-api-guide/Doxyfile, - ${builddir}/doc/platform-api-guide/output) + ${builddir}/doc/platform-api-guide/output, + ${srcdir}/doc/driver-api-guide/Doxyfile, + ${builddir}/doc/driver-api-guide/output) ########################################################################## # Enable/disable ODP_DEBUG_PRINT diff --git a/doc/Makefile.am b/doc/Makefile.am index d49d84b..59d6a6c 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,4 +1,8 @@ -SUBDIRS = application-api-guide helper-guide platform-api-guide +SUBDIRS = \ + application-api-guide \ + helper-guide \ + platform-api-guide \ + driver-api-guide if user_guide SUBDIRS += implementers-guide users-guide process-guide diff --git a/doc/driver-api-guide/.gitignore b/doc/driver-api-guide/.gitignore new file mode 100644 index 0000000..53752db --- /dev/null +++ b/doc/driver-api-guide/.gitignore @@ -0,0 +1 @@ +output diff --git a/doc/driver-api-guide/Doxyfile b/doc/driver-api-guide/Doxyfile new file mode 100644 index 0000000..680d1d4 --- /dev/null +++ b/doc/driver-api-guide/Doxyfile @@ -0,0 +1,14 @@ +@INCLUDE = $(SRCDIR)/doc/Doxyfile_common + +PROJECT_NAME = "Driver Interface (drv) Reference Manual" +PROJECT_NUMBER = $(VERSION) +PROJECT_LOGO = $(SRCDIR)/doc/images/ODP-Logo-HQ.svg +INPUT = $(SRCDIR)/doc/driver-api-guide \ + $(SRCDIR)/include/odp/drv \ + $(SRCDIR)/include/odp_drv.h +EXCLUDE_PATTERNS = drv* odp_drv.h +EXAMPLE_PATH = $(SRCDIR)/example $(SRCDIR) +PREDEFINED = __GNUC__ \ + "ODP_HANDLE_T(type)=odp_handle_t type" \ + odpdrv_bool_t=int +WARNINGS = NO diff --git a/doc/driver-api-guide/Makefile.am b/doc/driver-api-guide/Makefile.am new file mode 100644 index 0000000..4fc4755 --- /dev/null +++ b/doc/driver-api-guide/Makefile.am @@ -0,0 +1,5 @@ +EXTRA_DIST = \ + odp.dox + +clean-local: + rm -rf output diff --git a/doc/driver-api-guide/odp.dox b/doc/driver-api-guide/odp.dox new file mode 100644 index 0000000..687a79e --- /dev/null +++ b/doc/driver-api-guide/odp.dox @@ -0,0 +1,20 @@ +/* Copyright (c) 2016, Linaro Limited + * All rights reserved + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +/** + * @mainpage + * + * @section sec_1 Introduction + * + * OpenDataPlane (ODP) provides a driver interface + + * + * @section contact Contact Details + * - The main web site is http://www.opendataplane.org/ + * - The git repo is https://git.linaro.org/lng/odp.git + * - Bug tracking is https://bugs.linaro.org/buglist.cgi?product=OpenDataPlane + * + */ diff --git a/doc/m4/configure.m4 b/doc/m4/configure.m4 index ed9451d..6e02f76 100644 --- a/doc/m4/configure.m4 +++ b/doc/m4/configure.m4 @@ -42,4 +42,5 @@ AC_CONFIG_FILES([doc/application-api-guide/Makefile doc/Makefile doc/platform-api-guide/Makefile doc/process-guide/Makefile - doc/users-guide/Makefile]) + doc/users-guide/Makefile + doc/driver-api-guide/Makefile]) ----------------------------------------------------------------------- Summary of changes: configure.ac | 4 +++- doc/Makefile.am | 6 +++++- doc/{application-api-guide => driver-api-guide}/.gitignore | 0 doc/{application-api-guide => driver-api-guide}/Doxyfile | 10 ++++++---- doc/{platform-api-guide => driver-api-guide}/Makefile.am | 2 +- doc/{helper-guide => driver-api-guide}/odp.dox | 10 ++-------- doc/m4/configure.m4 | 3 ++- 7 files changed, 19 insertions(+), 16 deletions(-) copy doc/{application-api-guide => driver-api-guide}/.gitignore (100%) copy doc/{application-api-guide => driver-api-guide}/Doxyfile (51%) copy doc/{platform-api-guide => driver-api-guide}/Makefile.am (74%) copy doc/{helper-guide => driver-api-guide}/odp.dox (55%) hooks/post-receive --

7 years, 9 months

1
0
0 0

[COMMIT] branch api-next updated. v1.10.1.0-103-g064cdec

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 064cdece468e83bb72ef9ece63e8f0e05856eeb7 (commit) via 20f14c1e726c97cb675c26627c073b730bcb58e6 (commit) via d440fa6b463d9dad5e852d7970c5f77493f190f0 (commit) from 8fede35ce4e41dc8a5de3164be40e2e630cd0812 (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 064cdece468e83bb72ef9ece63e8f0e05856eeb7 Merge: 8fede35 20f14c1 Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Fri Jul 22 15:38:17 2016 +0300 Merge branch 'master' into api-next Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --cc platform/Makefile.inc index 404c798,a44f88f..079f34d --- a/platform/Makefile.inc +++ b/platform/Makefile.inc @@@ -61,12 -61,19 +61,29 @@@ odpapispecinclude_HEADERS = $(top_srcdir)/include/odp/api/spec/traffic_mngr.h \ $(top_srcdir)/include/odp/api/spec/version.h +odpdrvspecincludedir= $(includedir)/odp/drv/spec +odpdrvspecinclude_HEADERS = \ + $(top_srcdir)/include/odp/drv/spec/align.h \ + $(top_srcdir)/include/odp/drv/spec/atomic.h \ + $(top_srcdir)/include/odp/drv/spec/byteorder.h \ + $(top_srcdir)/include/odp/drv/spec/compiler.h \ + $(top_srcdir)/include/odp/drv/spec/spinlock.h \ + $(top_srcdir)/include/odp/drv/spec/std_types.h \ + $(top_srcdir)/include/odp/drv/spec/sync.h ++ + EXTRA_DIST = \ + arch/arm/odp/api/cpu_arch.h \ + arch/arm/odp_cpu_arch.c \ + arch/arm/odp_sysinfo_parse.c \ + arch/default/odp/api/cpu_arch.h \ + arch/default/odp_cpu_arch.c \ + arch/default/odp_sysinfo_parse.c \ + arch/mips64/odp/api/cpu_arch.h \ + arch/mips64/odp_cpu_arch.c \ + arch/mips64/odp_sysinfo_parse.c \ + arch/powerpc/odp/api/cpu_arch.h \ + arch/powerpc/odp_cpu_arch.c \ + arch/powerpc/odp_sysinfo_parse.c \ + arch/x86/odp/api/cpu_arch.h \ + arch/x86/odp_cpu_arch.c \ + arch/x86/odp_sysinfo_parse.c ----------------------------------------------------------------------- Summary of changes: platform/Makefile.inc | 17 +++++++++++++++++ platform/linux-generic/Makefile.am | 17 ----------------- platform/linux-generic/include/odp_config_internal.h | 2 +- 3 files changed, 18 insertions(+), 18 deletions(-) hooks/post-receive --

7 years, 9 months

1
0
0 0

[COMMIT] branch master updated. v1.10.1.0-62-g20f14c1

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 20f14c1e726c97cb675c26627c073b730bcb58e6 (commit) from d440fa6b463d9dad5e852d7970c5f77493f190f0 (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 20f14c1e726c97cb675c26627c073b730bcb58e6 Author: Anders Roxell <anders.roxell(a)linaro.org> Date: Fri Jul 22 12:52:22 2016 +0200 linux-gen: Makefile: Move EXTRA_DIST to to platform/Makefile.inc Make it easier for other platforms like odp-dpdk to reuse arch specific files in EXTRA_DIST for "free". Reported-by: Fathi Boudra <fathi.boudra(a)linaro.org> Signed-off-by: Anders Roxell <anders.roxell(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/Makefile.inc b/platform/Makefile.inc index 053bd12..a44f88f 100644 --- a/platform/Makefile.inc +++ b/platform/Makefile.inc @@ -60,3 +60,20 @@ odpapispecinclude_HEADERS = \ $(top_srcdir)/include/odp/api/spec/timer.h \ $(top_srcdir)/include/odp/api/spec/traffic_mngr.h \ $(top_srcdir)/include/odp/api/spec/version.h + +EXTRA_DIST = \ + arch/arm/odp/api/cpu_arch.h \ + arch/arm/odp_cpu_arch.c \ + arch/arm/odp_sysinfo_parse.c \ + arch/default/odp/api/cpu_arch.h \ + arch/default/odp_cpu_arch.c \ + arch/default/odp_sysinfo_parse.c \ + arch/mips64/odp/api/cpu_arch.h \ + arch/mips64/odp_cpu_arch.c \ + arch/mips64/odp_sysinfo_parse.c \ + arch/powerpc/odp/api/cpu_arch.h \ + arch/powerpc/odp_cpu_arch.c \ + arch/powerpc/odp_sysinfo_parse.c \ + arch/x86/odp/api/cpu_arch.h \ + arch/x86/odp_cpu_arch.c \ + arch/x86/odp_sysinfo_parse.c diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index c8fd8cb..0cfd0fe 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -186,23 +186,6 @@ __LIB__libodp_linux_la_SOURCES = \ arch/@ARCH_DIR@/odp_cpu_arch.c \ arch/@ARCH_DIR@/odp_sysinfo_parse.c -EXTRA_DIST = \ - arch/default/odp/api/cpu_arch.h \ - arch/default/odp_cpu_arch.c \ - arch/default/odp_sysinfo_parse.c \ - arch/mips64/odp/api/cpu_arch.h \ - arch/mips64/odp_cpu_arch.c \ - arch/mips64/odp_sysinfo_parse.c \ - arch/powerpc/odp/api/cpu_arch.h \ - arch/powerpc/odp_cpu_arch.c \ - arch/powerpc/odp_sysinfo_parse.c \ - arch/x86/odp/api/cpu_arch.h \ - arch/x86/odp_cpu_arch.c \ - arch/x86/odp_sysinfo_parse.c \ - arch/arm/odp/api/cpu_arch.h \ - arch/arm/odp_cpu_arch.c \ - arch/arm/odp_sysinfo_parse.c - if HAVE_PCAP __LIB__libodp_linux_la_SOURCES += pktio/pcap.c endif ----------------------------------------------------------------------- Summary of changes: platform/Makefile.inc | 17 +++++++++++++++++ platform/linux-generic/Makefile.am | 17 ----------------- 2 files changed, 17 insertions(+), 17 deletions(-) hooks/post-receive --

7 years, 9 months

1
0
0 0

[COMMIT] branch master updated. v1.10.1.0-61-gd440fa6

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 d440fa6b463d9dad5e852d7970c5f77493f190f0 (commit) from 5d5304117434ab340cdd138066561e00a6b0642d (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 d440fa6b463d9dad5e852d7970c5f77493f190f0 Author: Oriol Arcas <oriol(a)starflownetworks.com> Date: Tue Jul 19 11:16:43 2016 +0200 linux-generic: pool: set maximum number of pools to 64 Signed-off-by: Oriol Arcas <oriol(a)starflownetworks.com> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/include/odp_config_internal.h b/platform/linux-generic/include/odp_config_internal.h index b108c07..989ea08 100644 --- a/platform/linux-generic/include/odp_config_internal.h +++ b/platform/linux-generic/include/odp_config_internal.h @@ -14,7 +14,7 @@ extern "C" { /* * Maximum number of pools */ -#define ODP_CONFIG_POOLS 16 +#define ODP_CONFIG_POOLS 64 /* * Maximum number of queues ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/include/odp_config_internal.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive --

7 years, 9 months

1
0
0 0

[COMMIT] branch api-next updated. v1.10.1.0-100-g8fede35

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 8fede35ce4e41dc8a5de3164be40e2e630cd0812 (commit) via 5d5304117434ab340cdd138066561e00a6b0642d (commit) via 79534012879ca74a68256ca40922b3fef7983611 (commit) via efa6bc89a4e7a5823a3c8c27fcdc9573d7ac5694 (commit) via c79b041f389e56a2c713a507b75762e08d75e4b4 (commit) from 2151bf694d870493846e02f5d85fbda189008259 (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 8fede35ce4e41dc8a5de3164be40e2e630cd0812 Merge: 2151bf6 5d53041 Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Thu Jul 21 16:57:12 2016 +0300 Merge branch 'master' into api-next Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> ----------------------------------------------------------------------- Summary of changes: configure.ac | 2 +- doc/implementers-guide/implementers-guide.adoc | 137 ++++++++++++--------- test/Makefile.am | 6 +- test/common_plat/Makefile.am | 7 ++ .../{validation => common_plat}/common/Makefile.am | 0 .../common/mask_common.c | 0 .../common/mask_common.h | 0 .../common/odp_cunit_common.c | 0 .../common/odp_cunit_common.h | 0 test/common_plat/m4/configure.m4 | 33 +++++ test/{ => common_plat}/m4/miscellaneous.m4 | 0 test/{ => common_plat}/m4/performance.m4 | 0 test/{ => common_plat}/m4/validation.m4 | 0 test/{ => common_plat}/miscellaneous/.gitignore | 0 test/{ => common_plat}/miscellaneous/Makefile.am | 0 .../miscellaneous/odp_api_from_cpp.cpp | 0 test/{ => common_plat}/performance/.gitignore | 0 test/{ => common_plat}/performance/Makefile.am | 0 test/{ => common_plat}/performance/odp_crypto.c | 6 +- test/{ => common_plat}/performance/odp_l2fwd.c | 1 - .../{ => common_plat}/performance/odp_l2fwd_run.sh | 11 +- .../{ => common_plat}/performance/odp_pktio_perf.c | 34 ++--- .../{ => common_plat}/performance/odp_scheduling.c | 19 ++- .../performance/odp_scheduling_run.sh | 0 test/common_plat/validation/Makefile.am | 3 + .../validation/api}/.gitignore | 0 .../validation/api}/Makefile.am | 2 +- .../validation/api}/Makefile.inc | 4 +- .../validation/api}/README | 0 .../validation/api}/atomic/.gitignore | 0 .../validation/api}/atomic/Makefile.am | 0 .../validation/api}/atomic/atomic.c | 0 .../validation/api}/atomic/atomic.h | 0 .../validation/api}/atomic/atomic_main.c | 0 .../validation/api}/barrier/.gitignore | 0 .../validation/api}/barrier/Makefile.am | 0 .../validation/api}/barrier/barrier.c | 0 .../validation/api}/barrier/barrier.h | 0 .../validation/api}/barrier/barrier_main.c | 0 .../validation/api}/buffer/.gitignore | 0 .../validation/api}/buffer/Makefile.am | 0 .../validation/api}/buffer/buffer.c | 0 .../validation/api}/buffer/buffer.h | 0 .../validation/api}/buffer/buffer_main.c | 0 .../validation/api}/classification/.gitignore | 0 .../validation/api}/classification/Makefile.am | 0 .../api}/classification/classification.c | 0 .../api}/classification/classification.h | 0 .../api}/classification/classification_main.c | 0 .../api}/classification/odp_classification_basic.c | 0 .../classification/odp_classification_common.c | 0 .../classification/odp_classification_test_pmr.c | 1 - .../api}/classification/odp_classification_tests.c | 0 .../classification/odp_classification_testsuites.h | 0 .../validation/api}/cpumask/.gitignore | 0 .../validation/api}/cpumask/Makefile.am | 0 .../validation/api}/cpumask/cpumask.c | 0 .../validation/api}/cpumask/cpumask.h | 0 .../validation/api}/cpumask/cpumask_main.c | 0 .../validation/api}/crypto/.gitignore | 0 .../validation/api}/crypto/Makefile.am | 0 .../validation/api}/crypto/crypto.c | 0 .../validation/api}/crypto/crypto.h | 0 .../validation/api}/crypto/crypto_main.c | 0 .../validation/api}/crypto/odp_crypto_test_inp.c | 32 ++--- .../validation/api}/crypto/odp_crypto_test_inp.h | 0 .../validation/api}/crypto/test_vectors.h | 2 +- .../validation/api}/crypto/test_vectors_len.h | 0 .../validation/api}/errno/.gitignore | 0 .../validation/api}/errno/Makefile.am | 0 .../validation/api}/errno/errno.c | 0 .../validation/api}/errno/errno.h | 0 .../validation/api}/errno/errno_main.c | 0 .../validation/api}/hash/.gitignore | 0 .../validation/api}/hash/Makefile.am | 0 .../validation/api}/hash/hash.c | 1 - .../validation/api}/hash/hash.h | 0 .../validation/api}/hash/hash_main.c | 0 .../validation/api}/init/.gitignore | 0 .../validation/api}/init/Makefile.am | 0 .../validation/api}/init/init.c | 0 .../validation/api}/init/init.h | 0 .../validation/api}/init/init_main_abort.c | 0 .../validation/api}/init/init_main_log.c | 0 .../validation/api}/init/init_main_ok.c | 0 .../validation/api}/lock/.gitignore | 0 .../validation/api}/lock/Makefile.am | 0 .../validation/api}/lock/lock.c | 0 .../validation/api}/lock/lock.h | 0 .../validation/api}/lock/lock_main.c | 0 .../validation/api}/packet/.gitignore | 0 .../validation/api}/packet/Makefile.am | 0 .../validation/api}/packet/packet.c | 0 .../validation/api}/packet/packet.h | 0 .../validation/api}/packet/packet_main.c | 0 .../validation/api}/pktio/.gitignore | 0 .../validation/api}/pktio/Makefile.am | 0 .../validation/api}/pktio/pktio.c | 2 - .../validation/api}/pktio/pktio.h | 0 .../validation/api}/pktio/pktio_main.c | 0 .../validation/api}/pool/.gitignore | 0 .../validation/api}/pool/Makefile.am | 0 .../validation/api}/pool/pool.c | 0 .../validation/api}/pool/pool.h | 0 .../validation/api}/pool/pool_main.c | 0 .../validation/api}/queue/.gitignore | 0 .../validation/api}/queue/Makefile.am | 0 .../validation/api}/queue/queue.c | 7 +- .../validation/api}/queue/queue.h | 0 .../validation/api}/queue/queue_main.c | 0 .../validation/api}/random/.gitignore | 0 .../validation/api}/random/Makefile.am | 0 .../validation/api}/random/random.c | 0 .../validation/api}/random/random.h | 0 .../validation/api}/random/random_main.c | 0 .../validation/api}/scheduler/.gitignore | 0 .../validation/api}/scheduler/Makefile.am | 0 .../validation/api}/scheduler/scheduler.c | 13 +- .../validation/api}/scheduler/scheduler.h | 0 .../validation/api}/scheduler/scheduler_main.c | 0 .../validation/api}/shmem/.gitignore | 0 .../validation/api}/shmem/Makefile.am | 0 .../validation/api}/shmem/shmem.c | 0 .../validation/api}/shmem/shmem.h | 0 .../validation/api}/shmem/shmem_main.c | 0 .../validation/api}/std_clib/.gitignore | 0 .../validation/api}/std_clib/Makefile.am | 0 .../validation/api}/std_clib/std_clib.c | 0 .../validation/api}/std_clib/std_clib.h | 0 .../validation/api}/std_clib/std_clib_main.c | 0 .../validation/api}/system/.gitignore | 0 .../validation/api}/system/Makefile.am | 0 .../validation/api}/system/system.c | 0 .../validation/api}/system/system.h | 0 .../validation/api}/system/system_main.c | 0 .../validation/api}/thread/.gitignore | 0 .../validation/api}/thread/Makefile.am | 0 .../validation/api}/thread/thread.c | 0 .../validation/api}/thread/thread.h | 0 .../validation/api}/thread/thread_main.c | 0 .../validation/api}/time/.gitignore | 0 .../validation/api}/time/Makefile.am | 0 .../validation/api}/time/time.c | 0 .../validation/api}/time/time.h | 0 .../validation/api}/time/time_main.c | 0 .../validation/api}/timer/.gitignore | 0 .../validation/api}/timer/Makefile.am | 0 .../validation/api}/timer/timer.c | 75 ++++++----- .../validation/api}/timer/timer.h | 0 .../validation/api}/timer/timer_main.c | 0 .../validation/api}/traffic_mngr/.gitignore | 0 .../validation/api}/traffic_mngr/Makefile.am | 0 .../validation/api}/traffic_mngr/traffic_mngr.c | 0 .../validation/api}/traffic_mngr/traffic_mngr.h | 0 .../api}/traffic_mngr/traffic_mngr_main.c | 0 test/{platform => }/linux-generic/.gitignore | 0 test/linux-generic/Makefile.am | 79 ++++++++++++ test/{platform => }/linux-generic/Makefile.inc | 4 +- test/linux-generic/m4/configure.m4 | 5 + .../linux-generic/pktio_ipc/.gitignore | 0 .../linux-generic/pktio_ipc/Makefile.am | 0 .../linux-generic/pktio_ipc/ipc_common.c | 0 .../linux-generic/pktio_ipc/ipc_common.h | 0 .../linux-generic/pktio_ipc/pktio_ipc1.c | 0 .../linux-generic/pktio_ipc/pktio_ipc2.c | 0 .../linux-generic/pktio_ipc/pktio_ipc_run.sh | 0 test/{platform => }/linux-generic/ring/.gitignore | 0 test/{platform => }/linux-generic/ring/Makefile.am | 0 .../{platform => }/linux-generic/ring/ring_basic.c | 0 test/{platform => }/linux-generic/ring/ring_main.c | 0 .../linux-generic/ring/ring_stress.c | 0 .../linux-generic/ring/ring_suites.c | 0 .../linux-generic/ring/ring_suites.h | 0 test/{platform => }/linux-generic/run-test | 0 test/linux-generic/validation/Makefile.inc | 1 + test/linux-generic/validation/api/Makefile.inc | 1 + .../validation/api/pktio}/.gitignore | 0 .../validation/api}/pktio/Makefile.am | 0 .../validation/api}/pktio/pktio_env | 0 .../validation/api}/pktio/pktio_run.sh | 4 +- .../validation/api}/pktio/pktio_run_dpdk.sh | 4 +- .../validation/api}/pktio/pktio_run_netmap.sh | 4 +- .../validation/api}/pktio/pktio_run_pcap.sh | 4 +- .../validation/api}/pktio/pktio_run_tap.sh | 4 +- .../validation/api}/shmem/.gitignore | 0 .../validation/api}/shmem/Makefile.am | 0 .../validation/api}/shmem/shmem.h | 0 .../validation/api}/shmem/shmem_common.h | 0 .../validation/api}/shmem/shmem_linux.c | 0 .../validation/api}/shmem/shmem_linux.h | 0 .../validation/api}/shmem/shmem_odp.c | 0 .../validation/api}/shmem/shmem_odp.h | 0 test/m4/configure.m4 | 33 +---- test/platform/linux-generic/Makefile.am | 74 ----------- test/platform/linux-generic/m4/configure.m4 | 5 - 195 files changed, 334 insertions(+), 286 deletions(-) create mode 100644 test/common_plat/Makefile.am rename test/{validation => common_plat}/common/Makefile.am (100%) rename test/{validation => common_plat}/common/mask_common.c (100%) rename test/{validation => common_plat}/common/mask_common.h (100%) rename test/{validation => common_plat}/common/odp_cunit_common.c (100%) rename test/{validation => common_plat}/common/odp_cunit_common.h (100%) create mode 100644 test/common_plat/m4/configure.m4 rename test/{ => common_plat}/m4/miscellaneous.m4 (100%) rename test/{ => common_plat}/m4/performance.m4 (100%) rename test/{ => common_plat}/m4/validation.m4 (100%) rename test/{ => common_plat}/miscellaneous/.gitignore (100%) rename test/{ => common_plat}/miscellaneous/Makefile.am (100%) rename test/{ => common_plat}/miscellaneous/odp_api_from_cpp.cpp (100%) rename test/{ => common_plat}/performance/.gitignore (100%) rename test/{ => common_plat}/performance/Makefile.am (100%) rename test/{ => common_plat}/performance/odp_crypto.c (99%) rename test/{ => common_plat}/performance/odp_l2fwd.c (99%) rename test/{ => common_plat}/performance/odp_l2fwd_run.sh (90%) rename test/{ => common_plat}/performance/odp_pktio_perf.c (97%) rename test/{ => common_plat}/performance/odp_scheduling.c (98%) rename test/{ => common_plat}/performance/odp_scheduling_run.sh (100%) create mode 100644 test/common_plat/validation/Makefile.am rename test/{platform/linux-generic/pktio => common_plat/validation/api}/.gitignore (100%) rename test/{validation => common_plat/validation/api}/Makefile.am (93%) rename test/{validation => common_plat/validation/api}/Makefile.inc (83%) rename test/{validation => common_plat/validation/api}/README (100%) rename test/{validation => common_plat/validation/api}/atomic/.gitignore (100%) rename test/{validation => common_plat/validation/api}/atomic/Makefile.am (100%) rename test/{validation => common_plat/validation/api}/atomic/atomic.c (100%) rename test/{validation => common_plat/validation/api}/atomic/atomic.h (100%) rename test/{validation => common_plat/validation/api}/atomic/atomic_main.c (100%) rename test/{validation => common_plat/validation/api}/barrier/.gitignore (100%) rename test/{validation => common_plat/validation/api}/barrier/Makefile.am (100%) rename test/{validation => common_plat/validation/api}/barrier/barrier.c (100%) rename test/{validation => common_plat/validation/api}/barrier/barrier.h (100%) rename test/{validation => common_plat/validation/api}/barrier/barrier_main.c (100%) rename test/{validation => common_plat/validation/api}/buffer/.gitignore (100%) rename test/{validation => common_plat/validation/api}/buffer/Makefile.am (100%) rename test/{validation => common_plat/validation/api}/buffer/buffer.c (100%) rename test/{validation => common_plat/validation/api}/buffer/buffer.h (100%) rename test/{validation => common_plat/validation/api}/buffer/buffer_main.c (100%) rename test/{validation => common_plat/validation/api}/classification/.gitignore (100%) rename test/{validation => common_plat/validation/api}/classification/Makefile.am (100%) rename test/{validation => common_plat/validation/api}/classification/classification.c (100%) rename test/{validation => common_plat/validation/api}/classification/classification.h (100%) rename test/{validation => common_plat/validation/api}/classification/classification_main.c (100%) rename test/{validation => common_plat/validation/api}/classification/odp_classification_basic.c (100%) rename test/{validation => common_plat/validation/api}/classification/odp_classification_common.c (100%) rename test/{validation => common_plat/validation/api}/classification/odp_classification_test_pmr.c (99%) rename test/{validation => common_plat/validation/api}/classification/odp_classification_tests.c (100%) rename test/{validation => common_plat/validation/api}/classification/odp_classification_testsuites.h (100%) rename test/{validation => common_plat/validation/api}/cpumask/.gitignore (100%) rename test/{validation => common_plat/validation/api}/cpumask/Makefile.am (100%) rename test/{validation => common_plat/validation/api}/cpumask/cpumask.c (100%) rename test/{validation => common_plat/validation/api}/cpumask/cpumask.h (100%) rename test/{validation => common_plat/validation/api}/cpumask/cpumask_main.c (100%) rename test/{validation => common_plat/validation/api}/crypto/.gitignore (100%) rename test/{validation => common_plat/validation/api}/crypto/Makefile.am (100%) rename test/{validation => common_plat/validation/api}/crypto/crypto.c (100%) rename test/{validation => common_plat/validation/api}/crypto/crypto.h (100%) rename test/{validation => common_plat/validation/api}/crypto/crypto_main.c (100%) rename test/{validation => common_plat/validation/api}/crypto/odp_crypto_test_inp.c (98%) rename test/{validation => common_plat/validation/api}/crypto/odp_crypto_test_inp.h (100%) rename test/{validation => common_plat/validation/api}/crypto/test_vectors.h (99%) rename test/{validation => common_plat/validation/api}/crypto/test_vectors_len.h (100%) rename test/{validation => common_plat/validation/api}/errno/.gitignore (100%) rename test/{validation => common_plat/validation/api}/errno/Makefile.am (100%) rename test/{validation => common_plat/validation/api}/errno/errno.c (100%) rename test/{validation => common_plat/validation/api}/errno/errno.h (100%) rename test/{validation => common_plat/validation/api}/errno/errno_main.c (100%) rename test/{validation => common_plat/validation/api}/hash/.gitignore (100%) rename test/{validation => common_plat/validation/api}/hash/Makefile.am (100%) rename test/{validation => common_plat/validation/api}/hash/hash.c (99%) rename test/{validation => common_plat/validation/api}/hash/hash.h (100%) rename test/{validation => common_plat/validation/api}/hash/hash_main.c (100%) rename test/{validation => common_plat/validation/api}/init/.gitignore (100%) rename test/{validation => common_plat/validation/api}/init/Makefile.am (100%) rename test/{validation => common_plat/validation/api}/init/init.c (100%) rename test/{validation => common_plat/validation/api}/init/init.h (100%) rename test/{validation => common_plat/validation/api}/init/init_main_abort.c (100%) rename test/{validation => common_plat/validation/api}/init/init_main_log.c (100%) rename test/{validation => common_plat/validation/api}/init/init_main_ok.c (100%) rename test/{validation => common_plat/validation/api}/lock/.gitignore (100%) rename test/{validation => common_plat/validation/api}/lock/Makefile.am (100%) rename test/{validation => common_plat/validation/api}/lock/lock.c (100%) rename test/{validation => common_plat/validation/api}/lock/lock.h (100%) rename test/{validation => common_plat/validation/api}/lock/lock_main.c (100%) rename test/{validation => common_plat/validation/api}/packet/.gitignore (100%) rename test/{validation => common_plat/validation/api}/packet/Makefile.am (100%) rename test/{validation => common_plat/validation/api}/packet/packet.c (100%) rename test/{validation => common_plat/validation/api}/packet/packet.h (100%) rename test/{validation => common_plat/validation/api}/packet/packet_main.c (100%) rename test/{validation => common_plat/validation/api}/pktio/.gitignore (100%) rename test/{validation => common_plat/validation/api}/pktio/Makefile.am (100%) rename test/{validation => common_plat/validation/api}/pktio/pktio.c (99%) rename test/{validation => common_plat/validation/api}/pktio/pktio.h (100%) rename test/{validation => common_plat/validation/api}/pktio/pktio_main.c (100%) rename test/{validation => common_plat/validation/api}/pool/.gitignore (100%) rename test/{validation => common_plat/validation/api}/pool/Makefile.am (100%) rename test/{validation => common_plat/validation/api}/pool/pool.c (100%) rename test/{validation => common_plat/validation/api}/pool/pool.h (100%) rename test/{validation => common_plat/validation/api}/pool/pool_main.c (100%) rename test/{validation => common_plat/validation/api}/queue/.gitignore (100%) rename test/{validation => common_plat/validation/api}/queue/Makefile.am (100%) rename test/{validation => common_plat/validation/api}/queue/queue.c (98%) rename test/{validation => common_plat/validation/api}/queue/queue.h (100%) rename test/{validation => common_plat/validation/api}/queue/queue_main.c (100%) rename test/{validation => common_plat/validation/api}/random/.gitignore (100%) rename test/{validation => common_plat/validation/api}/random/Makefile.am (100%) rename test/{validation => common_plat/validation/api}/random/random.c (100%) rename test/{validation => common_plat/validation/api}/random/random.h (100%) rename test/{validation => common_plat/validation/api}/random/random_main.c (100%) rename test/{validation => common_plat/validation/api}/scheduler/.gitignore (100%) rename test/{validation => common_plat/validation/api}/scheduler/Makefile.am (100%) rename test/{validation => common_plat/validation/api}/scheduler/scheduler.c (99%) rename test/{validation => common_plat/validation/api}/scheduler/scheduler.h (100%) rename test/{validation => common_plat/validation/api}/scheduler/scheduler_main.c (100%) rename test/{validation => common_plat/validation/api}/shmem/.gitignore (100%) rename test/{validation => common_plat/validation/api}/shmem/Makefile.am (100%) rename test/{validation => common_plat/validation/api}/shmem/shmem.c (100%) rename test/{validation => common_plat/validation/api}/shmem/shmem.h (100%) rename test/{validation => common_plat/validation/api}/shmem/shmem_main.c (100%) rename test/{validation => common_plat/validation/api}/std_clib/.gitignore (100%) rename test/{validation => common_plat/validation/api}/std_clib/Makefile.am (100%) rename test/{validation => common_plat/validation/api}/std_clib/std_clib.c (100%) rename test/{validation => common_plat/validation/api}/std_clib/std_clib.h (100%) rename test/{validation => common_plat/validation/api}/std_clib/std_clib_main.c (100%) rename test/{validation => common_plat/validation/api}/system/.gitignore (100%) rename test/{validation => common_plat/validation/api}/system/Makefile.am (100%) rename test/{validation => common_plat/validation/api}/system/system.c (100%) rename test/{validation => common_plat/validation/api}/system/system.h (100%) rename test/{validation => common_plat/validation/api}/system/system_main.c (100%) rename test/{validation => common_plat/validation/api}/thread/.gitignore (100%) rename test/{validation => common_plat/validation/api}/thread/Makefile.am (100%) rename test/{validation => common_plat/validation/api}/thread/thread.c (100%) rename test/{validation => common_plat/validation/api}/thread/thread.h (100%) rename test/{validation => common_plat/validation/api}/thread/thread_main.c (100%) rename test/{validation => common_plat/validation/api}/time/.gitignore (100%) rename test/{validation => common_plat/validation/api}/time/Makefile.am (100%) rename test/{validation => common_plat/validation/api}/time/time.c (100%) rename test/{validation => common_plat/validation/api}/time/time.h (100%) rename test/{validation => common_plat/validation/api}/time/time_main.c (100%) rename test/{validation => common_plat/validation/api}/timer/.gitignore (100%) rename test/{validation => common_plat/validation/api}/timer/Makefile.am (100%) rename test/{validation => common_plat/validation/api}/timer/timer.c (93%) rename test/{validation => common_plat/validation/api}/timer/timer.h (100%) rename test/{validation => common_plat/validation/api}/timer/timer_main.c (100%) rename test/{validation => common_plat/validation/api}/traffic_mngr/.gitignore (100%) rename test/{validation => common_plat/validation/api}/traffic_mngr/Makefile.am (100%) rename test/{validation => common_plat/validation/api}/traffic_mngr/traffic_mngr.c (100%) rename test/{validation => common_plat/validation/api}/traffic_mngr/traffic_mngr.h (100%) rename test/{validation => common_plat/validation/api}/traffic_mngr/traffic_mngr_main.c (100%) rename test/{platform => }/linux-generic/.gitignore (100%) create mode 100644 test/linux-generic/Makefile.am rename test/{platform => }/linux-generic/Makefile.inc (78%) create mode 100644 test/linux-generic/m4/configure.m4 rename test/{platform => }/linux-generic/pktio_ipc/.gitignore (100%) rename test/{platform => }/linux-generic/pktio_ipc/Makefile.am (100%) rename test/{platform => }/linux-generic/pktio_ipc/ipc_common.c (100%) rename test/{platform => }/linux-generic/pktio_ipc/ipc_common.h (100%) rename test/{platform => }/linux-generic/pktio_ipc/pktio_ipc1.c (100%) rename test/{platform => }/linux-generic/pktio_ipc/pktio_ipc2.c (100%) rename test/{platform => }/linux-generic/pktio_ipc/pktio_ipc_run.sh (100%) rename test/{platform => }/linux-generic/ring/.gitignore (100%) rename test/{platform => }/linux-generic/ring/Makefile.am (100%) rename test/{platform => }/linux-generic/ring/ring_basic.c (100%) rename test/{platform => }/linux-generic/ring/ring_main.c (100%) rename test/{platform => }/linux-generic/ring/ring_stress.c (100%) rename test/{platform => }/linux-generic/ring/ring_suites.c (100%) rename test/{platform => }/linux-generic/ring/ring_suites.h (100%) rename test/{platform => }/linux-generic/run-test (100%) create mode 100644 test/linux-generic/validation/Makefile.inc create mode 100644 test/linux-generic/validation/api/Makefile.inc rename test/{validation => linux-generic/validation/api/pktio}/.gitignore (100%) rename test/{platform/linux-generic => linux-generic/validation/api}/pktio/Makefile.am (100%) rename test/{platform/linux-generic => linux-generic/validation/api}/pktio/pktio_env (100%) rename test/{platform/linux-generic => linux-generic/validation/api}/pktio/pktio_run.sh (96%) rename test/{platform/linux-generic => linux-generic/validation/api}/pktio/pktio_run_dpdk.sh (95%) rename test/{platform/linux-generic => linux-generic/validation/api}/pktio/pktio_run_netmap.sh (95%) rename test/{platform/linux-generic => linux-generic/validation/api}/pktio/pktio_run_pcap.sh (90%) rename test/{platform/linux-generic => linux-generic/validation/api}/pktio/pktio_run_tap.sh (95%) rename test/{platform/linux-generic => linux-generic/validation/api}/shmem/.gitignore (100%) rename test/{platform/linux-generic => linux-generic/validation/api}/shmem/Makefile.am (100%) rename test/{platform/linux-generic => linux-generic/validation/api}/shmem/shmem.h (100%) rename test/{platform/linux-generic => linux-generic/validation/api}/shmem/shmem_common.h (100%) rename test/{platform/linux-generic => linux-generic/validation/api}/shmem/shmem_linux.c (100%) rename test/{platform/linux-generic => linux-generic/validation/api}/shmem/shmem_linux.h (100%) rename test/{platform/linux-generic => linux-generic/validation/api}/shmem/shmem_odp.c (100%) rename test/{platform/linux-generic => linux-generic/validation/api}/shmem/shmem_odp.h (100%) delete mode 100644 test/platform/linux-generic/Makefile.am delete mode 100644 test/platform/linux-generic/m4/configure.m4 hooks/post-receive --

7 years, 9 months

1
0
0 0

[COMMIT] branch master updated. v1.10.1.0-60-g5d53041

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 5d5304117434ab340cdd138066561e00a6b0642d (commit) via 79534012879ca74a68256ca40922b3fef7983611 (commit) via efa6bc89a4e7a5823a3c8c27fcdc9573d7ac5694 (commit) via c79b041f389e56a2c713a507b75762e08d75e4b4 (commit) from 197710ffc229f3db775a97c27e09c2dc063497c4 (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 5d5304117434ab340cdd138066561e00a6b0642d Author: Christophe Milard <christophe.milard(a)linaro.org> Date: Wed Jul 13 21:50:43 2016 +0200 doc: implementers guide update with the new structure Signed-off-by: Christophe Milard <christophe.milard(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-and-tested-by: Yi He <yi.he(a)linaro.org> Reviewed-by: Mike Holmes <mike.holmes(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/doc/implementers-guide/implementers-guide.adoc b/doc/implementers-guide/implementers-guide.adoc index 4f49e8f..5c0e864 100644 --- a/doc/implementers-guide/implementers-guide.adoc +++ b/doc/implementers-guide/implementers-guide.adoc @@ -227,21 +227,30 @@ the underlying platform. They are written in plain C code, and may only use functions defined in the standard libC (C99) library (besides the ODP functions being tested, of course). A free C99 specification can be found at the http://www.open-std.org/JTC1/sc22/wg14/www/docs/n1256.pdf[open-std.org] -web site. No other languages (like scripting) are allowed as their usage +web site. No other languages (like scripting) are allowed as their usage would make assumptions on the platform capability. -This area is located at `test/validation/` in the odp git repository. +This area is located at: `test/common_plat/` -The ODP API itself is ordered by module, where each module groups the set of -ODP API functions related to the same "topic". Examples of modules includes -"classification" (API functions dealing with ingress packets classification), -time (functions dealing with time, excluding timers which have their own -module), timer,... The complete module list can be seen at: -http://docs.opendataplane.org/master/linux-generic-doxygen-html/modules.html[ODP -Modules] + Within the platform agnostic area, the tests are also grouped by -modules, matching the ODP API modules: `test/validation/` mainly contains a -list of directories matching each module name (as defined by the doxygen -`@defgroup` or `@ingroup` statement present in each API `.h` file). +In this directory, tests are grouped by category: + +* validation : groups of test defining the ODP compliance +* performance : tests checking system responsiveness +* miscellaneous + +Each ODP interface contains modules, where each module groups the set of ODP +functions related to the same "topic" for the given interface. +Examples of modules for the application interface includes "classification" +(API functions dealing with ingress packets classification), time +(functions dealing with time, excluding timers which have their own module), +timer, ... +The complete module list can be seen at: +http://docs.opendataplane.org/master/linux-generic-doxygen-html/modules.html[ODP Modules] + +Within the platform agnostic area, the validation tests for a given interface +are also grouped by modules, matching the ODP interface modules: for instance, +`test/common_plat/validation/api` mainly contains a list of +directories matching each module name (as defined by the doxygen `@defgroup` +or `@ingroup` statement present in each API `.h` file). Within each of these directories, a library (called `libtest<module>.la`) and its associated `.h` file (called `<module>.h`) defines all the test functions @@ -253,9 +262,10 @@ for this module. See <<anchor-1, Module test and naming convention>> for more details. It is important to be aware that the tests defined for a given module -(defined in `test/validation/<module>`) are focused to test the ODP functions -belonging to this module, but are not limited to use this module's ODP functions -only: many modules needs some interaction with some other module to be tested. +(defined in `test/common_plat/validation/api/<module>`) are focused to test +the ODP functions belonging to this module, but are not limited to use this +module's ODP functions only: many modules needs some interaction with some +other module to be tested. The obvious illustration of this is for module "init" whose functions are required by all tests of all other modules (as ODP needs to be initialized to test anything else). @@ -317,8 +327,8 @@ library. === Platform specific -These tests are located under `platform/<platform>/test`. There is one such -area for each platform implementing ODP. This location will be referred as +These tests are located under `platform/<platform_name>/`. There is one such +area for each platform implementing ODP. This location will be referred as <PLATFORM_SPECIFIC> in the rest of this document. ==== The normal case @@ -329,55 +339,64 @@ simply needs to contain a single `Makefile.am` listing each of the executables listed in the automake TEST variable and will therefore be run on "make check". For the linux-generic platform, most tested modules fall into this category: -currently, the `platform/linux-generic/test/Makefile.am` looks as follows: +currently, the `test/linux-generic/test/Makefile.am` looks +roughly as follows: [source,am] ---- include $(top_srcdir)/test/Makefile.inc -TESTS_ENVIRONMENT += TEST_DIR=${top_builddir}/test/validation +TESTS_ENVIRONMENT += TEST_DIR=${top_builddir}/test/common_plat/validation + +ALL_API_VALIDATION = ${top_builddir}/test/common_plat/validation/api -ODP_MODULES = pktio +SUBDIRS = if test_vald -TESTS = pktio/pktio_run \ - ${top_builddir}/test/validation/buffer/buffer_main$(EXEEXT) \ - ${top_builddir}/test/validation/classification/classification_main$(EXEEXT) \ - ${top_builddir}/test/validation/cpumask/cpumask_main$(EXEEXT) \ - ${top_builddir}/test/validation/crypto/crypto_main$(EXEEXT) \ - ${top_builddir}/test/validation/errno/errno_main$(EXEEXT) \ - ${top_builddir}/test/validation/init/init_main_ok$(EXEEXT) \ - ${top_builddir}/test/validation/init/init_main_abort$(EXEEXT) \ - ${top_builddir}/test/validation/init/init_main_log$(EXEEXT) \ - ${top_builddir}/test/validation/packet/packet_main$(EXEEXT) \ - ${top_builddir}/test/validation/pool/pool_main$(EXEEXT) \ - ${top_builddir}/test/validation/queue/queue_main$(EXEEXT) \ - ${top_builddir}/test/validation/random/random_main$(EXEEXT) \ - ${top_builddir}/test/validation/scheduler/scheduler_main$(EXEEXT) \ - ${top_builddir}/test/validation/synchronizers/synchronizers_main$(EXEEXT) \ - ${top_builddir}/test/validation/thread/thread_main$(EXEEXT) \ - ${top_builddir}/test/validation/time/time_main$(EXEEXT) \ - ${top_builddir}/test/validation/timer/timer_main$(EXEEXT) \ - ${top_builddir}/test/validation/shmem/shmem_main$(EXEEXT) \ - ${top_builddir}/test/validation/system/system_main$(EXEEXT) - -SUBDIRS = $(ODP_MODULES) -endif +TESTS = validation/api/pktio/pktio_run.sh \ + validation/api/pktio/pktio_run_tap.sh \ + $(ALL_API_VALIDATION)/atomic/atomic_main$(EXEEXT) \ + $(ALL_API_VALIDATION)/barrier/barrier_main$(EXEEXT) \ + $(ALL_API_VALIDATION)/buffer/buffer_main$(EXEEXT) \ + $(ALL_API_VALIDATION)/classification/classification_main$(EXEEXT) \ + $(ALL_API_VALIDATION)/cpumask/cpumask_main$(EXEEXT) \ + $(ALL_API_VALIDATION)/crypto/crypto_main$(EXEEXT) \ + $(ALL_API_VALIDATION)/errno/errno_main$(EXEEXT) \ + $(ALL_API_VALIDATION)/hash/hash_main$(EXEEXT) \ + $(ALL_API_VALIDATION)/init/init_main_ok$(EXEEXT) \ + $(ALL_API_VALIDATION)/init/init_main_abort$(EXEEXT) \ + $(ALL_API_VALIDATION)/init/init_main_log$(EXEEXT) \ + $(ALL_API_VALIDATION)/lock/lock_main$(EXEEXT) \ + $(ALL_API_VALIDATION)/packet/packet_main$(EXEEXT) \ + $(ALL_API_VALIDATION)/pool/pool_main$(EXEEXT) \ + $(ALL_API_VALIDATION)/queue/queue_main$(EXEEXT) \ + $(ALL_API_VALIDATION)/random/random_main$(EXEEXT) \ + $(ALL_API_VALIDATION)/scheduler/scheduler_main$(EXEEXT) \ + $(ALL_API_VALIDATION)/std_clib/std_clib_main$(EXEEXT) \ + $(ALL_API_VALIDATION)/thread/thread_main$(EXEEXT) \ + $(ALL_API_VALIDATION)/time/time_main$(EXEEXT) \ + $(ALL_API_VALIDATION)/timer/timer_main$(EXEEXT) \ + $(ALL_API_VALIDATION)/traffic_mngr/traffic_mngr_main$(EXEEXT) \ + $(ALL_API_VALIDATION)/shmem/shmem_main$(EXEEXT) \ + $(ALL_API_VALIDATION)/system/system_main$(EXEEXT) \ + ---- With the exception for module pktio, all other modules testing just involves -calling the platform agnostic <module>_main executables (in test/validation). +calling the platform agnostic <module>_main executables (in +/test/common_plat/validation/api). ==== Using other languages The pktio module, above, is actually tested using a bash script. This script is needed to set up the interfaces used by the tests. The `pktio_run` script -eventually calls the platform agnostic `test/validation/pktio/pktio_main` after -setting up the interfaces needed by the tests. -Notice that the path to the script, `pktio/pktio_run`, is pointing to a file -within the <PLATFORM_SPECIFIC> tree so is private to this platform. Any -languages supported by the tested platform can be used there, as it will not -impact other platforms. +eventually calls the platform agnostic +`test/common_plat/validation/api/pktio/pktio_main` after setting up the +interfaces needed by the tests. +Notice that the path to the script, `validation/api/pktio/pktio_run.sh`, +is pointing to a file within the <PLATFORM_SPECIFIC> tree so is private to +this platform. Any languages supported by the tested platform can be used +there, as it will not impact other platforms. The platform "private" executables (such as this script), of course, must also return one of the return code expected by the automake test harness (0 for success, 77 for skipped, other values for errors). @@ -438,15 +457,20 @@ Sometimes, it may be necessary to call platform specific system calls to check some functionality: For instance, testing `odp_cpumask_*` could involve checking the underlying system CPU mask. On linux, such a test would require using the CPU_ISSET macro, which is linux specific. Such a test would be written in -`<PLATFORM_SPECIFIC>/cpumask/...` The contents of this directory would be very -similar to the contents of the platform agnostic side cpu_mask tests -(including a `Makefile.am`), but platform specific test would be written there. +`<PLATFORM_SPECIFIC>/<test-group>/<interface>/cpumask/...` The contents of +this directory would be very similar to the contents of the platform agnostic +side cpu_mask tests (including a `Makefile.am`...), but platform specific test +would be written there. `<PLATFORM_SPECIFIC>/Makefile.am` would then trigger the building of the platform specific tests (by listing their module name in `SUBDIRS` and therefore calling the appropriate `Makefile.am`) and then it would call both the platform agnostic executable(s) and the platform specific test executable. -==== Marking tests as inactive +The shm module of the linux-generic ODP API does have a validation +test written this way. You can see it at: +`test/linux-generic/validation/api/shmem` + +==== Marking validation tests as inactive The general policy is that a full run of the validation suite (a `make check`) must pass at all times. However a particular platform may have one or more test @@ -464,7 +488,8 @@ modify the properties of previously registered tests, for example to mark them as inactive. Inactive tests are registered with the test framework but aren't executed and will be recorded as inactive in test reports. -In `test/validation/foo/foo.c`, define all tests for the `foo` module: +In `test/common_plat/validation/api/foo/foo.c`, define all +validation tests for the 'foo' module: [source,c] ------------------ @@ -480,7 +505,7 @@ odp_suiteinfo_t foo_suites[] = { }; ------------------ -In `platform/<platform>/test/foo/foo_main.c`, register all the tests defined in +In `<platform>/validation/api/foo/foo_main.c`, register all the tests defined in the `foo` module, then mark a single specific test case as inactive: [source,c] commit 79534012879ca74a68256ca40922b3fef7983611 Author: Christophe Milard <christophe.milard(a)linaro.org> Date: Wed Jul 13 21:50:42 2016 +0200 test: restructuring platform-specific tests to allow other interface test/platform/<platform_name>/* moves to: test/<platform_name>/validation/api/ Two reasons: *test/platform/<platform_name>/ now moves to test/<platform_name>, hence at the same level than "common_plat" clearly separating between platform agnostic and platform specific parts. *Also, under test/<platform_name>, the test group "validation" and interface "api" are created, hence allowing for other tests type to have platform specifics (for instance running perf test from platform side to set proper pktios), and allowing other interfaces to be tested under validation. Signed-off-by: Christophe Milard <christophe.milard(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-and-tested-by: Yi He <yi.he(a)linaro.org> Reviewed-by: Mike Holmes <mike.holmes(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/configure.ac b/configure.ac index c0eb207..c0f0f21 100644 --- a/configure.ac +++ b/configure.ac @@ -118,7 +118,7 @@ IMPLEMENTATION_NAME="" if test "${with_platform}" == "linux-generic"; then m4_include([./platform/linux-generic/m4/configure.m4]) - m4_include([./test/platform/linux-generic/m4/configure.m4]) + m4_include([./test/linux-generic/m4/configure.m4]) IMPLEMENTATION_NAME="odp-linux" else echo "UNSUPPORTED PLATFORM: ${with_platform}" diff --git a/test/Makefile.am b/test/Makefile.am index 59532c8..3b59173 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1,5 +1 @@ -SUBDIRS = common_plat - -if cunit_support - SUBDIRS += @platform_with_platform@ -endif +SUBDIRS = common_plat @with_platform@ diff --git a/test/common_plat/performance/odp_l2fwd_run.sh b/test/common_plat/performance/odp_l2fwd_run.sh index 68e4498..e64aa47 100755 --- a/test/common_plat/performance/odp_l2fwd_run.sh +++ b/test/common_plat/performance/odp_l2fwd_run.sh @@ -30,6 +30,8 @@ PATH=$TEST_DIR:$TEST_DIR/../../../example/generator:$PATH # exit codes expected by automake for skipped tests TEST_SKIPPED=77 +PLATFORM_VALIDATION=${TEST_SRC_DIR}/../../$ODP_PLATFORM/validation + # Use installed pktio env or for make check take it from platform directory if [ -f "./pktio_env" ]; then . ./pktio_env @@ -37,8 +39,8 @@ elif [ "$ODP_PLATFORM" = "" ]; then echo "$0: error: ODP_PLATFORM must be defined" # not skipped as this should never happen via "make check" exit 1 -elif [ -f ${TEST_SRC_DIR}/../../platform/$ODP_PLATFORM/pktio/pktio_env ]; then - . ${TEST_SRC_DIR}/../../platform/$ODP_PLATFORM/pktio/pktio_env +elif [ -f ${PLATFORM_VALIDATION}/api/pktio/pktio_env ]; then + . ${PLATFORM_VALIDATION}/api/pktio/pktio_env else echo "BUG: unable to find pktio_env!" echo "pktio_env has to be in current directory or in platform/\$ODP_PLATFORM/test." diff --git a/test/platform/linux-generic/.gitignore b/test/linux-generic/.gitignore similarity index 100% rename from test/platform/linux-generic/.gitignore rename to test/linux-generic/.gitignore diff --git a/test/platform/linux-generic/Makefile.am b/test/linux-generic/Makefile.am similarity index 81% rename from test/platform/linux-generic/Makefile.am rename to test/linux-generic/Makefile.am index 83da140..f5cc52d 100644 --- a/test/platform/linux-generic/Makefile.am +++ b/test/linux-generic/Makefile.am @@ -1,17 +1,14 @@ include $(top_srcdir)/test/Makefile.inc TESTS_ENVIRONMENT += TEST_DIR=${top_builddir}/test/common_plat/validation -ODP_MODULES = pktio \ - ring \ - shmem - ALL_API_VALIDATION_DIR = ${top_builddir}/test/common_plat/validation/api +SUBDIRS = + if test_vald -TESTS = pktio/pktio_run.sh \ - pktio/pktio_run_tap.sh \ - ring/ring_main$(EXEEXT) \ - shmem/shmem_linux \ +TESTS = validation/api/pktio/pktio_run.sh \ + validation/api/pktio/pktio_run_tap.sh \ + validation/api/shmem/shmem_linux \ $(ALL_API_VALIDATION_DIR)/atomic/atomic_main$(EXEEXT) \ $(ALL_API_VALIDATION_DIR)/barrier/barrier_main$(EXEEXT) \ $(ALL_API_VALIDATION_DIR)/buffer/buffer_main$(EXEEXT) \ @@ -35,22 +32,32 @@ TESTS = pktio/pktio_run.sh \ $(ALL_API_VALIDATION_DIR)/timer/timer_main$(EXEEXT) \ $(ALL_API_VALIDATION_DIR)/traffic_mngr/traffic_mngr_main$(EXEEXT) \ $(ALL_API_VALIDATION_DIR)/shmem/shmem_main$(EXEEXT) \ - $(ALL_API_VALIDATION_DIR)/system/system_main$(EXEEXT) + $(ALL_API_VALIDATION_DIR)/system/system_main$(EXEEXT) \ + ring/ring_main$(EXEEXT) -SUBDIRS = $(ODP_MODULES) +SUBDIRS += validation/api/pktio\ + validation/api/shmem\ + pktio_ipc\ + ring if HAVE_PCAP -TESTS += pktio/pktio_run_pcap.sh +TESTS += validation/api/pktio/pktio_run_pcap.sh +endif +if netmap_support +TESTS += validation/api/pktio/pktio_run_netmap.sh endif +if PKTIO_DPDK +TESTS += validation/api/pktio/pktio_run_dpdk.sh +endif + if PKTIO_IPC TESTS += pktio_ipc/pktio_ipc_run.sh SUBDIRS += pktio_ipc endif -if netmap_support -TESTS += pktio/pktio_run_netmap.sh -endif -if PKTIO_DPDK -TESTS += pktio/pktio_run_dpdk.sh +else +#performance tests refer to pktio_env +if test_perf +SUBDIRS += validation/api/pktio endif endif @@ -70,7 +77,3 @@ installcheck-local: $(DESTDIR)/$(testdir)/run-test endif -#performance tests refer to pktio_env -if test_perf -SUBDIRS = pktio -endif diff --git a/test/platform/linux-generic/Makefile.inc b/test/linux-generic/Makefile.inc similarity index 100% rename from test/platform/linux-generic/Makefile.inc rename to test/linux-generic/Makefile.inc diff --git a/test/linux-generic/m4/configure.m4 b/test/linux-generic/m4/configure.m4 new file mode 100644 index 0000000..9eec545 --- /dev/null +++ b/test/linux-generic/m4/configure.m4 @@ -0,0 +1,5 @@ +AC_CONFIG_FILES([test/linux-generic/Makefile + test/linux-generic/validation/api/shmem/Makefile + test/linux-generic/validation/api/pktio/Makefile + test/linux-generic/pktio_ipc/Makefile + test/linux-generic/ring/Makefile]) diff --git a/test/platform/linux-generic/pktio_ipc/.gitignore b/test/linux-generic/pktio_ipc/.gitignore similarity index 100% rename from test/platform/linux-generic/pktio_ipc/.gitignore rename to test/linux-generic/pktio_ipc/.gitignore diff --git a/test/platform/linux-generic/pktio_ipc/Makefile.am b/test/linux-generic/pktio_ipc/Makefile.am similarity index 100% rename from test/platform/linux-generic/pktio_ipc/Makefile.am rename to test/linux-generic/pktio_ipc/Makefile.am diff --git a/test/platform/linux-generic/pktio_ipc/ipc_common.c b/test/linux-generic/pktio_ipc/ipc_common.c similarity index 100% rename from test/platform/linux-generic/pktio_ipc/ipc_common.c rename to test/linux-generic/pktio_ipc/ipc_common.c diff --git a/test/platform/linux-generic/pktio_ipc/ipc_common.h b/test/linux-generic/pktio_ipc/ipc_common.h similarity index 100% rename from test/platform/linux-generic/pktio_ipc/ipc_common.h rename to test/linux-generic/pktio_ipc/ipc_common.h diff --git a/test/platform/linux-generic/pktio_ipc/pktio_ipc1.c b/test/linux-generic/pktio_ipc/pktio_ipc1.c similarity index 100% rename from test/platform/linux-generic/pktio_ipc/pktio_ipc1.c rename to test/linux-generic/pktio_ipc/pktio_ipc1.c diff --git a/test/platform/linux-generic/pktio_ipc/pktio_ipc2.c b/test/linux-generic/pktio_ipc/pktio_ipc2.c similarity index 100% rename from test/platform/linux-generic/pktio_ipc/pktio_ipc2.c rename to test/linux-generic/pktio_ipc/pktio_ipc2.c diff --git a/test/platform/linux-generic/pktio_ipc/pktio_ipc_run.sh b/test/linux-generic/pktio_ipc/pktio_ipc_run.sh similarity index 100% rename from test/platform/linux-generic/pktio_ipc/pktio_ipc_run.sh rename to test/linux-generic/pktio_ipc/pktio_ipc_run.sh diff --git a/test/platform/linux-generic/ring/.gitignore b/test/linux-generic/ring/.gitignore similarity index 100% rename from test/platform/linux-generic/ring/.gitignore rename to test/linux-generic/ring/.gitignore diff --git a/test/platform/linux-generic/ring/Makefile.am b/test/linux-generic/ring/Makefile.am similarity index 100% rename from test/platform/linux-generic/ring/Makefile.am rename to test/linux-generic/ring/Makefile.am diff --git a/test/platform/linux-generic/ring/ring_basic.c b/test/linux-generic/ring/ring_basic.c similarity index 100% rename from test/platform/linux-generic/ring/ring_basic.c rename to test/linux-generic/ring/ring_basic.c diff --git a/test/platform/linux-generic/ring/ring_main.c b/test/linux-generic/ring/ring_main.c similarity index 100% rename from test/platform/linux-generic/ring/ring_main.c rename to test/linux-generic/ring/ring_main.c diff --git a/test/platform/linux-generic/ring/ring_stress.c b/test/linux-generic/ring/ring_stress.c similarity index 100% rename from test/platform/linux-generic/ring/ring_stress.c rename to test/linux-generic/ring/ring_stress.c diff --git a/test/platform/linux-generic/ring/ring_suites.c b/test/linux-generic/ring/ring_suites.c similarity index 100% rename from test/platform/linux-generic/ring/ring_suites.c rename to test/linux-generic/ring/ring_suites.c diff --git a/test/platform/linux-generic/ring/ring_suites.h b/test/linux-generic/ring/ring_suites.h similarity index 100% rename from test/platform/linux-generic/ring/ring_suites.h rename to test/linux-generic/ring/ring_suites.h diff --git a/test/platform/linux-generic/run-test b/test/linux-generic/run-test similarity index 100% rename from test/platform/linux-generic/run-test rename to test/linux-generic/run-test diff --git a/test/linux-generic/validation/Makefile.inc b/test/linux-generic/validation/Makefile.inc new file mode 100644 index 0000000..cf1dedb --- /dev/null +++ b/test/linux-generic/validation/Makefile.inc @@ -0,0 +1 @@ +include $(top_srcdir)/test/linux-generic/Makefile.inc diff --git a/test/linux-generic/validation/api/Makefile.inc b/test/linux-generic/validation/api/Makefile.inc new file mode 100644 index 0000000..19c9448 --- /dev/null +++ b/test/linux-generic/validation/api/Makefile.inc @@ -0,0 +1 @@ +include $(top_srcdir)/test/linux-generic/validation/Makefile.inc diff --git a/test/platform/linux-generic/pktio/.gitignore b/test/linux-generic/validation/api/pktio/.gitignore similarity index 100% rename from test/platform/linux-generic/pktio/.gitignore rename to test/linux-generic/validation/api/pktio/.gitignore diff --git a/test/platform/linux-generic/pktio/Makefile.am b/test/linux-generic/validation/api/pktio/Makefile.am similarity index 100% rename from test/platform/linux-generic/pktio/Makefile.am rename to test/linux-generic/validation/api/pktio/Makefile.am diff --git a/test/platform/linux-generic/pktio/pktio_env b/test/linux-generic/validation/api/pktio/pktio_env similarity index 100% rename from test/platform/linux-generic/pktio/pktio_env rename to test/linux-generic/validation/api/pktio/pktio_env diff --git a/test/platform/linux-generic/pktio/pktio_run.sh b/test/linux-generic/validation/api/pktio/pktio_run.sh similarity index 97% rename from test/platform/linux-generic/pktio/pktio_run.sh rename to test/linux-generic/validation/api/pktio/pktio_run.sh index 0905b8b..e8b0f93 100755 --- a/test/platform/linux-generic/pktio/pktio_run.sh +++ b/test/linux-generic/validation/api/pktio/pktio_run.sh @@ -23,7 +23,7 @@ # running stand alone out of tree requires setting PATH PATH=${TEST_DIR}/api/pktio:$PATH PATH=$(dirname $0):$PATH -PATH=$(dirname $0)/../../../../test/validation/api/pktio:$PATH +PATH=$(dirname $0)/../../../../common_plat/validation/api/pktio:$PATH PATH=.:$PATH pktio_main_path=$(which pktio_main${EXEEXT}) diff --git a/test/platform/linux-generic/pktio/pktio_run_dpdk.sh b/test/linux-generic/validation/api/pktio/pktio_run_dpdk.sh similarity index 97% rename from test/platform/linux-generic/pktio/pktio_run_dpdk.sh rename to test/linux-generic/validation/api/pktio/pktio_run_dpdk.sh index 4d16b29..fa46fa4 100755 --- a/test/platform/linux-generic/pktio/pktio_run_dpdk.sh +++ b/test/linux-generic/validation/api/pktio/pktio_run_dpdk.sh @@ -23,7 +23,7 @@ # running stand alone out of tree requires setting PATH PATH=${TEST_DIR}/api/pktio:$PATH PATH=$(dirname $0):$PATH -PATH=$(dirname $0)/../../../../test/validation/api/pktio:$PATH +PATH=$(dirname $0)/../../../../common_plat/validation/api/pktio:$PATH PATH=.:$PATH pktio_main_path=$(which pktio_main${EXEEXT}) diff --git a/test/platform/linux-generic/pktio/pktio_run_netmap.sh b/test/linux-generic/validation/api/pktio/pktio_run_netmap.sh similarity index 97% rename from test/platform/linux-generic/pktio/pktio_run_netmap.sh rename to test/linux-generic/validation/api/pktio/pktio_run_netmap.sh index 6fd271b..7dde7ae 100755 --- a/test/platform/linux-generic/pktio/pktio_run_netmap.sh +++ b/test/linux-generic/validation/api/pktio/pktio_run_netmap.sh @@ -17,7 +17,7 @@ # running stand alone out of tree requires setting PATH PATH=${TEST_DIR}/api/pktio:$PATH PATH=$(dirname $0):$PATH -PATH=$(dirname $0)/../../../../test/validation/api/pktio:$PATH +PATH=$(dirname $0)/../../../../common_plat/validation/api/pktio:$PATH PATH=.:$PATH pktio_main_path=$(which pktio_main${EXEEXT}) diff --git a/test/platform/linux-generic/pktio/pktio_run_pcap.sh b/test/linux-generic/validation/api/pktio/pktio_run_pcap.sh similarity index 93% rename from test/platform/linux-generic/pktio/pktio_run_pcap.sh rename to test/linux-generic/validation/api/pktio/pktio_run_pcap.sh index 721141a..b5b7735 100755 --- a/test/platform/linux-generic/pktio/pktio_run_pcap.sh +++ b/test/linux-generic/validation/api/pktio/pktio_run_pcap.sh @@ -17,7 +17,7 @@ # running stand alone out of tree requires setting PATH PATH=${TEST_DIR}/api/pktio:$PATH PATH=$(dirname $0):$PATH -PATH=$(dirname $0)/../../../../test/validation/api/pktio:$PATH +PATH=$(dirname $0)/../../../../common_plat/validation/api/pktio:$PATH PATH=.:$PATH pktio_main_path=$(which pktio_main${EXEEXT}) diff --git a/test/platform/linux-generic/pktio/pktio_run_tap.sh b/test/linux-generic/validation/api/pktio/pktio_run_tap.sh similarity index 97% rename from test/platform/linux-generic/pktio/pktio_run_tap.sh rename to test/linux-generic/validation/api/pktio/pktio_run_tap.sh index 96f6d5a..89579ca 100755 --- a/test/platform/linux-generic/pktio/pktio_run_tap.sh +++ b/test/linux-generic/validation/api/pktio/pktio_run_tap.sh @@ -18,7 +18,7 @@ # running stand alone out of tree requires setting PATH PATH=${TEST_DIR}/api/pktio:$PATH PATH=$(dirname $0):$PATH -PATH=$(dirname $0)/../../../../test/validation/api/pktio:$PATH +PATH=$(dirname $0)/../../../../common_plat/validation/api/pktio:$PATH PATH=.:$PATH pktio_main_path=$(which pktio_main${EXEEXT}) diff --git a/test/platform/linux-generic/shmem/.gitignore b/test/linux-generic/validation/api/shmem/.gitignore similarity index 100% rename from test/platform/linux-generic/shmem/.gitignore rename to test/linux-generic/validation/api/shmem/.gitignore diff --git a/test/platform/linux-generic/shmem/Makefile.am b/test/linux-generic/validation/api/shmem/Makefile.am similarity index 100% rename from test/platform/linux-generic/shmem/Makefile.am rename to test/linux-generic/validation/api/shmem/Makefile.am diff --git a/test/platform/linux-generic/shmem/shmem.h b/test/linux-generic/validation/api/shmem/shmem.h similarity index 100% rename from test/platform/linux-generic/shmem/shmem.h rename to test/linux-generic/validation/api/shmem/shmem.h diff --git a/test/platform/linux-generic/shmem/shmem_common.h b/test/linux-generic/validation/api/shmem/shmem_common.h similarity index 100% rename from test/platform/linux-generic/shmem/shmem_common.h rename to test/linux-generic/validation/api/shmem/shmem_common.h diff --git a/test/platform/linux-generic/shmem/shmem_linux.c b/test/linux-generic/validation/api/shmem/shmem_linux.c similarity index 100% rename from test/platform/linux-generic/shmem/shmem_linux.c rename to test/linux-generic/validation/api/shmem/shmem_linux.c diff --git a/test/platform/linux-generic/shmem/shmem_linux.h b/test/linux-generic/validation/api/shmem/shmem_linux.h similarity index 100% rename from test/platform/linux-generic/shmem/shmem_linux.h rename to test/linux-generic/validation/api/shmem/shmem_linux.h diff --git a/test/platform/linux-generic/shmem/shmem_odp.c b/test/linux-generic/validation/api/shmem/shmem_odp.c similarity index 100% rename from test/platform/linux-generic/shmem/shmem_odp.c rename to test/linux-generic/validation/api/shmem/shmem_odp.c diff --git a/test/platform/linux-generic/shmem/shmem_odp.h b/test/linux-generic/validation/api/shmem/shmem_odp.h similarity index 100% rename from test/platform/linux-generic/shmem/shmem_odp.h rename to test/linux-generic/validation/api/shmem/shmem_odp.h diff --git a/test/platform/linux-generic/m4/configure.m4 b/test/platform/linux-generic/m4/configure.m4 deleted file mode 100644 index 8c3db21..0000000 --- a/test/platform/linux-generic/m4/configure.m4 +++ /dev/null @@ -1,5 +0,0 @@ -AC_CONFIG_FILES([test/platform/linux-generic/Makefile - test/platform/linux-generic/shmem/Makefile - test/platform/linux-generic/pktio/Makefile - test/platform/linux-generic/pktio_ipc/Makefile - test/platform/linux-generic/ring/Makefile]) commit efa6bc89a4e7a5823a3c8c27fcdc9573d7ac5694 Author: Christophe Milard <christophe.milard(a)linaro.org> Date: Wed Jul 13 21:50:41 2016 +0200 validation: moving api validation tests to prepare for new interfaces API tests are now moved to test/common_plat/validation/api (from test/validation), The reason for this move is two folded: * Moving down validation to all-plaforms/validation disambiguates the meaning of validation (which up to now was referring to both platform agnostic tests and to the set of tests to pass to be ODP compatible). Now things in test/common_plat/ are platform agnostic. So test/common_plat/validation/* are platform agnostic things for the validation tests, as much as test/common_plat/performance are platform agnostic things for the performance tests. * creating the api directory under "validation" simply enable adding other interfaces (such as future drv) as part of the validation tests Signed-off-by: Christophe Milard <christophe.milard(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-and-tested-by: Yi He <yi.he(a)linaro.org> Reviewed-by: Mike Holmes <mike.holmes(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/Makefile.am b/test/Makefile.am index 8bab8fd..59532c8 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1,5 +1,5 @@ -SUBDIRS = performance miscellaneous +SUBDIRS = common_plat if cunit_support - SUBDIRS += validation @platform_with_platform@ + SUBDIRS += @platform_with_platform@ endif diff --git a/test/common_plat/Makefile.am b/test/common_plat/Makefile.am new file mode 100644 index 0000000..af78bb6 --- /dev/null +++ b/test/common_plat/Makefile.am @@ -0,0 +1,7 @@ +SUBDIRS = + +if cunit_support +SUBDIRS += common +endif + +SUBDIRS += performance miscellaneous validation diff --git a/test/validation/common/Makefile.am b/test/common_plat/common/Makefile.am similarity index 100% rename from test/validation/common/Makefile.am rename to test/common_plat/common/Makefile.am diff --git a/test/validation/common/mask_common.c b/test/common_plat/common/mask_common.c similarity index 100% rename from test/validation/common/mask_common.c rename to test/common_plat/common/mask_common.c diff --git a/test/validation/common/mask_common.h b/test/common_plat/common/mask_common.h similarity index 100% rename from test/validation/common/mask_common.h rename to test/common_plat/common/mask_common.h diff --git a/test/validation/common/odp_cunit_common.c b/test/common_plat/common/odp_cunit_common.c similarity index 100% rename from test/validation/common/odp_cunit_common.c rename to test/common_plat/common/odp_cunit_common.c diff --git a/test/validation/common/odp_cunit_common.h b/test/common_plat/common/odp_cunit_common.h similarity index 100% rename from test/validation/common/odp_cunit_common.h rename to test/common_plat/common/odp_cunit_common.h diff --git a/test/common_plat/m4/configure.m4 b/test/common_plat/m4/configure.m4 new file mode 100644 index 0000000..be878bd --- /dev/null +++ b/test/common_plat/m4/configure.m4 @@ -0,0 +1,33 @@ +m4_include([test/common_plat/m4/miscellaneous.m4]) +m4_include([test/common_plat/m4/performance.m4]) +m4_include([test/common_plat/m4/validation.m4]) + +AC_CONFIG_FILES([test/common_plat/Makefile + test/common_plat/common/Makefile + test/common_plat/miscellaneous/Makefile + test/common_plat/performance/Makefile + test/common_plat/validation/Makefile + test/common_plat/validation/api/atomic/Makefile + test/common_plat/validation/api/barrier/Makefile + test/common_plat/validation/api/buffer/Makefile + test/common_plat/validation/api/classification/Makefile + test/common_plat/validation/api/cpumask/Makefile + test/common_plat/validation/api/crypto/Makefile + test/common_plat/validation/api/errno/Makefile + test/common_plat/validation/api/hash/Makefile + test/common_plat/validation/api/init/Makefile + test/common_plat/validation/api/lock/Makefile + test/common_plat/validation/api/Makefile + test/common_plat/validation/api/packet/Makefile + test/common_plat/validation/api/pktio/Makefile + test/common_plat/validation/api/pool/Makefile + test/common_plat/validation/api/queue/Makefile + test/common_plat/validation/api/random/Makefile + test/common_plat/validation/api/scheduler/Makefile + test/common_plat/validation/api/shmem/Makefile + test/common_plat/validation/api/std_clib/Makefile + test/common_plat/validation/api/system/Makefile + test/common_plat/validation/api/thread/Makefile + test/common_plat/validation/api/time/Makefile + test/common_plat/validation/api/timer/Makefile + test/common_plat/validation/api/traffic_mngr/Makefile]) diff --git a/test/m4/miscellaneous.m4 b/test/common_plat/m4/miscellaneous.m4 similarity index 100% rename from test/m4/miscellaneous.m4 rename to test/common_plat/m4/miscellaneous.m4 diff --git a/test/m4/performance.m4 b/test/common_plat/m4/performance.m4 similarity index 100% rename from test/m4/performance.m4 rename to test/common_plat/m4/performance.m4 diff --git a/test/m4/validation.m4 b/test/common_plat/m4/validation.m4 similarity index 100% rename from test/m4/validation.m4 rename to test/common_plat/m4/validation.m4 diff --git a/test/miscellaneous/.gitignore b/test/common_plat/miscellaneous/.gitignore similarity index 100% rename from test/miscellaneous/.gitignore rename to test/common_plat/miscellaneous/.gitignore diff --git a/test/miscellaneous/Makefile.am b/test/common_plat/miscellaneous/Makefile.am similarity index 100% rename from test/miscellaneous/Makefile.am rename to test/common_plat/miscellaneous/Makefile.am diff --git a/test/miscellaneous/odp_api_from_cpp.cpp b/test/common_plat/miscellaneous/odp_api_from_cpp.cpp similarity index 100% rename from test/miscellaneous/odp_api_from_cpp.cpp rename to test/common_plat/miscellaneous/odp_api_from_cpp.cpp diff --git a/test/performance/.gitignore b/test/common_plat/performance/.gitignore similarity index 100% rename from test/performance/.gitignore rename to test/common_plat/performance/.gitignore diff --git a/test/performance/Makefile.am b/test/common_plat/performance/Makefile.am similarity index 100% rename from test/performance/Makefile.am rename to test/common_plat/performance/Makefile.am diff --git a/test/performance/odp_crypto.c b/test/common_plat/performance/odp_crypto.c similarity index 100% rename from test/performance/odp_crypto.c rename to test/common_plat/performance/odp_crypto.c diff --git a/test/performance/odp_l2fwd.c b/test/common_plat/performance/odp_l2fwd.c similarity index 100% rename from test/performance/odp_l2fwd.c rename to test/common_plat/performance/odp_l2fwd.c diff --git a/test/performance/odp_l2fwd_run.sh b/test/common_plat/performance/odp_l2fwd_run.sh similarity index 93% rename from test/performance/odp_l2fwd_run.sh rename to test/common_plat/performance/odp_l2fwd_run.sh index 1fff087..68e4498 100755 --- a/test/performance/odp_l2fwd_run.sh +++ b/test/common_plat/performance/odp_l2fwd_run.sh @@ -25,7 +25,7 @@ TEST_DIR="${TEST_DIR:-$PWD}" # directory where test sources are, including scripts TEST_SRC_DIR=$(dirname $0) -PATH=$TEST_DIR:$TEST_DIR/../../example/generator:$PATH +PATH=$TEST_DIR:$TEST_DIR/../../../example/generator:$PATH # exit codes expected by automake for skipped tests TEST_SKIPPED=77 @@ -37,8 +37,8 @@ elif [ "$ODP_PLATFORM" = "" ]; then echo "$0: error: ODP_PLATFORM must be defined" # not skipped as this should never happen via "make check" exit 1 -elif [ -f ${TEST_SRC_DIR}/../platform/$ODP_PLATFORM/pktio/pktio_env ]; then - . ${TEST_SRC_DIR}/../platform/$ODP_PLATFORM/pktio/pktio_env +elif [ -f ${TEST_SRC_DIR}/../../platform/$ODP_PLATFORM/pktio/pktio_env ]; then + . ${TEST_SRC_DIR}/../../platform/$ODP_PLATFORM/pktio/pktio_env else echo "BUG: unable to find pktio_env!" echo "pktio_env has to be in current directory or in platform/\$ODP_PLATFORM/test." diff --git a/test/performance/odp_pktio_perf.c b/test/common_plat/performance/odp_pktio_perf.c similarity index 100% rename from test/performance/odp_pktio_perf.c rename to test/common_plat/performance/odp_pktio_perf.c diff --git a/test/performance/odp_scheduling.c b/test/common_plat/performance/odp_scheduling.c similarity index 100% rename from test/performance/odp_scheduling.c rename to test/common_plat/performance/odp_scheduling.c diff --git a/test/performance/odp_scheduling_run.sh b/test/common_plat/performance/odp_scheduling_run.sh similarity index 100% rename from test/performance/odp_scheduling_run.sh rename to test/common_plat/performance/odp_scheduling_run.sh diff --git a/test/common_plat/validation/Makefile.am b/test/common_plat/validation/Makefile.am new file mode 100644 index 0000000..5d525fb --- /dev/null +++ b/test/common_plat/validation/Makefile.am @@ -0,0 +1,3 @@ +if cunit_support + SUBDIRS = api +endif diff --git a/test/validation/.gitignore b/test/common_plat/validation/api/.gitignore similarity index 100% rename from test/validation/.gitignore rename to test/common_plat/validation/api/.gitignore diff --git a/test/validation/Makefile.am b/test/common_plat/validation/api/Makefile.am similarity index 93% rename from test/validation/Makefile.am rename to test/common_plat/validation/api/Makefile.am index 90cc549..e2d30a6 100644 --- a/test/validation/Makefile.am +++ b/test/common_plat/validation/api/Makefile.am @@ -22,7 +22,7 @@ ODP_MODULES = atomic \ shmem \ system -SUBDIRS = common $(ODP_MODULES) +SUBDIRS = $(ODP_MODULES) #The tests will need to retain the deprecated test implementation AM_CFLAGS += -Wno-deprecated-declarations diff --git a/test/validation/Makefile.inc b/test/common_plat/validation/api/Makefile.inc similarity index 83% rename from test/validation/Makefile.inc rename to test/common_plat/validation/api/Makefile.inc index 9f36f9d..ffba620 100644 --- a/test/validation/Makefile.inc +++ b/test/common_plat/validation/api/Makefile.inc @@ -1,13 +1,13 @@ include $(top_srcdir)/test/Makefile.inc -COMMON_DIR = $(top_builddir)/test/validation/common +COMMON_DIR = $(top_builddir)/test/common_plat/common #the following option ensure that option '-I.' is not passed to gcc, #therefore distinguishing between '#include "X"' and '#include <X>'. #It allows common filenames (such as 'errno.h') to be used locally. AUTOMAKE_OPTIONS = nostdinc -AM_CFLAGS += -I$(top_srcdir)/test/validation/common +AM_CFLAGS += -I$(top_srcdir)/test/common_plat/common AM_LDFLAGS += -static LIBCUNIT_COMMON = $(COMMON_DIR)/libcunit_common.la diff --git a/test/validation/README b/test/common_plat/validation/api/README similarity index 100% rename from test/validation/README rename to test/common_plat/validation/api/README diff --git a/test/validation/atomic/.gitignore b/test/common_plat/validation/api/atomic/.gitignore similarity index 100% rename from test/validation/atomic/.gitignore rename to test/common_plat/validation/api/atomic/.gitignore diff --git a/test/validation/atomic/Makefile.am b/test/common_plat/validation/api/atomic/Makefile.am similarity index 100% rename from test/validation/atomic/Makefile.am rename to test/common_plat/validation/api/atomic/Makefile.am diff --git a/test/validation/atomic/atomic.c b/test/common_plat/validation/api/atomic/atomic.c similarity index 100% rename from test/validation/atomic/atomic.c rename to test/common_plat/validation/api/atomic/atomic.c diff --git a/test/validation/atomic/atomic.h b/test/common_plat/validation/api/atomic/atomic.h similarity index 100% rename from test/validation/atomic/atomic.h rename to test/common_plat/validation/api/atomic/atomic.h diff --git a/test/validation/atomic/atomic_main.c b/test/common_plat/validation/api/atomic/atomic_main.c similarity index 100% rename from test/validation/atomic/atomic_main.c rename to test/common_plat/validation/api/atomic/atomic_main.c diff --git a/test/validation/barrier/.gitignore b/test/common_plat/validation/api/barrier/.gitignore similarity index 100% rename from test/validation/barrier/.gitignore rename to test/common_plat/validation/api/barrier/.gitignore diff --git a/test/validation/barrier/Makefile.am b/test/common_plat/validation/api/barrier/Makefile.am similarity index 100% rename from test/validation/barrier/Makefile.am rename to test/common_plat/validation/api/barrier/Makefile.am diff --git a/test/validation/barrier/barrier.c b/test/common_plat/validation/api/barrier/barrier.c similarity index 100% rename from test/validation/barrier/barrier.c rename to test/common_plat/validation/api/barrier/barrier.c diff --git a/test/validation/barrier/barrier.h b/test/common_plat/validation/api/barrier/barrier.h similarity index 100% rename from test/validation/barrier/barrier.h rename to test/common_plat/validation/api/barrier/barrier.h diff --git a/test/validation/barrier/barrier_main.c b/test/common_plat/validation/api/barrier/barrier_main.c similarity index 100% rename from test/validation/barrier/barrier_main.c rename to test/common_plat/validation/api/barrier/barrier_main.c diff --git a/test/validation/buffer/.gitignore b/test/common_plat/validation/api/buffer/.gitignore similarity index 100% rename from test/validation/buffer/.gitignore rename to test/common_plat/validation/api/buffer/.gitignore diff --git a/test/validation/buffer/Makefile.am b/test/common_plat/validation/api/buffer/Makefile.am similarity index 100% rename from test/validation/buffer/Makefile.am rename to test/common_plat/validation/api/buffer/Makefile.am diff --git a/test/validation/buffer/buffer.c b/test/common_plat/validation/api/buffer/buffer.c similarity index 100% rename from test/validation/buffer/buffer.c rename to test/common_plat/validation/api/buffer/buffer.c diff --git a/test/validation/buffer/buffer.h b/test/common_plat/validation/api/buffer/buffer.h similarity index 100% rename from test/validation/buffer/buffer.h rename to test/common_plat/validation/api/buffer/buffer.h diff --git a/test/validation/buffer/buffer_main.c b/test/common_plat/validation/api/buffer/buffer_main.c similarity index 100% rename from test/validation/buffer/buffer_main.c rename to test/common_plat/validation/api/buffer/buffer_main.c diff --git a/test/validation/classification/.gitignore b/test/common_plat/validation/api/classification/.gitignore similarity index 100% rename from test/validation/classification/.gitignore rename to test/common_plat/validation/api/classification/.gitignore diff --git a/test/validation/classification/Makefile.am b/test/common_plat/validation/api/classification/Makefile.am similarity index 100% rename from test/validation/classification/Makefile.am rename to test/common_plat/validation/api/classification/Makefile.am diff --git a/test/validation/classification/classification.c b/test/common_plat/validation/api/classification/classification.c similarity index 100% rename from test/validation/classification/classification.c rename to test/common_plat/validation/api/classification/classification.c diff --git a/test/validation/classification/classification.h b/test/common_plat/validation/api/classification/classification.h similarity index 100% rename from test/validation/classification/classification.h rename to test/common_plat/validation/api/classification/classification.h diff --git a/test/validation/classification/classification_main.c b/test/common_plat/validation/api/classification/classification_main.c similarity index 100% rename from test/validation/classification/classification_main.c rename to test/common_plat/validation/api/classification/classification_main.c diff --git a/test/validation/classification/odp_classification_basic.c b/test/common_plat/validation/api/classification/odp_classification_basic.c similarity index 100% rename from test/validation/classification/odp_classification_basic.c rename to test/common_plat/validation/api/classification/odp_classification_basic.c diff --git a/test/validation/classification/odp_classification_common.c b/test/common_plat/validation/api/classification/odp_classification_common.c similarity index 100% rename from test/validation/classification/odp_classification_common.c rename to test/common_plat/validation/api/classification/odp_classification_common.c diff --git a/test/validation/classification/odp_classification_test_pmr.c b/test/common_plat/validation/api/classification/odp_classification_test_pmr.c similarity index 100% rename from test/validation/classification/odp_classification_test_pmr.c rename to test/common_plat/validation/api/classification/odp_classification_test_pmr.c diff --git a/test/validation/classification/odp_classification_tests.c b/test/common_plat/validation/api/classification/odp_classification_tests.c similarity index 100% rename from test/validation/classification/odp_classification_tests.c rename to test/common_plat/validation/api/classification/odp_classification_tests.c diff --git a/test/validation/classification/odp_classification_testsuites.h b/test/common_plat/validation/api/classification/odp_classification_testsuites.h similarity index 100% rename from test/validation/classification/odp_classification_testsuites.h rename to test/common_plat/validation/api/classification/odp_classification_testsuites.h diff --git a/test/validation/cpumask/.gitignore b/test/common_plat/validation/api/cpumask/.gitignore similarity index 100% rename from test/validation/cpumask/.gitignore rename to test/common_plat/validation/api/cpumask/.gitignore diff --git a/test/validation/cpumask/Makefile.am b/test/common_plat/validation/api/cpumask/Makefile.am similarity index 100% rename from test/validation/cpumask/Makefile.am rename to test/common_plat/validation/api/cpumask/Makefile.am diff --git a/test/validation/cpumask/cpumask.c b/test/common_plat/validation/api/cpumask/cpumask.c similarity index 100% rename from test/validation/cpumask/cpumask.c rename to test/common_plat/validation/api/cpumask/cpumask.c diff --git a/test/validation/cpumask/cpumask.h b/test/common_plat/validation/api/cpumask/cpumask.h similarity index 100% rename from test/validation/cpumask/cpumask.h rename to test/common_plat/validation/api/cpumask/cpumask.h diff --git a/test/validation/cpumask/cpumask_main.c b/test/common_plat/validation/api/cpumask/cpumask_main.c similarity index 100% rename from test/validation/cpumask/cpumask_main.c rename to test/common_plat/validation/api/cpumask/cpumask_main.c diff --git a/test/validation/crypto/.gitignore b/test/common_plat/validation/api/crypto/.gitignore similarity index 100% rename from test/validation/crypto/.gitignore rename to test/common_plat/validation/api/crypto/.gitignore diff --git a/test/validation/crypto/Makefile.am b/test/common_plat/validation/api/crypto/Makefile.am similarity index 100% rename from test/validation/crypto/Makefile.am rename to test/common_plat/validation/api/crypto/Makefile.am diff --git a/test/validation/crypto/crypto.c b/test/common_plat/validation/api/crypto/crypto.c similarity index 100% rename from test/validation/crypto/crypto.c rename to test/common_plat/validation/api/crypto/crypto.c diff --git a/test/validation/crypto/crypto.h b/test/common_plat/validation/api/crypto/crypto.h similarity index 100% rename from test/validation/crypto/crypto.h rename to test/common_plat/validation/api/crypto/crypto.h diff --git a/test/validation/crypto/crypto_main.c b/test/common_plat/validation/api/crypto/crypto_main.c similarity index 100% rename from test/validation/crypto/crypto_main.c rename to test/common_plat/validation/api/crypto/crypto_main.c diff --git a/test/validation/crypto/odp_crypto_test_inp.c b/test/common_plat/validation/api/crypto/odp_crypto_test_inp.c similarity index 100% rename from test/validation/crypto/odp_crypto_test_inp.c rename to test/common_plat/validation/api/crypto/odp_crypto_test_inp.c diff --git a/test/validation/crypto/odp_crypto_test_inp.h b/test/common_plat/validation/api/crypto/odp_crypto_test_inp.h similarity index 100% rename from test/validation/crypto/odp_crypto_test_inp.h rename to test/common_plat/validation/api/crypto/odp_crypto_test_inp.h diff --git a/test/validation/crypto/test_vectors.h b/test/common_plat/validation/api/crypto/test_vectors.h similarity index 100% rename from test/validation/crypto/test_vectors.h rename to test/common_plat/validation/api/crypto/test_vectors.h diff --git a/test/validation/crypto/test_vectors_len.h b/test/common_plat/validation/api/crypto/test_vectors_len.h similarity index 100% rename from test/validation/crypto/test_vectors_len.h rename to test/common_plat/validation/api/crypto/test_vectors_len.h diff --git a/test/validation/errno/.gitignore b/test/common_plat/validation/api/errno/.gitignore similarity index 100% rename from test/validation/errno/.gitignore rename to test/common_plat/validation/api/errno/.gitignore diff --git a/test/validation/errno/Makefile.am b/test/common_plat/validation/api/errno/Makefile.am similarity index 100% rename from test/validation/errno/Makefile.am rename to test/common_plat/validation/api/errno/Makefile.am diff --git a/test/validation/errno/errno.c b/test/common_plat/validation/api/errno/errno.c similarity index 100% rename from test/validation/errno/errno.c rename to test/common_plat/validation/api/errno/errno.c diff --git a/test/validation/errno/errno.h b/test/common_plat/validation/api/errno/errno.h similarity index 100% rename from test/validation/errno/errno.h rename to test/common_plat/validation/api/errno/errno.h diff --git a/test/validation/errno/errno_main.c b/test/common_plat/validation/api/errno/errno_main.c similarity index 100% rename from test/validation/errno/errno_main.c rename to test/common_plat/validation/api/errno/errno_main.c diff --git a/test/validation/hash/.gitignore b/test/common_plat/validation/api/hash/.gitignore similarity index 100% rename from test/validation/hash/.gitignore rename to test/common_plat/validation/api/hash/.gitignore diff --git a/test/validation/hash/Makefile.am b/test/common_plat/validation/api/hash/Makefile.am similarity index 100% rename from test/validation/hash/Makefile.am rename to test/common_plat/validation/api/hash/Makefile.am diff --git a/test/validation/hash/hash.c b/test/common_plat/validation/api/hash/hash.c similarity index 100% rename from test/validation/hash/hash.c rename to test/common_plat/validation/api/hash/hash.c diff --git a/test/validation/hash/hash.h b/test/common_plat/validation/api/hash/hash.h similarity index 100% rename from test/validation/hash/hash.h rename to test/common_plat/validation/api/hash/hash.h diff --git a/test/validation/hash/hash_main.c b/test/common_plat/validation/api/hash/hash_main.c similarity index 100% rename from test/validation/hash/hash_main.c rename to test/common_plat/validation/api/hash/hash_main.c diff --git a/test/validation/init/.gitignore b/test/common_plat/validation/api/init/.gitignore similarity index 100% rename from test/validation/init/.gitignore rename to test/common_plat/validation/api/init/.gitignore diff --git a/test/validation/init/Makefile.am b/test/common_plat/validation/api/init/Makefile.am similarity index 100% rename from test/validation/init/Makefile.am rename to test/common_plat/validation/api/init/Makefile.am diff --git a/test/validation/init/init.c b/test/common_plat/validation/api/init/init.c similarity index 100% rename from test/validation/init/init.c rename to test/common_plat/validation/api/init/init.c diff --git a/test/validation/init/init.h b/test/common_plat/validation/api/init/init.h similarity index 100% rename from test/validation/init/init.h rename to test/common_plat/validation/api/init/init.h diff --git a/test/validation/init/init_main_abort.c b/test/common_plat/validation/api/init/init_main_abort.c similarity index 100% rename from test/validation/init/init_main_abort.c rename to test/common_plat/validation/api/init/init_main_abort.c diff --git a/test/validation/init/init_main_log.c b/test/common_plat/validation/api/init/init_main_log.c similarity index 100% rename from test/validation/init/init_main_log.c rename to test/common_plat/validation/api/init/init_main_log.c diff --git a/test/validation/init/init_main_ok.c b/test/common_plat/validation/api/init/init_main_ok.c similarity index 100% rename from test/validation/init/init_main_ok.c rename to test/common_plat/validation/api/init/init_main_ok.c diff --git a/test/validation/lock/.gitignore b/test/common_plat/validation/api/lock/.gitignore similarity index 100% rename from test/validation/lock/.gitignore rename to test/common_plat/validation/api/lock/.gitignore diff --git a/test/validation/lock/Makefile.am b/test/common_plat/validation/api/lock/Makefile.am similarity index 100% rename from test/validation/lock/Makefile.am rename to test/common_plat/validation/api/lock/Makefile.am diff --git a/test/validation/lock/lock.c b/test/common_plat/validation/api/lock/lock.c similarity index 100% rename from test/validation/lock/lock.c rename to test/common_plat/validation/api/lock/lock.c diff --git a/test/validation/lock/lock.h b/test/common_plat/validation/api/lock/lock.h similarity index 100% rename from test/validation/lock/lock.h rename to test/common_plat/validation/api/lock/lock.h diff --git a/test/validation/lock/lock_main.c b/test/common_plat/validation/api/lock/lock_main.c similarity index 100% rename from test/validation/lock/lock_main.c rename to test/common_plat/validation/api/lock/lock_main.c diff --git a/test/validation/packet/.gitignore b/test/common_plat/validation/api/packet/.gitignore similarity index 100% rename from test/validation/packet/.gitignore rename to test/common_plat/validation/api/packet/.gitignore diff --git a/test/validation/packet/Makefile.am b/test/common_plat/validation/api/packet/Makefile.am similarity index 100% rename from test/validation/packet/Makefile.am rename to test/common_plat/validation/api/packet/Makefile.am diff --git a/test/validation/packet/packet.c b/test/common_plat/validation/api/packet/packet.c similarity index 100% rename from test/validation/packet/packet.c rename to test/common_plat/validation/api/packet/packet.c diff --git a/test/validation/packet/packet.h b/test/common_plat/validation/api/packet/packet.h similarity index 100% rename from test/validation/packet/packet.h rename to test/common_plat/validation/api/packet/packet.h diff --git a/test/validation/packet/packet_main.c b/test/common_plat/validation/api/packet/packet_main.c similarity index 100% rename from test/validation/packet/packet_main.c rename to test/common_plat/validation/api/packet/packet_main.c diff --git a/test/validation/pktio/.gitignore b/test/common_plat/validation/api/pktio/.gitignore similarity index 100% rename from test/validation/pktio/.gitignore rename to test/common_plat/validation/api/pktio/.gitignore diff --git a/test/validation/pktio/Makefile.am b/test/common_plat/validation/api/pktio/Makefile.am similarity index 100% rename from test/validation/pktio/Makefile.am rename to test/common_plat/validation/api/pktio/Makefile.am diff --git a/test/validation/pktio/pktio.c b/test/common_plat/validation/api/pktio/pktio.c similarity index 100% rename from test/validation/pktio/pktio.c rename to test/common_plat/validation/api/pktio/pktio.c diff --git a/test/validation/pktio/pktio.h b/test/common_plat/validation/api/pktio/pktio.h similarity index 100% rename from test/validation/pktio/pktio.h rename to test/common_plat/validation/api/pktio/pktio.h diff --git a/test/validation/pktio/pktio_main.c b/test/common_plat/validation/api/pktio/pktio_main.c similarity index 100% rename from test/validation/pktio/pktio_main.c rename to test/common_plat/validation/api/pktio/pktio_main.c diff --git a/test/validation/pool/.gitignore b/test/common_plat/validation/api/pool/.gitignore similarity index 100% rename from test/validation/pool/.gitignore rename to test/common_plat/validation/api/pool/.gitignore diff --git a/test/validation/pool/Makefile.am b/test/common_plat/validation/api/pool/Makefile.am similarity index 100% rename from test/validation/pool/Makefile.am rename to test/common_plat/validation/api/pool/Makefile.am diff --git a/test/validation/pool/pool.c b/test/common_plat/validation/api/pool/pool.c similarity index 100% rename from test/validation/pool/pool.c rename to test/common_plat/validation/api/pool/pool.c diff --git a/test/validation/pool/pool.h b/test/common_plat/validation/api/pool/pool.h similarity index 100% rename from test/validation/pool/pool.h rename to test/common_plat/validation/api/pool/pool.h diff --git a/test/validation/pool/pool_main.c b/test/common_plat/validation/api/pool/pool_main.c similarity index 100% rename from test/validation/pool/pool_main.c rename to test/common_plat/validation/api/pool/pool_main.c diff --git a/test/validation/queue/.gitignore b/test/common_plat/validation/api/queue/.gitignore similarity index 100% rename from test/validation/queue/.gitignore rename to test/common_plat/validation/api/queue/.gitignore diff --git a/test/validation/queue/Makefile.am b/test/common_plat/validation/api/queue/Makefile.am similarity index 100% rename from test/validation/queue/Makefile.am rename to test/common_plat/validation/api/queue/Makefile.am diff --git a/test/validation/queue/queue.c b/test/common_plat/validation/api/queue/queue.c similarity index 100% rename from test/validation/queue/queue.c rename to test/common_plat/validation/api/queue/queue.c diff --git a/test/validation/queue/queue.h b/test/common_plat/validation/api/queue/queue.h similarity index 100% rename from test/validation/queue/queue.h rename to test/common_plat/validation/api/queue/queue.h diff --git a/test/validation/queue/queue_main.c b/test/common_plat/validation/api/queue/queue_main.c similarity index 100% rename from test/validation/queue/queue_main.c rename to test/common_plat/validation/api/queue/queue_main.c diff --git a/test/validation/random/.gitignore b/test/common_plat/validation/api/random/.gitignore similarity index 100% rename from test/validation/random/.gitignore rename to test/common_plat/validation/api/random/.gitignore diff --git a/test/validation/random/Makefile.am b/test/common_plat/validation/api/random/Makefile.am similarity index 100% rename from test/validation/random/Makefile.am rename to test/common_plat/validation/api/random/Makefile.am diff --git a/test/validation/random/random.c b/test/common_plat/validation/api/random/random.c similarity index 100% rename from test/validation/random/random.c rename to test/common_plat/validation/api/random/random.c diff --git a/test/validation/random/random.h b/test/common_plat/validation/api/random/random.h similarity index 100% rename from test/validation/random/random.h rename to test/common_plat/validation/api/random/random.h diff --git a/test/validation/random/random_main.c b/test/common_plat/validation/api/random/random_main.c similarity index 100% rename from test/validation/random/random_main.c rename to test/common_plat/validation/api/random/random_main.c diff --git a/test/validation/scheduler/.gitignore b/test/common_plat/validation/api/scheduler/.gitignore similarity index 100% rename from test/validation/scheduler/.gitignore rename to test/common_plat/validation/api/scheduler/.gitignore diff --git a/test/validation/scheduler/Makefile.am b/test/common_plat/validation/api/scheduler/Makefile.am similarity index 100% rename from test/validation/scheduler/Makefile.am rename to test/common_plat/validation/api/scheduler/Makefile.am diff --git a/test/validation/scheduler/scheduler.c b/test/common_plat/validation/api/scheduler/scheduler.c similarity index 100% rename from test/validation/scheduler/scheduler.c rename to test/common_plat/validation/api/scheduler/scheduler.c diff --git a/test/validation/scheduler/scheduler.h b/test/common_plat/validation/api/scheduler/scheduler.h similarity index 100% rename from test/validation/scheduler/scheduler.h rename to test/common_plat/validation/api/scheduler/scheduler.h diff --git a/test/validation/scheduler/scheduler_main.c b/test/common_plat/validation/api/scheduler/scheduler_main.c similarity index 100% rename from test/validation/scheduler/scheduler_main.c rename to test/common_plat/validation/api/scheduler/scheduler_main.c diff --git a/test/validation/shmem/.gitignore b/test/common_plat/validation/api/shmem/.gitignore similarity index 100% rename from test/validation/shmem/.gitignore rename to test/common_plat/validation/api/shmem/.gitignore diff --git a/test/validation/shmem/Makefile.am b/test/common_plat/validation/api/shmem/Makefile.am similarity index 100% rename from test/validation/shmem/Makefile.am rename to test/common_plat/validation/api/shmem/Makefile.am diff --git a/test/validation/shmem/shmem.c b/test/common_plat/validation/api/shmem/shmem.c similarity index 100% rename from test/validation/shmem/shmem.c rename to test/common_plat/validation/api/shmem/shmem.c diff --git a/test/validation/shmem/shmem.h b/test/common_plat/validation/api/shmem/shmem.h similarity index 100% rename from test/validation/shmem/shmem.h rename to test/common_plat/validation/api/shmem/shmem.h diff --git a/test/validation/shmem/shmem_main.c b/test/common_plat/validation/api/shmem/shmem_main.c similarity index 100% rename from test/validation/shmem/shmem_main.c rename to test/common_plat/validation/api/shmem/shmem_main.c diff --git a/test/validation/std_clib/.gitignore b/test/common_plat/validation/api/std_clib/.gitignore similarity index 100% rename from test/validation/std_clib/.gitignore rename to test/common_plat/validation/api/std_clib/.gitignore diff --git a/test/validation/std_clib/Makefile.am b/test/common_plat/validation/api/std_clib/Makefile.am similarity index 100% rename from test/validation/std_clib/Makefile.am rename to test/common_plat/validation/api/std_clib/Makefile.am diff --git a/test/validation/std_clib/std_clib.c b/test/common_plat/validation/api/std_clib/std_clib.c similarity index 100% rename from test/validation/std_clib/std_clib.c rename to test/common_plat/validation/api/std_clib/std_clib.c diff --git a/test/validation/std_clib/std_clib.h b/test/common_plat/validation/api/std_clib/std_clib.h similarity index 100% rename from test/validation/std_clib/std_clib.h rename to test/common_plat/validation/api/std_clib/std_clib.h diff --git a/test/validation/std_clib/std_clib_main.c b/test/common_plat/validation/api/std_clib/std_clib_main.c similarity index 100% rename from test/validation/std_clib/std_clib_main.c rename to test/common_plat/validation/api/std_clib/std_clib_main.c diff --git a/test/validation/system/.gitignore b/test/common_plat/validation/api/system/.gitignore similarity index 100% rename from test/validation/system/.gitignore rename to test/common_plat/validation/api/system/.gitignore diff --git a/test/validation/system/Makefile.am b/test/common_plat/validation/api/system/Makefile.am similarity index 100% rename from test/validation/system/Makefile.am rename to test/common_plat/validation/api/system/Makefile.am diff --git a/test/validation/system/system.c b/test/common_plat/validation/api/system/system.c similarity index 100% rename from test/validation/system/system.c rename to test/common_plat/validation/api/system/system.c diff --git a/test/validation/system/system.h b/test/common_plat/validation/api/system/system.h similarity index 100% rename from test/validation/system/system.h rename to test/common_plat/validation/api/system/system.h diff --git a/test/validation/system/system_main.c b/test/common_plat/validation/api/system/system_main.c similarity index 100% rename from test/validation/system/system_main.c rename to test/common_plat/validation/api/system/system_main.c diff --git a/test/validation/thread/.gitignore b/test/common_plat/validation/api/thread/.gitignore similarity index 100% rename from test/validation/thread/.gitignore rename to test/common_plat/validation/api/thread/.gitignore diff --git a/test/validation/thread/Makefile.am b/test/common_plat/validation/api/thread/Makefile.am similarity index 100% rename from test/validation/thread/Makefile.am rename to test/common_plat/validation/api/thread/Makefile.am diff --git a/test/validation/thread/thread.c b/test/common_plat/validation/api/thread/thread.c similarity index 100% rename from test/validation/thread/thread.c rename to test/common_plat/validation/api/thread/thread.c diff --git a/test/validation/thread/thread.h b/test/common_plat/validation/api/thread/thread.h similarity index 100% rename from test/validation/thread/thread.h rename to test/common_plat/validation/api/thread/thread.h diff --git a/test/validation/thread/thread_main.c b/test/common_plat/validation/api/thread/thread_main.c similarity index 100% rename from test/validation/thread/thread_main.c rename to test/common_plat/validation/api/thread/thread_main.c diff --git a/test/validation/time/.gitignore b/test/common_plat/validation/api/time/.gitignore similarity index 100% rename from test/validation/time/.gitignore rename to test/common_plat/validation/api/time/.gitignore diff --git a/test/validation/time/Makefile.am b/test/common_plat/validation/api/time/Makefile.am similarity index 100% rename from test/validation/time/Makefile.am rename to test/common_plat/validation/api/time/Makefile.am diff --git a/test/validation/time/time.c b/test/common_plat/validation/api/time/time.c similarity index 100% rename from test/validation/time/time.c rename to test/common_plat/validation/api/time/time.c diff --git a/test/validation/time/time.h b/test/common_plat/validation/api/time/time.h similarity index 100% rename from test/validation/time/time.h rename to test/common_plat/validation/api/time/time.h diff --git a/test/validation/time/time_main.c b/test/common_plat/validation/api/time/time_main.c similarity index 100% rename from test/validation/time/time_main.c rename to test/common_plat/validation/api/time/time_main.c diff --git a/test/validation/timer/.gitignore b/test/common_plat/validation/api/timer/.gitignore similarity index 100% rename from test/validation/timer/.gitignore rename to test/common_plat/validation/api/timer/.gitignore diff --git a/test/validation/timer/Makefile.am b/test/common_plat/validation/api/timer/Makefile.am similarity index 100% rename from test/validation/timer/Makefile.am rename to test/common_plat/validation/api/timer/Makefile.am diff --git a/test/validation/timer/timer.c b/test/common_plat/validation/api/timer/timer.c similarity index 100% rename from test/validation/timer/timer.c rename to test/common_plat/validation/api/timer/timer.c diff --git a/test/validation/timer/timer.h b/test/common_plat/validation/api/timer/timer.h similarity index 100% rename from test/validation/timer/timer.h rename to test/common_plat/validation/api/timer/timer.h diff --git a/test/validation/timer/timer_main.c b/test/common_plat/validation/api/timer/timer_main.c similarity index 100% rename from test/validation/timer/timer_main.c rename to test/common_plat/validation/api/timer/timer_main.c diff --git a/test/validation/traffic_mngr/.gitignore b/test/common_plat/validation/api/traffic_mngr/.gitignore similarity index 100% rename from test/validation/traffic_mngr/.gitignore rename to test/common_plat/validation/api/traffic_mngr/.gitignore diff --git a/test/validation/traffic_mngr/Makefile.am b/test/common_plat/validation/api/traffic_mngr/Makefile.am similarity index 100% rename from test/validation/traffic_mngr/Makefile.am rename to test/common_plat/validation/api/traffic_mngr/Makefile.am diff --git a/test/validation/traffic_mngr/traffic_mngr.c b/test/common_plat/validation/api/traffic_mngr/traffic_mngr.c similarity index 100% rename from test/validation/traffic_mngr/traffic_mngr.c rename to test/common_plat/validation/api/traffic_mngr/traffic_mngr.c diff --git a/test/validation/traffic_mngr/traffic_mngr.h b/test/common_plat/validation/api/traffic_mngr/traffic_mngr.h similarity index 100% rename from test/validation/traffic_mngr/traffic_mngr.h rename to test/common_plat/validation/api/traffic_mngr/traffic_mngr.h diff --git a/test/validation/traffic_mngr/traffic_mngr_main.c b/test/common_plat/validation/api/traffic_mngr/traffic_mngr_main.c similarity index 100% rename from test/validation/traffic_mngr/traffic_mngr_main.c rename to test/common_plat/validation/api/traffic_mngr/traffic_mngr_main.c diff --git a/test/m4/configure.m4 b/test/m4/configure.m4 index 5a74809..460e844 100644 --- a/test/m4/configure.m4 +++ b/test/m4/configure.m4 @@ -1,32 +1,3 @@ -m4_include([test/m4/miscellaneous.m4]) -m4_include([test/m4/performance.m4]) -m4_include([test/m4/validation.m4]) +m4_include([test/common_plat/m4/configure.m4]) -AC_CONFIG_FILES([test/Makefile - test/miscellaneous/Makefile - test/performance/Makefile - test/validation/atomic/Makefile - test/validation/barrier/Makefile - test/validation/buffer/Makefile - test/validation/classification/Makefile - test/validation/common/Makefile - test/validation/cpumask/Makefile - test/validation/crypto/Makefile - test/validation/errno/Makefile - test/validation/hash/Makefile - test/validation/init/Makefile - test/validation/lock/Makefile - test/validation/Makefile - test/validation/packet/Makefile - test/validation/pktio/Makefile - test/validation/pool/Makefile - test/validation/queue/Makefile - test/validation/random/Makefile - test/validation/scheduler/Makefile - test/validation/shmem/Makefile - test/validation/std_clib/Makefile - test/validation/system/Makefile - test/validation/thread/Makefile - test/validation/time/Makefile - test/validation/timer/Makefile - test/validation/traffic_mngr/Makefile]) +AC_CONFIG_FILES([test/Makefile]) diff --git a/test/platform/linux-generic/Makefile.am b/test/platform/linux-generic/Makefile.am index 2d58c57..83da140 100644 --- a/test/platform/linux-generic/Makefile.am +++ b/test/platform/linux-generic/Makefile.am @@ -1,39 +1,41 @@ include $(top_srcdir)/test/Makefile.inc -TESTS_ENVIRONMENT += TEST_DIR=${top_builddir}/test/validation +TESTS_ENVIRONMENT += TEST_DIR=${top_builddir}/test/common_plat/validation ODP_MODULES = pktio \ ring \ shmem +ALL_API_VALIDATION_DIR = ${top_builddir}/test/common_plat/validation/api + if test_vald TESTS = pktio/pktio_run.sh \ pktio/pktio_run_tap.sh \ ring/ring_main$(EXEEXT) \ shmem/shmem_linux \ - ${top_builddir}/test/validation/atomic/atomic_main$(EXEEXT) \ - ${top_builddir}/test/validation/barrier/barrier_main$(EXEEXT) \ - ${top_builddir}/test/validation/buffer/buffer_main$(EXEEXT) \ - ${top_builddir}/test/validation/classification/classification_main$(EXEEXT) \ - ${top_builddir}/test/validation/cpumask/cpumask_main$(EXEEXT) \ - ${top_builddir}/test/validation/crypto/crypto_main$(EXEEXT) \ - ${top_builddir}/test/validation/errno/errno_main$(EXEEXT) \ - ${top_builddir}/test/validation/hash/hash_main$(EXEEXT) \ - ${top_builddir}/test/validation/init/init_main_ok$(EXEEXT) \ - ${top_builddir}/test/validation/init/init_main_abort$(EXEEXT) \ - ${top_builddir}/test/validation/init/init_main_log$(EXEEXT) \ - ${top_builddir}/test/validation/lock/lock_main$(EXEEXT) \ - ${top_builddir}/test/validation/packet/packet_main$(EXEEXT) \ - ${top_builddir}/test/validation/pool/pool_main$(EXEEXT) \ - ${top_builddir}/test/validation/queue/queue_main$(EXEEXT) \ - ${top_builddir}/test/validation/random/random_main$(EXEEXT) \ - ${top_builddir}/test/validation/scheduler/scheduler_main$(EXEEXT) \ - ${top_builddir}/test/validation/std_clib/std_clib_main$(EXEEXT) \ - ${top_builddir}/test/validation/thread/thread_main$(EXEEXT) \ - ${top_builddir}/test/validation/time/time_main$(EXEEXT) \ - ${top_builddir}/test/validation/timer/timer_main$(EXEEXT) \ - ${top_builddir}/test/validation/traffic_mngr/traffic_mngr_main$(EXEEXT) \ - ${top_builddir}/test/validation/shmem/shmem_main$(EXEEXT) \ - ${top_builddir}/test/validation/system/system_main$(EXEEXT) + $(ALL_API_VALIDATION_DIR)/atomic/atomic_main$(EXEEXT) \ + $(ALL_API_VALIDATION_DIR)/barrier/barrier_main$(EXEEXT) \ + $(ALL_API_VALIDATION_DIR)/buffer/buffer_main$(EXEEXT) \ + $(ALL_API_VALIDATION_DIR)/classification/classification_main$(EXEEXT) \ + $(ALL_API_VALIDATION_DIR)/cpumask/cpumask_main$(EXEEXT) \ + $(ALL_API_VALIDATION_DIR)/crypto/crypto_main$(EXEEXT) \ + $(ALL_API_VALIDATION_DIR)/errno/errno_main$(EXEEXT) \ + $(ALL_API_VALIDATION_DIR)/hash/hash_main$(EXEEXT) \ + $(ALL_API_VALIDATION_DIR)/init/init_main_ok$(EXEEXT) \ + $(ALL_API_VALIDATION_DIR)/init/init_main_abort$(EXEEXT) \ + $(ALL_API_VALIDATION_DIR)/init/init_main_log$(EXEEXT) \ + $(ALL_API_VALIDATION_DIR)/lock/lock_main$(EXEEXT) \ + $(ALL_API_VALIDATION_DIR)/packet/packet_main$(EXEEXT) \ + $(ALL_API_VALIDATION_DIR)/pool/pool_main$(EXEEXT) \ + $(ALL_API_VALIDATION_DIR)/queue/queue_main$(EXEEXT) \ + $(ALL_API_VALIDATION_DIR)/random/random_main$(EXEEXT) \ + $(ALL_API_VALIDATION_DIR)/scheduler/scheduler_main$(EXEEXT) \ + $(ALL_API_VALIDATION_DIR)/std_clib/std_clib_main$(EXEEXT) \ + $(ALL_API_VALIDATION_DIR)/thread/thread_main$(EXEEXT) \ + $(ALL_API_VALIDATION_DIR)/time/time_main$(EXEEXT) \ + $(ALL_API_VALIDATION_DIR)/timer/timer_main$(EXEEXT) \ + $(ALL_API_VALIDATION_DIR)/traffic_mngr/traffic_mngr_main$(EXEEXT) \ + $(ALL_API_VALIDATION_DIR)/shmem/shmem_main$(EXEEXT) \ + $(ALL_API_VALIDATION_DIR)/system/system_main$(EXEEXT) SUBDIRS = $(ODP_MODULES) diff --git a/test/platform/linux-generic/Makefile.inc b/test/platform/linux-generic/Makefile.inc index 80b66ae..b26324f 100644 --- a/test/platform/linux-generic/Makefile.inc +++ b/test/platform/linux-generic/Makefile.inc @@ -4,11 +4,11 @@ AM_LDFLAGS += -static -LIBCUNIT_COMMON = $(top_builddir)/test/validation/common/libcunit_common.la +LIBCUNIT_COMMON = $(top_builddir)/test/common_plat/common/libcunit_common.la LIB = $(top_builddir)/lib LIBODP = $(LIB)/libodphelper-linux.la $(LIB)/libodp-linux.la -INCCUNIT_COMMON = -I$(top_srcdir)/test/validation/common +INCCUNIT_COMMON = -I$(top_srcdir)/test/common_plat/common INCODP = -I$(top_srcdir)/test \ -I$(top_srcdir)/platform/@with_platform@/include \ -I$(top_srcdir)/platform/@with_platform@/arch/$(ARCH_DIR) \ diff --git a/test/platform/linux-generic/pktio/pktio_run.sh b/test/platform/linux-generic/pktio/pktio_run.sh index 1dc1f44..0905b8b 100755 --- a/test/platform/linux-generic/pktio/pktio_run.sh +++ b/test/platform/linux-generic/pktio/pktio_run.sh @@ -21,9 +21,9 @@ # -in the validation when running standalone (./pktio_run) intree. # -in the current directory. # running stand alone out of tree requires setting PATH -PATH=${TEST_DIR}/pktio:$PATH +PATH=${TEST_DIR}/api/pktio:$PATH PATH=$(dirname $0):$PATH -PATH=$(dirname $0)/../../../../test/validation/pktio:$PATH +PATH=$(dirname $0)/../../../../test/validation/api/pktio:$PATH PATH=.:$PATH pktio_main_path=$(which pktio_main${EXEEXT}) diff --git a/test/platform/linux-generic/pktio/pktio_run_dpdk.sh b/test/platform/linux-generic/pktio/pktio_run_dpdk.sh index fd552c6..4d16b29 100755 --- a/test/platform/linux-generic/pktio/pktio_run_dpdk.sh +++ b/test/platform/linux-generic/pktio/pktio_run_dpdk.sh @@ -21,9 +21,9 @@ # -in the validation when running standalone (./pktio_run) intree. # -in the current directory. # running stand alone out of tree requires setting PATH -PATH=${TEST_DIR}/pktio:$PATH +PATH=${TEST_DIR}/api/pktio:$PATH PATH=$(dirname $0):$PATH -PATH=$(dirname $0)/../../../../test/validation/pktio:$PATH +PATH=$(dirname $0)/../../../../test/validation/api/pktio:$PATH PATH=.:$PATH pktio_main_path=$(which pktio_main${EXEEXT}) diff --git a/test/platform/linux-generic/pktio/pktio_run_netmap.sh b/test/platform/linux-generic/pktio/pktio_run_netmap.sh index b651ea3..6fd271b 100755 --- a/test/platform/linux-generic/pktio/pktio_run_netmap.sh +++ b/test/platform/linux-generic/pktio/pktio_run_netmap.sh @@ -15,9 +15,9 @@ # -in the validation when running standalone (./pktio_run) intree. # -in the current directory. # running stand alone out of tree requires setting PATH -PATH=${TEST_DIR}/pktio:$PATH +PATH=${TEST_DIR}/api/pktio:$PATH PATH=$(dirname $0):$PATH -PATH=$(dirname $0)/../../../../test/validation/pktio:$PATH +PATH=$(dirname $0)/../../../../test/validation/api/pktio:$PATH PATH=.:$PATH pktio_main_path=$(which pktio_main${EXEEXT}) diff --git a/test/platform/linux-generic/pktio/pktio_run_pcap.sh b/test/platform/linux-generic/pktio/pktio_run_pcap.sh index 51716fb..721141a 100755 --- a/test/platform/linux-generic/pktio/pktio_run_pcap.sh +++ b/test/platform/linux-generic/pktio/pktio_run_pcap.sh @@ -15,9 +15,9 @@ # -in the validation when running standalone intree. # -in the current directory. # running stand alone out of tree requires setting PATH -PATH=${TEST_DIR}/pktio:$PATH +PATH=${TEST_DIR}/api/pktio:$PATH PATH=$(dirname $0):$PATH -PATH=$(dirname $0)/../../../../test/validation/pktio:$PATH +PATH=$(dirname $0)/../../../../test/validation/api/pktio:$PATH PATH=.:$PATH pktio_main_path=$(which pktio_main${EXEEXT}) diff --git a/test/platform/linux-generic/pktio/pktio_run_tap.sh b/test/platform/linux-generic/pktio/pktio_run_tap.sh index 1150158..96f6d5a 100755 --- a/test/platform/linux-generic/pktio/pktio_run_tap.sh +++ b/test/platform/linux-generic/pktio/pktio_run_tap.sh @@ -16,9 +16,9 @@ # -in the validation when running standalone intree. # -in the current directory. # running stand alone out of tree requires setting PATH -PATH=${TEST_DIR}/pktio:$PATH +PATH=${TEST_DIR}/api/pktio:$PATH PATH=$(dirname $0):$PATH -PATH=$(dirname $0)/../../../../test/validation/pktio:$PATH +PATH=$(dirname $0)/../../../../test/validation/api/pktio:$PATH PATH=.:$PATH pktio_main_path=$(which pktio_main${EXEEXT}) commit c79b041f389e56a2c713a507b75762e08d75e4b4 Author: Christophe Milard <christophe.milard(a)linaro.org> Date: Wed Jul 13 21:50:40 2016 +0200 validation: diverse cosmetic fixes for checkpatch To reduce the number of issues picked up by check-odp when moving the files in next patch Signed-off-by: Christophe Milard <christophe.milard(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-and-tested-by: Yi He <yi.he(a)linaro.org> Reviewed-by: Mike Holmes <mike.holmes(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/performance/odp_crypto.c b/test/performance/odp_crypto.c index b7818ea..49a9f4b 100644 --- a/test/performance/odp_crypto.c +++ b/test/performance/odp_crypto.c @@ -552,11 +552,9 @@ run_measure_one(crypto_args_t *cargs, if (newpkt == ODP_PACKET_INVALID) { app_err("failed to allocate buffer\n"); return -1; - } else { - void *mem = odp_packet_data(pkt); - - memset(mem, 1, payload_length); } + mem = odp_packet_data(newpkt); + memset(mem, 1, payload_length); params.pkt = newpkt; params.out_pkt = cargs->in_place ? newpkt : ODP_PACKET_INVALID; diff --git a/test/performance/odp_l2fwd.c b/test/performance/odp_l2fwd.c index f05aa30..418382d 100644 --- a/test/performance/odp_l2fwd.c +++ b/test/performance/odp_l2fwd.c @@ -80,7 +80,6 @@ static inline int sched_mode(pktin_mode_t in_mode) (in_mode == SCHED_ORDERED); } - /** Get rid of path in filename - only for unix-type paths using '/' */ #define NO_PATH(file_name) (strrchr((file_name), '/') ? \ strrchr((file_name), '/') + 1 : (file_name)) diff --git a/test/performance/odp_l2fwd_run.sh b/test/performance/odp_l2fwd_run.sh index fc3d05d..1fff087 100755 --- a/test/performance/odp_l2fwd_run.sh +++ b/test/performance/odp_l2fwd_run.sh @@ -65,7 +65,8 @@ run_l2fwd() #@todo: limit odp_generator to cores #https://bugs.linaro.org/show_bug.cgi?id=1398 (odp_generator${EXEEXT} -I $IF0 \ - --srcip 192.168.0.1 --dstip 192.168.0.2 -m u 2>&1 > /dev/null) \ + --srcip 192.168.0.1 --dstip 192.168.0.2 \ + -m u 2>&1 > /dev/null) \ 2>&1 > /dev/null & GEN_PID=$! diff --git a/test/performance/odp_pktio_perf.c b/test/performance/odp_pktio_perf.c index 18a1aa2..f041b13 100644 --- a/test/performance/odp_pktio_perf.c +++ b/test/performance/odp_pktio_perf.c @@ -255,7 +255,6 @@ static int pktio_pkt_has_magic(odp_packet_t pkt) return 0; } - /* * Allocate packets for transmission. */ @@ -375,8 +374,8 @@ static int run_thread_tx(void *arg) cur_time = odp_time_local(); } - VPRINT(" %02d: TxPkts %-8"PRIu64" EnqFail %-6"PRIu64 - " AllocFail %-6"PRIu64" Idle %"PRIu64"ms\n", + VPRINT(" %02d: TxPkts %-8" PRIu64 " EnqFail %-6" PRIu64 + " AllocFail %-6" PRIu64 " Idle %" PRIu64 "ms\n", thr_id, stats->s.tx_cnt, stats->s.enq_failures, stats->s.alloc_failures, odp_time_to_ns(stats->s.idle_ticks) / @@ -417,6 +416,7 @@ static int run_thread_rx(void *arg) test_globals_t *globals; int thr_id, batch_len; odp_queue_t queue = ODP_QUEUE_INVALID; + odp_packet_t pkt; thread_args_t *targs = arg; @@ -445,7 +445,7 @@ static int run_thread_rx(void *arg) for (i = 0; i < n_ev; ++i) { if (odp_event_type(ev[i]) == ODP_EVENT_PACKET) { - odp_packet_t pkt = odp_packet_from_event(ev[i]); + pkt = odp_packet_from_event(ev[i]); if (pktio_pkt_has_magic(pkt)) stats->s.rx_cnt++; else @@ -498,16 +498,16 @@ static int process_results(uint64_t expected_tx_cnt, attempted_pps = status->pps_curr; - len += snprintf(&str[len], sizeof(str)-1-len, - "PPS: %-8"PRIu64" ", attempted_pps); - len += snprintf(&str[len], sizeof(str)-1-len, + len += snprintf(&str[len], sizeof(str) - 1 - len, + "PPS: %-8" PRIu64 " ", attempted_pps); + len += snprintf(&str[len], sizeof(str) - 1 - len, "Succeeded: %-4s ", fail ? "No" : "Yes"); - len += snprintf(&str[len], sizeof(str)-1-len, - "TxPkts: %-8"PRIu64" ", tx_pkts); - len += snprintf(&str[len], sizeof(str)-1-len, - "RxPkts: %-8"PRIu64" ", rx_pkts); - len += snprintf(&str[len], sizeof(str)-1-len, - "DropPkts: %-8"PRIu64" ", drops); + len += snprintf(&str[len], sizeof(str) - 1 - len, + "TxPkts: %-8" PRIu64 " ", tx_pkts); + len += snprintf(&str[len], sizeof(str) - 1 - len, + "RxPkts: %-8" PRIu64 " ", rx_pkts); + len += snprintf(&str[len], sizeof(str) - 1 - len, + "DropPkts: %-8" PRIu64 " ", drops); printf("%s\n", str); if (gbl_args->args.search == 0) { @@ -537,7 +537,7 @@ static int process_results(uint64_t expected_tx_cnt, unsigned pkt_len = gbl_args->args.pkt_len + PKT_HDR_LEN; int mbps = (pkt_len * status->pps_pass * 8) / 1024 / 1024; - printf("Maximum packet rate: %"PRIu64" PPS (%d Mbps)\n", + printf("Maximum packet rate: %" PRIu64 " PPS (%d Mbps)\n", status->pps_pass, mbps); return 0; @@ -587,8 +587,8 @@ static int setup_txrx_masks(odp_cpumask_t *thd_mask_tx, num_rx_workers = odp_cpumask_count(thd_mask_rx); - odp_barrier_init(&gbl_args->rx_barrier, num_rx_workers+1); - odp_barrier_init(&gbl_args->tx_barrier, num_tx_workers+1); + odp_barrier_init(&gbl_args->rx_barrier, num_rx_workers + 1); + odp_barrier_init(&gbl_args->tx_barrier, num_tx_workers + 1); return 0; } @@ -978,7 +978,7 @@ static void parse_args(int argc, char *argv[], test_args_t *args) { char *token; - args->if_str = malloc(strlen(optarg)+1); + args->if_str = malloc(strlen(optarg) + 1); if (!args->if_str) LOG_ABORT("Failed to alloc iface storage\n"); diff --git a/test/performance/odp_scheduling.c b/test/performance/odp_scheduling.c index bd37f9b..5a2997f 100644 --- a/test/performance/odp_scheduling.c +++ b/test/performance/odp_scheduling.c @@ -28,12 +28,12 @@ /* GNU lib C */ #include <getopt.h> -#define MSG_POOL_SIZE (4*1024*1024) /**< Message pool size */ +#define MSG_POOL_SIZE (4 * 1024 * 1024) /**< Message pool size */ #define MAX_ALLOCS 35 /**< Alloc burst size */ #define QUEUES_PER_PRIO 64 /**< Queue per priority */ #define NUM_PRIOS 2 /**< Number of tested priorities */ -#define QUEUE_ROUNDS (512*1024) /**< Queue test rounds */ -#define ALLOC_ROUNDS (1024*1024) /**< Alloc test rounds */ +#define QUEUE_ROUNDS (512 * 1024) /**< Queue test rounds */ +#define ALLOC_ROUNDS (1024 * 1024) /**< Alloc test rounds */ #define MULTI_BUFS_MAX 4 /**< Buffer burst size */ #define TEST_SEC 2 /**< Time test duration in sec */ #define STATS_PER_LINE 8 /**< Stats per printed line */ @@ -163,7 +163,6 @@ static int enqueue_events(int thr, int prio, int num_queues, int num_events, return 0; } - /** * @internal Test single buffer alloc and free * @@ -228,7 +227,7 @@ static int test_alloc_multi(int thr, test_globals_t *globals) } for (; j > 0; j--) - odp_buffer_free(temp_buf[j-1]); + odp_buffer_free(temp_buf[j - 1]); } c2 = odp_cpu_cycles(); @@ -385,7 +384,6 @@ static int test_schedule_single(const char *str, int thr, return 0; } - /** * @internal Test scheduling of multiple queues - with odp_schedule() * @@ -533,7 +531,6 @@ static int test_schedule_multi(const char *str, int thr, odp_schedule_resume(); - c2 = odp_cpu_cycles(); cycles = odp_cpu_cycles_diff(c2, c1); @@ -655,7 +652,6 @@ static int run_thread(void *arg ODP_UNUSED) ODP_SCHED_PRIO_HIGHEST, globals)) return -1; - printf("Thread %i exits\n", thr); fflush(NULL); return 0; @@ -768,7 +764,6 @@ static void parse_args(int argc, char *argv[], test_args_t *args) } } - /** * Test main function */ @@ -857,7 +852,7 @@ int main(int argc, char *argv[]) odp_pool_param_init(&params); params.buf.size = sizeof(test_message_t); params.buf.align = 0; - params.buf.num = MSG_POOL_SIZE/sizeof(test_message_t); + params.buf.num = MSG_POOL_SIZE / sizeof(test_message_t); params.type = ODP_POOL_BUFFER; pool = odp_pool_create("msg_pool", &params); @@ -905,8 +900,8 @@ int main(int argc, char *argv[]) param.sched.group = ODP_SCHED_GROUP_ALL; for (j = 0; j < QUEUES_PER_PRIO; j++) { - name[9] = '0' + j/10; - name[10] = '0' + j - 10*(j/10); + name[9] = '0' + j / 10; + name[10] = '0' + j - 10 * (j / 10); queue = odp_queue_create(name, &param); diff --git a/test/validation/classification/odp_classification_test_pmr.c b/test/validation/classification/odp_classification_test_pmr.c index 7c7d07e..c8bbf50 100644 --- a/test/validation/classification/odp_classification_test_pmr.c +++ b/test/validation/classification/odp_classification_test_pmr.c @@ -70,7 +70,6 @@ void configure_default_cos(odp_pktio_t pktio, odp_cos_t *cos, *cos = default_cos; *queue = default_queue; *pool = default_pool; - return; } int classification_suite_pmr_term(void) diff --git a/test/validation/crypto/odp_crypto_test_inp.c b/test/validation/crypto/odp_crypto_test_inp.c index 0c5b110..4ac4a07 100644 --- a/test/validation/crypto/odp_crypto_test_inp.c +++ b/test/validation/crypto/odp_crypto_test_inp.c @@ -53,6 +53,10 @@ static void alg_test(odp_crypto_op_t op, odp_event_t event; odp_crypto_compl_t compl_event; odp_crypto_op_result_t result; + odp_crypto_session_params_t ses_params; + odp_crypto_op_params_t op_params; + uint8_t *data_addr; + int data_off; rc = odp_crypto_capability(&capability); CU_ASSERT(!rc); @@ -100,7 +104,6 @@ static void alg_test(odp_crypto_op_t op, CU_ASSERT(!rc); /* Create a crypto session */ - odp_crypto_session_params_t ses_params; memset(&ses_params, 0, sizeof(ses_params)); ses_params.op = op; ses_params.auth_cipher_text = false; @@ -123,12 +126,11 @@ static void alg_test(odp_crypto_op_t op, odp_packet_t pkt = odp_packet_alloc(suite_context.pool, plaintext_len + digest_len); CU_ASSERT(pkt != ODP_PACKET_INVALID); - uint8_t *data_addr = odp_packet_data(pkt); + data_addr = odp_packet_data(pkt); memcpy(data_addr, plaintext, plaintext_len); - int data_off = 0; + data_off = 0; /* Prepare input/output params */ - odp_crypto_op_params_t op_params; memset(&op_params, 0, sizeof(op_params)); op_params.session = session; op_params.pkt = pkt; @@ -199,10 +201,10 @@ void crypto_test_enc_alg_3des_cbc(void) odp_crypto_key_t cipher_key = { .data = NULL, .length = 0 }, auth_key = { .data = NULL, .length = 0 }; odp_crypto_iv_t iv; - unsigned int test_vec_num = (sizeof(tdes_cbc_reference_length)/ + unsigned int test_vec_num = (sizeof(tdes_cbc_reference_length) / sizeof(tdes_cbc_reference_length[0])); - unsigned int i; + for (i = 0; i < test_vec_num; i++) { cipher_key.data = tdes_cbc_reference_key[i]; cipher_key.length = sizeof(tdes_cbc_reference_key[i]); @@ -232,10 +234,10 @@ void crypto_test_enc_alg_3des_cbc_ovr_iv(void) odp_crypto_key_t cipher_key = { .data = NULL, .length = 0 }, auth_key = { .data = NULL, .length = 0 }; odp_crypto_iv_t iv = { .data = NULL, .length = TDES_CBC_IV_LEN }; - unsigned int test_vec_num = (sizeof(tdes_cbc_reference_length)/ + unsigned int test_vec_num = (sizeof(tdes_cbc_reference_length) / sizeof(tdes_cbc_reference_length[0])); - unsigned int i; + for (i = 0; i < test_vec_num; i++) { cipher_key.data = tdes_cbc_reference_key[i]; cipher_key.length = sizeof(tdes_cbc_reference_key[i]); @@ -255,7 +257,6 @@ void crypto_test_enc_alg_3des_cbc_ovr_iv(void) } } - /* This test verifies the correctness of decode (ciphertext -> plaintext) * operation for 3DES_CBC algorithm. IV for the operation is the session IV * In addition the test verifies if the implementation can use the @@ -266,10 +267,10 @@ void crypto_test_dec_alg_3des_cbc(void) odp_crypto_key_t cipher_key = { .data = NULL, .length = 0 }, auth_key = { .data = NULL, .length = 0 }; odp_crypto_iv_t iv = { .data = NULL, .length = 0 }; - unsigned int test_vec_num = (sizeof(tdes_cbc_reference_length)/ + unsigned int test_vec_num = (sizeof(tdes_cbc_reference_length) / sizeof(tdes_cbc_reference_length[0])); - unsigned int i; + for (i = 0; i < test_vec_num; i++) { cipher_key.data = tdes_cbc_reference_key[i]; cipher_key.length = sizeof(tdes_cbc_reference_key[i]); @@ -301,10 +302,10 @@ void crypto_test_dec_alg_3des_cbc_ovr_iv(void) odp_crypto_key_t cipher_key = { .data = NULL, .length = 0 }, auth_key = { .data = NULL, .length = 0 }; odp_crypto_iv_t iv = { .data = NULL, .length = TDES_CBC_IV_LEN }; - unsigned int test_vec_num = (sizeof(tdes_cbc_reference_length)/ + unsigned int test_vec_num = (sizeof(tdes_cbc_reference_length) / sizeof(tdes_cbc_reference_length[0])); - unsigned int i; + for (i = 0; i < test_vec_num; i++) { cipher_key.data = tdes_cbc_reference_key[i]; cipher_key.length = sizeof(tdes_cbc_reference_key[i]); @@ -607,7 +608,6 @@ void crypto_test_dec_alg_aes128_cbc_ovr_iv(void) } } - /* This test verifies the correctness of HMAC_MD5 digest operation. * The output check length is truncated to 12 bytes (96 bits) as * returned by the crypto operation API call. @@ -621,10 +621,10 @@ void crypto_test_alg_hmac_md5(void) auth_key = { .data = NULL, .length = 0 }; odp_crypto_iv_t iv = { .data = NULL, .length = 0 }; - unsigned int test_vec_num = (sizeof(hmac_md5_reference_length)/ + unsigned int test_vec_num = (sizeof(hmac_md5_reference_length) / sizeof(hmac_md5_reference_length[0])); - unsigned int i; + for (i = 0; i < test_vec_num; i++) { auth_key.data = hmac_md5_reference_key[i]; auth_key.length = sizeof(hmac_md5_reference_key[i]); diff --git a/test/validation/crypto/test_vectors.h b/test/validation/crypto/test_vectors.h index 1b760a2..da4610f 100644 --- a/test/validation/crypto/test_vectors.h +++ b/test/validation/crypto/test_vectors.h @@ -266,7 +266,7 @@ aes128_gcm_reference_ciphertext[][AES128_GCM_MAX_DATA_LEN] = { static uint8_t hmac_md5_reference_key[][HMAC_MD5_KEY_LEN] = { { 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, - 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b } , + 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b }, /* "Jefe" */ { 0x4a, 0x65, 0x66, 0x65 }, diff --git a/test/validation/hash/hash.c b/test/validation/hash/hash.c index feaa6ae..b353fce 100644 --- a/test/validation/hash/hash.c +++ b/test/validation/hash/hash.c @@ -51,5 +51,4 @@ int hash_main(int argc, char *argv[]) ret = odp_cunit_run(); return ret; - } diff --git a/test/validation/pktio/pktio.c b/test/validation/pktio/pktio.c index d53a419..a6a18c3 100644 --- a/test/validation/pktio/pktio.c +++ b/test/validation/pktio/pktio.c @@ -1547,7 +1547,6 @@ void pktio_test_start_stop(void) /* Test Rx on a stopped interface. Only works if there are 2 */ if (num_ifaces > 1) { - alloc = create_packets(tx_pkt, pkt_seq, 1000, pktio[0], pktio[1]); @@ -1591,7 +1590,6 @@ void pktio_test_start_stop(void) } } - if (num_ifaces > 1) pktio_in = pktio[1]; else diff --git a/test/validation/queue/queue.c b/test/validation/queue/queue.c index 96941f4..dc3a977 100644 --- a/test/validation/queue/queue.c +++ b/test/validation/queue/queue.c @@ -148,6 +148,7 @@ void queue_test_param(void) int nr_deq_entries = 0; int max_iteration = CONFIG_MAX_ITERATION; odp_queue_param_t qparams; + odp_buffer_t enbuf; /* Schedule type queue */ odp_queue_param_init(&qparams); @@ -197,7 +198,7 @@ void queue_test_param(void) } for (i = 0; i < MAX_BUFFER_QUEUE; i++) { - odp_buffer_t buf = odp_buffer_alloc(msg_pool); + buf = odp_buffer_alloc(msg_pool); enev[i] = odp_buffer_to_event(buf); } @@ -223,7 +224,7 @@ void queue_test_param(void) } while (nr_deq_entries < MAX_BUFFER_QUEUE); for (i = 0; i < MAX_BUFFER_QUEUE; i++) { - odp_buffer_t enbuf = odp_buffer_from_event(enev[i]); + enbuf = odp_buffer_from_event(enev[i]); CU_ASSERT(enev[i] == deev[i]); odp_buffer_free(enbuf); } @@ -283,7 +284,7 @@ void queue_test_info(void) CU_ASSERT(info.param.sched.group == odp_queue_sched_group(q_order)); ret = odp_queue_lock_count(q_order); CU_ASSERT(ret >= 0); - lock_count = (unsigned) ret; + lock_count = (unsigned)ret; CU_ASSERT(info.param.sched.lock_count == lock_count); CU_ASSERT(odp_queue_destroy(q_plain) == 0); diff --git a/test/validation/scheduler/scheduler.c b/test/validation/scheduler/scheduler.c index 316370d..919cfb6 100644 --- a/test/validation/scheduler/scheduler.c +++ b/test/validation/scheduler/scheduler.c @@ -676,6 +676,9 @@ static int schedule_common_(void *arg) odp_pool_t pool; int locked; int num; + odp_event_t ev; + odp_buffer_t buf, buf_cpy; + odp_queue_t from; globals = args->globals; sync = args->sync; @@ -687,9 +690,7 @@ static int schedule_common_(void *arg) odp_barrier_wait(&globals->barrier); while (1) { - odp_event_t ev; - odp_buffer_t buf, buf_cpy; - odp_queue_t from = ODP_QUEUE_INVALID; + from = ODP_QUEUE_INVALID; num = 0; odp_ticketlock_lock(&globals->lock); @@ -902,6 +903,8 @@ static void fill_queues(thread_args_t *args) test_globals_t *globals; char name[32]; int ret; + odp_buffer_t buf; + odp_event_t ev; globals = args->globals; sync = args->sync; @@ -937,8 +940,6 @@ static void fill_queues(thread_args_t *args) CU_ASSERT_FATAL(queue != ODP_QUEUE_INVALID); for (k = 0; k < args->num_bufs; k++) { - odp_buffer_t buf; - odp_event_t ev; buf = odp_buffer_alloc(pool); CU_ASSERT_FATAL(buf != ODP_BUFFER_INVALID); ev = odp_buffer_to_event(buf); @@ -1332,6 +1333,7 @@ static int create_queues(void) odp_buffer_t queue_ctx_buf; queue_context *qctx, *pqctx; uint32_t ndx; + odp_queue_param_t p; if (odp_queue_capability(&capa) < 0) { printf("Queue capability query failed\n"); @@ -1359,7 +1361,6 @@ static int create_queues(void) } for (i = 0; i < prios; i++) { - odp_queue_param_t p; odp_queue_param_init(&p); p.type = ODP_QUEUE_TYPE_SCHED; p.sched.prio = i; diff --git a/test/validation/timer/timer.c b/test/validation/timer/timer.c index 33eb478..0007639 100644 --- a/test/validation/timer/timer.c +++ b/test/validation/timer/timer.c @@ -251,7 +251,8 @@ static void handle_tmo(odp_event_t ev, bool stale, uint64_t prev_tick) CU_FAIL("Wrong status (stale) for fresh timeout"); /* Fresh timeout => local timer must have matching tick */ if (ttp && ttp->tick != tick) { - LOG_DBG("Wrong tick: expected %" PRIu64 " actual %" PRIu64 "\n", + LOG_DBG("Wrong tick: expected %" PRIu64 + " actual %" PRIu64 "\n", ttp->tick, tick); CU_FAIL("odp_timeout_tick() wrong tick"); } @@ -259,7 +260,8 @@ static void handle_tmo(odp_event_t ev, bool stale, uint64_t prev_tick) if (tick > odp_timer_current_tick(tp)) CU_FAIL("Timeout delivered early"); if (tick < prev_tick) { - LOG_DBG("Too late tick: %" PRIu64 " prev_tick %" PRIu64"\n", + LOG_DBG("Too late tick: %" PRIu64 + " prev_tick %" PRIu64"\n", tick, prev_tick); /* We don't report late timeouts using CU_FAIL */ odp_atomic_inc_u32(&ndelivtoolate); @@ -281,12 +283,26 @@ static int worker_entrypoint(void *arg TEST_UNUSED) uint32_t i, allocated; unsigned seed = thr; int rc; + odp_queue_t queue; + struct test_timer *tt; + uint32_t nset; + uint64_t tck; + uint32_t nrcv; + uint32_t nreset; + uint32_t ncancel; + uint32_t ntoolate; + uint32_t ms; + uint64_t prev_tick; + odp_event_t ev; + struct timespec ts; + uint32_t nstale; + odp_timer_set_t timer_rc; - odp_queue_t queue = odp_queue_create("timer_queue", NULL); + queue = odp_queue_create("timer_queue", NULL); if (queue == ODP_QUEUE_INVALID) CU_FAIL_FATAL("Queue create failed"); - struct test_timer *tt = malloc(sizeof(struct test_timer) * NTIMERS); + tt = malloc(sizeof(struct test_timer) * NTIMERS); if (!tt) CU_FAIL_FATAL("malloc failed"); @@ -316,15 +332,13 @@ static int worker_entrypoint(void *arg TEST_UNUSED) odp_barrier_wait(&test_barrier); /* Initial set all timers with a random expiration time */ - uint32_t nset = 0; + nset = 0; for (i = 0; i < allocated; i++) { - uint64_t tck = odp_timer_current_tick(tp) + 1 + - odp_timer_ns_to_tick(tp, - (rand_r(&seed) % RANGE_MS) - * 1000000ULL); - odp_timer_set_t rc; - rc = odp_timer_set_abs(tt[i].tim, tck, &tt[i].ev); - if (rc != ODP_TIMER_SUCCESS) { + tck = odp_timer_current_tick(tp) + 1 + + odp_timer_ns_to_tick(tp, (rand_r(&seed) % RANGE_MS) + * 1000000ULL); + timer_rc = odp_timer_set_abs(tt[i].tim, tck, &tt[i].ev); + if (timer_rc != ODP_TIMER_SUCCESS) { CU_FAIL("Failed to set timer"); } else { tt[i].tick = tck; @@ -333,15 +347,13 @@ static int worker_entrypoint(void *arg TEST_UNUSED) } /* Step through wall time, 1ms at a time and check for expired timers */ - uint32_t nrcv = 0; - uint32_t nreset = 0; - uint32_t ncancel = 0; - uint32_t ntoolate = 0; - uint32_t ms; - uint64_t prev_tick = odp_timer_current_tick(tp); + nrcv = 0; + nreset = 0; + ncancel = 0; + ntoolate = 0; + prev_tick = odp_timer_current_tick(tp); for (ms = 0; ms < 7 * RANGE_MS / 10 && allocated > 0; ms++) { - odp_event_t ev; while ((ev = odp_queue_deq(queue)) != ODP_EVENT_INVALID) { /* Subtract one from prev_tick to allow for timeouts * to be delivered a tick late */ @@ -388,7 +400,6 @@ static int worker_entrypoint(void *arg TEST_UNUSED) tt[i].tick = cur_tick + tck; } } - struct timespec ts; ts.tv_sec = 0; ts.tv_nsec = 1000000; /* 1ms */ if (nanosleep(&ts, NULL) < 0) @@ -396,7 +407,7 @@ static int worker_entrypoint(void *arg TEST_UNUSED) } /* Cancel and free all timers */ - uint32_t nstale = 0; + nstale = 0; for (i = 0; i < allocated; i++) { (void)odp_timer_cancel(tt[i].tim, &tt[i].ev); tt[i].tick = TICK_INVALID; @@ -412,22 +423,22 @@ static int worker_entrypoint(void *arg TEST_UNUSED) LOG_DBG("Thread %u: %" PRIu32 " timers reset/cancelled too late\n", thr, ntoolate); LOG_DBG("Thread %u: %" PRIu32 " timeouts received\n", thr, nrcv); - LOG_DBG("Thread %u: %" PRIu32 " stale timeout(s) after odp_timer_free()\n", + LOG_DBG("Thread %u: %" PRIu32 + " stale timeout(s) after odp_timer_free()\n", thr, nstale); /* Delay some more to ensure timeouts for expired timers can be * received. Can not use busy loop here to make background timer * thread finish their work. */ - struct timespec ts; ts.tv_sec = 0; ts.tv_nsec = (3 * RANGE_MS / 10 + 50) * ODP_TIME_MSEC_IN_NS; if (nanosleep(&ts, NULL) < 0) CU_FAIL_FATAL("nanosleep failed"); while (nstale != 0) { - odp_event_t ev = odp_queue_deq(queue); + ev = odp_queue_deq(queue); if (ev != ODP_EVENT_INVALID) { - handle_tmo(ev, true, 0/*Dont' care for stale tmo's*/); + handle_tmo(ev, true, 0/*Don't care for stale tmo's*/); nstale--; } else { CU_FAIL("Failed to receive stale timeout"); @@ -441,7 +452,7 @@ static int worker_entrypoint(void *arg TEST_UNUSED) } /* Check if there any more (unexpected) events */ - odp_event_t ev = odp_queue_deq(queue); + ev = odp_queue_deq(queue); if (ev != ODP_EVENT_INVALID) CU_FAIL("Unexpected event received"); @@ -464,6 +475,11 @@ void timer_test_odp_timer_all(void) odp_pool_param_t params; odp_timer_pool_param_t tparam; odp_cpumask_t unused; + odp_timer_pool_info_t tpinfo; + uint64_t tick; + uint64_t ns; + uint64_t t2; + pthrd_arg thrdarg; /* Reserve at least one core for running other processes so the timer * test hopefully can run undisturbed and thus get better timing @@ -505,7 +521,6 @@ void timer_test_odp_timer_all(void) /* Start all created timer pools */ odp_timer_pool_start(); - odp_timer_pool_info_t tpinfo; if (odp_timer_pool_info(tp, &tpinfo) != 0) CU_FAIL("odp_timer_pool_info"); CU_ASSERT(strcmp(tpinfo.name, NAME) == 0); @@ -519,10 +534,9 @@ void timer_test_odp_timer_all(void) LOG_DBG("Tmo range: %u ms (%" PRIu64 " ticks)\n", RANGE_MS, odp_timer_ns_to_tick(tp, 1000000ULL * RANGE_MS)); - uint64_t tick; for (tick = 0; tick < 1000000000000ULL; tick += 1000000ULL) { - uint64_t ns = odp_timer_tick_to_ns(tp, tick); - uint64_t t2 = odp_timer_ns_to_tick(tp, ns); + ns = odp_timer_tick_to_ns(tp, tick); + t2 = odp_timer_ns_to_tick(tp, ns); if (tick != t2) CU_FAIL("Invalid conversion tick->ns->tick"); } @@ -537,7 +551,6 @@ void timer_test_odp_timer_all(void) odp_atomic_init_u32(&timers_allocated, 0); /* Create and start worker threads */ - pthrd_arg thrdarg; thrdarg.testcase = 0; thrdarg.numthrds = num_workers; odp_cunit_thread_create(worker_entrypoint, &thrdarg); ----------------------------------------------------------------------- Summary of changes: configure.ac | 2 +- doc/implementers-guide/implementers-guide.adoc | 137 ++++++++++++--------- test/Makefile.am | 6 +- test/common_plat/Makefile.am | 7 ++ .../{validation => common_plat}/common/Makefile.am | 0 .../common/mask_common.c | 0 .../common/mask_common.h | 0 .../common/odp_cunit_common.c | 0 .../common/odp_cunit_common.h | 0 test/common_plat/m4/configure.m4 | 33 +++++ test/{ => common_plat}/m4/miscellaneous.m4 | 0 test/{ => common_plat}/m4/performance.m4 | 0 test/{ => common_plat}/m4/validation.m4 | 0 test/{ => common_plat}/miscellaneous/.gitignore | 0 test/{ => common_plat}/miscellaneous/Makefile.am | 0 .../miscellaneous/odp_api_from_cpp.cpp | 0 test/{ => common_plat}/performance/.gitignore | 0 test/{ => common_plat}/performance/Makefile.am | 0 test/{ => common_plat}/performance/odp_crypto.c | 6 +- test/{ => common_plat}/performance/odp_l2fwd.c | 1 - .../{ => common_plat}/performance/odp_l2fwd_run.sh | 11 +- .../{ => common_plat}/performance/odp_pktio_perf.c | 34 ++--- .../{ => common_plat}/performance/odp_scheduling.c | 19 ++- .../performance/odp_scheduling_run.sh | 0 test/common_plat/validation/Makefile.am | 3 + .../validation/api}/.gitignore | 0 .../validation/api}/Makefile.am | 2 +- .../validation/api}/Makefile.inc | 4 +- .../validation/api}/README | 0 .../validation/api}/atomic/.gitignore | 0 .../validation/api}/atomic/Makefile.am | 0 .../validation/api}/atomic/atomic.c | 0 .../validation/api}/atomic/atomic.h | 0 .../validation/api}/atomic/atomic_main.c | 0 .../validation/api}/barrier/.gitignore | 0 .../validation/api}/barrier/Makefile.am | 0 .../validation/api}/barrier/barrier.c | 0 .../validation/api}/barrier/barrier.h | 0 .../validation/api}/barrier/barrier_main.c | 0 .../validation/api}/buffer/.gitignore | 0 .../validation/api}/buffer/Makefile.am | 0 .../validation/api}/buffer/buffer.c | 0 .../validation/api}/buffer/buffer.h | 0 .../validation/api}/buffer/buffer_main.c | 0 .../validation/api}/classification/.gitignore | 0 .../validation/api}/classification/Makefile.am | 0 .../api}/classification/classification.c | 0 .../api}/classification/classification.h | 0 .../api}/classification/classification_main.c | 0 .../api}/classification/odp_classification_basic.c | 0 .../classification/odp_classification_common.c | 0 .../classification/odp_classification_test_pmr.c | 1 - .../api}/classification/odp_classification_tests.c | 0 .../classification/odp_classification_testsuites.h | 0 .../validation/api}/cpumask/.gitignore | 0 .../validation/api}/cpumask/Makefile.am | 0 .../validation/api}/cpumask/cpumask.c | 0 .../validation/api}/cpumask/cpumask.h | 0 .../validation/api}/cpumask/cpumask_main.c | 0 .../validation/api}/crypto/.gitignore | 0 .../validation/api}/crypto/Makefile.am | 0 .../validation/api}/crypto/crypto.c | 0 .../validation/api}/crypto/crypto.h | 0 .../validation/api}/crypto/crypto_main.c | 0 .../validation/api}/crypto/odp_crypto_test_inp.c | 32 ++--- .../validation/api}/crypto/odp_crypto_test_inp.h | 0 .../validation/api}/crypto/test_vectors.h | 2 +- .../validation/api}/crypto/test_vectors_len.h | 0 .../validation/api}/errno/.gitignore | 0 .../validation/api}/errno/Makefile.am | 0 .../validation/api}/errno/errno.c | 0 .../validation/api}/errno/errno.h | 0 .../validation/api}/errno/errno_main.c | 0 .../validation/api}/hash/.gitignore | 0 .../validation/api}/hash/Makefile.am | 0 .../validation/api}/hash/hash.c | 1 - .../validation/api}/hash/hash.h | 0 .../validation/api}/hash/hash_main.c | 0 .../validation/api}/init/.gitignore | 0 .../validation/api}/init/Makefile.am | 0 .../validation/api}/init/init.c | 0 .../validation/api}/init/init.h | 0 .../validation/api}/init/init_main_abort.c | 0 .../validation/api}/init/init_main_log.c | 0 .../validation/api}/init/init_main_ok.c | 0 .../validation/api}/lock/.gitignore | 0 .../validation/api}/lock/Makefile.am | 0 .../validation/api}/lock/lock.c | 0 .../validation/api}/lock/lock.h | 0 .../validation/api}/lock/lock_main.c | 0 .../validation/api}/packet/.gitignore | 0 .../validation/api}/packet/Makefile.am | 0 .../validation/api}/packet/packet.c | 0 .../validation/api}/packet/packet.h | 0 .../validation/api}/packet/packet_main.c | 0 .../validation/api}/pktio/.gitignore | 0 .../validation/api}/pktio/Makefile.am | 0 .../validation/api}/pktio/pktio.c | 2 - .../validation/api}/pktio/pktio.h | 0 .../validation/api}/pktio/pktio_main.c | 0 .../validation/api}/pool/.gitignore | 0 .../validation/api}/pool/Makefile.am | 0 .../validation/api}/pool/pool.c | 0 .../validation/api}/pool/pool.h | 0 .../validation/api}/pool/pool_main.c | 0 .../validation/api}/queue/.gitignore | 0 .../validation/api}/queue/Makefile.am | 0 .../validation/api}/queue/queue.c | 7 +- .../validation/api}/queue/queue.h | 0 .../validation/api}/queue/queue_main.c | 0 .../validation/api}/random/.gitignore | 0 .../validation/api}/random/Makefile.am | 0 .../validation/api}/random/random.c | 0 .../validation/api}/random/random.h | 0 .../validation/api}/random/random_main.c | 0 .../validation/api}/scheduler/.gitignore | 0 .../validation/api}/scheduler/Makefile.am | 0 .../validation/api}/scheduler/scheduler.c | 13 +- .../validation/api}/scheduler/scheduler.h | 0 .../validation/api}/scheduler/scheduler_main.c | 0 .../validation/api}/shmem/.gitignore | 0 .../validation/api}/shmem/Makefile.am | 0 .../validation/api}/shmem/shmem.c | 0 .../validation/api}/shmem/shmem.h | 0 .../validation/api}/shmem/shmem_main.c | 0 .../validation/api}/std_clib/.gitignore | 0 .../validation/api}/std_clib/Makefile.am | 0 .../validation/api}/std_clib/std_clib.c | 0 .../validation/api}/std_clib/std_clib.h | 0 .../validation/api}/std_clib/std_clib_main.c | 0 .../validation/api}/system/.gitignore | 0 .../validation/api}/system/Makefile.am | 0 .../validation/api}/system/system.c | 0 .../validation/api}/system/system.h | 0 .../validation/api}/system/system_main.c | 0 .../validation/api}/thread/.gitignore | 0 .../validation/api}/thread/Makefile.am | 0 .../validation/api}/thread/thread.c | 0 .../validation/api}/thread/thread.h | 0 .../validation/api}/thread/thread_main.c | 0 .../validation/api}/time/.gitignore | 0 .../validation/api}/time/Makefile.am | 0 .../validation/api}/time/time.c | 0 .../validation/api}/time/time.h | 0 .../validation/api}/time/time_main.c | 0 .../validation/api}/timer/.gitignore | 0 .../validation/api}/timer/Makefile.am | 0 .../validation/api}/timer/timer.c | 75 ++++++----- .../validation/api}/timer/timer.h | 0 .../validation/api}/timer/timer_main.c | 0 .../validation/api}/traffic_mngr/.gitignore | 0 .../validation/api}/traffic_mngr/Makefile.am | 0 .../validation/api}/traffic_mngr/traffic_mngr.c | 0 .../validation/api}/traffic_mngr/traffic_mngr.h | 0 .../api}/traffic_mngr/traffic_mngr_main.c | 0 test/{platform => }/linux-generic/.gitignore | 0 test/linux-generic/Makefile.am | 79 ++++++++++++ test/{platform => }/linux-generic/Makefile.inc | 4 +- test/linux-generic/m4/configure.m4 | 5 + .../linux-generic/pktio_ipc/.gitignore | 0 .../linux-generic/pktio_ipc/Makefile.am | 0 .../linux-generic/pktio_ipc/ipc_common.c | 0 .../linux-generic/pktio_ipc/ipc_common.h | 0 .../linux-generic/pktio_ipc/pktio_ipc1.c | 0 .../linux-generic/pktio_ipc/pktio_ipc2.c | 0 .../linux-generic/pktio_ipc/pktio_ipc_run.sh | 0 test/{platform => }/linux-generic/ring/.gitignore | 0 test/{platform => }/linux-generic/ring/Makefile.am | 0 .../{platform => }/linux-generic/ring/ring_basic.c | 0 test/{platform => }/linux-generic/ring/ring_main.c | 0 .../linux-generic/ring/ring_stress.c | 0 .../linux-generic/ring/ring_suites.c | 0 .../linux-generic/ring/ring_suites.h | 0 test/{platform => }/linux-generic/run-test | 0 test/linux-generic/validation/Makefile.inc | 1 + test/linux-generic/validation/api/Makefile.inc | 1 + .../validation/api/pktio}/.gitignore | 0 .../validation/api}/pktio/Makefile.am | 0 .../validation/api}/pktio/pktio_env | 0 .../validation/api}/pktio/pktio_run.sh | 4 +- .../validation/api}/pktio/pktio_run_dpdk.sh | 4 +- .../validation/api}/pktio/pktio_run_netmap.sh | 4 +- .../validation/api}/pktio/pktio_run_pcap.sh | 4 +- .../validation/api}/pktio/pktio_run_tap.sh | 4 +- .../validation/api}/shmem/.gitignore | 0 .../validation/api}/shmem/Makefile.am | 0 .../validation/api}/shmem/shmem.h | 0 .../validation/api}/shmem/shmem_common.h | 0 .../validation/api}/shmem/shmem_linux.c | 0 .../validation/api}/shmem/shmem_linux.h | 0 .../validation/api}/shmem/shmem_odp.c | 0 .../validation/api}/shmem/shmem_odp.h | 0 test/m4/configure.m4 | 33 +---- test/platform/linux-generic/Makefile.am | 74 ----------- test/platform/linux-generic/m4/configure.m4 | 5 - 195 files changed, 334 insertions(+), 286 deletions(-) create mode 100644 test/common_plat/Makefile.am rename test/{validation => common_plat}/common/Makefile.am (100%) rename test/{validation => common_plat}/common/mask_common.c (100%) rename test/{validation => common_plat}/common/mask_common.h (100%) rename test/{validation => common_plat}/common/odp_cunit_common.c (100%) rename test/{validation => common_plat}/common/odp_cunit_common.h (100%) create mode 100644 test/common_plat/m4/configure.m4 rename test/{ => common_plat}/m4/miscellaneous.m4 (100%) rename test/{ => common_plat}/m4/performance.m4 (100%) rename test/{ => common_plat}/m4/validation.m4 (100%) rename test/{ => common_plat}/miscellaneous/.gitignore (100%) rename test/{ => common_plat}/miscellaneous/Makefile.am (100%) rename test/{ => common_plat}/miscellaneous/odp_api_from_cpp.cpp (100%) rename test/{ => common_plat}/performance/.gitignore (100%) rename test/{ => common_plat}/performance/Makefile.am (100%) rename test/{ => common_plat}/performance/odp_crypto.c (99%) rename test/{ => common_plat}/performance/odp_l2fwd.c (99%) rename test/{ => common_plat}/performance/odp_l2fwd_run.sh (90%) rename test/{ => common_plat}/performance/odp_pktio_perf.c (97%) rename test/{ => common_plat}/performance/odp_scheduling.c (98%) rename test/{ => common_plat}/performance/odp_scheduling_run.sh (100%) create mode 100644 test/common_plat/validation/Makefile.am rename test/{platform/linux-generic/pktio => common_plat/validation/api}/.gitignore (100%) rename test/{validation => common_plat/validation/api}/Makefile.am (93%) rename test/{validation => common_plat/validation/api}/Makefile.inc (83%) rename test/{validation => common_plat/validation/api}/README (100%) rename test/{validation => common_plat/validation/api}/atomic/.gitignore (100%) rename test/{validation => common_plat/validation/api}/atomic/Makefile.am (100%) rename test/{validation => common_plat/validation/api}/atomic/atomic.c (100%) rename test/{validation => common_plat/validation/api}/atomic/atomic.h (100%) rename test/{validation => common_plat/validation/api}/atomic/atomic_main.c (100%) rename test/{validation => common_plat/validation/api}/barrier/.gitignore (100%) rename test/{validation => common_plat/validation/api}/barrier/Makefile.am (100%) rename test/{validation => common_plat/validation/api}/barrier/barrier.c (100%) rename test/{validation => common_plat/validation/api}/barrier/barrier.h (100%) rename test/{validation => common_plat/validation/api}/barrier/barrier_main.c (100%) rename test/{validation => common_plat/validation/api}/buffer/.gitignore (100%) rename test/{validation => common_plat/validation/api}/buffer/Makefile.am (100%) rename test/{validation => common_plat/validation/api}/buffer/buffer.c (100%) rename test/{validation => common_plat/validation/api}/buffer/buffer.h (100%) rename test/{validation => common_plat/validation/api}/buffer/buffer_main.c (100%) rename test/{validation => common_plat/validation/api}/classification/.gitignore (100%) rename test/{validation => common_plat/validation/api}/classification/Makefile.am (100%) rename test/{validation => common_plat/validation/api}/classification/classification.c (100%) rename test/{validation => common_plat/validation/api}/classification/classification.h (100%) rename test/{validation => common_plat/validation/api}/classification/classification_main.c (100%) rename test/{validation => common_plat/validation/api}/classification/odp_classification_basic.c (100%) rename test/{validation => common_plat/validation/api}/classification/odp_classification_common.c (100%) rename test/{validation => common_plat/validation/api}/classification/odp_classification_test_pmr.c (99%) rename test/{validation => common_plat/validation/api}/classification/odp_classification_tests.c (100%) rename test/{validation => common_plat/validation/api}/classification/odp_classification_testsuites.h (100%) rename test/{validation => common_plat/validation/api}/cpumask/.gitignore (100%) rename test/{validation => common_plat/validation/api}/cpumask/Makefile.am (100%) rename test/{validation => common_plat/validation/api}/cpumask/cpumask.c (100%) rename test/{validation => common_plat/validation/api}/cpumask/cpumask.h (100%) rename test/{validation => common_plat/validation/api}/cpumask/cpumask_main.c (100%) rename test/{validation => common_plat/validation/api}/crypto/.gitignore (100%) rename test/{validation => common_plat/validation/api}/crypto/Makefile.am (100%) rename test/{validation => common_plat/validation/api}/crypto/crypto.c (100%) rename test/{validation => common_plat/validation/api}/crypto/crypto.h (100%) rename test/{validation => common_plat/validation/api}/crypto/crypto_main.c (100%) rename test/{validation => common_plat/validation/api}/crypto/odp_crypto_test_inp.c (98%) rename test/{validation => common_plat/validation/api}/crypto/odp_crypto_test_inp.h (100%) rename test/{validation => common_plat/validation/api}/crypto/test_vectors.h (99%) rename test/{validation => common_plat/validation/api}/crypto/test_vectors_len.h (100%) rename test/{validation => common_plat/validation/api}/errno/.gitignore (100%) rename test/{validation => common_plat/validation/api}/errno/Makefile.am (100%) rename test/{validation => common_plat/validation/api}/errno/errno.c (100%) rename test/{validation => common_plat/validation/api}/errno/errno.h (100%) rename test/{validation => common_plat/validation/api}/errno/errno_main.c (100%) rename test/{validation => common_plat/validation/api}/hash/.gitignore (100%) rename test/{validation => common_plat/validation/api}/hash/Makefile.am (100%) rename test/{validation => common_plat/validation/api}/hash/hash.c (99%) rename test/{validation => common_plat/validation/api}/hash/hash.h (100%) rename test/{validation => common_plat/validation/api}/hash/hash_main.c (100%) rename test/{validation => common_plat/validation/api}/init/.gitignore (100%) rename test/{validation => common_plat/validation/api}/init/Makefile.am (100%) rename test/{validation => common_plat/validation/api}/init/init.c (100%) rename test/{validation => common_plat/validation/api}/init/init.h (100%) rename test/{validation => common_plat/validation/api}/init/init_main_abort.c (100%) rename test/{validation => common_plat/validation/api}/init/init_main_log.c (100%) rename test/{validation => common_plat/validation/api}/init/init_main_ok.c (100%) rename test/{validation => common_plat/validation/api}/lock/.gitignore (100%) rename test/{validation => common_plat/validation/api}/lock/Makefile.am (100%) rename test/{validation => common_plat/validation/api}/lock/lock.c (100%) rename test/{validation => common_plat/validation/api}/lock/lock.h (100%) rename test/{validation => common_plat/validation/api}/lock/lock_main.c (100%) rename test/{validation => common_plat/validation/api}/packet/.gitignore (100%) rename test/{validation => common_plat/validation/api}/packet/Makefile.am (100%) rename test/{validation => common_plat/validation/api}/packet/packet.c (100%) rename test/{validation => common_plat/validation/api}/packet/packet.h (100%) rename test/{validation => common_plat/validation/api}/packet/packet_main.c (100%) rename test/{validation => common_plat/validation/api}/pktio/.gitignore (100%) rename test/{validation => common_plat/validation/api}/pktio/Makefile.am (100%) rename test/{validation => common_plat/validation/api}/pktio/pktio.c (99%) rename test/{validation => common_plat/validation/api}/pktio/pktio.h (100%) rename test/{validation => common_plat/validation/api}/pktio/pktio_main.c (100%) rename test/{validation => common_plat/validation/api}/pool/.gitignore (100%) rename test/{validation => common_plat/validation/api}/pool/Makefile.am (100%) rename test/{validation => common_plat/validation/api}/pool/pool.c (100%) rename test/{validation => common_plat/validation/api}/pool/pool.h (100%) rename test/{validation => common_plat/validation/api}/pool/pool_main.c (100%) rename test/{validation => common_plat/validation/api}/queue/.gitignore (100%) rename test/{validation => common_plat/validation/api}/queue/Makefile.am (100%) rename test/{validation => common_plat/validation/api}/queue/queue.c (98%) rename test/{validation => common_plat/validation/api}/queue/queue.h (100%) rename test/{validation => common_plat/validation/api}/queue/queue_main.c (100%) rename test/{validation => common_plat/validation/api}/random/.gitignore (100%) rename test/{validation => common_plat/validation/api}/random/Makefile.am (100%) rename test/{validation => common_plat/validation/api}/random/random.c (100%) rename test/{validation => common_plat/validation/api}/random/random.h (100%) rename test/{validation => common_plat/validation/api}/random/random_main.c (100%) rename test/{validation => common_plat/validation/api}/scheduler/.gitignore (100%) rename test/{validation => common_plat/validation/api}/scheduler/Makefile.am (100%) rename test/{validation => common_plat/validation/api}/scheduler/scheduler.c (99%) rename test/{validation => common_plat/validation/api}/scheduler/scheduler.h (100%) rename test/{validation => common_plat/validation/api}/scheduler/scheduler_main.c (100%) rename test/{validation => common_plat/validation/api}/shmem/.gitignore (100%) rename test/{validation => common_plat/validation/api}/shmem/Makefile.am (100%) rename test/{validation => common_plat/validation/api}/shmem/shmem.c (100%) rename test/{validation => common_plat/validation/api}/shmem/shmem.h (100%) rename test/{validation => common_plat/validation/api}/shmem/shmem_main.c (100%) rename test/{validation => common_plat/validation/api}/std_clib/.gitignore (100%) rename test/{validation => common_plat/validation/api}/std_clib/Makefile.am (100%) rename test/{validation => common_plat/validation/api}/std_clib/std_clib.c (100%) rename test/{validation => common_plat/validation/api}/std_clib/std_clib.h (100%) rename test/{validation => common_plat/validation/api}/std_clib/std_clib_main.c (100%) rename test/{validation => common_plat/validation/api}/system/.gitignore (100%) rename test/{validation => common_plat/validation/api}/system/Makefile.am (100%) rename test/{validation => common_plat/validation/api}/system/system.c (100%) rename test/{validation => common_plat/validation/api}/system/system.h (100%) rename test/{validation => common_plat/validation/api}/system/system_main.c (100%) rename test/{validation => common_plat/validation/api}/thread/.gitignore (100%) rename test/{validation => common_plat/validation/api}/thread/Makefile.am (100%) rename test/{validation => common_plat/validation/api}/thread/thread.c (100%) rename test/{validation => common_plat/validation/api}/thread/thread.h (100%) rename test/{validation => common_plat/validation/api}/thread/thread_main.c (100%) rename test/{validation => common_plat/validation/api}/time/.gitignore (100%) rename test/{validation => common_plat/validation/api}/time/Makefile.am (100%) rename test/{validation => common_plat/validation/api}/time/time.c (100%) rename test/{validation => common_plat/validation/api}/time/time.h (100%) rename test/{validation => common_plat/validation/api}/time/time_main.c (100%) rename test/{validation => common_plat/validation/api}/timer/.gitignore (100%) rename test/{validation => common_plat/validation/api}/timer/Makefile.am (100%) rename test/{validation => common_plat/validation/api}/timer/timer.c (93%) rename test/{validation => common_plat/validation/api}/timer/timer.h (100%) rename test/{validation => common_plat/validation/api}/timer/timer_main.c (100%) rename test/{validation => common_plat/validation/api}/traffic_mngr/.gitignore (100%) rename test/{validation => common_plat/validation/api}/traffic_mngr/Makefile.am (100%) rename test/{validation => common_plat/validation/api}/traffic_mngr/traffic_mngr.c (100%) rename test/{validation => common_plat/validation/api}/traffic_mngr/traffic_mngr.h (100%) rename test/{validation => common_plat/validation/api}/traffic_mngr/traffic_mngr_main.c (100%) rename test/{platform => }/linux-generic/.gitignore (100%) create mode 100644 test/linux-generic/Makefile.am rename test/{platform => }/linux-generic/Makefile.inc (78%) create mode 100644 test/linux-generic/m4/configure.m4 rename test/{platform => }/linux-generic/pktio_ipc/.gitignore (100%) rename test/{platform => }/linux-generic/pktio_ipc/Makefile.am (100%) rename test/{platform => }/linux-generic/pktio_ipc/ipc_common.c (100%) rename test/{platform => }/linux-generic/pktio_ipc/ipc_common.h (100%) rename test/{platform => }/linux-generic/pktio_ipc/pktio_ipc1.c (100%) rename test/{platform => }/linux-generic/pktio_ipc/pktio_ipc2.c (100%) rename test/{platform => }/linux-generic/pktio_ipc/pktio_ipc_run.sh (100%) rename test/{platform => }/linux-generic/ring/.gitignore (100%) rename test/{platform => }/linux-generic/ring/Makefile.am (100%) rename test/{platform => }/linux-generic/ring/ring_basic.c (100%) rename test/{platform => }/linux-generic/ring/ring_main.c (100%) rename test/{platform => }/linux-generic/ring/ring_stress.c (100%) rename test/{platform => }/linux-generic/ring/ring_suites.c (100%) rename test/{platform => }/linux-generic/ring/ring_suites.h (100%) rename test/{platform => }/linux-generic/run-test (100%) create mode 100644 test/linux-generic/validation/Makefile.inc create mode 100644 test/linux-generic/validation/api/Makefile.inc rename test/{validation => linux-generic/validation/api/pktio}/.gitignore (100%) rename test/{platform/linux-generic => linux-generic/validation/api}/pktio/Makefile.am (100%) rename test/{platform/linux-generic => linux-generic/validation/api}/pktio/pktio_env (100%) rename test/{platform/linux-generic => linux-generic/validation/api}/pktio/pktio_run.sh (96%) rename test/{platform/linux-generic => linux-generic/validation/api}/pktio/pktio_run_dpdk.sh (95%) rename test/{platform/linux-generic => linux-generic/validation/api}/pktio/pktio_run_netmap.sh (95%) rename test/{platform/linux-generic => linux-generic/validation/api}/pktio/pktio_run_pcap.sh (90%) rename test/{platform/linux-generic => linux-generic/validation/api}/pktio/pktio_run_tap.sh (95%) rename test/{platform/linux-generic => linux-generic/validation/api}/shmem/.gitignore (100%) rename test/{platform/linux-generic => linux-generic/validation/api}/shmem/Makefile.am (100%) rename test/{platform/linux-generic => linux-generic/validation/api}/shmem/shmem.h (100%) rename test/{platform/linux-generic => linux-generic/validation/api}/shmem/shmem_common.h (100%) rename test/{platform/linux-generic => linux-generic/validation/api}/shmem/shmem_linux.c (100%) rename test/{platform/linux-generic => linux-generic/validation/api}/shmem/shmem_linux.h (100%) rename test/{platform/linux-generic => linux-generic/validation/api}/shmem/shmem_odp.c (100%) rename test/{platform/linux-generic => linux-generic/validation/api}/shmem/shmem_odp.h (100%) delete mode 100644 test/platform/linux-generic/Makefile.am delete mode 100644 test/platform/linux-generic/m4/configure.m4 hooks/post-receive --

7 years, 9 months

1
0
0 0

subscribe

by Maxim Uvarov

subscribe

7 years, 9 months

1
0
0 0

[COMMIT] branch monarch_lts created. v1.10.1.0-56-g197710f

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, monarch_lts has been created at 197710ffc229f3db775a97c27e09c2dc063497c4 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- hooks/post-receive --

7 years, 9 months

1
0
0 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

git-lng-odp July 2016