tests: move benchmark tests to legacy/

These are using old kernel APIs and need to be converted.

Change-Id: I7457270fb5e93e290023756316e82a384712e82b
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>

135 files changed, 10 insertions, 10 deletions

diff --git a/tests/benchmark/sys_kernel/src/Makefile b/tests/benchmark/sys_kernel/src/Makefile
deleted file mode 100644
index d03d0cb42..000000000
--- a/tests/benchmark/sys_kernel/src/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-ccflags-y = -I$(ZEPHYR_BASE)/tests/benchmark/latency_measure/microkernel/src -I${ZEPHYR_BASE}/tests/include
-ccflags-y += -I$(CURDIR)/misc/generated/sysgen
-
-obj-y = lifo.o \
-	mwfifo.o \
-	sema.o \
-	stack.o \
-	syskernel.o
diff --git a/tests/benchmark/app_kernel/Makefile b/tests/legacy/benchmark/app_kernel/Makefile
index 5f0733029..5f0733029 100644
--- a/tests/benchmark/app_kernel/Makefile
+++ b/tests/legacy/benchmark/app_kernel/Makefile
diff --git a/tests/benchmark/app_kernel/README.txt b/tests/legacy/benchmark/app_kernel/README.txt
index cda93d0ef..cda93d0ef 100644
--- a/tests/benchmark/app_kernel/README.txt
+++ b/tests/legacy/benchmark/app_kernel/README.txt
diff --git a/tests/benchmark/app_kernel/prj.mdef b/tests/legacy/benchmark/app_kernel/prj.mdef
index d53f626c3..d53f626c3 100644
--- a/tests/benchmark/app_kernel/prj.mdef
+++ b/tests/legacy/benchmark/app_kernel/prj.mdef
diff --git a/tests/benchmark/app_kernel/prj_fp.conf b/tests/legacy/benchmark/app_kernel/prj_fp.conf
index a784069aa..a784069aa 100644
--- a/tests/benchmark/app_kernel/prj_fp.conf
+++ b/tests/legacy/benchmark/app_kernel/prj_fp.conf
diff --git a/tests/benchmark/app_kernel/prj_no_fp.conf b/tests/legacy/benchmark/app_kernel/prj_no_fp.conf
index 0c3a22bf0..0c3a22bf0 100644
--- a/tests/benchmark/app_kernel/prj_no_fp.conf
+++ b/tests/legacy/benchmark/app_kernel/prj_no_fp.conf
diff --git a/tests/benchmark/app_kernel/src/Makefile b/tests/legacy/benchmark/app_kernel/src/Makefile
index dadf02d0c..7cf811551 100644
--- a/tests/benchmark/app_kernel/src/Makefile
+++ b/tests/legacy/benchmark/app_kernel/src/Makefile
@@ -1,5 +1,5 @@
 ccflags-y += -I$(CURDIR)/misc/generated/sysgen
-ccflags-y += -I$(ZEPHYR_BASE)/tests/benchmark/latency_measure/microkernel/src \
+ccflags-y += -I$(ZEPHYR_BASE)/tests/legacy/benchmark/latency_measure/microkernel/src \
 	-I${ZEPHYR_BASE}/tests/include
 
 obj-y := fifo_b.o mailbox_b.o master.o mempool_b.o \
