benchmarks: reorg configuration and split float tests

Change-Id: Ic988b5028eaffb0a1c2ed52d28f1eddb98c15130
Signed-off-by: Anas Nashif <anas.nashif@intel.com>

12 files changed, 75 insertions, 4 deletions

diff --git a/samples/microkernel/benchmark/footprint/Makefile b/samples/microkernel/benchmark/footprint/Makefile
index 654bd9d36..f02a6a6cd 100644
--- a/samples/microkernel/benchmark/footprint/Makefile
+++ b/samples/microkernel/benchmark/footprint/Makefile
@@ -4,9 +4,13 @@ BOARD ?= qemu_x86
 
 MDEF_FILE = micro_${TEST}.mdef
 KERNEL_TYPE = micro
-CONF_FILE = $(or $(wildcard prj_${TEST}_${ARCH}_${BOARD}.conf), \
-                 $(wildcard prj_${TEST}_${ARCH}.conf))
-CFLAGS += -DTEST_${TEST}
+CONF_FILE = $(or $(wildcard $(TEST)/$(BOARD).conf), \
+                 $(wildcard $(TEST)/$(ARCH).conf))
+ifeq ($(TEST),float)
+CFLAGS += -DTEST_max
+else
+CFLAGS += -DTEST_$(TEST)
+endif
 
 include ${ZEPHYR_BASE}/Makefile.inc
 
