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
The following commit(s) were added to refs/heads/master by this push:
new 26e273686 benchmarks/coremark: apply SEED_METHOD/MEM_METHOD update
26e273686 is described below
commit 26e27368635bb7d1b86c5f3ece4a443af6c8b90f
Author: haopengxiang <[email protected]>
AuthorDate: Wed Aug 9 23:35:55 2023 +0800
benchmarks/coremark: apply SEED_METHOD/MEM_METHOD update
Signed-off-by: haopengxiang <[email protected]>
---
benchmarks/coremark/Kconfig | 26 ++++++++++++++++++++++++++
benchmarks/coremark/Makefile | 23 ++++++++++++++++++++---
2 files changed, 46 insertions(+), 3 deletions(-)
diff --git a/benchmarks/coremark/Kconfig b/benchmarks/coremark/Kconfig
index 8f08eb9e7..3e148642d 100644
--- a/benchmarks/coremark/Kconfig
+++ b/benchmarks/coremark/Kconfig
@@ -27,6 +27,32 @@ config COREMARK_STACKSIZE
int "CoreMark task stack size"
default 4096
+config COREMARK_SEED_METHOD
+ int "Coremark Seed Method"
+ default 2
+ ---help---
+ Set Coremark Seed Method:
+ 0: SEED_ARG
+ 1: SEED_FUNC
+ 2: SEED_VOLATILE
+
+config COREMARK_MEM_METHOD
+ int "Coremark Memory Method"
+ default 1
+ ---help---
+ Set Coremark Memory Method:
+ 0: MEM_STATIC
+ 1: MEM_MALLOC
+ 2: MEM_STACK
+
+config COREMARK_DEBUG
+ int "Coremark Core Debug"
+ default 0
+ ---help---
+ Enable the Core Debug:
+ 0: Disable
+ 1: Enable
+
config COREMARK_PRINT_ARGS
bool "Print CoreMark arguments when executing"
default n
diff --git a/benchmarks/coremark/Makefile b/benchmarks/coremark/Makefile
index a26accaa3..21aede4a6 100644
--- a/benchmarks/coremark/Makefile
+++ b/benchmarks/coremark/Makefile
@@ -57,14 +57,31 @@ else
COREMARK_PRINT_ARGS = 0
endif
-CFLAGS += ${DEFINE_PREFIX}USE_PTHREAD ${DEFINE_PREFIX}PERFORMANCE_RUN=1
-CFLAGS += ${DEFINE_PREFIX}MULTITHREAD=$(COREMARK_NTHREADS)
+ifeq ($(CONFIG_COREMARK_MEM_METHOD), 1)
+CFLAGS += ${DEFINE_PREFIX}MEM_LOCATION=\"HEAP\"
+else ifeq ($(CONFIG_COREMARK_MEM_METHOD), 2)
+CFLAGS += ${DEFINE_PREFIX}MEM_LOCATION=\"STACK\"
+else
+CFLAGS += ${DEFINE_PREFIX}MEM_LOCATION=\"GLOBAL\"
+endif
+
+CFLAGS += ${DEFINE_PREFIX}CALLGRIND_RUN=0
+CFLAGS += ${DEFINE_PREFIX}COMPILER_REQUIRES_SORT_RETURN=0
+CFLAGS += ${DEFINE_PREFIX}CORE_DEBUG=$(CONFIG_COREMARK_DEBUG)
CFLAGS += ${DEFINE_PREFIX}FLAGS_STR=\""$(ARCHOPTIMIZATION)\""
+CFLAGS += ${DEFINE_PREFIX}MEM_METHOD=$(CONFIG_COREMARK_MEM_METHOD)
+CFLAGS += ${DEFINE_PREFIX}MICA=0
+CFLAGS += ${DEFINE_PREFIX}MULTITHREAD=$(COREMARK_NTHREADS)
+CFLAGS += ${DEFINE_PREFIX}PERFORMANCE_RUN=1
CFLAGS += ${DEFINE_PREFIX}PRINT_ARGS=$(COREMARK_PRINT_ARGS)
-CFLAGS += ${DEFINE_PREFIX}MEM_LOCATION=\"Stack\"
+CFLAGS += ${DEFINE_PREFIX}SEED_METHOD=$(CONFIG_COREMARK_SEED_METHOD)
+CFLAGS += ${DEFINE_PREFIX}USE_CLOCK=1
+CFLAGS += ${DEFINE_PREFIX}USE_PTHREAD
ifeq ($(CONFIG_COREMARK_ITERATIONS_OVERRIDE),y)
CFLAGS += ${DEFINE_PREFIX}ITERATIONS=$(CONFIG_COREMARK_ITERATIONS_COUNT)
+else
+CFLAGS += ${DEFINE_PREFIX}ITERATIONS=0
endif
CSRCS += core_list_join.c
