Skip to content

Commit

Permalink
maple_tree: skip other tests when BENCH is enabled
Browse files Browse the repository at this point in the history
Skip other tests when BENCH is enabled so that performance can be measured
in user space.

Link: https://lkml.kernel.org/r/20231027033845.90608-8-zhangpeng.00@bytedance.com
Signed-off-by: Peng Zhang <zhangpeng.00@bytedance.com>
Reviewed-by: Liam R. Howlett <Liam.Howlett@oracle.com>
Cc: Christian Brauner <brauner@kernel.org>
Cc: Jonathan Corbet <corbet@lwn.net>
Cc: Mateusz Guzik <mjguzik@gmail.com>
Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Cc: Matthew Wilcox <willy@infradead.org>
Cc: Michael S. Tsirkin <mst@redhat.com>
Cc: Mike Christie <michael.christie@oracle.com>
Cc: Nicholas Piggin <npiggin@gmail.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Suren Baghdasaryan <surenb@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
  • Loading branch information
Peng Zhang authored and Andrew Morton committed Dec 11, 2023
1 parent 9bc1d3c commit f670fa1
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
8 changes: 4 additions & 4 deletions lib/test_maple_tree.c
Original file line number Diff line number Diff line change
Expand Up @@ -3585,10 +3585,6 @@ static int __init maple_tree_seed(void)

pr_info("\nTEST STARTING\n\n");

mt_init_flags(&tree, MT_FLAGS_ALLOC_RANGE);
check_root_expand(&tree);
mtree_destroy(&tree);

#if defined(BENCH_SLOT_STORE)
#define BENCH
mt_init_flags(&tree, MT_FLAGS_ALLOC_RANGE);
Expand Down Expand Up @@ -3646,6 +3642,10 @@ static int __init maple_tree_seed(void)
goto skip;
#endif

mt_init_flags(&tree, MT_FLAGS_ALLOC_RANGE);
check_root_expand(&tree);
mtree_destroy(&tree);

mt_init_flags(&tree, MT_FLAGS_ALLOC_RANGE);
check_iteration(&tree);
mtree_destroy(&tree);
Expand Down
2 changes: 2 additions & 0 deletions tools/testing/radix-tree/maple.c
Original file line number Diff line number Diff line change
Expand Up @@ -36299,7 +36299,9 @@ void farmer_tests(void)

void maple_tree_tests(void)
{
#if !defined(BENCH)
farmer_tests();
#endif
maple_tree_seed();
maple_tree_harvest();
}
Expand Down

0 comments on commit f670fa1

Please sign in to comment.