diff --git a/samples/microkernel/benchmark/footprint/prj_max_arm.conf b/samples/microkernel/benchmark/footprint/float/arm.conf
index 70f04eec8..70f04eec8 100644
--- a/samples/microkernel/benchmark/footprint/prj_max_arm.conf
+++ b/samples/microkernel/benchmark/footprint/float/arm.conf
diff --git a/samples/microkernel/benchmark/footprint/prj_max_x86.conf b/samples/microkernel/benchmark/footprint/float/x86.conf
index 2921d5d53..2921d5d53 100644
--- a/samples/microkernel/benchmark/footprint/prj_max_x86.conf
+++ b/samples/microkernel/benchmark/footprint/float/x86.conf
diff --git a/samples/microkernel/benchmark/footprint/max/arm.conf b/samples/microkernel/benchmark/footprint/max/arm.conf
new file mode 100644
index 000000000..f7ee3578a
--- /dev/null
+++ b/samples/microkernel/benchmark/footprint/max/arm.conf
@@ -0,0 +1,12 @@
+CONFIG_ISR_STACK_SIZE=2048
+CONFIG_MAIN_STACK_SIZE=1024
+CONFIG_COMMAND_STACK_SIZE=64
+CONFIG_PRINTK=y
+CONFIG_STDOUT_CONSOLE=y
+CONFIG_NUM_TASK_PRIORITIES=64
+CONFIG_NUM_COMMAND_PACKETS=64
+CONFIG_NUM_TIMER_PACKETS=16
+CONFIG_MICROKERNEL_SERVER_STACK_SIZE=4096
+CONFIG_ADVANCED_POWER_MANAGEMENT=y
+CONFIG_MAX_NUM_TASK_IRQS=2
+CONFIG_NUM_IRQS=43
diff --git a/samples/microkernel/benchmark/footprint/max/x86.conf b/samples/microkernel/benchmark/footprint/max/x86.conf
new file mode 100644
index 000000000..b90db16a1
--- /dev/null
+++ b/samples/microkernel/benchmark/footprint/max/x86.conf
@@ -0,0 +1,13 @@
+CONFIG_ISR_STACK_SIZE=2048
+CONFIG_MAIN_STACK_SIZE=1024
+CONFIG_COMMAND_STACK_SIZE=64
+CONFIG_PRINTK=y
+CONFIG_STDOUT_CONSOLE=y
+CONFIG_IDT_NUM_VECTORS=256
+CONFIG_NUM_TASK_PRIORITIES=64
+CONFIG_NUM_COMMAND_PACKETS=64
+CONFIG_NUM_TIMER_PACKETS=16
+CONFIG_MICROKERNEL_SERVER_STACK_SIZE=4096
+CONFIG_ADVANCED_POWER_MANAGEMENT=y
+CONFIG_MAX_NUM_TASK_IRQS=2
+
diff --git a/samples/microkernel/benchmark/footprint/micro_float.mdef b/samples/microkernel/benchmark/footprint/micro_float.mdef
new file mode 100644
index 000000000..6f08ffd81
--- /dev/null
+++ b/samples/microkernel/benchmark/footprint/micro_float.mdef
@@ -0,0 +1,37 @@
+% Application       : maximal Microkernel footprint
+
+% TASK NAME      PRIO  ENTRY           STACK GROUPS
+% ==================================================
+  TASK fgTask    10    fgTaskEntry      1024 [EXE]
+
+% EVENT NAME     ENTRY
+% ====================
+  EVENT MYEVENT  NULL
+
+% MUTEX NAME
+% ==============
+  MUTEX MY_MUTEX
+
+% SEMA NAME
+% ===========
+  SEMA MYSEMA
+
+% FIFO NAME      DEPTH WIDTH
+% ==========================
+  FIFO MYFIFO        1    4
+
+% PIPE    NAME     BUFFERSIZE
+% ===========================
+  PIPE    MYPIPE            0
+
+% MAILBOX NAME
+% ==============
+  MAILBOX MYMBOX
+
+% MAP  NAME    BLOCKS  BLOCKSIZE
+% ==============================
+  MAP  MYMAP        1          4
+
+% POOL NAME    MIN  MAX     NMAX
+% ==============================
+  POOL MYPOOL    4    4        1
diff --git a/samples/microkernel/benchmark/footprint/prj_min_arm.conf b/samples/microkernel/benchmark/footprint/min/arm.conf
index 2058e4cd6..2058e4cd6 100644
--- a/samples/microkernel/benchmark/footprint/prj_min_arm.conf
+++ b/samples/microkernel/benchmark/footprint/min/arm.conf
diff --git a/samples/microkernel/benchmark/footprint/prj_min_x86_galileo.conf b/samples/microkernel/benchmark/footprint/min/galileo.conf
index 9259ee68d..9259ee68d 100644
--- a/samples/microkernel/benchmark/footprint/prj_min_x86_galileo.conf
+++ b/samples/microkernel/benchmark/footprint/min/galileo.conf
diff --git a/samples/microkernel/benchmark/footprint/prj_min_x86.conf b/samples/microkernel/benchmark/footprint/min/x86.conf
index 9203c034b..9203c034b 100644
--- a/samples/microkernel/benchmark/footprint/prj_min_x86.conf
+++ b/samples/microkernel/benchmark/footprint/min/x86.conf
diff --git a/samples/microkernel/benchmark/footprint/prj_reg_arm.conf b/samples/microkernel/benchmark/footprint/reg/arm.conf
index 73676e078..73676e078 100644
--- a/samples/microkernel/benchmark/footprint/prj_reg_arm.conf
+++ b/samples/microkernel/benchmark/footprint/reg/arm.conf
diff --git a/samples/microkernel/benchmark/footprint/prj_reg_x86.conf b/samples/microkernel/benchmark/footprint/reg/x86.conf
index a2a402fe1..a2a402fe1 100644
--- a/samples/microkernel/benchmark/footprint/prj_reg_x86.conf
+++ b/samples/microkernel/benchmark/footprint/reg/x86.conf
diff --git a/samples/microkernel/benchmark/footprint/testcase.ini b/samples/microkernel/benchmark/footprint/testcase.ini
index b66ce93b6..29a7c2a98 100644
--- a/samples/microkernel/benchmark/footprint/testcase.ini
+++ b/samples/microkernel/benchmark/footprint/testcase.ini
@@ -15,5 +15,10 @@ tags = footprint
 extra_args = TEST=max
 build_only = true
 arch_whitelist = x86
-config_whitelist = !CONFIG_CPU_MINUTEIA
 
+[footprint-float]
+tags = footprint
+extra_args = TEST=float
+build_only = true
+arch_whitelist = x86
+config_whitelist = !CONFIG_CPU_MINUTEIA