fix: resolve conflicts after rebase

Author: marchioa

Deeploy/Targets/Magia/Deployer.py

@@ -11,6 +11,7 @@
 from Deeploy.CommonExtensions.NetworkDeployers.SignPropDeployer import SignPropDeployer
 from Deeploy.DeeployTypes import ConstantBuffer, DeploymentPlatform, NodeTemplate, TopologyOptimizer, VariableBuffer
 
+
 class MagiaDeployer(SignPropDeployer):
 
     def __init__(self,

Deeploy/Targets/Magia/Platform.py

@@ -7,19 +7,16 @@
 
 from Deeploy.DeeployTypes import ConstantBuffer, DeploymentEngine, DeploymentPlatform, NetworkContext, NodeMapper, \
     NodeTemplate, StructBuffer, TopologyOptimizer, TransientBuffer, VariableBuffer
-
-from Deeploy.Targets.Generic.Templates import AllocateTemplate as BasicAllocateTemplate
 from Deeploy.Targets.Generic.Bindings import BasicAddBindings
-from Deeploy.Targets.Generic.Parsers import AddParser
 from Deeploy.Targets.Generic.Layers import AddLayer
-
+from Deeploy.Targets.Generic.Parsers import AddParser
+from Deeploy.Targets.Generic.Templates import AllocateTemplate as BasicAllocateTemplate
 from Deeploy.Targets.Magia.Templates import AllocateTemplate, FreeTemplate
 
 AddMapper = NodeMapper(AddParser(), BasicAddBindings)
 
-MagiaMapping = {
-    'Add': AddLayer([AddMapper])
-}
+MagiaMapping = {'Add': AddLayer([AddMapper])}
+
 
 class MagiaVariableBuffer(VariableBuffer):
 
@@ -41,6 +38,7 @@ def _bufferRepresentation(self):
             "_memoryLevel": memoryLevel
         }
 
+
 class MagiaTransientBuffer(TransientBuffer):
 
     initTemplate = AllocateTemplate.magiaInitTemplate
@@ -54,11 +52,8 @@ def _bufferRepresentation(self):
         else:
             memoryLevel = None
 
-        return {"type": self._type, 
-                "name": self.name, 
-                "size": self.size, 
-                "_memoryLevel": memoryLevel
-        }
+        return {"type": self._type, "name": self.name, "size": self.size, "_memoryLevel": memoryLevel}
+
 
 class MagiaConstantBuffer(ConstantBuffer):
 
@@ -78,6 +73,7 @@ def _bufferRepresentation(self):
 
         return operatorRepresentation
 
+
 class MagiaStructBuffer(StructBuffer):
 
     initTemplate = BasicAllocateTemplate.referenceStructInitTemplate
@@ -91,10 +87,7 @@ class MagiaStructBuffer(StructBuffer):
     ],
     name = "MagiaOptimizer")
 
-
-_includeList = [
-    "tile.h", "idma.h", "redmule.h", "eventunit.h"
-]
+_includeList = ["tile.h", "idma.h", "redmule.h", "eventunit.h"]
 
 
 class MagiaMeshEngine(DeploymentEngine):
