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

Commit c6ce3e2f authored by Rehas Sachdeva's avatar Rehas Sachdeva Committed by Matthew Wilcox
Browse files

radix tree test suite: Add config option for map shift 



Add config option "SHIFT=<value>" to Makefile for building test suite
with any value of RADIX_TREE_MAP_SHIFT between 3 and 7 inclusive.

Signed-off-by: default avatarRehas Sachdeva <aquannie@gmail.com>
[mawilcox@microsoft.com: .gitignore, quieten grep, remove on clean]
Signed-off-by: default avatarMatthew Wilcox <mawilcox@microsoft.com>
parent 7e73eb0b

tools/testing/radix-tree/.gitignore

+1 −0
Original line number Original line Diff line number Diff line 
generated/map-shift.h

idr.c

idr.c

idr-test

idr-test

main

main

tools/testing/radix-tree/Makefile

+13 −5
Original line number Original line Diff line number Diff line
@@ -6,11 +6,11 @@ CORE_OFILES := radix-tree.o idr.o linux.o test.o find_bit.o 
OFILES = main.o $(CORE_OFILES) regression1.o regression2.o regression3.o \

OFILES = main.o $(CORE_OFILES) regression1.o regression2.o regression3.o \

	 tag_check.o multiorder.o idr-test.o iteration_check.o benchmark.o

	 tag_check.o multiorder.o idr-test.o iteration_check.o benchmark.o





ifdef BENCHMARK

ifndef SHIFT

	CFLAGS += -DBENCHMARK=1

	SHIFT=3

endif

endif





targets: $(TARGETS)

targets: mapshift $(TARGETS)





main:	$(OFILES)

main:	$(OFILES)

	$(CC) $(CFLAGS) $(LDFLAGS) $^ -o main

	$(CC) $(CFLAGS) $(LDFLAGS) $^ -o main
@@ -22,11 +22,11 @@ multiorder: multiorder.o $(CORE_OFILES) 
	$(CC) $(CFLAGS) $(LDFLAGS) $^ -o multiorder

	$(CC) $(CFLAGS) $(LDFLAGS) $^ -o multiorder





clean:

clean:

	$(RM) $(TARGETS) *.o radix-tree.c idr.c

	$(RM) $(TARGETS) *.o radix-tree.c idr.c generated/map-shift.h





vpath %.c ../../lib

vpath %.c ../../lib





$(OFILES): *.h */*.h \

$(OFILES): *.h */*.h generated/map-shift.h \

	../../include/linux/*.h \

	../../include/linux/*.h \

	../../include/asm/*.h \

	../../include/asm/*.h \

	../../../include/linux/radix-tree.h \

	../../../include/linux/radix-tree.h \
@@ -37,3 +37,11 @@ radix-tree.c: ../../../lib/radix-tree.c 




idr.c: ../../../lib/idr.c

idr.c: ../../../lib/idr.c

	sed -e 's/^static //' -e 's/__always_inline //' -e 's/inline //' < $< > $@

	sed -e 's/^static //' -e 's/__always_inline //' -e 's/inline //' < $< > $@



.PHONY: mapshift



mapshift:

	@if ! grep -qw $(SHIFT) generated/map-shift.h; then		\

		echo "#define RADIX_TREE_MAP_SHIFT $(SHIFT)" >		\

				generated/map-shift.h;			\

	fi

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

+0 −6
Original line number Original line Diff line number Diff line
@@ -12,12 +12,6 @@ 
#include <linux/log2.h>

#include <linux/log2.h>

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

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





#ifdef BENCHMARK

#define RADIX_TREE_MAP_SHIFT	6

#else

#define RADIX_TREE_MAP_SHIFT	3

#endif



#define printk printf

#define printk printf

#define pr_debug printk

#define pr_debug printk

#define pr_cont printk

#define pr_cont printk

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

+2 −0
Original line number Original line Diff line number Diff line 
#ifndef _TEST_RADIX_TREE_H

#ifndef _TEST_RADIX_TREE_H

#define _TEST_RADIX_TREE_H

#define _TEST_RADIX_TREE_H



#include "generated/map-shift.h"

#include "../../../../include/linux/radix-tree.h"

#include "../../../../include/linux/radix-tree.h"





extern int kmalloc_verbose;

extern int kmalloc_verbose;