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

[COMMIT] branch api-next updated. v1.10.1.0-213-g28d95ca

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 28d95ca27265aeaf95f06bcc7b937263f96fd826 (commit) from 6b806e0dc32f28e7c8a15ef4fbb3a3fa215bb0f3 (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 28d95ca27265aeaf95f06bcc7b937263f96fd826 Author: Christophe Milard <christophe.milard(a)linaro.org> Date: Wed Oct 19 16:30:13 2016 +0200 test: drv: shm: decrease test memory requirement The memory consumption is proporsional to the number of ODP threads available. The test failed on systems with large number of CPU, due to outage ot pre-allocaed address space. This patch shrinks the test requirement. Signed-off-by: Christophe Milard <christophe.milard(a)linaro.org> Reviewed-and-tested-by: Matias Elo <matias.elo(a)nokia.com> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/common_plat/validation/drv/drvshmem/drvshmem.c b/test/common_plat/validation/drv/drvshmem/drvshmem.c index 5e6d2e5..559c55d 100644 --- a/test/common_plat/validation/drv/drvshmem/drvshmem.c +++ b/test/common_plat/validation/drv/drvshmem/drvshmem.c @@ -16,7 +16,7 @@ #define TEST_SHARE_BAR (0xf0f0f0f) #define SMALL_MEM 10 #define MEDIUM_MEM 4096 -#define BIG_MEM 16777216 +#define BIG_MEM 65536 #define STRESS_SIZE 32 /* power of 2 and <=256 */ #define STRESS_RANDOM_SZ 5 #define STRESS_ITERATION 5000 ----------------------------------------------------------------------- Summary of changes: test/common_plat/validation/drv/drvshmem/drvshmem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive --

7 years, 6 months

1
0
0 0

[COMMIT] branch master updated. v1.10.1.0-134-gaaca222

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 aaca222d10a3829e4c982a1b4842b0be11860b7d (commit) via 25f82fc54a78100098eae5b22719571b6991c955 (commit) from ce4fec46c1f6821afb5d0ef9c3099cd094153fd9 (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 aaca222d10a3829e4c982a1b4842b0be11860b7d Author: Brian Brooks <brian.brooks(a)linaro.org> Date: Mon Jul 18 13:16:46 2016 -0400 timer: add missing atomic decrement Signed-off-by: Brian Brooks <brian.brooks(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/odp_timer.c b/platform/linux-generic/odp_timer.c index b26ac6b..ee4c4c0 100644 --- a/platform/linux-generic/odp_timer.c +++ b/platform/linux-generic/odp_timer.c @@ -316,6 +316,8 @@ static void odp_timer_pool_del(odp_timer_pool *tp) int rc = odp_shm_free(tp->shm); if (rc != 0) ODP_ABORT("Failed to free shared memory (%d)\n", rc); + + odp_atomic_sub_u32(&num_timer_pools, 1); } static inline odp_timer_t timer_alloc(odp_timer_pool *tp, commit 25f82fc54a78100098eae5b22719571b6991c955 Author: Brian Brooks <brian.brooks(a)linaro.org> Date: Mon Jul 18 13:16:45 2016 -0400 example: odp_timer_simple: decrease timer pool resolution POSIX timer overruns are experienced on Linux generic platforms when resolution is less than one millisecond. Decrease resolution from 10 microseconds to 10 milliseconds so this example program works as intended on generic Linux platforms. Signed-off-by: Brian Brooks <brian.brooks(a)linaro.org> Reviewed-by: Kevin Wang <kevin.wang(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/example/timer/odp_timer_simple.c b/example/timer/odp_timer_simple.c index 98c08ce..70804bb 100644 --- a/example/timer/odp_timer_simple.c +++ b/example/timer/odp_timer_simple.c @@ -61,8 +61,8 @@ int main(int argc ODP_UNUSED, char *argv[] ODP_UNUSED) /* * Create pool of timeouts */ - tparams.res_ns = 10 * ODP_TIME_USEC_IN_NS; - tparams.min_tmo = 10 * ODP_TIME_USEC_IN_NS; + tparams.res_ns = 10 * ODP_TIME_MSEC_IN_NS; + tparams.min_tmo = 10 * ODP_TIME_MSEC_IN_NS; tparams.max_tmo = 1 * ODP_TIME_SEC_IN_NS; tparams.num_timers = 1; /* One timer per worker */ tparams.priv = 0; /* Shared */ ----------------------------------------------------------------------- Summary of changes: example/timer/odp_timer_simple.c | 4 ++-- platform/linux-generic/odp_timer.c | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) hooks/post-receive --

7 years, 6 months

1
0
0 0

[COMMIT] branch api-next updated. v1.10.1.0-212-g6b806e0

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 6b806e0dc32f28e7c8a15ef4fbb3a3fa215bb0f3 (commit) via ce4fec46c1f6821afb5d0ef9c3099cd094153fd9 (commit) via 7af8b884256bbab5070996d7897216ae77b758fe (commit) via f73250fc93346412b526c97de3554ddc9186d7c0 (commit) via 79833e86ea0be9e1f337dd4baff096bce7067b51 (commit) via bf9380296de8cd62c0a8569c1fc775869b8501ab (commit) via f83b71e6a9c685227615455df1f9e4fefeff19ae (commit) via a8e5a8f6853ddc998430d112c22994928ddb4070 (commit) via 09abf90268a0a5a2daf7c7e0ae37a2d7c35e87c5 (commit) via 88df2613cb91022233f9ec973f6ef338eb060f17 (commit) via bc65897481d8ce89a55257b22bf93d05abf74f70 (commit) via e858d688c3ad3ce0d0b3ea22539cac8e6ec844b7 (commit) via 93718d4ead55bfbaa8e564c24d1f3b76e60235ce (commit) via 582065e74e2375b5c81ac8fcec9eb02f541f42ff (commit) via 5f4f2e0da6e04637b6b4bd7aa6bb4d4d32680525 (commit) via 92336dd2808af4826371d467588dcb81daafe4cf (commit) via 7bb62b522a5f89d6d19a4c77254222b1c07ab44b (commit) via 566492d067083e870548c78a89f8c65b02ecde89 (commit) from cf6425f16f8ee554815f6697a231e398ddb0546c (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 6b806e0dc32f28e7c8a15ef4fbb3a3fa215bb0f3 Merge: cf6425f ce4fec4 Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Fri Oct 21 11:25:41 2016 +0300 Merge branch 'master' into api-next Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --cc platform/linux-generic/include/odp_config_internal.h index 7d5dbeb,b7ff610..e1bab20 --- a/platform/linux-generic/include/odp_config_internal.h +++ b/platform/linux-generic/include/odp_config_internal.h @@@ -111,21 -111,13 +111,28 @@@ extern "C" #define ODP_CONFIG_SHM_BLOCKS (ODP_CONFIG_POOLS + 48) /* - * Maximum event burst size + * Size of the virtual address space pre-reserver for ISHM + * + * This is just virtual space preallocation size, not memory allocation. + * This address space is used by ISHM to map things at a common address in + * all ODP threads (when the _ODP_ISHM_SINGLE_VA flag is used). + * In bytes. + */ +#define ODP_CONFIG_ISHM_VA_PREALLOC_SZ (536870912L) + +/* Maximum number of shared memory blocks available on the driver interface. + * + * This the the number of separate SHM areas that can be reserved concurrently + */ +#define ODPDRV_CONFIG_SHM_BLOCKS 48 + ++/* Maximum event burst size + * + * This controls the burst size on various enqueue, dequeue, etc calls. Large + * burst size improves throughput, but may degrade QoS (increase latency). + */ + #define CONFIG_BURST_SIZE 16 + #ifdef __cplusplus } #endif ----------------------------------------------------------------------- Summary of changes: configure.ac | 26 +- platform/linux-generic/.gitignore | 2 +- platform/linux-generic/Makefile.am | 3 +- platform/linux-generic/include/odp/api/atomic.h | 4 +- platform/linux-generic/include/odp/api/byteorder.h | 4 +- .../api/plat/{inlines.h.in => static_inline.h.in} | 19 +- .../odp/api/plat/ticketlock_inlines.h} | 56 +- platform/linux-generic/include/odp/api/std_clib.h | 4 +- platform/linux-generic/include/odp/api/sync.h | 4 +- .../linux-generic/include/odp_buffer_internal.h | 7 + .../linux-generic/include/odp_config_internal.h | 7 + platform/linux-generic/include/odp_internal.h | 1 - .../linux-generic/include/odp_packet_io_queue.h | 3 +- platform/linux-generic/include/odp_pool_internal.h | 24 +- .../linux-generic/include/odp_queue_internal.h | 15 +- platform/linux-generic/include/odp_schedule_if.h | 3 - .../linux-generic/include/odp_schedule_internal.h | 2 +- platform/linux-generic/m4/configure.m4 | 2 +- platform/linux-generic/odp_atomic.c | 2 +- platform/linux-generic/odp_byteorder.c | 2 +- platform/linux-generic/odp_init.c | 7 +- platform/linux-generic/odp_queue.c | 271 ++++---- platform/linux-generic/odp_schedule.c | 1 - platform/linux-generic/odp_schedule_ordered.c | 37 +- platform/linux-generic/odp_schedule_sp.c | 12 - platform/linux-generic/odp_std_clib.c | 2 +- platform/linux-generic/odp_sync.c | 2 +- platform/linux-generic/odp_ticketlock.c | 68 +- platform/linux-generic/odp_timer.c | 2 +- platform/linux-generic/odp_traffic_mngr.c | 3 +- platform/linux-generic/pktio/ipc.c | 7 +- test/common_plat/performance/.gitignore | 1 + test/common_plat/performance/Makefile.am | 5 + test/common_plat/performance/odp_l2fwd_run.sh | 4 +- test/common_plat/performance/odp_sched_latency.c | 767 +++++++++++++++++++++ ..._scheduling_run.sh => odp_sched_latency_run.sh} | 11 +- 36 files changed, 1055 insertions(+), 335 deletions(-) rename platform/linux-generic/include/odp/api/plat/{inlines.h.in => static_inline.h.in} (58%) copy platform/linux-generic/{odp_ticketlock.c => include/odp/api/plat/ticketlock_inlines.h} (71%) create mode 100644 test/common_plat/performance/odp_sched_latency.c copy test/common_plat/performance/{odp_scheduling_run.sh => odp_sched_latency_run.sh} (51%) hooks/post-receive --

7 years, 6 months

1
0
0 0

[COMMIT] branch master updated. v1.10.1.0-132-gce4fec4

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 ce4fec46c1f6821afb5d0ef9c3099cd094153fd9 (commit) from 7af8b884256bbab5070996d7897216ae77b758fe (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 ce4fec46c1f6821afb5d0ef9c3099cd094153fd9 Author: Brian Brooks <brian.brooks(a)linaro.org> Date: Thu Oct 13 16:18:44 2016 -0500 timers: fix off by one tick in timer expiration processing A timer pool's tick starts at t0 (zero). Once the first period has passed, the timer pool is scanned for any timers that have expired since t0 + 1. Current code does an atomic fetch increment on the tick, but uses the previous tick during timer expiration processing. What is needed is the previous tick + 1. The observable effect without this patch is that timers are expired one tick period (timer resolution) later than they should be. Fixes https://bugs.linaro.org/show_bug.cgi?id=2552 Signed-off-by: Brian Brooks <brian.brooks(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/odp_timer.c b/platform/linux-generic/odp_timer.c index becea9d..b26ac6b 100644 --- a/platform/linux-generic/odp_timer.c +++ b/platform/linux-generic/odp_timer.c @@ -691,7 +691,7 @@ static void timer_notify(odp_timer_pool *tp) prev_tick = odp_atomic_fetch_inc_u64(&tp->cur_tick); /* Scan timer array, looking for timers to expire */ - (void)odp_timer_pool_expire(tp, prev_tick); + (void)odp_timer_pool_expire(tp, prev_tick + 1); /* Else skip scan of timers. cur_tick was updated and next itimer * invocation will process older expiration ticks as well */ ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/odp_timer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive --

7 years, 6 months

1
0
0 0

[COMMIT] branch master updated. v1.10.1.0-131-g7af8b88

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 7af8b884256bbab5070996d7897216ae77b758fe (commit) from f73250fc93346412b526c97de3554ddc9186d7c0 (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 7af8b884256bbab5070996d7897216ae77b758fe Author: Bill Fischofer <bill.fischofer(a)linaro.org> Date: Thu Sep 22 14:04:41 2016 -0500 linux-generic: ticketlock: add missing doxygen for ticketlock_inlines.h Add the missing internal doxygen documentation for the ticketlock_inlines functions used to accelerate odp-linux even when building with --enable-abi-compat=yes Signed-off-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-and-tested-by: Mike Holmes <mike.holmes(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/include/odp/api/plat/ticketlock_inlines.h b/platform/linux-generic/include/odp/api/plat/ticketlock_inlines.h index 957d22e..87432a7 100644 --- a/platform/linux-generic/include/odp/api/plat/ticketlock_inlines.h +++ b/platform/linux-generic/include/odp/api/plat/ticketlock_inlines.h @@ -18,6 +18,11 @@ #include <odp/api/sync.h> #include <odp/api/cpu.h> +/** @internal + * Acquire ticket lock. + * + * @param ticketlock Pointer to a ticket lock + */ static inline void _odp_ticketlock_lock(odp_ticketlock_t *ticketlock) { uint32_t ticket; @@ -33,6 +38,14 @@ static inline void _odp_ticketlock_lock(odp_ticketlock_t *ticketlock) odp_cpu_pause(); } +/** @internal + * Try to acquire ticket lock. + * + * @param tklock Pointer to a ticket lock + * + * @retval 1 lock acquired + * @retval 0 lock not acquired + */ static inline int _odp_ticketlock_trylock(odp_ticketlock_t *tklock) { /* We read 'next_ticket' and 'cur_ticket' non-atomically which should @@ -61,6 +74,11 @@ static inline int _odp_ticketlock_trylock(odp_ticketlock_t *tklock) return 0; } +/** @internal + * Release ticket lock + * + * @param ticketlock Pointer to a ticket lock + */ static inline void _odp_ticketlock_unlock(odp_ticketlock_t *ticketlock) { /* Release the lock by incrementing 'cur_ticket'. As we are the @@ -73,6 +91,14 @@ static inline void _odp_ticketlock_unlock(odp_ticketlock_t *ticketlock) odp_atomic_store_rel_u32(&ticketlock->cur_ticket, cur + 1); } +/** @internal + * Check if ticket lock is locked + * + * @param ticketlock Pointer to a ticket lock + * + * @retval 1 the lock is busy (locked) + * @retval 0 the lock is available (unlocked) + */ static inline int _odp_ticketlock_is_locked(odp_ticketlock_t *ticketlock) { /* Compare 'cur_ticket' with 'next_ticket'. Ideally we should read ----------------------------------------------------------------------- Summary of changes: .../include/odp/api/plat/ticketlock_inlines.h | 26 ++++++++++++++++++++++ 1 file changed, 26 insertions(+) hooks/post-receive --

7 years, 6 months

1
0
0 0

[COMMIT] branch master updated. v1.10.1.0-130-gf73250f

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 f73250fc93346412b526c97de3554ddc9186d7c0 (commit) from 79833e86ea0be9e1f337dd4baff096bce7067b51 (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 f73250fc93346412b526c97de3554ddc9186d7c0 Author: Mike Holmes <mike.holmes(a)linaro.org> Date: Wed Oct 12 14:42:29 2016 -0400 example: generator: actually use specified default The help states default is 1000ms. 0 for flood mode, however the default was incorrectly set to zero. Fix odp_l2fwd to specify the timeout it requires to flood mode Signed-off-by: Mike Holmes <mike.holmes(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/example/generator/odp_generator.c b/example/generator/odp_generator.c index b0053b9..48d7f5f 100644 --- a/example/generator/odp_generator.c +++ b/example/generator/odp_generator.c @@ -946,6 +946,7 @@ static void parse_args(int argc, char *argv[], appl_args_t *appl_args) appl_args->number = -1; appl_args->payload = 56; appl_args->timeout = -1; + appl_args->interval = DEFAULT_PKT_INTERVAL; opterr = 0; /* do not issue errors on helper options */ diff --git a/test/common_plat/performance/odp_l2fwd_run.sh b/test/common_plat/performance/odp_l2fwd_run.sh index e64aa47..757cf53 100755 --- a/test/common_plat/performance/odp_l2fwd_run.sh +++ b/test/common_plat/performance/odp_l2fwd_run.sh @@ -32,6 +32,8 @@ TEST_SKIPPED=77 PLATFORM_VALIDATION=${TEST_SRC_DIR}/../../$ODP_PLATFORM/validation +FLOOD_MODE=0 + # Use installed pktio env or for make check take it from platform directory if [ -f "./pktio_env" ]; then . ./pktio_env @@ -66,7 +68,7 @@ run_l2fwd() #@todo: limit odp_generator to cores #https://bugs.linaro.org/show_bug.cgi?id=1398 - (odp_generator${EXEEXT} -I $IF0 \ + (odp_generator${EXEEXT} --interval $FLOOD_MODE -I $IF0 \ --srcip 192.168.0.1 --dstip 192.168.0.2 \ -m u 2>&1 > /dev/null) \ 2>&1 > /dev/null & ----------------------------------------------------------------------- Summary of changes: example/generator/odp_generator.c | 1 + test/common_plat/performance/odp_l2fwd_run.sh | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) hooks/post-receive --

7 years, 6 months

1
0
0 0

[COMMIT] branch master updated. v1.10.1.0-129-g79833e8

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 79833e86ea0be9e1f337dd4baff096bce7067b51 (commit) from bf9380296de8cd62c0a8569c1fc775869b8501ab (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 79833e86ea0be9e1f337dd4baff096bce7067b51 Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Fri Oct 14 14:23:58 2016 +0300 Revert "test: skip pktio_perf tests on 1 and 2 cpus machines" This reverts commit bf9380296de8cd62c0a8569c1fc775869b8501ab. Patch has logic break of original code. if (ret) break is not correct statement. Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/common_plat/performance/odp_pktio_perf.c b/test/common_plat/performance/odp_pktio_perf.c index 846dfaa..f041b13 100644 --- a/test/common_plat/performance/odp_pktio_perf.c +++ b/test/common_plat/performance/odp_pktio_perf.c @@ -34,8 +34,6 @@ #include <inttypes.h> #include <test_debug.h> -#define TEST_SKIP 77 - #define PKT_BUF_NUM 8192 #define MAX_NUM_IFACES 2 #define TEST_HDR_MAGIC 0x92749451 @@ -560,7 +558,7 @@ static int setup_txrx_masks(odp_cpumask_t *thd_mask_tx, gbl_args->args.cpu_count); if (num_workers < 2) { LOG_ERR("Need at least two cores\n"); - return TEST_SKIP; + return -1; } if (gbl_args->args.num_tx_workers) { @@ -671,9 +669,8 @@ static int run_test(void) .warmup = 1, }; - ret = setup_txrx_masks(&txmask, &rxmask); - if (ret) - return ret; + if (setup_txrx_masks(&txmask, &rxmask) != 0) + return -1; printf("Starting test with params:\n"); printf("\tTransmit workers: \t%d\n", odp_cpumask_count(&txmask)); @@ -694,11 +691,8 @@ static int run_test(void) run_test_single(&txmask, &rxmask, &status); status.warmup = 0; - while (1) { + while (ret > 0) ret = run_test_single(&txmask, &rxmask, &status); - if (ret) - break; - } return ret; } ----------------------------------------------------------------------- Summary of changes: test/common_plat/performance/odp_pktio_perf.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) hooks/post-receive --

7 years, 6 months

1
0
0 0

[COMMIT] branch master updated. v1.10.1.0-128-gbf93802

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 bf9380296de8cd62c0a8569c1fc775869b8501ab (commit) from f83b71e6a9c685227615455df1f9e4fefeff19ae (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 bf9380296de8cd62c0a8569c1fc775869b8501ab Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Fri Sep 23 16:44:19 2016 +0300 test: skip pktio_perf tests on 1 and 2 cpus machines Make check should skip the test instead of failing it. Test splits RX and TX cores for packet processing. Core 0 bind to control thread. So running machine should have at least 2 worker threads which is not enough on 1 and 2 cpus machine. CUnit uses special value 77 to mark test as SKIPPED and not fail on it. Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> Reviewed-and-tested-by: Mike Holmes <mike.holmes(a)linaro.org> diff --git a/test/common_plat/performance/odp_pktio_perf.c b/test/common_plat/performance/odp_pktio_perf.c index f041b13..846dfaa 100644 --- a/test/common_plat/performance/odp_pktio_perf.c +++ b/test/common_plat/performance/odp_pktio_perf.c @@ -34,6 +34,8 @@ #include <inttypes.h> #include <test_debug.h> +#define TEST_SKIP 77 + #define PKT_BUF_NUM 8192 #define MAX_NUM_IFACES 2 #define TEST_HDR_MAGIC 0x92749451 @@ -558,7 +560,7 @@ static int setup_txrx_masks(odp_cpumask_t *thd_mask_tx, gbl_args->args.cpu_count); if (num_workers < 2) { LOG_ERR("Need at least two cores\n"); - return -1; + return TEST_SKIP; } if (gbl_args->args.num_tx_workers) { @@ -669,8 +671,9 @@ static int run_test(void) .warmup = 1, }; - if (setup_txrx_masks(&txmask, &rxmask) != 0) - return -1; + ret = setup_txrx_masks(&txmask, &rxmask); + if (ret) + return ret; printf("Starting test with params:\n"); printf("\tTransmit workers: \t%d\n", odp_cpumask_count(&txmask)); @@ -691,8 +694,11 @@ static int run_test(void) run_test_single(&txmask, &rxmask, &status); status.warmup = 0; - while (ret > 0) + while (1) { ret = run_test_single(&txmask, &rxmask, &status); + if (ret) + break; + } return ret; } ----------------------------------------------------------------------- Summary of changes: test/common_plat/performance/odp_pktio_perf.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) hooks/post-receive --

7 years, 6 months

1
0
0 0

[COMMIT] branch master updated. v1.10.1.0-127-gf83b71e

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 f83b71e6a9c685227615455df1f9e4fefeff19ae (commit) from a8e5a8f6853ddc998430d112c22994928ddb4070 (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 f83b71e6a9c685227615455df1f9e4fefeff19ae Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Fri Sep 30 02:46:08 2016 +0300 linux-gen: build: de-couple abi compatibility from shared lib Building ABI compatible or shared library are two different targets. A shared library may be used also without ABI compatibility. A new --enable-abi-compat configuration option is introduced. By default libraries are not built in ABI compat mode to enable function inlining. There is a noticeable performance difference when e.g. odp_atomic_xxx calls are not inlined. Signed-off-by: Petri Savolainen <petri.savolainen(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/configure.ac b/configure.ac index 982aff7..f081c51 100644 --- a/configure.ac +++ b/configure.ac @@ -176,13 +176,6 @@ AM_CONDITIONAL([test_example], [test x$test_example = xyes ]) AM_CONDITIONAL([HAVE_DOXYGEN], [test "x${DOXYGEN}" = "xdoxygen"]) AM_CONDITIONAL([user_guide], [test "x${user_guides}" = "xyes" ]) AM_CONDITIONAL([HAVE_MSCGEN], [test "x${MSCGEN}" = "xmscgen"]) -if test x$enable_shared != xyes; -then - _ODP_INLINES="_ODP_INLINES" -else - _ODP_INLINES="_ODP_NO_INLINES" -fi -AC_SUBST(_ODP_INLINES) ########################################################################## # Setup doxygen documentation @@ -225,6 +218,22 @@ AC_ARG_ENABLE([debug], ODP_CFLAGS="$ODP_CFLAGS -DODP_DEBUG=$ODP_DEBUG" ########################################################################## +# Enable/disable ABI compatible build +########################################################################## +ODP_ABI_COMPAT=1 +abi_compat=yes +AC_ARG_ENABLE([abi-compat], + [ --enable-abi-compat build all targets in ABI compatible mode (default=yes)], + [if test "x$enableval" = "xyes"; then + ODP_ABI_COMPAT=1 + abi_compat=yes + else + ODP_ABI_COMPAT=0 + abi_compat=no + fi]) +AC_SUBST(ODP_ABI_COMPAT) + +########################################################################## # Default warning setup ########################################################################## ODP_CFLAGS="$ODP_CFLAGS -W -Wall -Werror -Wstrict-prototypes -Wmissing-prototypes" @@ -307,6 +316,9 @@ AC_MSG_RESULT([ am_ldflags: ${AM_LDFLAGS} libs: ${LIBS} defs: ${DEFS} + static libraries: ${enable_static} + shared libraries: ${enable_shared} + ABI compatible: ${abi_compat} cunit: ${cunit_support} test_vald: ${test_vald} test_perf: ${test_perf} diff --git a/platform/linux-generic/.gitignore b/platform/linux-generic/.gitignore index ec6ca37..909756a 100644 --- a/platform/linux-generic/.gitignore +++ b/platform/linux-generic/.gitignore @@ -1 +1 @@ -include/odp/api/plat/inlines.h +include/odp/api/plat/static_inline.h diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 900ac08..0ec13d4 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -61,7 +61,7 @@ odpapiinclude_HEADERS = \ odpapiplatincludedir= $(includedir)/odp/api/plat odpapiplatinclude_HEADERS = \ - $(builddir)/include/odp/api/plat/inlines.h \ + $(builddir)/include/odp/api/plat/static_inline.h \ $(srcdir)/include/odp/api/plat/atomic_inlines.h \ $(srcdir)/include/odp/api/plat/atomic_types.h \ $(srcdir)/include/odp/api/plat/barrier_types.h \ diff --git a/platform/linux-generic/include/odp/api/atomic.h b/platform/linux-generic/include/odp/api/atomic.h index c18e68b..7886cb4 100644 --- a/platform/linux-generic/include/odp/api/atomic.h +++ b/platform/linux-generic/include/odp/api/atomic.h @@ -24,8 +24,8 @@ extern "C" { * @{ */ -#include <odp/api/plat/inlines.h> -#ifdef _ODP_INLINES +#include <odp/api/plat/static_inline.h> +#if ODP_ABI_COMPAT == 0 #include <odp/api/plat/atomic_inlines.h> #endif diff --git a/platform/linux-generic/include/odp/api/byteorder.h b/platform/linux-generic/include/odp/api/byteorder.h index 84d1173..ec3d0ee 100644 --- a/platform/linux-generic/include/odp/api/byteorder.h +++ b/platform/linux-generic/include/odp/api/byteorder.h @@ -25,8 +25,8 @@ extern "C" { * @{ */ -#include <odp/api/plat/inlines.h> -#ifdef _ODP_INLINES +#include <odp/api/plat/static_inline.h> +#if ODP_ABI_COMPAT == 0 #include <odp/api/plat/byteorder_inlines.h> #endif diff --git a/platform/linux-generic/include/odp/api/plat/inlines.h.in b/platform/linux-generic/include/odp/api/plat/static_inline.h.in similarity index 58% rename from platform/linux-generic/include/odp/api/plat/inlines.h.in rename to platform/linux-generic/include/odp/api/plat/static_inline.h.in index 5d8c0dc..acee5f3 100644 --- a/platform/linux-generic/include/odp/api/plat/inlines.h.in +++ b/platform/linux-generic/include/odp/api/plat/static_inline.h.in @@ -7,27 +7,26 @@ /** * @file * - * ODP platform inline functions + * Macro for static inline functions */ -#ifndef ODP_PLAT_INLINES_H_ -#define ODP_PLAT_INLINES_H_ +#ifndef ODP_PLAT_STATIC_INLINE_H_ +#define ODP_PLAT_STATIC_INLINE_H_ #ifdef __cplusplus extern "C" { #endif -#define @_ODP_INLINES@ - -#ifdef _ODP_INLINES -#define _STATIC static inline -#else +#if @ODP_ABI_COMPAT@ +#define ODP_ABI_COMPAT 1 #define _STATIC +#else +#define ODP_ABI_COMPAT 0 +#define _STATIC static inline #endif #ifdef __cplusplus } #endif - -#endif /* ODP_PLAT_INLINES_H_ */ +#endif diff --git a/platform/linux-generic/include/odp/api/std_clib.h b/platform/linux-generic/include/odp/api/std_clib.h index c498f68..fea4725 100644 --- a/platform/linux-generic/include/odp/api/std_clib.h +++ b/platform/linux-generic/include/odp/api/std_clib.h @@ -14,8 +14,8 @@ extern "C" { #include <odp/api/spec/std_types.h> #include <string.h> -#include <odp/api/plat/inlines.h> -#ifdef _ODP_INLINES +#include <odp/api/plat/static_inline.h> +#if ODP_ABI_COMPAT == 0 #include <odp/api/plat/std_clib_inlines.h> #endif diff --git a/platform/linux-generic/include/odp/api/sync.h b/platform/linux-generic/include/odp/api/sync.h index d2becb9..e1afcc7 100644 --- a/platform/linux-generic/include/odp/api/sync.h +++ b/platform/linux-generic/include/odp/api/sync.h @@ -21,8 +21,8 @@ extern "C" { * @{ */ -#include <odp/api/plat/inlines.h> -#ifdef _ODP_INLINES +#include <odp/api/plat/static_inline.h> +#if ODP_ABI_COMPAT == 0 #include <odp/api/plat/sync_inlines.h> #endif diff --git a/platform/linux-generic/m4/configure.m4 b/platform/linux-generic/m4/configure.m4 index 6fb05c0..d3e5528 100644 --- a/platform/linux-generic/m4/configure.m4 +++ b/platform/linux-generic/m4/configure.m4 @@ -37,4 +37,4 @@ m4_include([platform/linux-generic/m4/odp_ipc.m4]) m4_include([platform/linux-generic/m4/odp_schedule.m4]) AC_CONFIG_FILES([platform/linux-generic/Makefile - platform/linux-generic/include/odp/api/plat/inlines.h]) + platform/linux-generic/include/odp/api/plat/static_inline.h]) diff --git a/platform/linux-generic/odp_atomic.c b/platform/linux-generic/odp_atomic.c index e9a3ed0..0e40cda 100644 --- a/platform/linux-generic/odp_atomic.c +++ b/platform/linux-generic/odp_atomic.c @@ -5,7 +5,7 @@ */ #include <odp/api/atomic.h> -#ifndef _ODP_INLINES +#if ODP_ABI_COMPAT == 1 #include <odp/api/plat/atomic_inlines.h> #endif diff --git a/platform/linux-generic/odp_byteorder.c b/platform/linux-generic/odp_byteorder.c index fc87291..a344c53 100644 --- a/platform/linux-generic/odp_byteorder.c +++ b/platform/linux-generic/odp_byteorder.c @@ -5,6 +5,6 @@ */ #include <odp/api/byteorder.h> -#ifndef _ODP_INLINES +#if ODP_ABI_COMPAT == 1 #include <odp/api/plat/byteorder_inlines.h> #endif diff --git a/platform/linux-generic/odp_std_clib.c b/platform/linux-generic/odp_std_clib.c index 611ba12..24df249 100644 --- a/platform/linux-generic/odp_std_clib.c +++ b/platform/linux-generic/odp_std_clib.c @@ -5,6 +5,6 @@ */ #include <odp/api/std_clib.h> -#ifndef _ODP_INLINES +#if ODP_ABI_COMPAT == 1 #include <odp/api/plat/std_clib_inlines.h> #endif diff --git a/platform/linux-generic/odp_sync.c b/platform/linux-generic/odp_sync.c index f31c389..b7eb503 100644 --- a/platform/linux-generic/odp_sync.c +++ b/platform/linux-generic/odp_sync.c @@ -5,6 +5,6 @@ */ #include <odp/api/sync.h> -#ifndef _ODP_INLINES +#if ODP_ABI_COMPAT == 1 #include <odp/api/plat/sync_inlines.h> #endif ----------------------------------------------------------------------- Summary of changes: configure.ac | 26 ++++++++++++++++------ platform/linux-generic/.gitignore | 2 +- platform/linux-generic/Makefile.am | 2 +- platform/linux-generic/include/odp/api/atomic.h | 4 ++-- platform/linux-generic/include/odp/api/byteorder.h | 4 ++-- .../api/plat/{inlines.h.in => static_inline.h.in} | 19 ++++++++-------- platform/linux-generic/include/odp/api/std_clib.h | 4 ++-- platform/linux-generic/include/odp/api/sync.h | 4 ++-- platform/linux-generic/m4/configure.m4 | 2 +- platform/linux-generic/odp_atomic.c | 2 +- platform/linux-generic/odp_byteorder.c | 2 +- platform/linux-generic/odp_std_clib.c | 2 +- platform/linux-generic/odp_sync.c | 2 +- 13 files changed, 43 insertions(+), 32 deletions(-) rename platform/linux-generic/include/odp/api/plat/{inlines.h.in => static_inline.h.in} (58%) hooks/post-receive --

7 years, 6 months

1
0
0 0

[COMMIT] branch master updated. v1.10.1.0-126-ga8e5a8f

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 a8e5a8f6853ddc998430d112c22994928ddb4070 (commit) from 09abf90268a0a5a2daf7c7e0ae37a2d7c35e87c5 (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 a8e5a8f6853ddc998430d112c22994928ddb4070 Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Thu Sep 8 18:53:00 2016 +0300 linux-gen: pktio: ipc: remove todos Remove todo around copying packet data from shared pool as it's not a bug and can be considered as future request. But left small comment that we coping packet data to make it more visible. https://bugs.linaro.org/show_bug.cgi?id=2408 Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> Reviewed-by: Mike Holmes <mike.holmes(a)linaro.org> diff --git a/platform/linux-generic/pktio/ipc.c b/platform/linux-generic/pktio/ipc.c index b779ab7..c1f28db 100644 --- a/platform/linux-generic/pktio/ipc.c +++ b/platform/linux-generic/pktio/ipc.c @@ -373,11 +373,6 @@ static int _ipc_slave_start(pktio_entry_t *pktio_entry) pinfo->master.mdata_offset; pktio_entry->s.ipc.pkt_size = pinfo->master.shm_pkt_size; - /* @todo: to simplify in odp-linux implementation we create pool for - * packets from IPC queue. On receive implementation copies packets to - * that pool. Later we can try to reuse original pool without packets - * copying. (pkt refcounts needs to be implemented). - */ _ipc_export_pool(pinfo, pktio_entry->s.ipc.pool); odp_atomic_store_u32(&pktio_entry->s.ipc.ready, 1); @@ -573,7 +568,7 @@ static int ipc_pktio_recv_lockless(pktio_entry_t *pktio_entry, (PKTIO_TYPE_IPC_SLAVE == pktio_entry->s.ipc.type)); - /* @todo fix copy packet!!! */ + /* Copy packet data from shared pool to local pool. */ memcpy(pkt_data, remote_pkt_data, phdr.frame_len); /* Copy packets L2, L3 parsed offsets and size */ ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/pktio/ipc.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) hooks/post-receive --

7 years, 6 months

1
0
0 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

git-lng-odp October 2016