Skip to content

apps/testing: Move sd_bench to apps/bechmarks #2977

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 27, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions testing/sd_bench/Kconfig → benchmarks/sd_bench/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -3,31 +3,31 @@
# see the file kconfig-language.txt in the NuttX tools repository.
#

config TESTING_SD_BENCH
config BENCHMARK_SD_BENCH
tristate "SD benchmark program"
depends on ALLOW_BSD_COMPONENTS
default n
---help---
SD benchmark application based on https://github.com/PX4/PX4-Autopilot/blob/main/src/systemcmds/sd_bench/sd_bench.cpp

if TESTING_SD_BENCH
if BENCHMARK_SD_BENCH

config TESTING_SD_BENCH_PROGNAME
config BENCHMARK_SD_BENCH_PROGNAME
string "Program name"
default "sdbench"
---help---
This is the name of the program that will be used when the NSH ELF
program is installed.

config TESTING_SD_BENCH_PRIORITY
config BENCHMARK_SD_BENCH_PRIORITY
int "SD bench task priority"
default 100

config TESTING_SD_BENCH_STACKSIZE
config BENCHMARK_SD_BENCH_STACKSIZE
int "SD bench stack size"
default DEFAULT_TASK_STACKSIZE

config TESTING_SD_BENCH_DEVICE
config BENCHMARK_SD_BENCH_DEVICE
string "SD / MMC mount point"
default "/mnt"

Expand Down
6 changes: 3 additions & 3 deletions testing/sd_bench/Make.defs → benchmarks/sd_bench/Make.defs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
############################################################################
# apps/testing/sd_bench/Make.defs
# apps/benchmarks/sd_bench/Make.defs
#
# SPDX-License-Identifier: Apache-2.0
#
Expand All @@ -20,6 +20,6 @@
#
############################################################################

ifneq ($(CONFIG_TESTING_SD_BENCH),)
CONFIGURED_APPS += $(APPDIR)/testing/sd_bench
ifneq ($(CONFIG_BENCHMARK_SD_BENCH),)
CONFIGURED_APPS += $(APPDIR)/benchmarks/sd_bench
endif
10 changes: 5 additions & 5 deletions testing/sd_bench/Makefile → benchmarks/sd_bench/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
############################################################################
# apps/testing/sd_bench/Makefile
# apps/benchmarks/sd_bench/Makefile
#
# SPDX-License-Identifier: Apache-2.0
#
Expand All @@ -22,10 +22,10 @@

include $(APPDIR)/Make.defs

PROGNAME = $(CONFIG_TESTING_SD_BENCH_PROGNAME)
PRIORITY = $(CONFIG_TESTING_SD_BENCH_PRIORITY)
STACKSIZE = $(CONFIG_TESTING_SD_BENCH_STACKSIZE)
MODULE = $(CONFIG_TESTING_SD_BENCH)
PROGNAME = $(CONFIG_BENCHMARK_SD_BENCH_PROGNAME)
PRIORITY = $(CONFIG_BENCHMARK_SD_BENCH_PRIORITY)
STACKSIZE = $(CONFIG_BENCHMARK_SD_BENCH_STACKSIZE)
MODULE = $(CONFIG_BENCHMARK_SD_BENCH)

MAINSRC = sd_bench_main.c

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
/****************************************************************************
* apps/testing/sd_bench/sd_bench_main.c
* apps/benchmarks/sd_bench/sd_bench_main.c
*
* SPDX-License-Identifier: BSD-3-Clause
* SPDX-FileCopyrightText: 2016-2021 PX4 Development Team. All rights reserved.
* SPDX-FileCopyrightText: 2016-2021 PX4 Development Team.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
Expand Down Expand Up @@ -77,7 +78,7 @@ typedef struct sdb_config
****************************************************************************/

static const char *BENCHMARK_FILE =
CONFIG_TESTING_SD_BENCH_DEVICE "/sd_bench";
CONFIG_BENCHMARK_SD_BENCH_DEVICE "/sd_bench";

static const size_t max_block = 65536;
static const size_t min_block = 1;
Expand Down Expand Up @@ -350,7 +351,7 @@ static int read_test(int fd, sdb_config_t *cfg, uint8_t *block,
static void usage(void)
{
printf("Test the speed of an SD card or mount point\n");
printf(CONFIG_TESTING_SD_BENCH_PROGNAME
printf(CONFIG_BENCHMARK_SD_BENCH_PROGNAME
": [-b] [-r] [-d] [-k] [-s] [-a] [-v]\n");
printf(" -b Block size per write (%zu-%zu), default %zu\n",
min_block, max_block, default_block);
Expand Down
Loading