| commit | fd878a6f7d98067c3251cb0c4b3498fc6014a191 | [log] [tgz] |
|---|---|---|
| author | Anas Nashif <anas.nashif@intel.com> | Sat Jan 23 09:44:14 2016 -0500 |
| committer | Anas Nashif <anas.nashif@intel.com> | Fri Feb 05 20:25:30 2016 -0500 |
| tree | 924789b1dddc71e498b31135e7a1d788a1f91b59 | |
| parent | c4312b652c0d5feb3abfcc27e7e8c36ff7a63606 [diff] |
benchmarks: cleanup footprint tests (nano kernel) Remove float option from 'max' configuration and add a new 'float' test for hardware that supports floating point. Move configuration files into directories to ease maintenance. Change-Id: Ibf4c88ea946a78b8025bc61409b0ab661250f4fb Signed-off-by: Anas Nashif <anas.nashif@intel.com>
diff --git a/samples/nanokernel/benchmark/footprint/Makefile b/samples/nanokernel/benchmark/footprint/Makefile index fc693c3..da53c4d 100644 --- a/samples/nanokernel/benchmark/footprint/Makefile +++ b/samples/nanokernel/benchmark/footprint/Makefile
@@ -3,9 +3,13 @@ KERNEL_TYPE = nano BOARD ?= qemu_x86 -CONF_FILE = $(or $(wildcard prj_$(TEST)_$(ARCH)_$(BOARD).conf), \ - $(wildcard prj_$(TEST)_$(ARCH).conf)) +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/nanokernel/benchmark/footprint/prj_max_x86.conf b/samples/nanokernel/benchmark/footprint/float/x86.conf similarity index 100% rename from samples/nanokernel/benchmark/footprint/prj_max_x86.conf rename to samples/nanokernel/benchmark/footprint/float/x86.conf
diff --git a/samples/nanokernel/benchmark/footprint/prj_max_arm.conf b/samples/nanokernel/benchmark/footprint/max/arm.conf similarity index 100% rename from samples/nanokernel/benchmark/footprint/prj_max_arm.conf rename to samples/nanokernel/benchmark/footprint/max/arm.conf
diff --git a/samples/nanokernel/benchmark/footprint/max/x86.conf b/samples/nanokernel/benchmark/footprint/max/x86.conf new file mode 100644 index 0000000..a3e6c5e --- /dev/null +++ b/samples/nanokernel/benchmark/footprint/max/x86.conf
@@ -0,0 +1,4 @@ +CONFIG_PRINTK=y +CONFIG_STDOUT_CONSOLE=y +CONFIG_IDT_NUM_VECTORS=256 +CONFIG_NUM_DYNAMIC_STUBS=2
diff --git a/samples/nanokernel/benchmark/footprint/prj_min_arc.conf b/samples/nanokernel/benchmark/footprint/min/arc.conf similarity index 100% rename from samples/nanokernel/benchmark/footprint/prj_min_arc.conf rename to samples/nanokernel/benchmark/footprint/min/arc.conf
diff --git a/samples/nanokernel/benchmark/footprint/prj_min_arm.conf b/samples/nanokernel/benchmark/footprint/min/arm.conf similarity index 100% rename from samples/nanokernel/benchmark/footprint/prj_min_arm.conf rename to samples/nanokernel/benchmark/footprint/min/arm.conf
diff --git a/samples/nanokernel/benchmark/footprint/prj_min_x86_galileo.conf b/samples/nanokernel/benchmark/footprint/min/galileo.conf similarity index 100% rename from samples/nanokernel/benchmark/footprint/prj_min_x86_galileo.conf rename to samples/nanokernel/benchmark/footprint/min/galileo.conf
diff --git a/samples/nanokernel/benchmark/footprint/prj_min_x86_quark_d2000.conf b/samples/nanokernel/benchmark/footprint/min/quark_d2000.conf similarity index 100% rename from samples/nanokernel/benchmark/footprint/prj_min_x86_quark_d2000.conf rename to samples/nanokernel/benchmark/footprint/min/quark_d2000.conf
diff --git a/samples/nanokernel/benchmark/footprint/prj_min_x86.conf b/samples/nanokernel/benchmark/footprint/min/x86.conf similarity index 100% rename from samples/nanokernel/benchmark/footprint/prj_min_x86.conf rename to samples/nanokernel/benchmark/footprint/min/x86.conf
diff --git a/samples/nanokernel/benchmark/footprint/prj_reg_arm.conf b/samples/nanokernel/benchmark/footprint/reg/arm.conf similarity index 100% rename from samples/nanokernel/benchmark/footprint/prj_reg_arm.conf rename to samples/nanokernel/benchmark/footprint/reg/arm.conf
diff --git a/samples/nanokernel/benchmark/footprint/prj_reg_x86.conf b/samples/nanokernel/benchmark/footprint/reg/x86.conf similarity index 100% rename from samples/nanokernel/benchmark/footprint/prj_reg_x86.conf rename to samples/nanokernel/benchmark/footprint/reg/x86.conf
diff --git a/samples/nanokernel/benchmark/footprint/testcase.ini b/samples/nanokernel/benchmark/footprint/testcase.ini index 61a5f2b..ad0c8eb 100644 --- a/samples/nanokernel/benchmark/footprint/testcase.ini +++ b/samples/nanokernel/benchmark/footprint/testcase.ini
@@ -14,4 +14,10 @@ extra_args = TEST=max build_only = true arch_whitelist = x86 + +[footprint-float] +tags = footprint +extra_args = TEST=float +build_only = true +arch_whitelist = x86 config_whitelist = !CONFIG_CPU_MINUTEIA