diff --git a/tests/benchmark/app_kernel/src/config.h b/tests/legacy/benchmark/app_kernel/src/config.h
index a543a1720..a543a1720 100644
--- a/tests/benchmark/app_kernel/src/config.h
+++ b/tests/legacy/benchmark/app_kernel/src/config.h
diff --git a/tests/benchmark/app_kernel/src/event_b.c b/tests/legacy/benchmark/app_kernel/src/event_b.c
index 374076e4c..374076e4c 100644
--- a/tests/benchmark/app_kernel/src/event_b.c
+++ b/tests/legacy/benchmark/app_kernel/src/event_b.c
diff --git a/tests/benchmark/app_kernel/src/fifo_b.c b/tests/legacy/benchmark/app_kernel/src/fifo_b.c
index a19af8169..a19af8169 100644
--- a/tests/benchmark/app_kernel/src/fifo_b.c
+++ b/tests/legacy/benchmark/app_kernel/src/fifo_b.c
diff --git a/tests/benchmark/app_kernel/src/fifo_r.c b/tests/legacy/benchmark/app_kernel/src/fifo_r.c
index 2472cd26c..2472cd26c 100644
--- a/tests/benchmark/app_kernel/src/fifo_r.c
+++ b/tests/legacy/benchmark/app_kernel/src/fifo_r.c
diff --git a/tests/benchmark/app_kernel/src/mailbox_b.c b/tests/legacy/benchmark/app_kernel/src/mailbox_b.c
index 84f2c1753..84f2c1753 100644
--- a/tests/benchmark/app_kernel/src/mailbox_b.c
+++ b/tests/legacy/benchmark/app_kernel/src/mailbox_b.c
diff --git a/tests/benchmark/app_kernel/src/mailbox_r.c b/tests/legacy/benchmark/app_kernel/src/mailbox_r.c
index d0aec7f9c..d0aec7f9c 100644
--- a/tests/benchmark/app_kernel/src/mailbox_r.c
+++ b/tests/legacy/benchmark/app_kernel/src/mailbox_r.c
diff --git a/tests/benchmark/app_kernel/src/master.c b/tests/legacy/benchmark/app_kernel/src/master.c
index 816d65942..816d65942 100644
--- a/tests/benchmark/app_kernel/src/master.c
+++ b/tests/legacy/benchmark/app_kernel/src/master.c
diff --git a/tests/benchmark/app_kernel/src/master.h b/tests/legacy/benchmark/app_kernel/src/master.h
index 2859e7987..2859e7987 100644
--- a/tests/benchmark/app_kernel/src/master.h
+++ b/tests/legacy/benchmark/app_kernel/src/master.h
diff --git a/tests/benchmark/app_kernel/src/memcfg.h b/tests/legacy/benchmark/app_kernel/src/memcfg.h
index e0afb4531..e0afb4531 100644
--- a/tests/benchmark/app_kernel/src/memcfg.h
+++ b/tests/legacy/benchmark/app_kernel/src/memcfg.h
diff --git a/tests/benchmark/app_kernel/src/memmap_b.c b/tests/legacy/benchmark/app_kernel/src/memmap_b.c
index d5c8d1101..d5c8d1101 100644
--- a/tests/benchmark/app_kernel/src/memmap_b.c
+++ b/tests/legacy/benchmark/app_kernel/src/memmap_b.c
diff --git a/tests/benchmark/app_kernel/src/mempool_b.c b/tests/legacy/benchmark/app_kernel/src/mempool_b.c
index 05c862267..05c862267 100644
--- a/tests/benchmark/app_kernel/src/mempool_b.c
+++ b/tests/legacy/benchmark/app_kernel/src/mempool_b.c
diff --git a/tests/benchmark/app_kernel/src/mutex_b.c b/tests/legacy/benchmark/app_kernel/src/mutex_b.c
index 4c6d8bf43..4c6d8bf43 100644
--- a/tests/benchmark/app_kernel/src/mutex_b.c
+++ b/tests/legacy/benchmark/app_kernel/src/mutex_b.c
diff --git a/tests/benchmark/app_kernel/src/nop_b.c b/tests/legacy/benchmark/app_kernel/src/nop_b.c
index 3bee948f9..3bee948f9 100644
--- a/tests/benchmark/app_kernel/src/nop_b.c
+++ b/tests/legacy/benchmark/app_kernel/src/nop_b.c
diff --git a/tests/benchmark/app_kernel/src/pipe_b.c b/tests/legacy/benchmark/app_kernel/src/pipe_b.c
index 443127672..443127672 100644
--- a/tests/benchmark/app_kernel/src/pipe_b.c
+++ b/tests/legacy/benchmark/app_kernel/src/pipe_b.c
diff --git a/tests/benchmark/app_kernel/src/pipe_r.c b/tests/legacy/benchmark/app_kernel/src/pipe_r.c
index 2ea644e2b..2ea644e2b 100644
--- a/tests/benchmark/app_kernel/src/pipe_r.c
+++ b/tests/legacy/benchmark/app_kernel/src/pipe_r.c
diff --git a/tests/benchmark/app_kernel/src/receiver.c b/tests/legacy/benchmark/app_kernel/src/receiver.c
index 5a88afddd..5a88afddd 100644
--- a/tests/benchmark/app_kernel/src/receiver.c
+++ b/tests/legacy/benchmark/app_kernel/src/receiver.c
diff --git a/tests/benchmark/app_kernel/src/receiver.h b/tests/legacy/benchmark/app_kernel/src/receiver.h
index eaa2065f7..eaa2065f7 100644
--- a/tests/benchmark/app_kernel/src/receiver.h
+++ b/tests/legacy/benchmark/app_kernel/src/receiver.h
diff --git a/tests/benchmark/app_kernel/src/sema_b.c b/tests/legacy/benchmark/app_kernel/src/sema_b.c
index 099b3c461..099b3c461 100644
--- a/tests/benchmark/app_kernel/src/sema_b.c
+++ b/tests/legacy/benchmark/app_kernel/src/sema_b.c
diff --git a/tests/benchmark/app_kernel/src/sema_r.c b/tests/legacy/benchmark/app_kernel/src/sema_r.c
index dbba8b99f..dbba8b99f 100644
--- a/tests/benchmark/app_kernel/src/sema_r.c
+++ b/tests/legacy/benchmark/app_kernel/src/sema_r.c
diff --git a/tests/benchmark/app_kernel/testcase.ini b/tests/legacy/benchmark/app_kernel/testcase.ini
index 5b4ff149b..5b4ff149b 100644
--- a/tests/benchmark/app_kernel/testcase.ini
+++ b/tests/legacy/benchmark/app_kernel/testcase.ini
diff --git a/tests/benchmark/boot_time/microkernel/Makefile b/tests/legacy/benchmark/boot_time/microkernel/Makefile
index 769440896..769440896 100644
--- a/tests/benchmark/boot_time/microkernel/Makefile
+++ b/tests/legacy/benchmark/boot_time/microkernel/Makefile
diff --git a/tests/benchmark/boot_time/microkernel/README.txt b/tests/legacy/benchmark/boot_time/microkernel/README.txt
index 52b2815a4..52b2815a4 100644
--- a/tests/benchmark/boot_time/microkernel/README.txt
+++ b/tests/legacy/benchmark/boot_time/microkernel/README.txt
diff --git a/tests/benchmark/boot_time/microkernel/ia32/prj_expert_test.conf b/tests/legacy/benchmark/boot_time/microkernel/ia32/prj_expert_test.conf
index c89a49dce..c89a49dce 100644
--- a/tests/benchmark/boot_time/microkernel/ia32/prj_expert_test.conf
+++ b/tests/legacy/benchmark/boot_time/microkernel/ia32/prj_expert_test.conf
diff --git a/tests/benchmark/boot_time/microkernel/prj.mdef b/tests/legacy/benchmark/boot_time/microkernel/prj.mdef
index fe9933835..fe9933835 100644
--- a/tests/benchmark/boot_time/microkernel/prj.mdef
+++ b/tests/legacy/benchmark/boot_time/microkernel/prj.mdef
diff --git a/tests/benchmark/boot_time/microkernel/quark_d2000/quark_d2000_prj.conf b/tests/legacy/benchmark/boot_time/microkernel/quark_d2000/quark_d2000_prj.conf
index 3df25eec0..3df25eec0 100644
--- a/tests/benchmark/boot_time/microkernel/quark_d2000/quark_d2000_prj.conf
+++ b/tests/legacy/benchmark/boot_time/microkernel/quark_d2000/quark_d2000_prj.conf
diff --git a/tests/benchmark/boot_time/microkernel/quark_se/quark_se_prj.conf b/tests/legacy/benchmark/boot_time/microkernel/quark_se/quark_se_prj.conf
index 3df25eec0..3df25eec0 100644
--- a/tests/benchmark/boot_time/microkernel/quark_se/quark_se_prj.conf
+++ b/tests/legacy/benchmark/boot_time/microkernel/quark_se/quark_se_prj.conf
diff --git a/tests/benchmark/boot_time/microkernel/quark_x1000/prj.conf b/tests/legacy/benchmark/boot_time/microkernel/quark_x1000/prj.conf
index ee58e4158..ee58e4158 100644
--- a/tests/benchmark/boot_time/microkernel/quark_x1000/prj.conf
+++ b/tests/legacy/benchmark/boot_time/microkernel/quark_x1000/prj.conf
diff --git a/tests/benchmark/boot_time/microkernel/src/Makefile b/tests/legacy/benchmark/boot_time/microkernel/src/Makefile
index eab469842..eab469842 100644
--- a/tests/benchmark/boot_time/microkernel/src/Makefile
+++ b/tests/legacy/benchmark/boot_time/microkernel/src/Makefile
diff --git a/tests/benchmark/boot_time/microkernel/src/boot_time.c b/tests/legacy/benchmark/boot_time/microkernel/src/boot_time.c
index bf735cbf3..bf735cbf3 100644
--- a/tests/benchmark/boot_time/microkernel/src/boot_time.c
+++ b/tests/legacy/benchmark/boot_time/microkernel/src/boot_time.c
diff --git a/tests/benchmark/boot_time/microkernel/testcase.ini b/tests/legacy/benchmark/boot_time/microkernel/testcase.ini
index 594a0a607..594a0a607 100644
--- a/tests/benchmark/boot_time/microkernel/testcase.ini
+++ b/tests/legacy/benchmark/boot_time/microkernel/testcase.ini
diff --git a/tests/benchmark/boot_time/nanokernel/Makefile b/tests/legacy/benchmark/boot_time/nanokernel/Makefile
index c88fd5d57..c88fd5d57 100644
--- a/tests/benchmark/boot_time/nanokernel/Makefile
+++ b/tests/legacy/benchmark/boot_time/nanokernel/Makefile
diff --git a/tests/benchmark/boot_time/nanokernel/README.txt b/tests/legacy/benchmark/boot_time/nanokernel/README.txt
index ef6482847..ef6482847 100644
--- a/tests/benchmark/boot_time/nanokernel/README.txt
+++ b/tests/legacy/benchmark/boot_time/nanokernel/README.txt
diff --git a/tests/benchmark/boot_time/nanokernel/ia32/prj_expert_test.conf b/tests/legacy/benchmark/boot_time/nanokernel/ia32/prj_expert_test.conf
index c89a49dce..c89a49dce 100644
--- a/tests/benchmark/boot_time/nanokernel/ia32/prj_expert_test.conf
+++ b/tests/legacy/benchmark/boot_time/nanokernel/ia32/prj_expert_test.conf
diff --git a/tests/benchmark/boot_time/nanokernel/quark_d2000/quark_d2000_prj.conf b/tests/legacy/benchmark/boot_time/nanokernel/quark_d2000/quark_d2000_prj.conf
index 3df25eec0..3df25eec0 100644
--- a/tests/benchmark/boot_time/nanokernel/quark_d2000/quark_d2000_prj.conf
+++ b/tests/legacy/benchmark/boot_time/nanokernel/quark_d2000/quark_d2000_prj.conf
diff --git a/tests/benchmark/boot_time/nanokernel/quark_se/quark_se_prj.conf b/tests/legacy/benchmark/boot_time/nanokernel/quark_se/quark_se_prj.conf
index 3df25eec0..3df25eec0 100644
--- a/tests/benchmark/boot_time/nanokernel/quark_se/quark_se_prj.conf
+++ b/tests/legacy/benchmark/boot_time/nanokernel/quark_se/quark_se_prj.conf
diff --git a/tests/benchmark/boot_time/nanokernel/quark_x1000/prj.conf b/tests/legacy/benchmark/boot_time/nanokernel/quark_x1000/prj.conf
index ee58e4158..ee58e4158 100644
--- a/tests/benchmark/boot_time/nanokernel/quark_x1000/prj.conf
+++ b/tests/legacy/benchmark/boot_time/nanokernel/quark_x1000/prj.conf
diff --git a/tests/benchmark/boot_time/nanokernel/src/Makefile b/tests/legacy/benchmark/boot_time/nanokernel/src/Makefile
index f9772487d..f9772487d 100644
--- a/tests/benchmark/boot_time/nanokernel/src/Makefile
+++ b/tests/legacy/benchmark/boot_time/nanokernel/src/Makefile
diff --git a/tests/benchmark/boot_time/nanokernel/src/boot_time.c b/tests/legacy/benchmark/boot_time/nanokernel/src/boot_time.c
index ee935d85f..ee935d85f 100644
--- a/tests/benchmark/boot_time/nanokernel/src/boot_time.c
+++ b/tests/legacy/benchmark/boot_time/nanokernel/src/boot_time.c
diff --git a/tests/benchmark/boot_time/nanokernel/testcase.ini b/tests/legacy/benchmark/boot_time/nanokernel/testcase.ini
index 6700dc2c6..6700dc2c6 100644
--- a/tests/benchmark/boot_time/nanokernel/testcase.ini
+++ b/tests/legacy/benchmark/boot_time/nanokernel/testcase.ini
diff --git a/tests/benchmark/footprint/microkernel/Makefile b/tests/legacy/benchmark/footprint/microkernel/Makefile
index f02a6a6cd..f02a6a6cd 100644
--- a/tests/benchmark/footprint/microkernel/Makefile
+++ b/tests/legacy/benchmark/footprint/microkernel/Makefile
diff --git a/tests/benchmark/footprint/microkernel/README.txt b/tests/legacy/benchmark/footprint/microkernel/README.txt
index 1bbc45d95..1bbc45d95 100644
--- a/tests/benchmark/footprint/microkernel/README.txt
+++ b/tests/legacy/benchmark/footprint/microkernel/README.txt
diff --git a/tests/benchmark/footprint/microkernel/float/arm.conf b/tests/legacy/benchmark/footprint/microkernel/float/arm.conf
index b9753cf52..b9753cf52 100644
--- a/tests/benchmark/footprint/microkernel/float/arm.conf
+++ b/tests/legacy/benchmark/footprint/microkernel/float/arm.conf
diff --git a/tests/benchmark/footprint/microkernel/float/x86.conf b/tests/legacy/benchmark/footprint/microkernel/float/x86.conf
index 4e1588aa2..4e1588aa2 100644
--- a/tests/benchmark/footprint/microkernel/float/x86.conf
+++ b/tests/legacy/benchmark/footprint/microkernel/float/x86.conf
diff --git a/tests/benchmark/footprint/microkernel/max/arm.conf b/tests/legacy/benchmark/footprint/microkernel/max/arm.conf
index 0f78db6e8..0f78db6e8 100644
--- a/tests/benchmark/footprint/microkernel/max/arm.conf
+++ b/tests/legacy/benchmark/footprint/microkernel/max/arm.conf
diff --git a/tests/benchmark/footprint/microkernel/max/x86.conf b/tests/legacy/benchmark/footprint/microkernel/max/x86.conf
index 8cfdbfbfa..8cfdbfbfa 100644
--- a/tests/benchmark/footprint/microkernel/max/x86.conf
+++ b/tests/legacy/benchmark/footprint/microkernel/max/x86.conf
diff --git a/tests/benchmark/footprint/microkernel/micro_float.mdef b/tests/legacy/benchmark/footprint/microkernel/micro_float.mdef
index 6f08ffd81..6f08ffd81 100644
--- a/tests/benchmark/footprint/microkernel/micro_float.mdef
+++ b/tests/legacy/benchmark/footprint/microkernel/micro_float.mdef
diff --git a/tests/benchmark/footprint/microkernel/micro_max.mdef b/tests/legacy/benchmark/footprint/microkernel/micro_max.mdef
index 6f08ffd81..6f08ffd81 100644
--- a/tests/benchmark/footprint/microkernel/micro_max.mdef
+++ b/tests/legacy/benchmark/footprint/microkernel/micro_max.mdef
diff --git a/tests/benchmark/footprint/microkernel/micro_min.mdef b/tests/legacy/benchmark/footprint/microkernel/micro_min.mdef
index a9f6b6e27..a9f6b6e27 100644
--- a/tests/benchmark/footprint/microkernel/micro_min.mdef
+++ b/tests/legacy/benchmark/footprint/microkernel/micro_min.mdef
diff --git a/tests/benchmark/footprint/microkernel/micro_reg.mdef b/tests/legacy/benchmark/footprint/microkernel/micro_reg.mdef
index 77d192b9f..77d192b9f 100644
--- a/tests/benchmark/footprint/microkernel/micro_reg.mdef
+++ b/tests/legacy/benchmark/footprint/microkernel/micro_reg.mdef
diff --git a/tests/benchmark/footprint/microkernel/min/arm.conf b/tests/legacy/benchmark/footprint/microkernel/min/arm.conf
index 2058e4cd6..2058e4cd6 100644
--- a/tests/benchmark/footprint/microkernel/min/arm.conf
+++ b/tests/legacy/benchmark/footprint/microkernel/min/arm.conf
diff --git a/tests/benchmark/footprint/microkernel/min/galileo.conf b/tests/legacy/benchmark/footprint/microkernel/min/galileo.conf
index 9259ee68d..9259ee68d 100644
--- a/tests/benchmark/footprint/microkernel/min/galileo.conf
+++ b/tests/legacy/benchmark/footprint/microkernel/min/galileo.conf
diff --git a/tests/benchmark/footprint/microkernel/min/x86.conf b/tests/legacy/benchmark/footprint/microkernel/min/x86.conf
index 9203c034b..9203c034b 100644
--- a/tests/benchmark/footprint/microkernel/min/x86.conf
+++ b/tests/legacy/benchmark/footprint/microkernel/min/x86.conf
diff --git a/tests/benchmark/footprint/microkernel/reg/arm.conf b/tests/legacy/benchmark/footprint/microkernel/reg/arm.conf
index 73676e078..73676e078 100644
--- a/tests/benchmark/footprint/microkernel/reg/arm.conf
+++ b/tests/legacy/benchmark/footprint/microkernel/reg/arm.conf
diff --git a/tests/benchmark/footprint/microkernel/reg/x86.conf b/tests/legacy/benchmark/footprint/microkernel/reg/x86.conf
index a2a402fe1..a2a402fe1 100644
--- a/tests/benchmark/footprint/microkernel/reg/x86.conf
+++ b/tests/legacy/benchmark/footprint/microkernel/reg/x86.conf
diff --git a/tests/benchmark/footprint/microkernel/src/Makefile b/tests/legacy/benchmark/footprint/microkernel/src/Makefile
index 269f1b14e..269f1b14e 100644
--- a/tests/benchmark/footprint/microkernel/src/Makefile
+++ b/tests/legacy/benchmark/footprint/microkernel/src/Makefile
diff --git a/tests/benchmark/footprint/microkernel/src/microkernel_footprint.c b/tests/legacy/benchmark/footprint/microkernel/src/microkernel_footprint.c
index 32be3e8ba..32be3e8ba 100644
--- a/tests/benchmark/footprint/microkernel/src/microkernel_footprint.c
+++ b/tests/legacy/benchmark/footprint/microkernel/src/microkernel_footprint.c
diff --git a/tests/benchmark/footprint/microkernel/testcase.ini b/tests/legacy/benchmark/footprint/microkernel/testcase.ini
index e33b46957..e33b46957 100644
--- a/tests/benchmark/footprint/microkernel/testcase.ini
+++ b/tests/legacy/benchmark/footprint/microkernel/testcase.ini
diff --git a/tests/benchmark/footprint/nanokernel/Makefile b/tests/legacy/benchmark/footprint/nanokernel/Makefile
index da53c4d03..da53c4d03 100644
--- a/tests/benchmark/footprint/nanokernel/Makefile
+++ b/tests/legacy/benchmark/footprint/nanokernel/Makefile
diff --git a/tests/benchmark/footprint/nanokernel/README.txt b/tests/legacy/benchmark/footprint/nanokernel/README.txt
index 591ab58d7..591ab58d7 100644
--- a/tests/benchmark/footprint/nanokernel/README.txt
+++ b/tests/legacy/benchmark/footprint/nanokernel/README.txt
diff --git a/tests/benchmark/footprint/nanokernel/float/x86.conf b/tests/legacy/benchmark/footprint/nanokernel/float/x86.conf
index 24366bc9b..24366bc9b 100644
--- a/tests/benchmark/footprint/nanokernel/float/x86.conf
+++ b/tests/legacy/benchmark/footprint/nanokernel/float/x86.conf
diff --git a/tests/benchmark/footprint/nanokernel/max/arc.conf b/tests/legacy/benchmark/footprint/nanokernel/max/arc.conf
index c808d0d63..c808d0d63 100644
--- a/tests/benchmark/footprint/nanokernel/max/arc.conf
+++ b/tests/legacy/benchmark/footprint/nanokernel/max/arc.conf
diff --git a/tests/benchmark/footprint/nanokernel/max/arm.conf b/tests/legacy/benchmark/footprint/nanokernel/max/arm.conf
index d8c7611af..d8c7611af 100644
--- a/tests/benchmark/footprint/nanokernel/max/arm.conf
+++ b/tests/legacy/benchmark/footprint/nanokernel/max/arm.conf
diff --git a/tests/benchmark/footprint/nanokernel/max/x86.conf b/tests/legacy/benchmark/footprint/nanokernel/max/x86.conf
index ceb5a2685..ceb5a2685 100644
--- a/tests/benchmark/footprint/nanokernel/max/x86.conf
+++ b/tests/legacy/benchmark/footprint/nanokernel/max/x86.conf
diff --git a/tests/benchmark/footprint/nanokernel/min/arc.conf b/tests/legacy/benchmark/footprint/nanokernel/min/arc.conf
index 03f2a47bf..03f2a47bf 100644
--- a/tests/benchmark/footprint/nanokernel/min/arc.conf
+++ b/tests/legacy/benchmark/footprint/nanokernel/min/arc.conf
diff --git a/tests/benchmark/footprint/nanokernel/min/arm.conf b/tests/legacy/benchmark/footprint/nanokernel/min/arm.conf
index 90ba00b5a..90ba00b5a 100644
--- a/tests/benchmark/footprint/nanokernel/min/arm.conf
+++ b/tests/legacy/benchmark/footprint/nanokernel/min/arm.conf
diff --git a/tests/benchmark/footprint/nanokernel/min/galileo.conf b/tests/legacy/benchmark/footprint/nanokernel/min/galileo.conf
index d56704293..d56704293 100644
--- a/tests/benchmark/footprint/nanokernel/min/galileo.conf
+++ b/tests/legacy/benchmark/footprint/nanokernel/min/galileo.conf
diff --git a/tests/benchmark/footprint/nanokernel/min/quark_d2000.conf b/tests/legacy/benchmark/footprint/nanokernel/min/quark_d2000.conf
index 9b780b598..9b780b598 100644
--- a/tests/benchmark/footprint/nanokernel/min/quark_d2000.conf
+++ b/tests/legacy/benchmark/footprint/nanokernel/min/quark_d2000.conf
diff --git a/tests/benchmark/footprint/nanokernel/min/x86.conf b/tests/legacy/benchmark/footprint/nanokernel/min/x86.conf
index f0d691f12..f0d691f12 100644
--- a/tests/benchmark/footprint/nanokernel/min/x86.conf
+++ b/tests/legacy/benchmark/footprint/nanokernel/min/x86.conf
diff --git a/tests/benchmark/footprint/nanokernel/reg/arc.conf b/tests/legacy/benchmark/footprint/nanokernel/reg/arc.conf
index c808d0d63..c808d0d63 100644
--- a/tests/benchmark/footprint/nanokernel/reg/arc.conf
+++ b/tests/legacy/benchmark/footprint/nanokernel/reg/arc.conf
diff --git a/tests/benchmark/footprint/nanokernel/reg/arm.conf b/tests/legacy/benchmark/footprint/nanokernel/reg/arm.conf
index dd5ff545b..dd5ff545b 100644
--- a/tests/benchmark/footprint/nanokernel/reg/arm.conf
+++ b/tests/legacy/benchmark/footprint/nanokernel/reg/arm.conf
diff --git a/tests/benchmark/footprint/nanokernel/reg/x86.conf b/tests/legacy/benchmark/footprint/nanokernel/reg/x86.conf
index 8d33c46e1..8d33c46e1 100644
--- a/tests/benchmark/footprint/nanokernel/reg/x86.conf
+++ b/tests/legacy/benchmark/footprint/nanokernel/reg/x86.conf
diff --git a/tests/benchmark/footprint/nanokernel/src/Makefile b/tests/legacy/benchmark/footprint/nanokernel/src/Makefile
index c936daa33..c936daa33 100644
--- a/tests/benchmark/footprint/nanokernel/src/Makefile
+++ b/tests/legacy/benchmark/footprint/nanokernel/src/Makefile
diff --git a/tests/benchmark/footprint/nanokernel/src/nanokernel_footprint.c b/tests/legacy/benchmark/footprint/nanokernel/src/nanokernel_footprint.c
index 952c79b9d..952c79b9d 100644
--- a/tests/benchmark/footprint/nanokernel/src/nanokernel_footprint.c
+++ b/tests/legacy/benchmark/footprint/nanokernel/src/nanokernel_footprint.c
diff --git a/tests/benchmark/footprint/nanokernel/testcase.ini b/tests/legacy/benchmark/footprint/nanokernel/testcase.ini
index 8aadcf8cc..8aadcf8cc 100644
--- a/tests/benchmark/footprint/nanokernel/testcase.ini
+++ b/tests/legacy/benchmark/footprint/nanokernel/testcase.ini
diff --git a/tests/benchmark/latency_measure/microkernel/Makefile b/tests/legacy/benchmark/latency_measure/microkernel/Makefile
index 0d56ce66d..0d56ce66d 100644
--- a/tests/benchmark/latency_measure/microkernel/Makefile
+++ b/tests/legacy/benchmark/latency_measure/microkernel/Makefile
diff --git a/tests/benchmark/latency_measure/microkernel/README.txt b/tests/legacy/benchmark/latency_measure/microkernel/README.txt
index da539e74d..da539e74d 100644
--- a/tests/benchmark/latency_measure/microkernel/README.txt
+++ b/tests/legacy/benchmark/latency_measure/microkernel/README.txt
diff --git a/tests/benchmark/latency_measure/microkernel/prj.conf b/tests/legacy/benchmark/latency_measure/microkernel/prj.conf
index dafd7be48..dafd7be48 100644
--- a/tests/benchmark/latency_measure/microkernel/prj.conf
+++ b/tests/legacy/benchmark/latency_measure/microkernel/prj.conf
diff --git a/tests/benchmark/latency_measure/microkernel/prj.mdef b/tests/legacy/benchmark/latency_measure/microkernel/prj.mdef
index d28c026c6..d28c026c6 100644
--- a/tests/benchmark/latency_measure/microkernel/prj.mdef
+++ b/tests/legacy/benchmark/latency_measure/microkernel/prj.mdef
diff --git a/tests/benchmark/latency_measure/microkernel/src/Makefile b/tests/legacy/benchmark/latency_measure/microkernel/src/Makefile
index bad4fe432..bad4fe432 100644
--- a/tests/benchmark/latency_measure/microkernel/src/Makefile
+++ b/tests/legacy/benchmark/latency_measure/microkernel/src/Makefile
diff --git a/tests/benchmark/latency_measure/microkernel/src/main.c b/tests/legacy/benchmark/latency_measure/microkernel/src/main.c
index dc135bdb5..dc135bdb5 100644
--- a/tests/benchmark/latency_measure/microkernel/src/main.c
+++ b/tests/legacy/benchmark/latency_measure/microkernel/src/main.c
diff --git a/tests/benchmark/latency_measure/microkernel/src/micro_int_to_task.c b/tests/legacy/benchmark/latency_measure/microkernel/src/micro_int_to_task.c
index 6add84b08..6add84b08 100644
--- a/tests/benchmark/latency_measure/microkernel/src/micro_int_to_task.c
+++ b/tests/legacy/benchmark/latency_measure/microkernel/src/micro_int_to_task.c
diff --git a/tests/benchmark/latency_measure/microkernel/src/micro_int_to_task_evt.c b/tests/legacy/benchmark/latency_measure/microkernel/src/micro_int_to_task_evt.c
index ddfdb4541..ddfdb4541 100644
--- a/tests/benchmark/latency_measure/microkernel/src/micro_int_to_task_evt.c
+++ b/tests/legacy/benchmark/latency_measure/microkernel/src/micro_int_to_task_evt.c
diff --git a/tests/benchmark/latency_measure/microkernel/src/micro_sema_lock_release.c b/tests/legacy/benchmark/latency_measure/microkernel/src/micro_sema_lock_release.c
index c8f84fbed..c8f84fbed 100644
--- a/tests/benchmark/latency_measure/microkernel/src/micro_sema_lock_release.c
+++ b/tests/legacy/benchmark/latency_measure/microkernel/src/micro_sema_lock_release.c
diff --git a/tests/benchmark/latency_measure/microkernel/src/micro_task_switch_yield.c b/tests/legacy/benchmark/latency_measure/microkernel/src/micro_task_switch_yield.c
index 1cf776dcd..1cf776dcd 100644
--- a/tests/benchmark/latency_measure/microkernel/src/micro_task_switch_yield.c
+++ b/tests/legacy/benchmark/latency_measure/microkernel/src/micro_task_switch_yield.c
diff --git a/tests/benchmark/latency_measure/microkernel/src/nano_ctx_switch.c b/tests/legacy/benchmark/latency_measure/microkernel/src/nano_ctx_switch.c
index 9696c63d3..9696c63d3 100644
--- a/tests/benchmark/latency_measure/microkernel/src/nano_ctx_switch.c
+++ b/tests/legacy/benchmark/latency_measure/microkernel/src/nano_ctx_switch.c
diff --git a/tests/benchmark/latency_measure/microkernel/src/nano_int.c b/tests/legacy/benchmark/latency_measure/microkernel/src/nano_int.c
index 79700fc7b..79700fc7b 100644
--- a/tests/benchmark/latency_measure/microkernel/src/nano_int.c
+++ b/tests/legacy/benchmark/latency_measure/microkernel/src/nano_int.c
diff --git a/tests/benchmark/latency_measure/microkernel/src/nano_int_lock_unlock.c b/tests/legacy/benchmark/latency_measure/microkernel/src/nano_int_lock_unlock.c
index cf732085d..cf732085d 100644
--- a/tests/benchmark/latency_measure/microkernel/src/nano_int_lock_unlock.c
+++ b/tests/legacy/benchmark/latency_measure/microkernel/src/nano_int_lock_unlock.c
diff --git a/tests/benchmark/latency_measure/microkernel/src/nano_int_to_fiber.c b/tests/legacy/benchmark/latency_measure/microkernel/src/nano_int_to_fiber.c
index c4517c428..c4517c428 100644
--- a/tests/benchmark/latency_measure/microkernel/src/nano_int_to_fiber.c
+++ b/tests/legacy/benchmark/latency_measure/microkernel/src/nano_int_to_fiber.c
diff --git a/tests/benchmark/latency_measure/microkernel/src/nano_int_to_fiber_sem.c b/tests/legacy/benchmark/latency_measure/microkernel/src/nano_int_to_fiber_sem.c
index cba82c1fb..cba82c1fb 100644
--- a/tests/benchmark/latency_measure/microkernel/src/nano_int_to_fiber_sem.c
+++ b/tests/legacy/benchmark/latency_measure/microkernel/src/nano_int_to_fiber_sem.c
diff --git a/tests/benchmark/latency_measure/microkernel/src/test_asm_inline_gcc.h b/tests/legacy/benchmark/latency_measure/microkernel/src/test_asm_inline_gcc.h
index 439ff8922..439ff8922 100644
--- a/tests/benchmark/latency_measure/microkernel/src/test_asm_inline_gcc.h
+++ b/tests/legacy/benchmark/latency_measure/microkernel/src/test_asm_inline_gcc.h
diff --git a/tests/benchmark/latency_measure/microkernel/src/timestamp.h b/tests/legacy/benchmark/latency_measure/microkernel/src/timestamp.h
index 8b1405e68..8b1405e68 100644
--- a/tests/benchmark/latency_measure/microkernel/src/timestamp.h
+++ b/tests/legacy/benchmark/latency_measure/microkernel/src/timestamp.h
diff --git a/tests/benchmark/latency_measure/microkernel/src/utils.c b/tests/legacy/benchmark/latency_measure/microkernel/src/utils.c
index 0aa97806b..0aa97806b 100644
--- a/tests/benchmark/latency_measure/microkernel/src/utils.c
+++ b/tests/legacy/benchmark/latency_measure/microkernel/src/utils.c
diff --git a/tests/benchmark/latency_measure/microkernel/src/utils.h b/tests/legacy/benchmark/latency_measure/microkernel/src/utils.h
index 337e3cb0a..337e3cb0a 100644
--- a/tests/benchmark/latency_measure/microkernel/src/utils.h
+++ b/tests/legacy/benchmark/latency_measure/microkernel/src/utils.h
diff --git a/tests/benchmark/latency_measure/microkernel/testcase.ini b/tests/legacy/benchmark/latency_measure/microkernel/testcase.ini
index cfe01903c..cfe01903c 100644
--- a/tests/benchmark/latency_measure/microkernel/testcase.ini
+++ b/tests/legacy/benchmark/latency_measure/microkernel/testcase.ini
diff --git a/tests/benchmark/latency_measure/nanokernel/Makefile b/tests/legacy/benchmark/latency_measure/nanokernel/Makefile
index ef310f57f..550a1b2b1 100644
--- a/tests/benchmark/latency_measure/nanokernel/Makefile
+++ b/tests/legacy/benchmark/latency_measure/nanokernel/Makefile
@@ -1,6 +1,6 @@
 KERNEL_TYPE = nano
 BOARD ?= qemu_x86
 CONF_FILE = prj.conf
