Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cfa40bcf authored by Konstantin Khlebnikov's avatar Konstantin Khlebnikov Committed by Linus Torvalds
Browse files

radix tree test suite: benchmark for iterator 

This adds simple benchmark for iterator similar to one I've used for
commit 78c1d784 ("radix-tree: introduce bit-optimized iterator")

Building with make BENCHMARK=1 set radix tree order to 6, this allows to
get performance comparable to in kernel performance.

Link: http://lkml.kernel.org/r/1480369871-5271-43-git-send-email-mawilcox@linuxonhyperv.com


Signed-off-by: default avatarKonstantin Khlebnikov <koct9i@gmail.com>
Signed-off-by: default avatarMatthew Wilcox <mawilcox@microsoft.com>
Tested-by: default avatarKirill A. Shutemov <kirill.shutemov@linux.intel.com>
Cc: Ross Zwisler <ross.zwisler@linux.intel.com>
Cc: Matthew Wilcox <mawilcox@microsoft.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent ba20cd60

tools/testing/radix-tree/Makefile

+5 −1
Original line number Diff line number Diff line
@@ -4,7 +4,11 @@ LDFLAGS += -lpthread -lurcu 
TARGETS = main

OFILES = main.o radix-tree.o linux.o test.o tag_check.o find_next_bit.o \

	 regression1.o regression2.o regression3.o multiorder.o \

	 iteration_check.o

	 iteration_check.o benchmark.o



ifdef BENCHMARK

	CFLAGS += -DBENCHMARK=1

endif



targets: $(TARGETS)

tools/testing/radix-tree/benchmark.c

0 → 100644
+98 −0
Original line number Diff line number Diff line 
/*

 * benchmark.c:

 * Author: Konstantin Khlebnikov <koct9i@gmail.com>

 *

 * This program is free software; you can redistribute it and/or modify it

 * under the terms and conditions of the GNU General Public License,

 * version 2, as published by the Free Software Foundation.

 *

 * This program is distributed in the hope it will be useful, but WITHOUT

 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

 * more details.

 */

#include <linux/radix-tree.h>

#include <linux/slab.h>

#include <linux/errno.h>

#include <time.h>

#include "test.h"



#define NSEC_PER_SEC	1000000000L



static long long benchmark_iter(struct radix_tree_root *root, bool tagged)

{

	volatile unsigned long sink = 0;

	struct radix_tree_iter iter;

	struct timespec start, finish;

	long long nsec;

	int l, loops = 1;

	void **slot;



#ifdef BENCHMARK

again:

#endif

	clock_gettime(CLOCK_MONOTONIC, &start);

	for (l = 0; l < loops; l++) {

		if (tagged) {

			radix_tree_for_each_tagged(slot, root, &iter, 0, 0)

				sink ^= (unsigned long)slot;

		} else {

			radix_tree_for_each_slot(slot, root, &iter, 0)

				sink ^= (unsigned long)slot;

		}

	}

	clock_gettime(CLOCK_MONOTONIC, &finish);



	nsec = (finish.tv_sec - start.tv_sec) * NSEC_PER_SEC +

	       (finish.tv_nsec - start.tv_nsec);



#ifdef BENCHMARK

	if (loops == 1 && nsec * 5 < NSEC_PER_SEC) {

		loops = NSEC_PER_SEC / nsec / 4 + 1;

		goto again;

	}

#endif



	nsec /= loops;

	return nsec;

}



static void benchmark_size(unsigned long size, unsigned long step, int order)

{

	RADIX_TREE(tree, GFP_KERNEL);

	long long normal, tagged;

	unsigned long index;



	for (index = 0 ; index < size ; index += step) {

		item_insert_order(&tree, index, order);

		radix_tree_tag_set(&tree, index, 0);

	}



	tagged = benchmark_iter(&tree, true);

	normal = benchmark_iter(&tree, false);



	printf("Size %ld, step %6ld, order %d tagged %10lld ns, normal %10lld ns\n",

		size, step, order, tagged, normal);



	item_kill_tree(&tree);

	rcu_barrier();

}



void benchmark(void)

{

	unsigned long size[] = {1 << 10, 1 << 20, 0};

	unsigned long step[] = {1, 2, 7, 15, 63, 64, 65,

				128, 256, 512, 12345, 0};

	int c, s;



	printf("starting benchmarks\n");

	printf("RADIX_TREE_MAP_SHIFT = %d\n", RADIX_TREE_MAP_SHIFT);



	for (c = 0; size[c]; c++)

		for (s = 0; step[s]; s++)

			benchmark_size(size[c], step[s], 0);



	for (c = 0; size[c]; c++)

		for (s = 0; step[s]; s++)

			benchmark_size(size[c], step[s] << 9, 9);

}

tools/testing/radix-tree/linux/kernel.h

+4 −0
Original line number Diff line number Diff line
@@ -10,7 +10,11 @@ 
#include "../../include/linux/compiler.h"

#include "../../../include/linux/kconfig.h"



#ifdef BENCHMARK

#define RADIX_TREE_MAP_SHIFT	6

#else

#define RADIX_TREE_MAP_SHIFT	3

#endif



#ifndef NULL

#define NULL	0

tools/testing/radix-tree/main.c

+2 −0
Original line number Diff line number Diff line
@@ -352,6 +352,8 @@ int main(int argc, char **argv) 
	/* Free any remaining preallocated nodes */

	radix_tree_cpu_dead(0);



	benchmark();



	sleep(1);

	printf("after sleep(1): %d allocated, preempt %d\n",

		nr_allocated, preempt_count);

tools/testing/radix-tree/test.h

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ void item_kill_tree(struct radix_tree_root *root); 
void tag_check(void);

void multiorder_checks(void);

void iteration_test(void);

void benchmark(void);



struct item *

item_tag_set(struct radix_tree_root *root, unsigned long index, int tag);