[microTVM][Cortex-R5] Add zephyr cortex-r5 board to Zephyr (#8519)

mehrdadh · web-flow · commit 59e96e04ce29 · 2021-07-22T09:33:19.000+01:00
* cortex r5 added

* add aot demo
diff --git a/apps/microtvm/zephyr/aot_demo/boards/qemu_cortex_r5.conf b/apps/microtvm/zephyr/aot_demo/boards/qemu_cortex_r5.conf
@@ -0,0 +1,25 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+# This file is specific to the QEMU-emulated Cortex R5 microTVM board.
+
+# For TVMPlatformGenerateRandom(). Remember, these values do not need to be truly random.
+CONFIG_TEST_RANDOM_GENERATOR=y
+CONFIG_TIMER_RANDOM_GENERATOR=y
+
+# Default stack size is 1k, this is required for debug mode. 
+CONFIG_MAIN_STACK_SIZE=2000
diff --git a/apps/microtvm/zephyr/host_driven/boards/qemu_cortex_r5.conf b/apps/microtvm/zephyr/host_driven/boards/qemu_cortex_r5.conf
@@ -0,0 +1,25 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+# This file is specific to the QEMU-emulated Cortex R5 microTVM board.
+
+# For TVMPlatformGenerateRandom(). Remember, these values do not need to be truly random.
+CONFIG_TEST_RANDOM_GENERATOR=y
+CONFIG_TIMER_RANDOM_GENERATOR=y
+
+# Default stack size is 1k, this is required for debug mode. 
+CONFIG_MAIN_STACK_SIZE=1536
diff --git a/apps/microtvm/zephyr/qemu-hack/qemu-system-arm b/apps/microtvm/zephyr/qemu-hack/qemu-system-arm
@@ -1 +1 @@
-./qemu-system-i386
+qemu-system-i386
diff --git a/apps/microtvm/zephyr/qemu-hack/qemu-system-xilinx-aarch64 b/apps/microtvm/zephyr/qemu-hack/qemu-system-xilinx-aarch64
@@ -0,0 +1 @@
+qemu-system-i386
diff --git a/python/tvm/target/target.py b/python/tvm/target/target.py
@@ -285,6 +285,7 @@ def intel_graphics(model="unknown", options=None):
     "nrf5340dk": ["-mcpu=cortex-m33"],
     "stm32f746xx": ["-mcpu=cortex-m7", "-march=armv7e-m"],
     "stm32l4r5zi": ["-mcpu=cortex-m4"],
+    "zynq_mp_r5": ["-mcpu=cortex-r5"],
 }
 
 
diff --git a/tests/lint/check_file_type.py b/tests/lint/check_file_type.py
@@ -136,6 +136,7 @@
     "apps/microtvm/zephyr/qemu-hack/qemu-system-arm",
     "apps/microtvm/zephyr/qemu-hack/qemu-system-riscv32",
     "apps/microtvm/zephyr/qemu-hack/qemu-system-riscv64",
+    "apps/microtvm/zephyr/qemu-hack/qemu-system-xilinx-aarch64",
     "apps/microtvm/zephyr/host_driven/prj.conf",
     "apps/microtvm/zephyr/host_driven/boards/qemu_x86.conf",
     "apps/microtvm/zephyr/host_driven/boards/qemu_riscv32.conf",
@@ -145,6 +146,7 @@
     "apps/microtvm/zephyr/host_driven/boards/stm32f746g_disco.conf",
     "apps/microtvm/zephyr/host_driven/boards/mps2_an521.conf",
     "apps/microtvm/zephyr/host_driven/boards/nucleo_l4r5zi.conf",
+    "apps/microtvm/zephyr/host_driven/boards/qemu_cortex_r5.conf",
     "apps/microtvm/zephyr/host_driven/qemu-hack",
     "apps/microtvm/zephyr/aot_demo/prj.conf",
     "apps/microtvm/zephyr/aot_demo/boards/qemu_x86.conf",
@@ -155,6 +157,7 @@
     "apps/microtvm/zephyr/aot_demo/boards/stm32f746g_disco.conf",
     "apps/microtvm/zephyr/aot_demo/boards/mps2_an521.conf",
     "apps/microtvm/zephyr/aot_demo/boards/nucleo_l4r5zi.conf",
+    "apps/microtvm/zephyr/aot_demo/boards/qemu_cortex_r5.conf",
     "apps/microtvm/zephyr/aot_demo/qemu-hack",
     # microTVM Virtual Machines
     "apps/microtvm/reference-vm/zephyr/Vagrantfile",
diff --git a/tests/micro/zephyr/conftest.py b/tests/micro/zephyr/conftest.py
@@ -29,6 +29,7 @@
     "stm32f746xx_disco": ("stm32f746xx", "stm32f746g_disco"),
     "stm32f746xx_nucleo": ("stm32f746xx", "nucleo_f746zg"),
     "stm32l4r5zi_nucleo": ("stm32l4r5zi", "nucleo_l4r5zi"),
+    "zynq_mp_r5": ("zynq_mp_r5", "qemu_cortex_r5"),
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -285,6 +285,7 @@ def intel_graphics(model="unknown", options=None):`
`285`	`285`	`"nrf5340dk": ["-mcpu=cortex-m33"],`
`286`	`286`	`"stm32f746xx": ["-mcpu=cortex-m7", "-march=armv7e-m"],`
`287`	`287`	`"stm32l4r5zi": ["-mcpu=cortex-m4"],`
	`288`	`+ "zynq_mp_r5": ["-mcpu=cortex-r5"],`
`288`	`289`	`}`
`289`	`290`
`290`	`291`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@`
`29`	`29`	`"stm32f746xx_disco": ("stm32f746xx", "stm32f746g_disco"),`
`30`	`30`	`"stm32f746xx_nucleo": ("stm32f746xx", "nucleo_f746zg"),`
`31`	`31`	`"stm32l4r5zi_nucleo": ("stm32l4r5zi", "nucleo_l4r5zi"),`
	`32`	`+ "zynq_mp_r5": ("zynq_mp_r5", "qemu_cortex_r5"),`
`32`	`33`	`}`
`33`	`34`
`34`	`35`