replace build code for unit tests
PATCH v5 9/10 build: make most device classes optional
In reply to Bruce RichardsonApart from ethdev and cryptodev, which have lots of components and tests which depend on them, we can make the device class libraries optional without too much work.
This patch marks:
* bbdev,
* compressdev,
* dmadev,
* eventdev,
* mldev,
* rawdev,
* regexdev
optional, and ensures that DPDK - including tests - can be built with these components disabled.
--- lib/meson.build | 7 +++++++ 1 file changed, 7 insertions(+)
lib/meson.build +7 -0
@@ -67,8 +67,12 @@ libraries = [ ] optional_libs = [ + 'bbdev', 'bitratestats', 'cfgfile', + 'compressdev', + 'dmadev', + 'eventdev', 'gpudev', 'graph', 'gro',
@@ -76,11 +80,14 @@ optional_libs = [ 'jobstats', 'latencystats', 'metrics', + 'mldev', 'node', 'pdump', 'pipeline', 'port', 'power', + 'rawdev', + 'regexdev', 'table', 'vhost', ]
Signature · 1 line
2.39.2
PATCH v5 10/10 build: expand list of optional libraries
In reply to Bruce RichardsonWith the unit test build now with individual per-file dependencies, we can more easily expand the list of optional libraries. Add 8 new libraries to the optional list.
--- lib/meson.build | 8 ++++++++ 1 file changed, 8 insertions(+)
lib/meson.build +8 -0
@@ -69,25 +69,33 @@ libraries = [ optional_libs = [ 'bbdev', 'bitratestats', + 'bpf', 'cfgfile', 'compressdev', + 'distributor', 'dmadev', + 'efd', 'eventdev', 'gpudev', 'graph', 'gro', 'gso', + 'ip_frag', 'jobstats', 'latencystats', + 'member', 'metrics', 'mldev', 'node', + 'pcapng', 'pdump', 'pipeline', 'port', 'power', 'rawdev', 'regexdev', + 'reorder', + 'sched', 'table', 'vhost', ]
Signature · 1 line
2.39.2
v6 cover expand list of optional libraries
In reply to Bruce RichardsonThis patchset contains changes to DPDK to make the build more configurable overall. The changes can be grouped into two areas:
* Firstly, there are changes to make the build of the unit tests more flexible and maintainable. These 7 patches switch the unit tests from having separate hard-coded lists of files and tests, with lots of conditional logic to add/remove items from the list, to instead being a single list of files and dependencies per-file. The actual lists of test-suites are built up dynamically from the list of files whose dependencies are met and therefore will be part of the build. This rework enables...
* The second set of patches which expands the list of libraries which can be disabled at build-time, while still giving a successful build of DPDK. Overall, after this set is applied, the list of optional libraries in DPDK is approx doubled in size. [15 additions giving 31 optional libs]
NOTES:
* as stated in the RFC, the test binary moves in the build as a result of this set - from app/test/dpdk-test to app/dpdk-test.
* running the suites of tests no longer works after patch 4 until patch 5-7 is applied. If this is an issue, the patches can be merged on apply. However, the individual tests are still runnable through the test binary - it's only through "meson test" that there are issues, so I'm keeping the patches separate since each is relatively complex in its own right.
* A number of files in the test directory were not being built, and seem to have never been built with meson. This requires separate work, outside the scope of the patchset to fix.
* Similarly, some unit tests were never added to test suites. These can now be found by using grep to find the old REGISTER_TEST_COMMAND macro. Again, adding orphan tests to suites is outside the scope of this set.
V6:
- include fix from David M. for mempool issue causing CI failures
- change use of "True" to "true" in C file macros for the fast-tests.
- add new/renamed python scripts to MAINTAINERS
- minor typo fixes
V5:
- revert back to using the environment to pass the test names rather than the commandline. This allows use of "--test-args" with meson test to pass additional EAL parameters, such as coremasks, to the test run.
- add back in support for the script for checking telemetry commands
- add support for the dump-* tests in the "debug-tests" suite. Sadly, even though these are hardcoded in commands.c, they aren't easily discoverable at build-time, so we have to use a hard-coded list.
V4:
- improve test suite definition, hopefully improving test pass rate:
- drop unnecessary file-prefix for fast tests, since tests are not parallel
- always pass driver path flag in "meson test" for shared builds.
V3:
- Create symlink to old path to test binary, to ensure all automated CI, and any other use of the test binary still works.
V2:
- Changes since RFC:
- merged two previous sets - reworking test build, and disabling libs - into one, since they depend on each other
- Reworked the list of dependencies for each file in the tests, so that files that depend on other files have those deps called out.
- Added list of external dependencies to the test builds
- For disabling libs, merged patches disabling individual libs together into one patch, since all unit test build changes were unnecessary. This made each patch a single-line addition to the optional list in lib/meson.build.
Bruce Richardson (10):
app/test: add new macros for various test types app/test: tag tests with the test type app/test: make telemetry data test buildable on windows app/test: build using per-file dependency matrix app/test: define unit tests suites based on test macros app/test: add test case for scripted telemetry commands app/test: add debug test suite
examples/l3fwd: make eventdev an optional dependency
build: make most device classes optional
build: expand list of optional libraries
David Marchand (1):
mempool: fix default ops for an empty mempool
MAINTAINERS | 3 +-
app/meson.build | 15 +-
app/test/meson.build | 823 +++++-------------
app/test/suites/meson.build | 124 +++
app/test/{ => suites}/test_telemetry.sh | 0
app/test/test.h | 9 +-
app/test/test_acl.c | 2 +-
app/test/test_atomic.c | 2 +-
app/test/test_barrier.c | 2 +-
app/test/test_bitmap.c | 2 +-
app/test/test_bitops.c | 2 +-
app/test/test_bpf.c | 4 +-
app/test/test_byteorder.c | 2 +-
app/test/test_cksum.c | 2 +-
app/test/test_cmdline.c | 2 +-
app/test/test_common.c | 2 +-
app/test/test_cpuflags.c | 2 +-
app/test/test_crc.c | 2 +-
app/test/test_cryptodev.c | 38 +-
app/test/test_cryptodev_asym.c | 2 +-
app/test/test_cycles.c | 2 +-
app/test/test_debug.c | 2 +-
app/test/test_devargs.c | 2 +-
app/test/test_distributor.c | 2 +-
app/test/test_distributor_perf.c | 2 +-
app/test/test_dmadev.c | 2 +-
app/test/test_eal_flags.c | 24 +-
app/test/test_eal_fs.c | 2 +-
app/test/test_efd.c | 2 +-
app/test/test_efd_perf.c | 2 +-
app/test/test_errno.c | 2 +-
app/test/test_ethdev_link.c | 2 +-
app/test/test_event_ring.c | 2 +-
app/test/test_eventdev.c | 2 +-
app/test/test_fbarray.c | 2 +-
app/test/test_fib.c | 4 +-
app/test/test_fib6.c | 4 +-
app/test/test_fib6_perf.c | 2 +-
app/test/test_fib_perf.c | 2 +-
app/test/test_func_reentrancy.c | 2 +-
app/test/test_hash.c | 2 +-
app/test/test_hash_functions.c | 2 +-
app/test/test_hash_multiwriter.c | 2 +-
app/test/test_hash_perf.c | 2 +-
app/test/test_hash_readwrite.c | 4 +-
app/test/test_hash_readwrite_lf_perf.c | 2 +-
app/test/test_interrupts.c | 2 +-
app/test/test_ipfrag.c | 2 +-
app/test/test_ipsec.c | 2 +-
app/test/test_ipsec_perf.c | 2 +-
app/test/test_kvargs.c | 2 +-
app/test/test_lcores.c | 2 +-
app/test/test_logs.c | 2 +-
app/test/test_lpm.c | 2 +-
app/test/test_lpm6.c | 2 +-
app/test/test_lpm6_perf.c | 2 +-
app/test/test_lpm_perf.c | 2 +-
app/test/test_malloc.c | 2 +-
app/test/test_malloc_perf.c | 2 +-
app/test/test_mbuf.c | 2 +-
app/test/test_mcslock.c | 2 +-
app/test/test_member.c | 2 +-
app/test/test_member_perf.c | 2 +-
app/test/test_memcpy.c | 2 +-
app/test/test_memcpy_perf.c | 2 +-
app/test/test_memory.c | 2 +-
app/test/test_mempool.c | 2 +-
app/test/test_mempool_perf.c | 2 +-
app/test/test_memzone.c | 2 +-
app/test/test_meter.c | 2 +-
app/test/test_mp_secondary.c | 2 +-
app/test/test_per_lcore.c | 2 +-
app/test/test_pflock.c | 2 +-
app/test/test_pie.c | 6 +-
app/test/test_pmd_perf.c | 2 +-
app/test/test_power.c | 2 +-
app/test/test_power_cpufreq.c | 2 +-
app/test/test_power_intel_uncore.c | 2 +-
app/test/test_power_kvm_vm.c | 2 +-
app/test/test_prefetch.c | 2 +-
app/test/test_rand_perf.c | 2 +-
app/test/test_rcu_qsbr.c | 2 +-
app/test/test_rcu_qsbr_perf.c | 2 +-
app/test/test_reassembly_perf.c | 2 +-
app/test/test_reciprocal_division.c | 2 +-
app/test/test_reciprocal_division_perf.c | 2 +-
app/test/test_red.c | 4 +-
app/test/test_reorder.c | 2 +-
app/test/test_rib.c | 4 +-
app/test/test_rib6.c | 4 +-
app/test/test_ring.c | 2 +-
app/test/test_ring_perf.c | 2 +-
app/test/test_rwlock.c | 8 +-
app/test/test_sched.c | 2 +-
app/test/test_security.c | 2 +-
app/test/test_seqlock.c | 2 +-
app/test/test_service_cores.c | 4 +-
app/test/test_spinlock.c | 2 +-
app/test/test_stack.c | 4 +-
app/test/test_stack_perf.c | 4 +-
app/test/test_string_fns.c | 2 +-
app/test/test_tailq.c | 2 +-
app/test/test_telemetry_data.c | 14 +-
app/test/test_thash.c | 2 +-
app/test/test_thash_perf.c | 2 +-
app/test/test_threads.c | 2 +-
app/test/test_ticketlock.c | 2 +-
app/test/test_timer.c | 2 +-
app/test/test_timer_perf.c | 2 +-
app/test/test_timer_racecond.c | 2 +-
app/test/test_trace.c | 2 +-
app/test/test_trace_perf.c | 2 +-
app/test/test_version.c | 2 +-
buildtools/get-test-suites.py | 33 +
.../has-hugepages.py | 0
buildtools/meson.build | 2 +
examples/l3fwd/l3fwd_em.c | 2 +
examples/l3fwd/l3fwd_em_hlm.h | 2 +
examples/l3fwd/l3fwd_event.c | 2 +
examples/l3fwd/l3fwd_event.h | 7 +-
examples/l3fwd/l3fwd_event_generic.c | 2 +
examples/l3fwd/l3fwd_event_internal_port.c | 2 +
examples/l3fwd/l3fwd_fib.c | 2 +
examples/l3fwd/l3fwd_lpm.c | 2 +
examples/l3fwd/main.c | 65 +-
examples/l3fwd/meson.build | 5 +-
lib/mempool/rte_mempool.c | 33 +-
lib/meson.build | 15 +
128 files changed, 680 insertions(+), 782 deletions(-)
create mode 100644 app/test/suites/meson.build
rename app/test/{ => suites}/test_telemetry.sh (100%)
create mode 100644 buildtools/get-test-suites.py
rename app/test/has_hugepage.py => buildtools/has-hugepages.py (100%)--
2.39.2
PATCH v6 1/11 mempool: fix default ops for an empty mempool
From: David Marchand <[email protected]>
An empty mempool's ops were not initialised to a default value wrt to what the application requested via the flags parameter. As rte_mempool_create() relies on rte_mempool_create_empty(), simply move this ops initialisation to rte_mempool_create_empty().
--- lib/mempool/rte_mempool.c | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-)
lib/mempool/rte_mempool.c +16 -17
@@ -914,6 +914,22 @@ rte_mempool_create_empty(const char *name, unsigned n, unsigned elt_size,STAILQ_INIT (&mp->elt_list);STAILQ_INIT (&mp->mem_list); +/* +* Since we have 4 combinations of the SP/SC/MP/MC examine the flags to +* set the correct index into the table of ops structs. +*/ +if ((flags &RTE_MEMPOOL_F_SP_PUT ) && (flags &RTE_MEMPOOL_F_SC_GET )) + ret =rte_mempool_set_ops_byname (mp,"ring_sp_sc" ,NULL ); +else if (flags &RTE_MEMPOOL_F_SP_PUT ) + ret =rte_mempool_set_ops_byname (mp,"ring_sp_mc" ,NULL ); +else if (flags &RTE_MEMPOOL_F_SC_GET ) + ret =rte_mempool_set_ops_byname (mp,"ring_mp_sc" ,NULL ); +else + ret =rte_mempool_set_ops_byname (mp,"ring_mp_mc" ,NULL ); + +if (ret) + goto exit_unlock; +/* * local_cache pointer is set even if cache_size is zero. * The local_cache points to just past the elt_pa[] array.
@@ -954,7 +970,6 @@ rte_mempool_create(const char *name, unsigned n, unsigned elt_size, rte_mempool_obj_cb_t *obj_init, void *obj_init_arg, int socket_id, unsigned flags) { -int ret;struct rte_mempool *mp; mp = rte_mempool_create_empty(name, n, elt_size, cache_size,
@@ -962,22 +977,6 @@ rte_mempool_create(const char *name, unsigned n, unsigned elt_size,if (mp ==NULL )return NULL ; -/* -* Since we have 4 combinations of the SP/SC/MP/MC examine the flags to -* set the correct index into the table of ops structs. -*/ -if ((flags &RTE_MEMPOOL_F_SP_PUT ) && (flags &RTE_MEMPOOL_F_SC_GET )) - ret =rte_mempool_set_ops_byname (mp,"ring_sp_sc" ,NULL ); -else if (flags &RTE_MEMPOOL_F_SP_PUT ) - ret =rte_mempool_set_ops_byname (mp,"ring_sp_mc" ,NULL ); -else if (flags &RTE_MEMPOOL_F_SC_GET ) - ret =rte_mempool_set_ops_byname (mp,"ring_mp_sc" ,NULL ); -else - ret =rte_mempool_set_ops_byname (mp,"ring_mp_mc" ,NULL ); - -if (ret) - goto fail; -/* call the mempool priv initializer */ if (mp_init)mp_init (mp, mp_init_arg);
Signature · 1 line
2.39.2
RE: [PATCH v6 01/11] mempool: fix default ops for an empty mempool
Quoted 10 lines
From: Bruce Richardson [mailto:[email protected]]
Sent: Wednesday, 16 August 2023 17.34From: David Marchand <[email protected]>
An empty mempool's ops were not initialised to a default value wrt to what the application requested via the flags parameter. As
rte_mempool_create()relies onrte_mempool_create_empty(), simply move this ops initialisation torte_mempool_create_empty().
Quoted 7 lines
Fixes aa10457eb4c2 ("mempool: make mempool populate and free apipublic")
Cc: [email protected]Signed-off-by David Marchand <[email protected]>Reviewed-by Bruce Richardson <[email protected]>---
I would have moved it to the exact same location.
PATCH v6 2/11 app/test: add new macros for various test types
In reply to Bruce RichardsonRather than just registering all tests using a single generic macro, add macros which identify the test as being of a particular type.
--- app/test/test.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
app/test/test.h +8 -1
@@ -190,7 +190,7 @@ struct test_command {void add_test_command (struct test_command *t); -/* Register a test function with its command string */ +/* Register a test function with its command string. Should not be used directly */ #define REGISTER_TEST_COMMAND (cmd, func) \ static struct test_command test_struct_##cmd = { \ .command = RTE_STR(cmd), \
@@ -201,4 +201,11 @@ void add_test_command(struct test_command *t); add_test_command(&test_struct_##cmd); \ } +/* Register a test function as a particular type. +* These can be used to build up test suites automatically +*/ +#define REGISTER_FAST_TEST (cmd, no_huge, ASan, func) REGISTER_TEST_COMMAND(cmd, func) +#define REGISTER_PERF_TEST REGISTER_TEST_COMMAND +#define REGISTER_DRIVER_TEST REGISTER_TEST_COMMAND +#endif
Signature · 1 line
2.39.2
PATCH v6 3/11 app/test: tag tests with the test type
In reply to Bruce RichardsonRather than having the test types called out in the meson.build file, we can use macros to identify the test type in the C file itself and then dynamically build up the tests lists at config time.
--- app/test/test_acl.c | 2 +- app/test/test_atomic.c | 2 +- app/test/test_barrier.c | 2 +- app/test/test_bitmap.c | 2 +- app/test/test_bitops.c | 2 +- app/test/test_bpf.c | 4 +-- app/test/test_byteorder.c | 2 +- app/test/test_cksum.c | 2 +- app/test/test_cmdline.c | 2 +- app/test/test_common.c | 2 +- app/test/test_cpuflags.c | 2 +- app/test/test_crc.c | 2 +- app/test/test_cryptodev.c | 38 ++++++++++++------------ app/test/test_cryptodev_asym.c | 2 +- app/test/test_cycles.c | 2 +- app/test/test_debug.c | 2 +- app/test/test_devargs.c | 2 +- app/test/test_distributor.c | 2 +- app/test/test_distributor_perf.c | 2 +- app/test/test_dmadev.c | 2 +- app/test/test_eal_flags.c | 24 +++++++-------- app/test/test_eal_fs.c | 2 +- app/test/test_efd.c | 2 +- app/test/test_efd_perf.c | 2 +- app/test/test_errno.c | 2 +- app/test/test_ethdev_link.c | 2 +- app/test/test_event_ring.c | 2 +- app/test/test_eventdev.c | 2 +- app/test/test_fbarray.c | 2 +- app/test/test_fib.c | 4 +-- app/test/test_fib6.c | 4 +-- app/test/test_fib6_perf.c | 2 +- app/test/test_fib_perf.c | 2 +- app/test/test_func_reentrancy.c | 2 +- app/test/test_hash.c | 2 +- app/test/test_hash_functions.c | 2 +- app/test/test_hash_multiwriter.c | 2 +- app/test/test_hash_perf.c | 2 +- app/test/test_hash_readwrite.c | 4 +-- app/test/test_hash_readwrite_lf_perf.c | 2 +- app/test/test_interrupts.c | 2 +- app/test/test_ipfrag.c | 2 +- app/test/test_ipsec.c | 2 +- app/test/test_ipsec_perf.c | 2 +- app/test/test_kvargs.c | 2 +- app/test/test_lcores.c | 2 +- app/test/test_logs.c | 2 +- app/test/test_lpm.c | 2 +- app/test/test_lpm6.c | 2 +- app/test/test_lpm6_perf.c | 2 +- app/test/test_lpm_perf.c | 2 +- app/test/test_malloc.c | 2 +- app/test/test_malloc_perf.c | 2 +- app/test/test_mbuf.c | 2 +- app/test/test_mcslock.c | 2 +- app/test/test_member.c | 2 +- app/test/test_member_perf.c | 2 +- app/test/test_memcpy.c | 2 +- app/test/test_memcpy_perf.c | 2 +- app/test/test_memory.c | 2 +- app/test/test_mempool.c | 2 +- app/test/test_mempool_perf.c | 2 +- app/test/test_memzone.c | 2 +- app/test/test_meter.c | 2 +- app/test/test_mp_secondary.c | 2 +- app/test/test_per_lcore.c | 2 +- app/test/test_pflock.c | 2 +- app/test/test_pie.c | 6 ++-- app/test/test_pmd_perf.c | 2 +- app/test/test_power.c | 2 +- app/test/test_power_cpufreq.c | 2 +- app/test/test_power_intel_uncore.c | 2 +- app/test/test_power_kvm_vm.c | 2 +- app/test/test_prefetch.c | 2 +- app/test/test_rand_perf.c | 2 +- app/test/test_rcu_qsbr.c | 2 +- app/test/test_rcu_qsbr_perf.c | 2 +- app/test/test_reassembly_perf.c | 2 +- app/test/test_reciprocal_division.c | 2 +- app/test/test_reciprocal_division_perf.c | 2 +- app/test/test_red.c | 4 +-- app/test/test_reorder.c | 2 +- app/test/test_rib.c | 4 +-- app/test/test_rib6.c | 4 +-- app/test/test_ring.c | 2 +- app/test/test_ring_perf.c | 2 +- app/test/test_rwlock.c | 8 ++--- app/test/test_sched.c | 2 +- app/test/test_security.c | 2 +- app/test/test_seqlock.c | 2 +- app/test/test_service_cores.c | 4 +-- app/test/test_spinlock.c | 2 +- app/test/test_stack.c | 4 +-- app/test/test_stack_perf.c | 4 +-- app/test/test_string_fns.c | 2 +- app/test/test_tailq.c | 2 +- app/test/test_thash.c | 2 +- app/test/test_thash_perf.c | 2 +- app/test/test_threads.c | 2 +- app/test/test_ticketlock.c | 2 +- app/test/test_timer.c | 2 +- app/test/test_timer_perf.c | 2 +- app/test/test_timer_racecond.c | 2 +- app/test/test_trace.c | 2 +- app/test/test_trace_perf.c | 2 +- app/test/test_version.c | 2 +- 106 files changed, 150 insertions(+), 150 deletions(-)
app/test/test_acl.c +1 -1
@@ -1749,4 +1749,4 @@ test_acl(void)#endif /* !RTE_EXEC_ENV_WINDOWS */ -REGISTER_TEST_COMMAND (acl_autotest, test_acl); +REGISTER_FAST_TEST (acl_autotest, true, true, test_acl);
app/test/test_atomic.c +1 -1
@@ -631,4 +631,4 @@ test_atomic(void)return 0 ; } -REGISTER_TEST_COMMAND (atomic_autotest, test_atomic); +REGISTER_FAST_TEST (atomic_autotest, false, true, test_atomic);
app/test/test_barrier.c +1 -1
@@ -285,4 +285,4 @@ test_barrier(void)return ret; } -REGISTER_TEST_COMMAND (barrier_autotest, test_barrier); +REGISTER_PERF_TEST (barrier_autotest, test_barrier);
app/test/test_bitmap.c +1 -1
@@ -269,4 +269,4 @@ test_bitmap(void)return test_bitmap_all_set (); } -REGISTER_TEST_COMMAND (bitmap_autotest, test_bitmap); +REGISTER_FAST_TEST (bitmap_autotest, true, true, test_bitmap);
app/test/test_bitops.c +1 -1
@@ -135,4 +135,4 @@ test_bitops(void)return TEST_SUCCESS ; } -REGISTER_TEST_COMMAND (bitops_autotest, test_bitops); +REGISTER_FAST_TEST (bitops_autotest, true, true, test_bitops);
app/test/test_bpf.c +2 -2
@@ -3262,7 +3262,7 @@ test_bpf(void)#endif /* !RTE_LIB_BPF */ -REGISTER_TEST_COMMAND (bpf_autotest, test_bpf); +REGISTER_FAST_TEST (bpf_autotest, true, true, test_bpf);#ifndef RTE_HAS_LIBPCAP
@@ -3473,4 +3473,4 @@ test_bpf_convert(void)#endif /* RTE_HAS_LIBPCAP */ -REGISTER_TEST_COMMAND (bpf_convert_autotest, test_bpf_convert); +REGISTER_FAST_TEST (bpf_convert_autotest, true, true, test_bpf_convert);
app/test/test_byteorder.c +1 -1
@@ -63,4 +63,4 @@ test_byteorder(void)return 0 ; } -REGISTER_TEST_COMMAND (byteorder_autotest, test_byteorder); +REGISTER_FAST_TEST (byteorder_autotest, true, true, test_byteorder);
app/test/test_cksum.c +1 -1
@@ -267,4 +267,4 @@ test_cksum(void) }#undef GOTO_FAIL -REGISTER_TEST_COMMAND (cksum_autotest, test_cksum); +REGISTER_FAST_TEST (cksum_autotest, true, true, test_cksum);
app/test/test_cmdline.c +1 -1
@@ -60,4 +60,4 @@ test_cmdline(void)return 0 ; } -REGISTER_TEST_COMMAND (cmdline_autotest, test_cmdline); +REGISTER_FAST_TEST (cmdline_autotest, true, true, test_cmdline);
app/test/test_common.c +1 -1
@@ -350,4 +350,4 @@ test_common(void)return ret; } -REGISTER_TEST_COMMAND (common_autotest, test_common); +REGISTER_FAST_TEST (common_autotest, true, true, test_common);
app/test/test_cpuflags.c +1 -1
@@ -334,4 +334,4 @@ test_cpuflags(void)return 0 ; } -REGISTER_TEST_COMMAND (cpuflags_autotest, test_cpuflags); +REGISTER_FAST_TEST (cpuflags_autotest, true, true, test_cpuflags);
app/test/test_crc.c +1 -1
@@ -171,4 +171,4 @@ test_crc(void)return 0 ; } -REGISTER_TEST_COMMAND (crc_autotest, test_crc); +REGISTER_FAST_TEST (crc_autotest, true, true, test_crc);
app/test/test_cryptodev.c +19 -19
@@ -17535,33 +17535,33 @@ REGISTER_TEST_COMMAND(cryptodev_dpaa2_sec_raw_api_autotest, test_cryptodev_dpaa2_sec_raw_api);REGISTER_TEST_COMMAND (cryptodev_dpaa_sec_raw_api_autotest, test_cryptodev_dpaa_sec_raw_api); -REGISTER_TEST_COMMAND (cryptodev_qat_raw_api_autotest, +REGISTER_DRIVER_TEST (cryptodev_qat_raw_api_autotest, test_cryptodev_qat_raw_api); -REGISTER_TEST_COMMAND (cryptodev_qat_autotest, test_cryptodev_qat); -REGISTER_TEST_COMMAND (cryptodev_aesni_mb_autotest, test_cryptodev_aesni_mb); -REGISTER_TEST_COMMAND (cryptodev_cpu_aesni_mb_autotest, +REGISTER_DRIVER_TEST (cryptodev_qat_autotest, test_cryptodev_qat); +REGISTER_DRIVER_TEST (cryptodev_aesni_mb_autotest, test_cryptodev_aesni_mb); +REGISTER_DRIVER_TEST (cryptodev_cpu_aesni_mb_autotest, test_cryptodev_cpu_aesni_mb); -REGISTER_TEST_COMMAND (cryptodev_chacha_poly_mb_autotest, +REGISTER_DRIVER_TEST (cryptodev_chacha_poly_mb_autotest, test_cryptodev_chacha_poly_mb); -REGISTER_TEST_COMMAND (cryptodev_openssl_autotest, test_cryptodev_openssl); -REGISTER_TEST_COMMAND (cryptodev_aesni_gcm_autotest, test_cryptodev_aesni_gcm); -REGISTER_TEST_COMMAND (cryptodev_cpu_aesni_gcm_autotest, +REGISTER_DRIVER_TEST (cryptodev_openssl_autotest, test_cryptodev_openssl); +REGISTER_DRIVER_TEST (cryptodev_aesni_gcm_autotest, test_cryptodev_aesni_gcm); +REGISTER_DRIVER_TEST (cryptodev_cpu_aesni_gcm_autotest, test_cryptodev_cpu_aesni_gcm);REGISTER_TEST_COMMAND (cryptodev_mlx5_autotest, test_cryptodev_mlx5); -REGISTER_TEST_COMMAND (cryptodev_null_autotest, test_cryptodev_null); -REGISTER_TEST_COMMAND (cryptodev_sw_snow3g_autotest, test_cryptodev_sw_snow3g); -REGISTER_TEST_COMMAND (cryptodev_sw_kasumi_autotest, test_cryptodev_sw_kasumi); -REGISTER_TEST_COMMAND (cryptodev_sw_zuc_autotest, test_cryptodev_sw_zuc); -REGISTER_TEST_COMMAND (cryptodev_sw_armv8_autotest, test_cryptodev_armv8); -REGISTER_TEST_COMMAND (cryptodev_sw_mvsam_autotest, test_cryptodev_mrvl); -REGISTER_TEST_COMMAND (cryptodev_dpaa2_sec_autotest, test_cryptodev_dpaa2_sec); -REGISTER_TEST_COMMAND (cryptodev_dpaa_sec_autotest, test_cryptodev_dpaa_sec); +REGISTER_DRIVER_TEST (cryptodev_null_autotest, test_cryptodev_null); +REGISTER_DRIVER_TEST (cryptodev_sw_snow3g_autotest, test_cryptodev_sw_snow3g); +REGISTER_DRIVER_TEST (cryptodev_sw_kasumi_autotest, test_cryptodev_sw_kasumi); +REGISTER_DRIVER_TEST (cryptodev_sw_zuc_autotest, test_cryptodev_sw_zuc); +REGISTER_DRIVER_TEST (cryptodev_sw_armv8_autotest, test_cryptodev_armv8); +REGISTER_DRIVER_TEST (cryptodev_sw_mvsam_autotest, test_cryptodev_mrvl); +REGISTER_DRIVER_TEST (cryptodev_dpaa2_sec_autotest, test_cryptodev_dpaa2_sec); +REGISTER_DRIVER_TEST (cryptodev_dpaa_sec_autotest, test_cryptodev_dpaa_sec);REGISTER_TEST_COMMAND (cryptodev_ccp_autotest, test_cryptodev_ccp); -REGISTER_TEST_COMMAND (cryptodev_uadk_autotest, test_cryptodev_uadk); +REGISTER_DRIVER_TEST (cryptodev_uadk_autotest, test_cryptodev_uadk);REGISTER_TEST_COMMAND (cryptodev_virtio_autotest, test_cryptodev_virtio);REGISTER_TEST_COMMAND (cryptodev_octeontx_autotest, test_cryptodev_octeontx);REGISTER_TEST_COMMAND (cryptodev_caam_jr_autotest, test_cryptodev_caam_jr);REGISTER_TEST_COMMAND (cryptodev_nitrox_autotest, test_cryptodev_nitrox);REGISTER_TEST_COMMAND (cryptodev_bcmfs_autotest, test_cryptodev_bcmfs); -REGISTER_TEST_COMMAND (cryptodev_cn9k_autotest, test_cryptodev_cn9k); -REGISTER_TEST_COMMAND (cryptodev_cn10k_autotest, test_cryptodev_cn10k); +REGISTER_DRIVER_TEST (cryptodev_cn9k_autotest, test_cryptodev_cn9k); +REGISTER_DRIVER_TEST (cryptodev_cn10k_autotest, test_cryptodev_cn10k);
app/test/test_cryptodev_asym.c +1 -1
@@ -2828,7 +2828,7 @@ test_cryptodev_cn10k_asym(void)REGISTER_TEST_COMMAND (cryptodev_openssl_asym_autotest, test_cryptodev_openssl_asym); -REGISTER_TEST_COMMAND (cryptodev_qat_asym_autotest, test_cryptodev_qat_asym); +REGISTER_DRIVER_TEST (cryptodev_qat_asym_autotest, test_cryptodev_qat_asym);REGISTER_TEST_COMMAND (cryptodev_octeontx_asym_autotest, test_cryptodev_octeontx_asym);
app/test/test_cycles.c +1 -1
@@ -53,4 +53,4 @@ test_user_delay_us(void)return 0 ; } -REGISTER_TEST_COMMAND (user_delay_us, test_user_delay_us); +REGISTER_FAST_TEST (user_delay_us, true, true, test_user_delay_us);
app/test/test_debug.c +1 -1
@@ -140,4 +140,4 @@ test_debug(void)#endif /* !RTE_EXEC_ENV_WINDOWS */ -REGISTER_TEST_COMMAND (debug_autotest, test_debug); +REGISTER_FAST_TEST (debug_autotest, true, true, test_debug);
app/test/test_devargs.c +1 -1
@@ -213,4 +213,4 @@ test_devargs(void)return 0 ; } -REGISTER_TEST_COMMAND (devargs_autotest, test_devargs); +REGISTER_FAST_TEST (devargs_autotest, true, true, test_devargs);
app/test/test_distributor.c +1 -1
@@ -952,4 +952,4 @@ test_distributor(void)#endif /* !RTE_EXEC_ENV_WINDOWS */ -REGISTER_TEST_COMMAND (distributor_autotest, test_distributor); +REGISTER_FAST_TEST (distributor_autotest, false, true, test_distributor);
app/test/test_distributor_perf.c +1 -1
@@ -277,4 +277,4 @@ test_distributor_perf(void)#endif /* !RTE_EXEC_ENV_WINDOWS */ -REGISTER_TEST_COMMAND (distributor_perf_autotest, test_distributor_perf); +REGISTER_PERF_TEST (distributor_perf_autotest, test_distributor_perf);
app/test/test_dmadev.c +1 -1
@@ -941,4 +941,4 @@ test_dma(void)return 0 ; } -REGISTER_TEST_COMMAND (dmadev_autotest, test_dma); +REGISTER_DRIVER_TEST (dmadev_autotest, test_dma);
app/test/test_eal_flags.c +12 -12
@@ -1644,15 +1644,15 @@ test_memory_flags(void)#endif /* !RTE_EXEC_ENV_WINDOWS */ -REGISTER_TEST_COMMAND (eal_flags_c_opt_autotest, test_missing_c_flag); -REGISTER_TEST_COMMAND (eal_flags_main_opt_autotest, test_main_lcore_flag); -REGISTER_TEST_COMMAND (eal_flags_n_opt_autotest, test_invalid_n_flag); -REGISTER_TEST_COMMAND (eal_flags_hpet_autotest, test_no_hpet_flag); -REGISTER_TEST_COMMAND (eal_flags_no_huge_autotest, test_no_huge_flag); -REGISTER_TEST_COMMAND (eal_flags_a_opt_autotest, test_allow_flag); -REGISTER_TEST_COMMAND (eal_flags_b_opt_autotest, test_invalid_b_flag); -REGISTER_TEST_COMMAND (eal_flags_vdev_opt_autotest, test_invalid_vdev_flag); -REGISTER_TEST_COMMAND (eal_flags_r_opt_autotest, test_invalid_r_flag); -REGISTER_TEST_COMMAND (eal_flags_mem_autotest, test_memory_flags); -REGISTER_TEST_COMMAND (eal_flags_file_prefix_autotest, test_file_prefix); -REGISTER_TEST_COMMAND (eal_flags_misc_autotest, test_misc_flags); +REGISTER_FAST_TEST (eal_flags_c_opt_autotest, false, false, test_missing_c_flag); +REGISTER_FAST_TEST (eal_flags_main_opt_autotest, false, false, test_main_lcore_flag); +REGISTER_FAST_TEST (eal_flags_n_opt_autotest, false, false, test_invalid_n_flag); +REGISTER_FAST_TEST (eal_flags_hpet_autotest, false, false, test_no_hpet_flag); +REGISTER_FAST_TEST (eal_flags_no_huge_autotest, false, false, test_no_huge_flag); +REGISTER_FAST_TEST (eal_flags_a_opt_autotest, false, false, test_allow_flag); +REGISTER_FAST_TEST (eal_flags_b_opt_autotest, false, false, test_invalid_b_flag); +REGISTER_FAST_TEST (eal_flags_vdev_opt_autotest, false, false, test_invalid_vdev_flag); +REGISTER_FAST_TEST (eal_flags_r_opt_autotest, false, false, test_invalid_r_flag); +REGISTER_FAST_TEST (eal_flags_mem_autotest, false, false, test_memory_flags); +REGISTER_FAST_TEST (eal_flags_file_prefix_autotest, false, false, test_file_prefix); +REGISTER_FAST_TEST (eal_flags_misc_autotest, false, false, test_misc_flags);
app/test/test_eal_fs.c +1 -1
@@ -185,4 +185,4 @@ test_eal_fs(void)#endif /* !RTE_EXEC_ENV_WINDOWS */ -REGISTER_TEST_COMMAND (eal_fs_autotest, test_eal_fs); +REGISTER_FAST_TEST (eal_fs_autotest, true, true, test_eal_fs);
app/test/test_efd.c +1 -1
@@ -473,4 +473,4 @@ test_efd(void)#endif /* !RTE_EXEC_ENV_WINDOWS */ -REGISTER_TEST_COMMAND (efd_autotest, test_efd); +REGISTER_PERF_TEST (efd_autotest, test_efd);
app/test/test_efd_perf.c +1 -1
@@ -393,4 +393,4 @@ test_efd_perf(void)#endif /* !RTE_EXEC_ENV_WINDOWS */ -REGISTER_TEST_COMMAND (efd_perf_autotest, test_efd_perf); +REGISTER_PERF_TEST (efd_perf_autotest, test_efd_perf);
app/test/test_errno.c +1 -1
@@ -94,4 +94,4 @@ test_errno(void)return 0 ; } -REGISTER_TEST_COMMAND (errno_autotest, test_errno); +REGISTER_FAST_TEST (errno_autotest, true, true, test_errno);
app/test/test_ethdev_link.c +1 -1
@@ -167,4 +167,4 @@ test_link_status(void)return unit_test_suite_runner (&link_status_testsuite); } -REGISTER_TEST_COMMAND (ethdev_link_status, test_link_status); +REGISTER_FAST_TEST (ethdev_link_status, true, true, test_link_status);
app/test/test_event_ring.c +1 -1
@@ -256,4 +256,4 @@ test_event_ring(void)#endif /* !RTE_EXEC_ENV_WINDOWS */ -REGISTER_TEST_COMMAND (event_ring_autotest, test_event_ring); +REGISTER_FAST_TEST (event_ring_autotest, true, true, test_event_ring);
app/test/test_eventdev.c +1 -1
@@ -1256,7 +1256,7 @@ test_eventdev_selftest_cn10k(void)#endif /* !RTE_EXEC_ENV_WINDOWS */ -REGISTER_TEST_COMMAND (eventdev_common_autotest, test_eventdev_common); +REGISTER_FAST_TEST (eventdev_common_autotest, true, true, test_eventdev_common);#ifndef RTE_EXEC_ENV_WINDOWS REGISTER_TEST_COMMAND (eventdev_selftest_sw, test_eventdev_selftest_sw);
app/test/test_fbarray.c +1 -1
@@ -733,4 +733,4 @@ test_fbarray(void)return unit_test_suite_runner (&fbarray_test_suite); } -REGISTER_TEST_COMMAND (fbarray_autotest, test_fbarray); +REGISTER_FAST_TEST (fbarray_autotest, true, true, test_fbarray);
app/test/test_fib.c +2 -2
@@ -415,5 +415,5 @@ test_slow_fib(void)return unit_test_suite_runner (&fib_slow_tests); } -REGISTER_TEST_COMMAND (fib_autotest, test_fib); -REGISTER_TEST_COMMAND (fib_slow_autotest, test_slow_fib); +REGISTER_FAST_TEST (fib_autotest, true, true, test_fib); +REGISTER_PERF_TEST (fib_slow_autotest, test_slow_fib);
app/test/test_fib6.c +2 -2
@@ -424,5 +424,5 @@ test_slow_fib6(void)return unit_test_suite_runner (&fib6_slow_tests); } -REGISTER_TEST_COMMAND (fib6_autotest, test_fib6); -REGISTER_TEST_COMMAND (fib6_slow_autotest, test_slow_fib6); +REGISTER_FAST_TEST (fib6_autotest, true, true, test_fib6); +REGISTER_PERF_TEST (fib6_slow_autotest, test_slow_fib6);
app/test/test_fib6_perf.c +1 -1
@@ -156,4 +156,4 @@ test_fib6_perf(void)return 0 ; } -REGISTER_TEST_COMMAND (fib6_perf_autotest, test_fib6_perf); +REGISTER_PERF_TEST (fib6_perf_autotest, test_fib6_perf);
app/test/test_fib_perf.c +1 -1
@@ -409,4 +409,4 @@ test_fib_perf(void)return 0 ; } -REGISTER_TEST_COMMAND (fib_perf_autotest, test_fib_perf); +REGISTER_PERF_TEST (fib_perf_autotest, test_fib_perf);
app/test/test_func_reentrancy.c +1 -1
@@ -507,4 +507,4 @@ test_func_reentrancy(void)return 0 ; } -REGISTER_TEST_COMMAND (func_reentrancy_autotest, test_func_reentrancy); +REGISTER_FAST_TEST (func_reentrancy_autotest, false, true, test_func_reentrancy);
app/test/test_hash.c +1 -1
@@ -2264,4 +2264,4 @@ test_hash(void)return 0 ; } -REGISTER_TEST_COMMAND (hash_autotest, test_hash); +REGISTER_FAST_TEST (hash_autotest, true, true, test_hash);
app/test/test_hash_functions.c +1 -1
@@ -290,4 +290,4 @@ test_hash_functions(void)return 0 ; } -REGISTER_TEST_COMMAND (hash_functions_autotest, test_hash_functions); +REGISTER_PERF_TEST (hash_functions_autotest, test_hash_functions);
app/test/test_hash_multiwriter.c +1 -1
@@ -287,4 +287,4 @@ test_hash_multiwriter_main(void)return 0 ; } -REGISTER_TEST_COMMAND (hash_multiwriter_autotest, test_hash_multiwriter_main); +REGISTER_PERF_TEST (hash_multiwriter_autotest, test_hash_multiwriter_main);
app/test/test_hash_perf.c +1 -1
@@ -757,4 +757,4 @@ test_hash_perf(void)return 0 ; } -REGISTER_TEST_COMMAND (hash_perf_autotest, test_hash_perf); +REGISTER_PERF_TEST (hash_perf_autotest, test_hash_perf);
app/test/test_hash_readwrite.c +2 -2
@@ -760,5 +760,5 @@ test_hash_rw_func_main(void)return 0 ; } -REGISTER_TEST_COMMAND (hash_readwrite_func_autotest, test_hash_rw_func_main); -REGISTER_TEST_COMMAND (hash_readwrite_perf_autotest, test_hash_rw_perf_main); +REGISTER_FAST_TEST (hash_readwrite_func_autotest, false, true, test_hash_rw_func_main); +REGISTER_PERF_TEST (hash_readwrite_perf_autotest, test_hash_rw_perf_main);
app/test/test_hash_readwrite_lf_perf.c +1 -1
@@ -1579,5 +1579,5 @@ test_hash_readwrite_lf_perf_main(void)return 0 ; } -REGISTER_TEST_COMMAND (hash_readwrite_lf_perf_autotest, +REGISTER_PERF_TEST (hash_readwrite_lf_perf_autotest, test_hash_readwrite_lf_perf_main);
app/test/test_interrupts.c +1 -1
@@ -594,4 +594,4 @@ test_interrupt(void)return ret; } -REGISTER_TEST_COMMAND (interrupt_autotest, test_interrupt); +REGISTER_FAST_TEST (interrupt_autotest, true, true, test_interrupt);
app/test/test_ipfrag.c +1 -1
@@ -510,4 +510,4 @@ test_ipfrag(void) } -REGISTER_TEST_COMMAND (ipfrag_autotest, test_ipfrag); +REGISTER_FAST_TEST (ipfrag_autotest, false, true, test_ipfrag);
app/test/test_ipsec.c +1 -1
@@ -2532,4 +2532,4 @@ test_ipsec(void)#endif /* !RTE_EXEC_ENV_WINDOWS */ -REGISTER_TEST_COMMAND (ipsec_autotest, test_ipsec); +REGISTER_FAST_TEST (ipsec_autotest, true, true, test_ipsec);
app/test/test_ipsec_perf.c +1 -1
@@ -631,4 +631,4 @@ test_libipsec_perf(void)#endif /* !RTE_EXEC_ENV_WINDOWS */ -REGISTER_TEST_COMMAND (ipsec_perf_autotest, test_libipsec_perf); +REGISTER_PERF_TEST (ipsec_perf_autotest, test_libipsec_perf);
app/test/test_kvargs.c +1 -1
@@ -292,4 +292,4 @@ test_kvargs(void)return 0 ; } -REGISTER_TEST_COMMAND (kvargs_autotest, test_kvargs); +REGISTER_FAST_TEST (kvargs_autotest, true, true, test_kvargs);
app/test/test_lcores.c +1 -1
@@ -412,4 +412,4 @@ test_lcores(void)return TEST_SUCCESS ; } -REGISTER_TEST_COMMAND (lcores_autotest, test_lcores); +REGISTER_FAST_TEST (lcores_autotest, true, true, test_lcores);
app/test/test_logs.c +1 -1
@@ -158,4 +158,4 @@ test_logs(void)return 0 ; } -REGISTER_TEST_COMMAND (logs_autotest, test_logs); +REGISTER_FAST_TEST (logs_autotest, true, true, test_logs);
app/test/test_lpm.c +1 -1
@@ -1584,4 +1584,4 @@ test_lpm(void)return global_status; } -REGISTER_TEST_COMMAND (lpm_autotest, test_lpm); +REGISTER_FAST_TEST (lpm_autotest, true, true, test_lpm);
app/test/test_lpm6.c +1 -1
@@ -1793,4 +1793,4 @@ test_lpm6(void)return global_status; } -REGISTER_TEST_COMMAND (lpm6_autotest, test_lpm6); +REGISTER_FAST_TEST (lpm6_autotest, true, true, test_lpm6);
app/test/test_lpm6_perf.c +1 -1
@@ -161,4 +161,4 @@ test_lpm6_perf(void)return 0 ; } -REGISTER_TEST_COMMAND (lpm6_perf_autotest, test_lpm6_perf); +REGISTER_PERF_TEST (lpm6_perf_autotest, test_lpm6_perf);
app/test/test_lpm_perf.c +1 -1
@@ -760,4 +760,4 @@ test_lpm_perf(void)return 0 ; } -REGISTER_TEST_COMMAND (lpm_perf_autotest, test_lpm_perf); +REGISTER_PERF_TEST (lpm_perf_autotest, test_lpm_perf);
app/test/test_malloc.c +1 -1
@@ -1091,4 +1091,4 @@ test_malloc(void)return 0 ; } -REGISTER_TEST_COMMAND (malloc_autotest, test_malloc); +REGISTER_FAST_TEST (malloc_autotest, false, true, test_malloc);
app/test/test_malloc_perf.c +1 -1
@@ -171,4 +171,4 @@ test_malloc_perf(void)return 0 ; } -REGISTER_TEST_COMMAND (malloc_perf_autotest, test_malloc_perf); +REGISTER_PERF_TEST (malloc_perf_autotest, test_malloc_perf);
app/test/test_mbuf.c +1 -1
@@ -2955,4 +2955,4 @@ test_mbuf(void) }#undef GOTO_FAIL -REGISTER_TEST_COMMAND (mbuf_autotest, test_mbuf); +REGISTER_FAST_TEST (mbuf_autotest, false, true, test_mbuf);
app/test/test_mcslock.c +1 -1
@@ -241,4 +241,4 @@ test_mcslock(void)return ret; } -REGISTER_TEST_COMMAND (mcslock_autotest, test_mcslock); +REGISTER_FAST_TEST (mcslock_autotest, false, true, test_mcslock);
app/test/test_member.c +1 -1
@@ -996,4 +996,4 @@ test_member(void)#endif /* !RTE_EXEC_ENV_WINDOWS */ -REGISTER_TEST_COMMAND (member_autotest, test_member); +REGISTER_FAST_TEST (member_autotest, true, true, test_member);
app/test/test_member_perf.c +1 -1
@@ -780,4 +780,4 @@ test_member_perf(void)#endif /* !RTE_EXEC_ENV_WINDOWS */ -REGISTER_TEST_COMMAND (member_perf_autotest, test_member_perf); +REGISTER_PERF_TEST (member_perf_autotest, test_member_perf);
app/test/test_memcpy.c +1 -1
@@ -129,4 +129,4 @@ test_memcpy(void)return 0 ; } -REGISTER_TEST_COMMAND (memcpy_autotest, test_memcpy); +REGISTER_FAST_TEST (memcpy_autotest, true, true, test_memcpy);
app/test/test_memcpy_perf.c +1 -1
@@ -348,4 +348,4 @@ test_memcpy_perf(void)return 0 ; } -REGISTER_TEST_COMMAND (memcpy_perf_autotest, test_memcpy_perf); +REGISTER_PERF_TEST (memcpy_perf_autotest, test_memcpy_perf);
app/test/test_memory.c +1 -1
@@ -110,4 +110,4 @@ test_memory(void)return 0 ; } -REGISTER_TEST_COMMAND (memory_autotest, test_memory); +REGISTER_FAST_TEST (memory_autotest, false, true, test_memory);
app/test/test_mempool.c +1 -1
@@ -1043,4 +1043,4 @@ test_mempool(void)return ret; } -REGISTER_TEST_COMMAND (mempool_autotest, test_mempool); +REGISTER_FAST_TEST (mempool_autotest, false, true, test_mempool);
app/test/test_mempool_perf.c +1 -1
@@ -437,4 +437,4 @@ test_mempool_perf(void)return ret; } -REGISTER_TEST_COMMAND (mempool_perf_autotest, test_mempool_perf); +REGISTER_PERF_TEST (mempool_perf_autotest, test_mempool_perf);
app/test/test_memzone.c +1 -1
@@ -1163,4 +1163,4 @@ test_memzone(void)return 0 ; } -REGISTER_TEST_COMMAND (memzone_autotest, test_memzone); +REGISTER_FAST_TEST (memzone_autotest, false, true, test_memzone);
app/test/test_meter.c +1 -1
@@ -713,4 +713,4 @@ test_meter(void) } -REGISTER_TEST_COMMAND (meter_autotest, test_meter); +REGISTER_FAST_TEST (meter_autotest, true, true, test_meter);
app/test/test_mp_secondary.c +1 -1
@@ -223,4 +223,4 @@ test_mp_secondary(void)#endif /* !RTE_EXEC_ENV_WINDOWS */ -REGISTER_TEST_COMMAND (multiprocess_autotest, test_mp_secondary); +REGISTER_FAST_TEST (multiprocess_autotest, false, false, test_mp_secondary);
app/test/test_per_lcore.c +1 -1
@@ -105,4 +105,4 @@ test_per_lcore(void)return 0 ; } -REGISTER_TEST_COMMAND (per_lcore_autotest, test_per_lcore); +REGISTER_FAST_TEST (per_lcore_autotest, true, true, test_per_lcore);
app/test/test_pflock.c +1 -1
@@ -193,4 +193,4 @@ test_pflock(void)return 0 ; } -REGISTER_TEST_COMMAND (pflock_autotest, test_pflock); +REGISTER_FAST_TEST (pflock_autotest, true, true, test_pflock);
app/test/test_pie.c +3 -3
@@ -1087,6 +1087,6 @@ test_pie_all(void)#endif /* !RTE_EXEC_ENV_WINDOWS */ -REGISTER_TEST_COMMAND (pie_autotest, test_pie); -REGISTER_TEST_COMMAND (pie_perf, test_pie_perf); -REGISTER_TEST_COMMAND (pie_all, test_pie_all); +REGISTER_FAST_TEST (pie_autotest, true, true, test_pie); +REGISTER_PERF_TEST (pie_perf, test_pie_perf); +REGISTER_PERF_TEST (pie_all, test_pie_all);
app/test/test_pmd_perf.c +1 -1
@@ -899,4 +899,4 @@ test_set_rxtx_sc(cmdline_fixed_string_t type)return -1 ; } -REGISTER_TEST_COMMAND (pmd_perf_autotest, test_pmd_perf); +REGISTER_PERF_TEST (pmd_perf_autotest, test_pmd_perf);
app/test/test_power.c +1 -1
@@ -172,4 +172,4 @@ test_power(void) }#endif -REGISTER_TEST_COMMAND (power_autotest, test_power); +REGISTER_FAST_TEST (power_autotest, true, true, test_power);
app/test/test_power_cpufreq.c +1 -1
@@ -703,5 +703,5 @@ test_power_caps(void)#endif -REGISTER_TEST_COMMAND (power_cpufreq_autotest, test_power_cpufreq); +REGISTER_FAST_TEST (power_cpufreq_autotest, false, true, test_power_cpufreq);REGISTER_TEST_COMMAND (power_caps_autotest, test_power_caps);
app/test/test_power_intel_uncore.c +1 -1
@@ -298,4 +298,4 @@ test_power_intel_uncore(void) }#endif -REGISTER_TEST_COMMAND (power_intel_uncore_autotest, test_power_intel_uncore); +REGISTER_FAST_TEST (power_intel_uncore_autotest, true, true, test_power_intel_uncore);
app/test/test_power_kvm_vm.c +1 -1
@@ -299,4 +299,4 @@ test_power_kvm_vm(void) }#endif -REGISTER_TEST_COMMAND (power_kvm_vm_autotest, test_power_kvm_vm); +REGISTER_FAST_TEST (power_kvm_vm_autotest, false, true, test_power_kvm_vm);
app/test/test_prefetch.c +1 -1
@@ -35,4 +35,4 @@ test_prefetch(void)return 0 ; } -REGISTER_TEST_COMMAND (prefetch_autotest, test_prefetch); +REGISTER_FAST_TEST (prefetch_autotest, true, true, test_prefetch);
app/test/test_rand_perf.c +1 -1
@@ -96,4 +96,4 @@ test_rand_perf(void)return 0 ; } -REGISTER_TEST_COMMAND (rand_perf_autotest, test_rand_perf); +REGISTER_PERF_TEST (rand_perf_autotest, test_rand_perf);
app/test/test_rcu_qsbr.c +1 -1
@@ -1418,4 +1418,4 @@ test_rcu_qsbr_main(void)return -1 ; } -REGISTER_TEST_COMMAND (rcu_qsbr_autotest, test_rcu_qsbr_main); +REGISTER_FAST_TEST (rcu_qsbr_autotest, true, true, test_rcu_qsbr_main);
app/test/test_rcu_qsbr_perf.c +1 -1
@@ -690,4 +690,4 @@ test_rcu_qsbr_main(void)return -1 ; } -REGISTER_TEST_COMMAND (rcu_qsbr_perf_autotest, test_rcu_qsbr_main); +REGISTER_PERF_TEST (rcu_qsbr_perf_autotest, test_rcu_qsbr_main);
app/test/test_reassembly_perf.c +1 -1
@@ -1000,4 +1000,4 @@ test_reassembly_perf(void)return TEST_SUCCESS ; } -REGISTER_TEST_COMMAND (reassembly_perf_autotest, test_reassembly_perf); +REGISTER_PERF_TEST (reassembly_perf_autotest, test_reassembly_perf);
app/test/test_reciprocal_division.c +1 -1
@@ -164,4 +164,4 @@ test_reciprocal(void)return result; } -REGISTER_TEST_COMMAND (reciprocal_division, test_reciprocal); +REGISTER_PERF_TEST (reciprocal_division, test_reciprocal);
app/test/test_reciprocal_division_perf.c +1 -1
@@ -205,4 +205,4 @@ test_reciprocal_division_perf(void)return result; } -REGISTER_TEST_COMMAND (reciprocal_division_perf, test_reciprocal_division_perf); +REGISTER_PERF_TEST (reciprocal_division_perf, test_reciprocal_division_perf);
app/test/test_red.c +2 -2
@@ -1878,5 +1878,5 @@ test_red_all(void)#endif /* !RTE_EXEC_ENV_WINDOWS */ REGISTER_TEST_COMMAND (red_autotest, test_red); -REGISTER_TEST_COMMAND (red_perf, test_red_perf); -REGISTER_TEST_COMMAND (red_all, test_red_all); +REGISTER_PERF_TEST (red_perf, test_red_perf); +REGISTER_PERF_TEST (red_all, test_red_all);
app/test/test_reorder.c +1 -1
@@ -548,4 +548,4 @@ test_reorder(void) } -REGISTER_TEST_COMMAND (reorder_autotest, test_reorder); +REGISTER_FAST_TEST (reorder_autotest, true, true, test_reorder);
app/test/test_rib.c +2 -2
@@ -363,5 +363,5 @@ test_slow_rib(void)return unit_test_suite_runner (&rib_slow_tests); } -REGISTER_TEST_COMMAND (rib_autotest, test_rib); -REGISTER_TEST_COMMAND (rib_slow_autotest, test_slow_rib); +REGISTER_FAST_TEST (rib_autotest, true, true, test_rib); +REGISTER_PERF_TEST (rib_slow_autotest, test_slow_rib);
app/test/test_rib6.c +2 -2
@@ -367,5 +367,5 @@ test_slow_rib6(void)return unit_test_suite_runner (&rib6_slow_tests); } -REGISTER_TEST_COMMAND (rib6_autotest, test_rib6); -REGISTER_TEST_COMMAND (rib6_slow_autotest, test_slow_rib6); +REGISTER_FAST_TEST (rib6_autotest, true, true, test_rib6); +REGISTER_PERF_TEST (rib6_slow_autotest, test_slow_rib6);
app/test/test_ring.c +1 -1
@@ -1241,4 +1241,4 @@ test_ring(void)return -1 ; } -REGISTER_TEST_COMMAND (ring_autotest, test_ring); +REGISTER_FAST_TEST (ring_autotest, true, true, test_ring);
app/test/test_ring_perf.c +1 -1
@@ -579,4 +579,4 @@ test_ring_perf(void)return 0 ; } -REGISTER_TEST_COMMAND (ring_perf_autotest, test_ring_perf); +REGISTER_PERF_TEST (ring_perf_autotest, test_ring_perf);
app/test/test_rwlock.c +4 -4
@@ -506,7 +506,7 @@ try_rwlock_test_rde_wro(void)return process_try_lcore_stats (); } -REGISTER_TEST_COMMAND (rwlock_test1_autotest, rwlock_test1); -REGISTER_TEST_COMMAND (rwlock_rda_autotest, try_rwlock_test_rda); -REGISTER_TEST_COMMAND (rwlock_rds_wrm_autotest, try_rwlock_test_rds_wrm); -REGISTER_TEST_COMMAND (rwlock_rde_wro_autotest, try_rwlock_test_rde_wro); +REGISTER_FAST_TEST (rwlock_test1_autotest, true, true, rwlock_test1); +REGISTER_FAST_TEST (rwlock_rda_autotest, true, true, try_rwlock_test_rda); +REGISTER_FAST_TEST (rwlock_rds_wrm_autotest, true, true, try_rwlock_test_rds_wrm); +REGISTER_FAST_TEST (rwlock_rde_wro_autotest, true, true, try_rwlock_test_rde_wro);
app/test/test_sched.c +1 -1
@@ -215,4 +215,4 @@ test_sched(void)#endif /* !RTE_EXEC_ENV_WINDOWS */ -REGISTER_TEST_COMMAND (sched_autotest, test_sched); +REGISTER_FAST_TEST (sched_autotest, true, true, test_sched);
app/test/test_security.c +1 -1
@@ -2314,4 +2314,4 @@ test_security(void)return unit_test_suite_runner (&security_testsuite); } -REGISTER_TEST_COMMAND (security_autotest, test_security); +REGISTER_FAST_TEST (security_autotest, false, true, test_security);
app/test/test_seqlock.c +1 -1
@@ -187,4 +187,4 @@ test_seqlock(void)return rc; } -REGISTER_TEST_COMMAND (seqlock_autotest, test_seqlock); +REGISTER_FAST_TEST (seqlock_autotest, true, true, test_seqlock);
app/test/test_service_cores.c +2 -2
@@ -1040,7 +1040,7 @@ test_service_common(void)return unit_test_suite_runner (&service_tests); } -REGISTER_TEST_COMMAND (service_autotest, test_service_common); +REGISTER_FAST_TEST (service_autotest, true, true, test_service_common);static struct unit_test_suite service_perf_tests = { .suite_name ="service core performance test suite" ,
@@ -1062,4 +1062,4 @@ test_service_perf(void)return unit_test_suite_runner (&service_perf_tests); } -REGISTER_TEST_COMMAND (service_perf_autotest, test_service_perf); +REGISTER_PERF_TEST (service_perf_autotest, test_service_perf);
app/test/test_spinlock.c +1 -1
@@ -302,4 +302,4 @@ test_spinlock(void)return ret; } -REGISTER_TEST_COMMAND (spinlock_autotest, test_spinlock); +REGISTER_FAST_TEST (spinlock_autotest, true, true, test_spinlock);
app/test/test_stack.c +2 -2
@@ -379,5 +379,5 @@ test_lf_stack(void)#endif } -REGISTER_TEST_COMMAND (stack_autotest, test_stack); -REGISTER_TEST_COMMAND (stack_lf_autotest, test_lf_stack); +REGISTER_FAST_TEST (stack_autotest, false, true, test_stack); +REGISTER_FAST_TEST (stack_lf_autotest, false, true, test_lf_stack);
app/test/test_stack_perf.c +2 -2
@@ -354,5 +354,5 @@ test_lf_stack_perf(void)#endif } -REGISTER_TEST_COMMAND (stack_perf_autotest, test_stack_perf); -REGISTER_TEST_COMMAND (stack_lf_perf_autotest, test_lf_stack_perf); +REGISTER_PERF_TEST (stack_perf_autotest, test_stack_perf); +REGISTER_PERF_TEST (stack_lf_perf_autotest, test_lf_stack_perf);
app/test/test_string_fns.c +1 -1
@@ -182,4 +182,4 @@ test_string_fns(void)return 0 ; } -REGISTER_TEST_COMMAND (string_autotest, test_string_fns); +REGISTER_FAST_TEST (string_autotest, true, true, test_string_fns);
app/test/test_tailq.c +1 -1
@@ -125,4 +125,4 @@ test_tailq(void)return ret; } -REGISTER_TEST_COMMAND (tailq_autotest, test_tailq); +REGISTER_FAST_TEST (tailq_autotest, true, true, test_tailq);
app/test/test_thash.c +1 -1
@@ -966,4 +966,4 @@ test_thash(void)return unit_test_suite_runner (&thash_tests); } -REGISTER_TEST_COMMAND (thash_autotest, test_thash); +REGISTER_FAST_TEST (thash_autotest, true, true, test_thash);
app/test/test_thash_perf.c +1 -1
@@ -135,4 +135,4 @@ test_thash_perf(void)return 0 ; } -REGISTER_TEST_COMMAND (thash_perf_autotest, test_thash_perf); +REGISTER_PERF_TEST (thash_perf_autotest, test_thash_perf);
app/test/test_threads.c +1 -1
@@ -279,4 +279,4 @@ test_threads(void)return unit_test_suite_runner (&threads_test_suite); } -REGISTER_TEST_COMMAND (threads_autotest, test_threads); +REGISTER_FAST_TEST (threads_autotest, true, true, test_threads);
app/test/test_ticketlock.c +1 -1
@@ -314,4 +314,4 @@ test_ticketlock(void)return ret; } -REGISTER_TEST_COMMAND (ticketlock_autotest, test_ticketlock); +REGISTER_FAST_TEST (ticketlock_autotest, true, true, test_ticketlock);
app/test/test_timer.c +1 -1
@@ -594,4 +594,4 @@ test_timer(void)return TEST_SUCCESS ; } -REGISTER_TEST_COMMAND (timer_autotest, test_timer); +REGISTER_FAST_TEST (timer_autotest, false, true, test_timer);
app/test/test_timer_perf.c +1 -1
@@ -131,4 +131,4 @@ test_timer_perf(void)return 0 ; } -REGISTER_TEST_COMMAND (timer_perf_autotest, test_timer_perf); +REGISTER_PERF_TEST (timer_perf_autotest, test_timer_perf);
app/test/test_timer_racecond.c +1 -1
@@ -172,4 +172,4 @@ test_timer_racecond(void)return TEST_SUCCESS ; } -REGISTER_TEST_COMMAND (timer_racecond_autotest, test_timer_racecond); +REGISTER_PERF_TEST (timer_racecond_autotest, test_timer_racecond);
app/test/test_trace.c +1 -1
@@ -250,4 +250,4 @@ test_trace(void)#endif /* !RTE_EXEC_ENV_WINDOWS */ -REGISTER_TEST_COMMAND (trace_autotest, test_trace); +REGISTER_FAST_TEST (trace_autotest, true, true, test_trace);
app/test/test_trace_perf.c +1 -1
@@ -179,4 +179,4 @@ test_trace_perf(void)return TEST_SUCCESS ; } -REGISTER_TEST_COMMAND (trace_perf_autotest, test_trace_perf); +REGISTER_PERF_TEST (trace_perf_autotest, test_trace_perf);
app/test/test_version.c +1 -1
@@ -25,4 +25,4 @@ test_version(void)return 0 ; } -REGISTER_TEST_COMMAND (version_autotest, test_version); +REGISTER_FAST_TEST (version_autotest, true, true, test_version);
Signature · 1 line
2.39.2
PATCH v6 4/11 app/test: make telemetry data test buildable on windows
In reply to Bruce RichardsonTo enable the building of the telemetry data tests file when building on windows, we need to provide a stub implementation. That way, the test file is buildable any time the library itself is built.
--- app/test/test_telemetry_data.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)
app/test/test_telemetry_data.c +12 -2
@@ -2,11 +2,20 @@* Copyright 2020 Intel Corporation */ +#ifdef RTE_EXEC_ENV_WINDOWS +#include "test.h" + +static int +telemetry_data_autotest (void ) +{ +return TEST_SKIPPED ; +} + +#else +#include <string.h> #include <sys/socket.h> -#ifndef RTE_EXEC_ENV_WINDOWS #include <sys/un.h> -#endif #include <unistd.h> #include <limits.h>
@@ -604,5 +613,6 @@ telemetry_data_autotest(void)close (sock); return 0; } +#endif /* windows/non-windows */ REGISTER_TEST_COMMAND (telemetry_data_autotest, telemetry_data_autotest);
Signature · 1 line
2.39.2
Re: [PATCH v6 04/11] app/test: make telemetry data test buildable on windows
Quoted 7 lines · Bruce Richardson
To enable the building of the telemetry data tests file when building on windows, we need to provide a stub implementation. That way, the test file is buildable any time the library itself is built.
Signed-off-by Bruce Richardson <[email protected]>Acked-by Morten Brørup <[email protected]>---
let me also ack the latest v6
PATCH v6 5/11 app/test: build using per-file dependency matrix
In reply to Bruce RichardsonRather than using if-else constructs to selectively add or remove files from the UT build, switch to a table-based approach where each file lists out what libs or drivers it depends upon.
Initial version of this table was generated via analysis of the header files included in each C file. The basic dependencies of the test binary [cmdline, ring, mempool and mbuf] were then removed from the per-file lists, as there is no point in checking them as the whole app will be disabled if they are not present.
With the file list, the dependencies for the "utility" C-files are kept separate, so that other tests which depend on the functions provided by those files can have that dependency recorded properly. The basic cryptodev tests also fall into this category as functions from the main cryptodev test file are used by other crypto tests.
As well as the main table for internal dependencies, some test files have separate external components too. A second, much smaller table lists these dependencies.
--- app/meson.build | 8 +- app/test/meson.build | 823 ++++++++++++------------------------------- 2 files changed, 238 insertions(+), 593 deletions(-)
app/meson.build +5 -3
@@ -32,6 +32,11 @@ apps = [ 'test-security-perf', ] +if get_option('tests') +# build the auto test app if enabled. + apps += 'test' +endif + default_cflags = machine_args + ['-DALLOW_EXPERIMENTAL_API'] default_ldflags = [] if get_option('default_library') == 'static' and not is_windows
@@ -106,6 +111,3 @@ foreach app:apps install_rpath: join_paths(get_option('prefix'), driver_install_path), install: true) endforeach - -# special case the autotests -subdir('test')
app/test/meson.build +233 -590
833 lines not on this page · raw message
Signature · 1 line
2.39.2
PATCH v6 6/11 app/test: define unit tests suites based on test macros
In reply to Bruce RichardsonRather than having the test suites listed out in the meson.build files and having to have them enabled/disabled selectively based on what libs are being built, pull the tests to run from the source files which were added to the build.
Most test suites require no additional info other than the list of test names in the suite. However the fast-test are special that they have additional parameters associated with them. This requires some additional work in the test extraction script and in the meson.build file for processing the output.
--- MAINTAINERS | 3 +- app/meson.build | 7 +- app/test/suites/meson.build | 74 +++++++++++++++++++ buildtools/get-test-suites.py | 33 +++++++++ .../has-hugepages.py | 0 buildtools/meson.build | 2 + 6 files changed, 117 insertions(+), 2 deletions(-) create mode 100644 app/test/suites/meson.build create mode 100644 buildtools/get-test-suites.py rename app/test/has_hugepage.py => buildtools/has-hugepages.py (100%)
MAINTAINERS +2 -1
@@ -1731,7 +1731,6 @@ Test Applications Unit tests framework F: app/test/commands.c -F: app/test/has_hugepage.py F: app/test/packet_burst_generator.c F: app/test/packet_burst_generator.h F: app/test/process.h
@@ -1742,6 +1741,8 @@ F: app/test/test_pmd_perf.c F: app/test/test_resource.c F: app/test/virtual_pmd.c F: app/test/virtual_pmd.h +F: buildtools/has-hugepages.py +F: buildtools/get-test-suites.py Sample packet helper functions for unit test M: Reshma Pattan <[email protected]>
app/meson.build +6 -1
@@ -101,7 +101,7 @@ foreach app:apps link_libs = dpdk_static_libraries + dpdk_drivers endif - executable('dpdk-' + name, + exec = executable('dpdk-' + name, sources, c_args: cflags, link_args: ldflags,
@@ -110,4 +110,9 @@ foreach app:apps include_directories: includes, install_rpath: join_paths(get_option('prefix'), driver_install_path), install: true) + if name == 'test' + dpdk_test = exec + autotest_sources = sources + subdir('test/suites') # define the pre-canned test suites + endif endforeach
app/test/suites/meson.build new file +74 -0
74 lines not on this page · raw message
buildtools/get-test-suites.py new file +33 -0
@@ -0,0 +1,33 @@ +#! /usr/bin/env python3 +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2023 Intel Corporation + +import sys +import re + +input_list = sys.argv[1:] +test_def_regex = re.compile("REGISTER_([A-Z]+)_TEST\s*\(\s*([a-z0-9_]+)") +test_suites = {} + +def get_fast_test_params(test_name, ln): + "Extract the extra fast-test parameters from the line" + #print(f"ln: {ln.rstrip()}, test_name: {test_name}, split: {ln.split(test_name, 1)}") + (_, rest_of_line) = ln.split(test_name, 1) + (_, nohuge, asan, _func) = rest_of_line.split(',', 3) + return f":{nohuge.strip().lower()}:{asan.strip().lower()}" + +for fname in input_list: + with open(fname) as f: + contents = [ln for ln in f.readlines() if test_def_regex.match(ln.strip())] + for ln in contents: + (test_suite, test_name) = test_def_regex.match(ln).group(1, 2) + suite_name = f"{test_suite.lower()}-tests" + if suite_name in test_suites: + test_suites[suite_name].append(test_name) + else: + test_suites[suite_name] = [test_name] + if suite_name == "fast-tests": + test_suites["fast-tests"][-1] += get_fast_test_params(test_name, ln) + +for suite in test_suites.keys(): + print(f"{suite}={','.join(test_suites[suite])}")
buildtools/has-hugepages.py renamed from app/test/has_hugepage.py +0 -0
buildtools/meson.build +2 -0
@@ -18,6 +18,8 @@ map_to_win_cmd = py3 + files('map_to_win.py') sphinx_wrapper = py3 + files('call-sphinx-build.py') get_cpu_count_cmd = py3 + files('get-cpu-count.py') get_numa_count_cmd = py3 + files('get-numa-count.py') +get_test_suites_cmd = py3 + files('get-test-suites.py') +has_hugepages_cmd = py3 + files('has-hugepages.py') binutils_avx512_check = (py3 + files('binutils-avx512-check.py') + [objdump] + cc.cmd_array())
Signature · 1 line
2.39.2
PATCH v6 7/11 app/test: add test case for scripted telemetry commands
In reply to Bruce RichardsonThe test script for calling all telemetry commands is not discoverable by checking the C files for the build. Therefore we need to add it in as a special-case test in the fast-tests group.
---
app/test/suites/meson.build | 30 +++++++++++++++++++++++++
app/test/{ => suites}/test_telemetry.sh | 0
2 files changed, 30 insertions(+)
rename app/test/{ => suites}/test_telemetry.sh (100%)app/test/suites/meson.build +30 -0
@@ -72,3 +72,33 @@ foreach suite:test_suites endforeach endif endforeach + +# standalone test for telemetry +if not is_windows and dpdk_conf.has('RTE_LIB_TELEMETRY') + test_args = [dpdk_test] + test_args += test_no_huge_args + if get_option('default_library') == 'shared' + test_args += ['-d', dpdk_drivers_build_dir] + endif + if dpdk_conf.has('RTE_CRYPTO_NULL') + test_args += ['--vdev=crypto_null0'] + endif + if dpdk_conf.has('RTE_DMA_SKELETON') + test_args += ['--vdev=dma_skeleton0'] + endif + if dpdk_conf.has('RTE_EVENT_SKELETON') + test_args += ['--vdev=event_skeleton0'] + endif + if dpdk_conf.has('RTE_NET_NULL') + test_args += ['--vdev=net_null0'] + endif + if dpdk_conf.has('RTE_RAW_SKELETON') + test_args += ['--vdev=rawdev_skeleton0'] + endif + test_args += ['-a', '0000:00:00.0'] + test('telemetry_all', find_program('test_telemetry.sh'), + args: test_args, + timeout : timeout_seconds_fast, + is_parallel : false, + suite : 'fast-tests') +endif
app/test/suites/test_telemetry.sh renamed from app/test/test_telemetry.sh +0 -0
Signature · 1 line
2.39.2
PATCH v6 8/11 app/test: add debug test suite
In reply to Bruce RichardsonAdd in for all platforms, the suite of tests to dump out the structure information available. Since the commands are defined in commands.c on all OS's, do not limit their presence to just the non-windows OS's.
--- app/test/suites/meson.build | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)
app/test/suites/meson.build +20 -0
@@ -102,3 +102,23 @@ if not is_windows and dpdk_conf.has('RTE_LIB_TELEMETRY') is_parallel : false, suite : 'fast-tests') endif + +# dump tests are defined in commands.c, and not easily extractable +dump_test_names = [ + 'dump_devargs', + 'dump_log_types', + 'dump_malloc_heaps', + 'dump_malloc_stats', + 'dump_mempool', + 'dump_memzone', + 'dump_physmem', + 'dump_ring', + 'dump_struct_sizes', +] +foreach arg : dump_test_names + test(arg, dpdk_test, + env : ['DPDK_TEST=' + arg], + timeout : timeout_seconds_fast, + is_parallel : false, + suite : 'debug-tests') +endforeach
Signature · 1 line
2.39.2
PATCH v6 9/11 examples/l3fwd: make eventdev an optional dependency
In reply to Bruce RichardsonWith l3fwd being a very commonly used example app, and built as part of our CI tests, we need to ensure it's buildable with just about all supported DPDK configurations. To enable l3fwd application to be built when the eventdev library is disabled, we need to compile in the eventdev support conditionally. Thankfully, the eventdev support is pretty self-contained, with only the main.c file having more than a couple of ifdefs.
--- examples/l3fwd/l3fwd_em.c | 2 + examples/l3fwd/l3fwd_em_hlm.h | 2 + examples/l3fwd/l3fwd_event.c | 2 + examples/l3fwd/l3fwd_event.h | 7 ++- examples/l3fwd/l3fwd_event_generic.c | 2 + examples/l3fwd/l3fwd_event_internal_port.c | 2 + examples/l3fwd/l3fwd_fib.c | 2 + examples/l3fwd/l3fwd_lpm.c | 2 + examples/l3fwd/main.c | 65 +++++++++++++++++----- examples/l3fwd/meson.build | 5 +- 10 files changed, 74 insertions(+), 17 deletions(-)
examples/l3fwd/l3fwd_em.c +2 -0
@@ -663,6 +663,7 @@ em_main_loop(__rte_unused void *dummy)return 0 ; } +#ifdef RTE_LIB_EVENTDEV static __rte_always_inline voidem_event_loop_single (struct l3fwd_event_resources *evt_rsrc,const uint8_t flags)
@@ -959,6 +960,7 @@ em_event_main_loop_tx_q_burst_vector(__rte_unused void *dummy)em_event_loop_vector (evt_rsrc,L3FWD_EVENT_TX_ENQ ); return 0; } +#endif /* Initialize exact match (hash) parameters. 8< */ void
examples/l3fwd/l3fwd_em_hlm.h +2 -0
@@ -255,6 +255,7 @@ l3fwd_em_send_packets(int nb_rx, struct rte_mbuf **pkts_burst, uint16_t portid,send_packets_multi (qconf, pkts_burst, dst_port, nb_rx); } +#ifdef RTE_LIB_EVENTDEV /* * Buffer optimized handling of events, invoked * from main_loop.
@@ -347,5 +348,6 @@ l3fwd_em_process_event_vector(struct rte_event_vector *vec,process_event_vector (vec, dst_port); } +#endif /* RTE_LIB_EVENTDEV */ #endif /* __L3FWD_EM_HLM_H__ */
examples/l3fwd/l3fwd_event.c +2 -0
@@ -2,6 +2,7 @@* Copyright(C) 2019 Marvell International Ltd. */ +#ifdef RTE_LIB_EVENTDEV #include <stdbool.h> #include <getopt.h>
@@ -341,3 +342,4 @@ l3fwd_event_worker_cleanup(uint8_t event_d_id, uint8_t event_p_id,rte_event_port_quiesce (event_d_id, event_p_id, l3fwd_event_port_flush, NULL); } +#endif /* #ifdef RTE_LIB_EVENTDEV */
examples/l3fwd/l3fwd_event.h +5 -2
@@ -6,11 +6,13 @@#define __L3FWD_EVENTDEV_H__#include <rte_common.h> +#include <rte_service.h> +#include <rte_spinlock.h> + +#ifdef RTE_LIB_EVENTDEV #include <rte_eventdev.h> #include <rte_event_eth_rx_adapter.h> #include <rte_event_eth_tx_adapter.h> -#include <rte_service.h> -#include <rte_spinlock.h> #include "l3fwd.h"
@@ -164,4 +166,5 @@ void l3fwd_event_worker_cleanup(uint8_t event_d_id, uint8_t event_p_id, struct rte_event events[], uint16_t nb_enq, uint16_t nb_deq, uint8_t is_vector); +#endif /* ifdef RTE_LIB_EVENTDEV */ #endif /* __L3FWD_EVENTDEV_H__ */
examples/l3fwd/l3fwd_event_generic.c +2 -0
@@ -2,6 +2,7 @@* Copyright(C) 2019 Marvell International Ltd. */ +#ifdef RTE_LIB_EVENTDEV #include <stdbool.h> #include "l3fwd.h"
@@ -309,3 +310,4 @@ l3fwd_event_set_generic_ops(struct l3fwd_event_setup_ops *ops) ops->event_port_setup = l3fwd_event_port_setup_generic; ops->adapter_setup = l3fwd_rx_tx_adapter_setup_generic; } +#endif /* RTE_LIB_EVENTDEV */
examples/l3fwd/l3fwd_event_internal_port.c +2 -0
@@ -2,6 +2,7 @@* Copyright(C) 2019 Marvell International Ltd. */ +#ifdef RTE_LIB_EVENTDEV #include <stdbool.h> #include "l3fwd.h"
@@ -311,3 +312,4 @@ l3fwd_event_set_internal_port_ops(struct l3fwd_event_setup_ops *ops) ops->event_port_setup = l3fwd_event_port_setup_internal_port; ops->adapter_setup = l3fwd_rx_tx_adapter_setup_internal_port; } +#endif /* RTE_LIB_EVENTDEV */
examples/l3fwd/l3fwd_fib.c +2 -0
@@ -253,6 +253,7 @@ fib_main_loop(__rte_unused void *dummy)return 0 ; } +#ifdef RTE_LIB_EVENTDEV /* One eventdev loop for single and burst using fib. */ static __rte_always_inline void fib_event_loop(struct l3fwd_event_resources *evt_rsrc,
@@ -635,6 +636,7 @@ fib_event_main_loop_tx_q_burst_vector(__rte_unused void *dummy)fib_event_loop_vector (evt_rsrc,L3FWD_EVENT_TX_ENQ ); return 0; } +#endif /* Function to setup fib. 8< */ void
examples/l3fwd/l3fwd_lpm.c +2 -0
@@ -226,6 +226,7 @@ lpm_main_loop(__rte_unused void *dummy)return 0 ; } +#ifdef RTE_LIB_EVENTDEV static __rte_always_inline uint16_tlpm_process_event_pkt (const struct lcore_conf *lconf,struct rte_mbuf *mbuf) {
@@ -554,6 +555,7 @@ lpm_event_main_loop_tx_q_burst_vector(__rte_unused void *dummy)lpm_event_loop_vector (evt_rsrc,L3FWD_EVENT_TX_ENQ ); return 0; } +#endif void setup_lpm (const int socketid)
examples/l3fwd/main.c +51 -14
227 lines not on this page · raw message
examples/l3fwd/meson.build +4 -1
@@ -7,7 +7,7 @@ # DPDK instance, use 'make' allow_experimental_apis = true -deps += ['acl', 'hash', 'lpm', 'fib', 'eventdev'] +deps += ['acl', 'hash', 'lpm', 'fib'] sources = files( 'l3fwd_acl.c', 'l3fwd_em.c',
@@ -18,3 +18,6 @@ sources = files( 'l3fwd_lpm.c', 'main.c', ) +if dpdk_conf.has('RTE_LIB_EVENTDEV') + deps += 'eventdev' +endif
Signature · 1 line
2.39.2
PATCH v6 10/11 build: make most device classes optional
In reply to Bruce RichardsonApart from ethdev and cryptodev, which have lots of components and tests which depend on them, we can make the device class libraries optional without too much work.
This patch marks:
* bbdev,
* compressdev,
* dmadev,
* eventdev,
* mldev,
* rawdev,
* regexdev
optional, and ensures that DPDK - including tests - can be built with these components disabled.
--- lib/meson.build | 7 +++++++ 1 file changed, 7 insertions(+)
lib/meson.build +7 -0
@@ -67,8 +67,12 @@ libraries = [ ] optional_libs = [ + 'bbdev', 'bitratestats', 'cfgfile', + 'compressdev', + 'dmadev', + 'eventdev', 'gpudev', 'graph', 'gro',
@@ -76,11 +80,14 @@ optional_libs = [ 'jobstats', 'latencystats', 'metrics', + 'mldev', 'node', 'pdump', 'pipeline', 'port', 'power', + 'rawdev', + 'regexdev', 'table', 'vhost', ]
Signature · 1 line
2.39.2
PATCH v6 11/11 build: expand list of optional libraries
In reply to Bruce RichardsonWith the unit test build now with individual per-file dependencies, we can more easily expand the list of optional libraries. Add 8 new libraries to the optional list.
--- lib/meson.build | 8 ++++++++ 1 file changed, 8 insertions(+)
lib/meson.build +8 -0
@@ -69,25 +69,33 @@ libraries = [ optional_libs = [ 'bbdev', 'bitratestats', + 'bpf', 'cfgfile', 'compressdev', + 'distributor', 'dmadev', + 'efd', 'eventdev', 'gpudev', 'graph', 'gro', 'gso', + 'ip_frag', 'jobstats', 'latencystats', + 'member', 'metrics', 'mldev', 'node', + 'pcapng', 'pdump', 'pipeline', 'port', 'power', 'rawdev', 'regexdev', + 'reorder', + 'sched', 'table', 'vhost', ]
Signature · 1 line
2.39.2
Re: [PATCH v6 00/11] expand list of optional libraries
In reply to Bruce RichardsonHello Bruce,
Quoted 18 lines · Bruce Richardson
This patchset contains changes to DPDK to make the build more configurable overall. The changes can be grouped into two areas:
* Firstly, there are changes to make the build of the unit tests more flexible and maintainable. These 7 patches switch the unit tests from having separate hard-coded lists of files and tests, with lots of conditional logic to add/remove items from the list, to instead being a single list of files and dependencies per-file. The actual lists of test-suites are built up dynamically from the list of files whose dependencies are met and therefore will be part of the build. This rework enables...
* The second set of patches which expands the list of libraries which can be disabled at build-time, while still giving a successful build of DPDK. Overall, after this set is applied, the list of optional libraries in DPDK is approx doubled in size. [15 additions giving 31 optional libs]
Quoted 9 lines
NOTES:
* as stated in the RFC, the test binary moves in the build as a result of this set - from app/test/dpdk-test to app/dpdk-test.
* running the suites of tests no longer works after patch 4 until patch 5-7 is applied. If this is an issue, the patches can be merged on apply. However, the individual tests are still runnable through the test binary - it's only through "meson test" that there are issues, so I'm keeping the patches separate since each is relatively complex in its own right.
Compilation is fine between those patches (which is the minimum). Seeing the size of the changes, I agree it is more readable to keep them separate.
And I think we can live with unit tests being "broken" (well, absent) between those patches.
Quoted 6 lines
* A number of files in the test directory were not being built, and seem to have never been built with meson. This requires separate work, outside the scope of the patchset to fix.
* Similarly, some unit tests were never added to test suites. These can now be found by using grep to find the oldREGISTER_TEST_COMMANDmacro. Again, adding orphan tests to suites is outside the scope of this set.
As discussed in the thread for patch 5
(https://inbox.dpdk.org/dev/CAJvnSUBcsA3=9CZvnU+g5CJ261X=tJMivcvygO-D=jcu+akEGg@mail.gmail.com/),
merging this series renders ARM container unit tests unavailable at UNH.
This is not perfect, but I prefer we make progress on the build framework changes the sooner possible.
This is a temporary state until either the possibility to skip test is added (and UNH makes use of it instead of patching app/test/meson.build) or the fixes I proposed for ethdev cleanup are merged (and UNH removes the patching of meson).
Hopefully, we will solve this remaining issue in the next weeks.
Series applied, thanks for this nice cleanup and enhancement Bruce.
As a followup on the optional libraries topic, next, I will merge the enable_libs option:
https://patchwork.dpdk.org/project/dpdk/list/?series=29044
Signature · 1 line
David Marchand