fix: resolve conflicts after rebase

Author: marchioa

DeeployTest/deeployRunner_magia.py

@@ -0,0 +1,23 @@
+#!/usr/bin/env python
+# SPDX-FileCopyrightText: 2025 ETH Zurich and University of Bologna
+#
+# SPDX-License-Identifier: Apache-2.0
+
+import sys
+
+from testUtils.deeployRunner import main
+
+if __name__ == "__main__":
+
+    # Define parser setup callback to add Siracusa-specific arguments
+    def setup_parser(parser):
+        parser.add_argument('--tiles', type=int, default=4, help='Number of mesh tiles (default: 4)')
+
+    sys.exit(
+        main(
+            default_platform="Magia",
+            default_simulator="none",
+            tiling_enabled=False,
+            parser_setup_callback=setup_parser,
+        )
+    )

DeeployTest/testRunner_magia.py

@@ -199,7 +199,7 @@ def run_simulation(config: DeeployTestConfig, skip: bool = False) -> TestResult:
     return test_result
 
 
-def run_complete_test(config: DeeployTestConfig, skipgen: bool = False, skipsim: bool = False) -> TestResult:
+def run_complete_test(config: DeeployTestConfig, skipgen: bool = False, skipbuild: bool = False, skipsim: bool = False) -> TestResult:
     """
     Run a complete test: generate, configure, build, and simulate.
     """
@@ -208,11 +208,14 @@ def run_complete_test(config: DeeployTestConfig, skipgen: bool = False, skipsim:
     # Step 1: Generate network
     generate_network(config, skip = skipgen)
 
-    # Step 2: Configure CMake
-    configure_cmake(config)
+    if skipbuild:
+        log.info(f"Skipping cmake configuration and binary building for {config.test_name}")
+    else:
+        # Step 2: Configure CMake
+        configure_cmake(config)
 
-    # Step 3: Build binary
-    build_binary(config)
+        # Step 3: Build binary
+        build_binary(config)
 
     # Step 4: Run simulation
     result = run_simulation(config, skip = skipsim)

DeeployTest/testUtils/core/execution.py

@@ -83,6 +83,11 @@ def __init__(self,
                           action = 'store_true',
                           default = False,
                           help = 'Skip network generation (reuse existing generated code)\n')
+        self.add_argument('--skipbuild',
+                          dest = 'skipbuild',
+                          action = 'store_true',
+                          default = False,
+                          help = 'Skip network simulation\n')
         self.add_argument('--skipsim',
                           dest = 'skipsim',
                           action = 'store_true',
@@ -347,6 +352,7 @@ def main(default_platform: Optional[str] = None,
         "snitch": "Snitch",
         "chimera": "Chimera",
         "softhier": "SoftHier",
+        "magia": "Magia",
     }
 
     if args.platform:
@@ -387,6 +393,7 @@ def main(default_platform: Optional[str] = None,
             "Snitch": "gvsoc",
             "Chimera": "gvsoc",
             "SoftHier": "gvsoc",
+            "Magia": "none",
         }
         simulator = simulator_map.get(platform, "host")
         log.info(f"No simulator specified, using default for {platform}: {simulator}")
@@ -409,7 +416,7 @@ def main(default_platform: Optional[str] = None,
     print_configuration(config)
 
     try:
-        result = run_complete_test(config, skipgen = args.skipgen, skipsim = args.skipsim)
+        result = run_complete_test(config, skipgen=args.skipgen, skipbuild=args.skipbuild, skipsim=args.skipsim)
 
         print_colored_result(result, config.test_name)