This is an automated email from the ASF dual-hosted git repository. xiaoxiang pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx-apps.git
commit e6c3930b2dd76d2813bda91df03ea107479c33a3 Author: chenrun1 <[email protected]> AuthorDate: Mon Nov 6 12:17:22 2023 +0800 apps:Move the performance tools to benchmark. 1.ramspeed 2.cachespeed 3.osperf 4.iozone 5.superPI Signed-off-by: chenrun1 <[email protected]> --- {testing => benchmarks}/cachespeed/CMakeLists.txt | 0 {testing => benchmarks}/cachespeed/Kconfig | 10 +++++----- {testing/ramspeed => benchmarks/cachespeed}/Make.defs | 6 +++--- {testing => benchmarks}/cachespeed/Makefile | 10 +++++----- {testing => benchmarks}/cachespeed/cachespeed_main.c | 2 +- {testing => benchmarks}/iozone/.gitignore | 0 {testing => benchmarks}/iozone/Kconfig | 12 ++++++------ {testing/osperf => benchmarks/iozone}/Make.defs | 6 +++--- {testing => benchmarks}/iozone/Makefile | 16 ++++++++-------- {testing => benchmarks}/iozone/iozone.patch | 0 {testing => benchmarks}/osperf/Kconfig | 8 ++++---- {testing/iozone => benchmarks/osperf}/Make.defs | 6 +++--- {testing => benchmarks}/osperf/Makefile | 8 ++++---- {testing => benchmarks}/osperf/osperf.c | 4 ++-- {testing => benchmarks}/ramspeed/Kconfig | 10 +++++----- {testing/cachespeed => benchmarks/ramspeed}/Make.defs | 6 +++--- {testing => benchmarks}/ramspeed/Makefile | 10 +++++----- {testing => benchmarks}/ramspeed/ramspeed_main.c | 2 +- {testing => benchmarks}/superpi/.gitignore | 0 {testing => benchmarks}/superpi/Kconfig | 12 ++++++------ {testing => benchmarks}/superpi/Make.defs | 6 +++--- {testing => benchmarks}/superpi/Makefile | 10 +++++----- 22 files changed, 72 insertions(+), 72 deletions(-) diff --git a/testing/cachespeed/CMakeLists.txt b/benchmarks/cachespeed/CMakeLists.txt similarity index 100% rename from testing/cachespeed/CMakeLists.txt rename to benchmarks/cachespeed/CMakeLists.txt diff --git a/testing/cachespeed/Kconfig b/benchmarks/cachespeed/Kconfig similarity index 87% rename from testing/cachespeed/Kconfig rename to benchmarks/cachespeed/Kconfig index e8a9cf8d8..ec8481542 100644 --- a/testing/cachespeed/Kconfig +++ b/benchmarks/cachespeed/Kconfig @@ -3,27 +3,27 @@ # see the file kconfig-language.txt in the NuttX tools repository. # -config TESTING_CACHESPEED +config BENCHMARK_CACHESPEED bool "CACHE Speed Test" depends on ARCH_ICACHE && ARCH_DCACHE default n ---help--- Enable a simple CACHE speed test. -if TESTING_CACHESPEED +if BENCHMARK_CACHESPEED -config TESTING_CACHESPEED_PROGNAME +config BENCHMARK_CACHESPEED_PROGNAME string "Program name" default "cachespeed" ---help--- This is the name of the program that will be used when the NSH ELF program is installed. -config TESTING_CACHESPEED_PRIORITY +config BENCHMARK_CACHESPEED_PRIORITY int "CACHE speed test task priority" default 100 -config TESTING_CACHESPEED_STACKSIZE +config BENCHMARK_CACHESPEED_STACKSIZE int "CACHE speed test stack size" default DEFAULT_TASK_STACKSIZE diff --git a/testing/ramspeed/Make.defs b/benchmarks/cachespeed/Make.defs similarity index 87% rename from testing/ramspeed/Make.defs rename to benchmarks/cachespeed/Make.defs index 24b6c633a..721bda7ca 100644 --- a/testing/ramspeed/Make.defs +++ b/benchmarks/cachespeed/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# apps/testing/ramspeed/Make.defs +# apps/benchmarks/cachespeed/Make.defs # # Licensed to the Apache Software Foundation (ASF) under one or more # contributor license agreements. See the NOTICE file distributed with @@ -18,6 +18,6 @@ # ############################################################################ -ifneq ($(CONFIG_TESTING_RAMSPEED),) -CONFIGURED_APPS += $(APPDIR)/testing/ramspeed +ifneq ($(CONFIG_BENCHMARK_CACHESPEED),) +CONFIGURED_APPS += $(APPDIR)/benchmarks/cachespeed endif diff --git a/testing/cachespeed/Makefile b/benchmarks/cachespeed/Makefile similarity index 82% rename from testing/cachespeed/Makefile rename to benchmarks/cachespeed/Makefile index b6224204e..76407f77c 100644 --- a/testing/cachespeed/Makefile +++ b/benchmarks/cachespeed/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# apps/testing/cachespeed/Makefile +# apps/benchmarks/cachespeed/Makefile # # Licensed to the Apache Software Foundation (ASF) under one or more # contributor license agreements. See the NOTICE file distributed with @@ -26,10 +26,10 @@ ifneq ($(CONFIG_CACHESPEED_MONOTONIC_TIME),y) CFLAGS += -DCACHESPEED_PERFTIME endif -PROGNAME = $(CONFIG_TESTING_CACHESPEED_PROGNAME) -PRIORITY = $(CONFIG_TESTING_CACHESPEED_PRIORITY) -STACKSIZE = $(CONFIG_TESTING_CACHESPEED_STACKSIZE) -MODULE = $(CONFIG_TESTING_CACHESPEED) +PROGNAME = $(CONFIG_BENCHMARK_CACHESPEED_PROGNAME) +PRIORITY = $(CONFIG_BENCHMARK_CACHESPEED_PRIORITY) +STACKSIZE = $(CONFIG_BENCHMARK_CACHESPEED_STACKSIZE) +MODULE = $(CONFIG_BENCHMARK_CACHESPEED) MAINSRC = cachespeed_main.c diff --git a/testing/cachespeed/cachespeed_main.c b/benchmarks/cachespeed/cachespeed_main.c similarity index 99% rename from testing/cachespeed/cachespeed_main.c rename to benchmarks/cachespeed/cachespeed_main.c index 87425cdc7..c8934e437 100644 --- a/testing/cachespeed/cachespeed_main.c +++ b/benchmarks/cachespeed/cachespeed_main.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/testing/cachespeed/cachespeed_main.c + * apps/benchmarks/cachespeed/cachespeed_main.c * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with diff --git a/testing/iozone/.gitignore b/benchmarks/iozone/.gitignore similarity index 100% rename from testing/iozone/.gitignore rename to benchmarks/iozone/.gitignore diff --git a/testing/iozone/Kconfig b/benchmarks/iozone/Kconfig similarity index 69% rename from testing/iozone/Kconfig rename to benchmarks/iozone/Kconfig index b35850036..eedff6067 100644 --- a/testing/iozone/Kconfig +++ b/benchmarks/iozone/Kconfig @@ -3,27 +3,27 @@ # see the file kconfig-language.txt in the NuttX tools repository. # -config TESTING_IOZONE +config BENCHMARK_IOZONE tristate "IOzone, filesystem benchmark tool" default n ---help--- https://www.iozone.org/ -if TESTING_IOZONE +if BENCHMARK_IOZONE -config TESTING_IOZONE_PROGNAME +config BENCHMARK_IOZONE_PROGNAME string "Program name" default "iozone" -config TESTING_IOZONE_PRIORITY +config BENCHMARK_IOZONE_PRIORITY int "IOzone task priority" default 100 -config TESTING_IOZONE_STACKSIZE +config BENCHMARK_IOZONE_STACKSIZE int "IOzone stack size" default 8192 -config TESTING_IOZONE_VERSION +config BENCHMARK_IOZONE_VERSION string "iozone version" default "3_493" diff --git a/testing/osperf/Make.defs b/benchmarks/iozone/Make.defs similarity index 88% rename from testing/osperf/Make.defs rename to benchmarks/iozone/Make.defs index 83f4dd8b1..09ed336e1 100644 --- a/testing/osperf/Make.defs +++ b/benchmarks/iozone/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# apps/testing/osperf/Make.defs +# apps/benchmarks/iozone/Make.defs # # Licensed to the Apache Software Foundation (ASF) under one or more # contributor license agreements. See the NOTICE file distributed with @@ -18,6 +18,6 @@ # ############################################################################ -ifneq ($(CONFIG_TESTING_OSPERF),) -CONFIGURED_APPS += $(APPDIR)/testing/osperf +ifneq ($(CONFIG_BENCHMARK_IOZONE),) +CONFIGURED_APPS += $(APPDIR)/benchmarks/iozone endif diff --git a/testing/iozone/Makefile b/benchmarks/iozone/Makefile similarity index 83% rename from testing/iozone/Makefile rename to benchmarks/iozone/Makefile index 81d36a08e..a593dd269 100644 --- a/testing/iozone/Makefile +++ b/benchmarks/iozone/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# apps/testing/iozone/Make.defs +# apps/benchmarks/iozone/Make.defs # # Licensed to the Apache Software Foundation (ASF) under one or more # contributor license agreements. See the NOTICE file distributed with @@ -20,10 +20,10 @@ include $(APPDIR)/Make.defs -PROGNAME = $(CONFIG_TESTING_IOZONE_PROGNAME) -PRIORITY = $(CONFIG_TESTING_IOZONE_PRIORITY) -STACKSIZE = $(CONFIG_TESTING_IOZONE_STACKSIZE) -MODULE = $(CONFIG_TESTING_IOZONE) +PROGNAME = $(CONFIG_BENCHMARK_IOZONE_PROGNAME) +PRIORITY = $(CONFIG_BENCHMARK_IOZONE_PRIORITY) +STACKSIZE = $(CONFIG_BENCHMARK_IOZONE_STACKSIZE) +MODULE = $(CONFIG_BENCHMARK_IOZONE) CFLAGS += -Dunix -DHAVE_ANSIC_C -DHAVE_PREAD -DNAME='"nuttx"' CFLAGS += -DNO_MADVISE -DNO_FORK -D__FreeBSD__ -DNO_THREADS @@ -37,15 +37,15 @@ CFLAGS += -DRECLEN_START=1024 CSRCS = iozone/src/current/libbif.c MAINSRC = iozone/src/current/iozone.c -CONFIG_TESTING_IOZONE_URL ?= "https://www.iozone.org/src/current/"; +CONFIG_BENCHMARK_IOZONE_URL ?= "https://www.iozone.org/src/current/"; IOZONE_UNPACKNAME = iozone -IOZONE_VERSION = $(patsubst "%",%,$(strip $(CONFIG_TESTING_IOZONE_VERSION))) +IOZONE_VERSION = $(patsubst "%",%,$(strip $(CONFIG_BENCHMARK_IOZONE_VERSION))) IOZONE_ZIP = iozone$(IOZONE_VERSION).tgz $(IOZONE_ZIP): @echo "Downloading: $(IOZONE_ZIP)" - $(Q) curl -O -L $(CONFIG_TESTING_IOZONE_URL)/$(IOZONE_ZIP) + $(Q) curl -O -L $(CONFIG_BENCHMARK_IOZONE_URL)/$(IOZONE_ZIP) $(IOZONE_UNPACKNAME): $(IOZONE_ZIP) @echo "Unpacking: $(IOZONE_ZIP) -> $(IOZONE_UNPACKNAME)" diff --git a/testing/iozone/iozone.patch b/benchmarks/iozone/iozone.patch similarity index 100% rename from testing/iozone/iozone.patch rename to benchmarks/iozone/iozone.patch diff --git a/testing/osperf/Kconfig b/benchmarks/osperf/Kconfig similarity index 79% rename from testing/osperf/Kconfig rename to benchmarks/osperf/Kconfig index 7520899df..40cf21d84 100644 --- a/testing/osperf/Kconfig +++ b/benchmarks/osperf/Kconfig @@ -3,20 +3,20 @@ # see the file kconfig-language.txt in the NuttX tools repository. # -config TESTING_OSPERF +config BENCHMARK_OSPERF tristate "System performance profiling" default n ---help--- Measure the performance of core system functions, such as thread switching and the time required for semaphore execution -if TESTING_OSPERF +if BENCHMARK_OSPERF -config TESTING_OSPERF_PRIORITY +config BENCHMARK_OSPERF_PRIORITY int "OS profiling task priority" default 100 -config TESTING_OSPERF_STACKSIZE +config BENCHMARK_OSPERF_STACKSIZE int "OS profiling stack size" default DEFAULT_TASK_STACKSIZE diff --git a/testing/iozone/Make.defs b/benchmarks/osperf/Make.defs similarity index 88% rename from testing/iozone/Make.defs rename to benchmarks/osperf/Make.defs index 71cc9374a..29888f7ae 100644 --- a/testing/iozone/Make.defs +++ b/benchmarks/osperf/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# apps/testing/iozone/Make.defs +# apps/benchmarks/osperf/Make.defs # # Licensed to the Apache Software Foundation (ASF) under one or more # contributor license agreements. See the NOTICE file distributed with @@ -18,6 +18,6 @@ # ############################################################################ -ifneq ($(CONFIG_TESTING_IOZONE),) -CONFIGURED_APPS += $(APPDIR)/testing/iozone +ifneq ($(CONFIG_BENCHMARK_OSPERF),) +CONFIGURED_APPS += $(APPDIR)/benchmarks/osperf endif diff --git a/testing/osperf/Makefile b/benchmarks/osperf/Makefile similarity index 85% rename from testing/osperf/Makefile rename to benchmarks/osperf/Makefile index 3da227093..29e94f2f1 100644 --- a/testing/osperf/Makefile +++ b/benchmarks/osperf/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# apps/testing/osperf/Makefile +# apps/benchmarks/osperf/Makefile # # Licensed to the Apache Software Foundation (ASF) under one or more # contributor license agreements. See the NOTICE file distributed with @@ -21,9 +21,9 @@ include $(APPDIR)/Make.defs PROGNAME = osperf -PRIORITY = $(CONFIG_TESTING_OSPERF_PRIORITY) -STACKSIZE = $(CONFIG_TESTING_OSPERF_STACKSIZE) -MODULE = $(CONFIG_TESTING_OSPERF) +PRIORITY = $(CONFIG_BENCHMARK_OSPERF_PRIORITY) +STACKSIZE = $(CONFIG_BENCHMARK_OSPERF_STACKSIZE) +MODULE = $(CONFIG_BENCHMARK_OSPERF) MAINSRC = osperf.c diff --git a/testing/osperf/osperf.c b/benchmarks/osperf/osperf.c similarity index 99% rename from testing/osperf/osperf.c rename to benchmarks/osperf/osperf.c index f44ee31eb..e4b69827c 100644 --- a/testing/osperf/osperf.c +++ b/benchmarks/osperf/osperf.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/testing/osperf/osperf.c + * apps/benchmarks/osperf/osperf.c * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -145,7 +145,7 @@ static size_t pthread_switch_performance(void) sem_init(&perf.sem, 0, 0); tid = performance_thread_create(pthread_switch_task, &perf, - CONFIG_TESTING_OSPERF_PRIORITY + 1); + CONFIG_BENCHMARK_OSPERF_PRIORITY + 1); performance_start(&perf.time); sem_post(&perf.sem); diff --git a/testing/ramspeed/Kconfig b/benchmarks/ramspeed/Kconfig similarity index 76% rename from testing/ramspeed/Kconfig rename to benchmarks/ramspeed/Kconfig index 304629711..86e890e42 100644 --- a/testing/ramspeed/Kconfig +++ b/benchmarks/ramspeed/Kconfig @@ -3,26 +3,26 @@ # see the file kconfig-language.txt in the NuttX tools repository. # -config TESTING_RAMSPEED +config BENCHMARK_RAMSPEED tristate "RAM Speed Test" default n ---help--- Enable a simple RAM speed test. -if TESTING_RAMSPEED +if BENCHMARK_RAMSPEED -config TESTING_RAMSPEED_PROGNAME +config BENCHMARK_RAMSPEED_PROGNAME string "Program name" default "ramspeed" ---help--- This is the name of the program that will be used when the NSH ELF program is installed. -config TESTING_RAMSPEED_PRIORITY +config BENCHMARK_RAMSPEED_PRIORITY int "RAM speed test task priority" default 100 -config TESTING_RAMSPEED_STACKSIZE +config BENCHMARK_RAMSPEED_STACKSIZE int "RAM speed test stack size" default DEFAULT_TASK_STACKSIZE diff --git a/testing/cachespeed/Make.defs b/benchmarks/ramspeed/Make.defs similarity index 88% rename from testing/cachespeed/Make.defs rename to benchmarks/ramspeed/Make.defs index 85e55491f..fd3c6673e 100644 --- a/testing/cachespeed/Make.defs +++ b/benchmarks/ramspeed/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# apps/testing/cachespeed/Make.defs +# apps/benchmarks/ramspeed/Make.defs # # Licensed to the Apache Software Foundation (ASF) under one or more # contributor license agreements. See the NOTICE file distributed with @@ -18,6 +18,6 @@ # ############################################################################ -ifneq ($(CONFIG_TESTING_CACHESPEED),) -CONFIGURED_APPS += $(APPDIR)/testing/cachespeed +ifneq ($(CONFIG_BENCHMARK_RAMSPEED),) +CONFIGURED_APPS += $(APPDIR)/benchmarks/ramspeed endif diff --git a/testing/ramspeed/Makefile b/benchmarks/ramspeed/Makefile similarity index 82% rename from testing/ramspeed/Makefile rename to benchmarks/ramspeed/Makefile index 926f4398b..f9376a9d5 100644 --- a/testing/ramspeed/Makefile +++ b/benchmarks/ramspeed/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# apps/testing/ramspeed/Makefile +# apps/benchmarks/ramspeed/Makefile # # Licensed to the Apache Software Foundation (ASF) under one or more # contributor license agreements. See the NOTICE file distributed with @@ -22,10 +22,10 @@ include $(APPDIR)/Make.defs # RAM speed test -PROGNAME = $(CONFIG_TESTING_RAMSPEED_PROGNAME) -PRIORITY = $(CONFIG_TESTING_RAMSPEED_PRIORITY) -STACKSIZE = $(CONFIG_TESTING_RAMSPEED_STACKSIZE) -MODULE = $(CONFIG_TESTING_RAMSPEED) +PROGNAME = $(CONFIG_BENCHMARK_RAMSPEED_PROGNAME) +PRIORITY = $(CONFIG_BENCHMARK_RAMSPEED_PRIORITY) +STACKSIZE = $(CONFIG_BENCHMARK_RAMSPEED_STACKSIZE) +MODULE = $(CONFIG_BENCHMARK_RAMSPEED) MAINSRC = ramspeed_main.c diff --git a/testing/ramspeed/ramspeed_main.c b/benchmarks/ramspeed/ramspeed_main.c similarity index 99% rename from testing/ramspeed/ramspeed_main.c rename to benchmarks/ramspeed/ramspeed_main.c index 3cc50fdf8..afd3ec9f7 100644 --- a/testing/ramspeed/ramspeed_main.c +++ b/benchmarks/ramspeed/ramspeed_main.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/testing/ramspeed/ramspeed_main.c + * apps/benchmarks/ramspeed/ramspeed_main.c * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with diff --git a/testing/superpi/.gitignore b/benchmarks/superpi/.gitignore similarity index 100% rename from testing/superpi/.gitignore rename to benchmarks/superpi/.gitignore diff --git a/testing/superpi/Kconfig b/benchmarks/superpi/Kconfig similarity index 58% rename from testing/superpi/Kconfig rename to benchmarks/superpi/Kconfig index 411d0d65c..b9a97255c 100644 --- a/testing/superpi/Kconfig +++ b/benchmarks/superpi/Kconfig @@ -1,21 +1,21 @@ -config SUPERPI +config BENCHMARK_SUPERPI tristate "SuperPI test" default n -if SUPERPI +if BENCHMARK_SUPERPI -config SUPERPI_PROGNAME +config BENCHMARK_SUPERPI_PROGNAME string "Program Name" default "pi_css5" -config SUPERPI_STACKSIZE +config BENCHMARK_SUPERPI_STACKSIZE int "SuperPI stack size" default DEFAULT_TASK_STACKSIZE -config SUPERPI_PRIORITY +config BENCHMARK_SUPERPI_PRIORITY int "Task PRIORITY" default 100 ---help--- The higher the priority value, the lower the priority. -endif # SUPERPI +endif # BENCHMARK_SUPERPI diff --git a/testing/superpi/Make.defs b/benchmarks/superpi/Make.defs similarity index 88% rename from testing/superpi/Make.defs rename to benchmarks/superpi/Make.defs index 7e91f33a0..570daccde 100644 --- a/testing/superpi/Make.defs +++ b/benchmarks/superpi/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# apps/testing/superpi/Make.defs +# apps/benchmarks/superpi/Make.defs # # Licensed to the Apache Software Foundation (ASF) under one or more # contributor license agreements. See the NOTICE file distributed with @@ -18,6 +18,6 @@ # ############################################################################ -ifneq ($(CONFIG_SUPERPI),) -CONFIGURED_APPS += $(APPDIR)/testing/superpi +ifneq ($(CONFIG_BENCHMARK_SUPERPI),) +CONFIGURED_APPS += $(APPDIR)/benchmarks/superpi endif diff --git a/testing/superpi/Makefile b/benchmarks/superpi/Makefile similarity index 88% rename from testing/superpi/Makefile rename to benchmarks/superpi/Makefile index a91c14724..74e9b2b4d 100644 --- a/testing/superpi/Makefile +++ b/benchmarks/superpi/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# apps/testing/superpi/Makefile +# apps/benchmarks/superpi/Makefile # # Licensed to the Apache Software Foundation (ASF) under one or more # contributor license agreements. See the NOTICE file distributed with @@ -27,10 +27,10 @@ SUPERPI_ZIP = $(SUPERPI_VERSION).zip UNPACK ?= unzip -q -o CSRCS += superpi/fftsg_h.c -PROGNAME = $(CONFIG_SUPERPI_PROGNAME) -PRIORITY = $(CONFIG_SUPERPI_PRIORITY) -STACKSIZE = $(CONFIG_SUPERPI_STACKSIZE) -MODULE = $(CONFIG_SUPERPI) +PROGNAME = $(CONFIG_BENCHMARK_SUPERPI_PROGNAME) +PRIORITY = $(CONFIG_BENCHMARK_SUPERPI_PRIORITY) +STACKSIZE = $(CONFIG_BENCHMARK_SUPERPI_STACKSIZE) +MODULE = $(CONFIG_BENCHMARK_SUPERPI) MAINSRC = superpi/pi_fftcs.c $(SUPERPI_ZIP):
