[microTVM][Zephyr] Hot Fix Bad Merge (apache#8980)

* fix bad merge

* Fix test to reflect change of simd size for ARM

Author: mehrdadh

tests/micro/zephyr/conftest.py

@@ -56,6 +56,7 @@ def zephyr_boards() -> dict:
 def pytest_addoption(parser):
     parser.addoption(
         "--zephyr-board",
+        required=True,
         choices=ZEPHYR_BOARDS.keys(),
         help=("Zephyr board for test."),
     )

tests/micro/zephyr/test_zephyr.py

@@ -380,11 +380,11 @@ def test_tensors(sess):
 
 
 @tvm.testing.requires_micro
-def test_autotune_conv2d(temp_dir, platform, west_cmd, tvm_debug):
+def test_autotune_conv2d(temp_dir, board, west_cmd, tvm_debug):
     """Test AutoTune for microTVM Zephyr"""
     import tvm.relay as relay
 
-    model, zephyr_board = PLATFORMS[platform]
+    model = conftest.ZEPHYR_BOARDS[board]
 
     # Create a Relay model
     data_shape = (1, 3, 16, 16)
@@ -424,7 +424,7 @@ def test_autotune_conv2d(temp_dir, platform, west_cmd, tvm_debug):
     module_loader = tvm.micro.AutoTvmModuleLoader(
         template_project_dir=template_project_dir,
         project_options={
-            "zephyr_board": zephyr_board,
+            "zephyr_board": board,
             "west_cmd": west_cmd,
             "verbose": 1,
             "project_type": "host_driven",
@@ -467,7 +467,7 @@ def test_autotune_conv2d(temp_dir, platform, west_cmd, tvm_debug):
         lowered,
         temp_dir / "project",
         {
-            "zephyr_board": zephyr_board,
+            "zephyr_board": board,
             "west_cmd": west_cmd,
             "verbose": 1,
             "project_type": "host_driven",
@@ -496,7 +496,7 @@ def test_autotune_conv2d(temp_dir, platform, west_cmd, tvm_debug):
         lowered_tuned,
         temp_dir / "project",
         {
-            "zephyr_board": zephyr_board,
+            "zephyr_board": board,
             "west_cmd": west_cmd,
             "verbose": 1,
             "project_type": "host_driven",

tests/python/relay/aot/test_crt_aot.py

@@ -562,9 +562,9 @@ def test_name_sanitiser_name_clash():
 @pytest.mark.parametrize(
     "workspace_byte_alignment,main_workspace_size,sum_workspace_size",
     [
-        (8, 10368, 15392),
-        (16, 10368, 15424),
-        (256, 10752, 17664),
+        (8, 10368, 15200),
+        (16, 10368, 15232),
+        (256, 10752, 17408),
     ],
 )
 def test_memory_planning(workspace_byte_alignment, main_workspace_size, sum_workspace_size):