@@ -108,6 +101,7 @@ def __init__(self,
         super().__init__(name, Mapping, initCode, includeList)
         self.n_tiles = n_tiles
 
+
 class MagiaPlatform(DeploymentPlatform):
 
     def __init__(self,
@@ -116,4 +110,4 @@ def __init__(self,
                  constantBuffer = MagiaConstantBuffer,
                  structBuffer = MagiaStructBuffer,
                  transientBuffer = MagiaTransientBuffer) -> None:
-        super().__init__(engines, variableBuffer, constantBuffer, structBuffer, transientBuffer)
+        super().__init__(engines, variableBuffer, constantBuffer, structBuffer, transientBuffer)

DeeployTest/deeployRunner_magia.py

@@ -0,0 +1,22 @@
+#!/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/generateNetwork.py

@@ -20,8 +20,8 @@
 from Deeploy.DeeployTypes import _NoVerbosity
 from Deeploy.Logging import DEFAULT_LOGGER as log
 from Deeploy.Targets.CortexM.Platform import CMSISPlatform
-from Deeploy.Targets.PULPOpen.Platform import PULPClusterEngine, PULPPlatform
 from Deeploy.Targets.Magia.Platform import MagiaMeshEngine, MagiaPlatform
+from Deeploy.Targets.PULPOpen.Platform import PULPClusterEngine, PULPPlatform
 
 
 def generateNetwork(args):
@@ -88,7 +88,7 @@ def generateNetwork(args):
     clusters = [engine for engine in platform.engines if isinstance(engine, PULPClusterEngine)]
     for cluster in clusters:
         cluster.n_cores = args.cores
-    
+
     meshes = [engine for engine in platform.engines if isinstance(engine, MagiaMeshEngine)]
     for mesh in meshes:
         mesh.n_tiles = args.tiles
@@ -195,7 +195,7 @@ def generateNetwork(args):
     parser.add_argument("--cores",
                         type = int,
                         default = 1,
-                        help = 'Number of cores on which the network is run.' 
+                        help = 'Number of cores on which the network is run.'
                         'Currently, required for im2col buffer sizing on Siracusa. Default: 1.\n')
     parser.add_argument("--tiles",
                         type = int,

DeeployTest/testRunner_magia.py

@@ -8,9 +8,9 @@
 import numpy as np
 
 from Deeploy.DeeployTypes import CodeGenVerbosity, ConstantBuffer, NetworkDeployer, VariableBuffer
+from Deeploy.Targets.Magia.Platform import MagiaPlatform
 from Deeploy.Targets.MemPool.Platform import MemPoolPlatform
 from Deeploy.Targets.PULPOpen.Platform import MemoryPULPPlatform, MemoryPULPPlatformWrapper, PULPPlatform
-from Deeploy.Targets.Magia.Platform import MagiaPlatform
 
 _TEXT_ALIGN = 30
 
@@ -128,7 +128,7 @@ def generateTestNetworkHeader(deployer: NetworkDeployer) -> str:
         #include <stdio.h>
         #include <stdlib.h>
         """
-    
+
     retStr += deployer.generateIncludeString()
     if isinstance(deployer.Platform, (PULPPlatform, MemoryPULPPlatform, MemoryPULPPlatformWrapper, MagiaPlatform)):
         retStr += """
@@ -160,7 +160,7 @@ def generateTestNetworkImplementation(deployer: NetworkDeployer, verbosityCfg: C
         #include <math.h>
         """
         retStr += deployer.generateIncludeString()
-    
+
     retStr += """
     #include "Network.h"
     """

DeeployTest/testUtils/codeGenerate.py

@@ -199,7 +199,10 @@ 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 +211,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)
 

DeeployTest/testUtils/deeployRunner.py

@@ -24,7 +24,7 @@
 from Deeploy.Targets.Neureka.Platform import MemoryNeurekaPlatform, MemoryNeurekaPlatformWrapper, NeurekaOptimizer, \
     NeurekaPlatform
 from Deeploy.Targets.PULPOpen.Deployer import PULPDeployer
-from Deeploy.Targets.PULPOpen.Platform import MemoryPULPPlatform, MemoryPULPPlatformWrapper, PULPOptimizer, PULPPlatform 
+from Deeploy.Targets.PULPOpen.Platform import MemoryPULPPlatform, MemoryPULPPlatformWrapper, PULPOptimizer, PULPPlatform
 from Deeploy.Targets.Snitch.Deployer import SnitchDeployer
 from Deeploy.Targets.Snitch.Platform import SnitchOptimizer, SnitchPlatform
 from Deeploy.Targets.SoftHier.Deployer import SoftHierDeployer
@@ -256,11 +256,11 @@ def mapDeployer(platform: DeploymentPlatform,
 
     elif isinstance(platform, (MagiaPlatform)):
         if loweringOptimizer is None:
-            loweringOptimizer = MagiaOptimizer 
+            loweringOptimizer = MagiaOptimizer
 
         if default_channels_first is None:
             default_channels_first = False
-        
+
         deployer = MagiaDeployer(graph,
                                  platform,
                                  inputTypes,

DeeployTest/testUtils/platformMapping.py

@@ -357,7 +357,7 @@ def generate_test(self):
 
         if self._platform in ["Siracusa", "Siracusa_w_neureka"]:
             command += f" --cores={self._args.cores}"
-        
+
         if self._platform in ["Magia"]:
             command += f" --tiles={self._args.tiles}"