diff options
author | Matias Elo <matias.elo@nokia.com> | 2023-08-17 15:39:46 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-08-17 15:39:46 +0300 |
commit | 5d505fde6d4327b27446389699abf3a593c02a17 (patch) | |
tree | 937164d89e7b8679a42f0e3705e19243baaf0147 /test/performance | |
parent | de97121a2e3afa072f7c51a0570f4b3bed0236c2 (diff) | |
parent | 7a200d709b64e743c002dd9737cd71f54ccc54ac (diff) |
Merge ODP v1.42.0.0v1.42.0.0_DPDK_22.11
Merge ODP linux-generic v1.42.0.0 into linux-dpdk.
Diffstat (limited to 'test/performance')
-rw-r--r-- | test/performance/Makefile.am | 1 | ||||
-rw-r--r-- | test/performance/odp_crypto.c | 8 | ||||
-rw-r--r-- | test/performance/odp_stress.c | 2 |
3 files changed, 9 insertions, 2 deletions
diff --git a/test/performance/Makefile.am b/test/performance/Makefile.am index 67d57590a..6e20ec07c 100644 --- a/test/performance/Makefile.am +++ b/test/performance/Makefile.am @@ -84,6 +84,7 @@ odp_timer_perf_SOURCES = odp_timer_perf.c if LIBCONFIG odp_ipsecfwd_SOURCES = odp_ipsecfwd.c +AM_CFLAGS += $(LIBCONFIG_CFLAGS) endif # l2fwd test depends on generator example diff --git a/test/performance/odp_crypto.c b/test/performance/odp_crypto.c index 52af6d2fc..fed3ebad8 100644 --- a/test/performance/odp_crypto.c +++ b/test/performance/odp_crypto.c @@ -1,5 +1,5 @@ /* Copyright (c) 2015-2018, Linaro Limited - * Copyright (c) 2022, Nokia + * Copyright (c) 2023, Nokia * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause @@ -1170,6 +1170,12 @@ static int run_measure_one_config(test_run_arg_t *arg) rc = 1; } +#if ODP_VERSION_API >= ODP_VERSION_API_NUM(1, 42, 0) + /* Bit mode ciphers can now be used in byte mode. */ + config->cipher_in_bit_mode = 0; + config->auth_in_bit_mode = 0; +#endif + if (rc == 0) rc = create_session_from_config(&session, config, cargs); if (rc) { diff --git a/test/performance/odp_stress.c b/test/performance/odp_stress.c index 15b44c113..d5e3142f6 100644 --- a/test/performance/odp_stress.c +++ b/test/performance/odp_stress.c @@ -213,7 +213,7 @@ static int worker_thread(void *arg) odp_timer_start_t start_param; odp_time_t t1, t2, max_time; odp_time_t work_t1, work_t2; - uint8_t *src, *dst; + uint8_t *src = NULL, *dst = NULL; thread_arg_t *thread_arg = arg; int worker_idx = thread_arg->worker_idx; test_global_t *global = thread_arg->global; |