-SOURCE_DIR = $(ZEPHYR_BASE)/tests/benchmark/latency_measure/microkernel/src/
+SOURCE_DIR = $(ZEPHYR_BASE)/tests/legacy/benchmark/latency_measure/microkernel/src/
 
 include $(ZEPHYR_BASE)/Makefile.inc
diff --git a/tests/benchmark/latency_measure/nanokernel/README.txt b/tests/legacy/benchmark/latency_measure/nanokernel/README.txt
index 7b05f82fd..7b05f82fd 100644
--- a/tests/benchmark/latency_measure/nanokernel/README.txt
+++ b/tests/legacy/benchmark/latency_measure/nanokernel/README.txt
diff --git a/tests/benchmark/latency_measure/nanokernel/prj.conf b/tests/legacy/benchmark/latency_measure/nanokernel/prj.conf
index c352c038d..c352c038d 100644
--- a/tests/benchmark/latency_measure/nanokernel/prj.conf
+++ b/tests/legacy/benchmark/latency_measure/nanokernel/prj.conf
diff --git a/tests/benchmark/latency_measure/nanokernel/testcase.ini b/tests/legacy/benchmark/latency_measure/nanokernel/testcase.ini
index 3609d3009..3609d3009 100644
--- a/tests/benchmark/latency_measure/nanokernel/testcase.ini
+++ b/tests/legacy/benchmark/latency_measure/nanokernel/testcase.ini
diff --git a/tests/benchmark/object_footprint/.gitignore b/tests/legacy/benchmark/object_footprint/.gitignore
index 1df5c9613..1df5c9613 100644
--- a/tests/benchmark/object_footprint/.gitignore
+++ b/tests/legacy/benchmark/object_footprint/.gitignore
diff --git a/tests/benchmark/object_footprint/Kconfig b/tests/legacy/benchmark/object_footprint/Kconfig
index b29a08587..b29a08587 100644
--- a/tests/benchmark/object_footprint/Kconfig
+++ b/tests/legacy/benchmark/object_footprint/Kconfig
diff --git a/tests/benchmark/object_footprint/Makefile b/tests/legacy/benchmark/object_footprint/Makefile
index 17e9e712a..17e9e712a 100644
--- a/tests/benchmark/object_footprint/Makefile
+++ b/tests/legacy/benchmark/object_footprint/Makefile
diff --git a/tests/benchmark/object_footprint/README.txt b/tests/legacy/benchmark/object_footprint/README.txt
index a9f518ed9..a9f518ed9 100644
--- a/tests/benchmark/object_footprint/README.txt
+++ b/tests/legacy/benchmark/object_footprint/README.txt
diff --git a/tests/benchmark/object_footprint/prj00.conf b/tests/legacy/benchmark/object_footprint/prj00.conf
index 2bd392372..2bd392372 100644
--- a/tests/benchmark/object_footprint/prj00.conf
+++ b/tests/legacy/benchmark/object_footprint/prj00.conf
diff --git a/tests/benchmark/object_footprint/prj01.conf b/tests/legacy/benchmark/object_footprint/prj01.conf
index 16b785299..16b785299 100644
--- a/tests/benchmark/object_footprint/prj01.conf
+++ b/tests/legacy/benchmark/object_footprint/prj01.conf
diff --git a/tests/benchmark/object_footprint/prj02.conf b/tests/legacy/benchmark/object_footprint/prj02.conf
index ea249917f..ea249917f 100644
--- a/tests/benchmark/object_footprint/prj02.conf
+++ b/tests/legacy/benchmark/object_footprint/prj02.conf
diff --git a/tests/benchmark/object_footprint/prj03.conf b/tests/legacy/benchmark/object_footprint/prj03.conf
index d8126ac9a..d8126ac9a 100644
--- a/tests/benchmark/object_footprint/prj03.conf
+++ b/tests/legacy/benchmark/object_footprint/prj03.conf
diff --git a/tests/benchmark/object_footprint/prj04.conf b/tests/legacy/benchmark/object_footprint/prj04.conf
index 7d16fda60..7d16fda60 100644
--- a/tests/benchmark/object_footprint/prj04.conf
+++ b/tests/legacy/benchmark/object_footprint/prj04.conf
diff --git a/tests/benchmark/object_footprint/prj05.conf b/tests/legacy/benchmark/object_footprint/prj05.conf
index c5aea8dd9..c5aea8dd9 100644
--- a/tests/benchmark/object_footprint/prj05.conf
+++ b/tests/legacy/benchmark/object_footprint/prj05.conf
diff --git a/tests/benchmark/object_footprint/prj06.conf b/tests/legacy/benchmark/object_footprint/prj06.conf
index e6b8eca69..e6b8eca69 100644
--- a/tests/benchmark/object_footprint/prj06.conf
+++ b/tests/legacy/benchmark/object_footprint/prj06.conf
diff --git a/tests/benchmark/object_footprint/prj07.conf b/tests/legacy/benchmark/object_footprint/prj07.conf
index 056e5cd98..056e5cd98 100644
--- a/tests/benchmark/object_footprint/prj07.conf
+++ b/tests/legacy/benchmark/object_footprint/prj07.conf
diff --git a/tests/benchmark/object_footprint/prj08.conf b/tests/legacy/benchmark/object_footprint/prj08.conf
index 80d1d4b5a..80d1d4b5a 100644
--- a/tests/benchmark/object_footprint/prj08.conf
+++ b/tests/legacy/benchmark/object_footprint/prj08.conf
diff --git a/tests/benchmark/object_footprint/prj09.conf b/tests/legacy/benchmark/object_footprint/prj09.conf
index 8e78fe891..8e78fe891 100644
--- a/tests/benchmark/object_footprint/prj09.conf
+++ b/tests/legacy/benchmark/object_footprint/prj09.conf
diff --git a/tests/benchmark/object_footprint/prj10.conf b/tests/legacy/benchmark/object_footprint/prj10.conf
index 00a7caf44..00a7caf44 100644
--- a/tests/benchmark/object_footprint/prj10.conf
+++ b/tests/legacy/benchmark/object_footprint/prj10.conf
diff --git a/tests/benchmark/object_footprint/prj11.conf b/tests/legacy/benchmark/object_footprint/prj11.conf
index 6eacacca7..6eacacca7 100644
--- a/tests/benchmark/object_footprint/prj11.conf
+++ b/tests/legacy/benchmark/object_footprint/prj11.conf
diff --git a/tests/benchmark/object_footprint/run.sh b/tests/legacy/benchmark/object_footprint/run.sh
index d3097bee4..d3097bee4 100755
--- a/tests/benchmark/object_footprint/run.sh
+++ b/tests/legacy/benchmark/object_footprint/run.sh
diff --git a/tests/benchmark/object_footprint/src/Makefile b/tests/legacy/benchmark/object_footprint/src/Makefile
index d30b91fae..d30b91fae 100644
--- a/tests/benchmark/object_footprint/src/Makefile
+++ b/tests/legacy/benchmark/object_footprint/src/Makefile
diff --git a/tests/benchmark/object_footprint/src/nanokernel_objects.c b/tests/legacy/benchmark/object_footprint/src/nanokernel_objects.c
index 1bba2b602..1bba2b602 100644
--- a/tests/benchmark/object_footprint/src/nanokernel_objects.c
+++ b/tests/legacy/benchmark/object_footprint/src/nanokernel_objects.c
diff --git a/tests/benchmark/sys_kernel/Makefile b/tests/legacy/benchmark/sys_kernel/Makefile
index c722d034c..c722d034c 100644
--- a/tests/benchmark/sys_kernel/Makefile
+++ b/tests/legacy/benchmark/sys_kernel/Makefile
diff --git a/tests/benchmark/sys_kernel/README.txt b/tests/legacy/benchmark/sys_kernel/README.txt
index 2afea788f..2afea788f 100644
--- a/tests/benchmark/sys_kernel/README.txt
+++ b/tests/legacy/benchmark/sys_kernel/README.txt
diff --git a/tests/benchmark/sys_kernel/prj.conf b/tests/legacy/benchmark/sys_kernel/prj.conf
index 95ffba67c..95ffba67c 100644
--- a/tests/benchmark/sys_kernel/prj.conf
+++ b/tests/legacy/benchmark/sys_kernel/prj.conf
diff --git a/tests/legacy/benchmark/sys_kernel/src/Makefile b/tests/legacy/benchmark/sys_kernel/src/Makefile
new file mode 100644
index 000000000..b90ef5639
--- /dev/null
+++ b/tests/legacy/benchmark/sys_kernel/src/Makefile
@@ -0,0 +1,8 @@
+ccflags-y = -I$(ZEPHYR_BASE)/tests/legacy/benchmark/latency_measure/microkernel/src -I${ZEPHYR_BASE}/tests/include
+ccflags-y += -I$(CURDIR)/misc/generated/sysgen
+
+obj-y = lifo.o \
+	mwfifo.o \
+	sema.o \
+	stack.o \
+	syskernel.o
diff --git a/tests/benchmark/sys_kernel/src/lifo.c b/tests/legacy/benchmark/sys_kernel/src/lifo.c
index f63aa35b2..f63aa35b2 100644
--- a/tests/benchmark/sys_kernel/src/lifo.c
+++ b/tests/legacy/benchmark/sys_kernel/src/lifo.c
diff --git a/tests/benchmark/sys_kernel/src/mwfifo.c b/tests/legacy/benchmark/sys_kernel/src/mwfifo.c
index 350477392..350477392 100644
--- a/tests/benchmark/sys_kernel/src/mwfifo.c
+++ b/tests/legacy/benchmark/sys_kernel/src/mwfifo.c
diff --git a/tests/benchmark/sys_kernel/src/sema.c b/tests/legacy/benchmark/sys_kernel/src/sema.c
index 1be61da81..1be61da81 100644
--- a/tests/benchmark/sys_kernel/src/sema.c
+++ b/tests/legacy/benchmark/sys_kernel/src/sema.c
diff --git a/tests/benchmark/sys_kernel/src/stack.c b/tests/legacy/benchmark/sys_kernel/src/stack.c
index 1da546eb2..1da546eb2 100644
--- a/tests/benchmark/sys_kernel/src/stack.c
+++ b/tests/legacy/benchmark/sys_kernel/src/stack.c
diff --git a/tests/benchmark/sys_kernel/src/syskernel.c b/tests/legacy/benchmark/sys_kernel/src/syskernel.c
index 0c92004bd..0c92004bd 100644
--- a/tests/benchmark/sys_kernel/src/syskernel.c
+++ b/tests/legacy/benchmark/sys_kernel/src/syskernel.c
diff --git a/tests/benchmark/sys_kernel/src/syskernel.h b/tests/legacy/benchmark/sys_kernel/src/syskernel.h
index 139ff4f45..139ff4f45 100644
--- a/tests/benchmark/sys_kernel/src/syskernel.h
+++ b/tests/legacy/benchmark/sys_kernel/src/syskernel.h
diff --git a/tests/benchmark/sys_kernel/testcase.ini b/tests/legacy/benchmark/sys_kernel/testcase.ini
index 6c0415550..6c0415550 100644
--- a/tests/benchmark/sys_kernel/testcase.ini
+++ b/tests/legacy/benchmark/sys_kernel/testcase.ini