mlonmcu 0.4.1__tar.gz → 0.5.dev0__tar.gz

{mlonmcu-0.4.1 → mlonmcu-0.5.dev0}/PKG-INFO

@@ -1,13 +1,12 @@
 Metadata-Version: 2.1
 Name: mlonmcu
-Version: 0.4.1
+Version: 0.5.dev0
 Summary: This project contains research code related to the deployment of inferenceor learning applications on tiny micro-controllers.
 Home-page: https://github.com/tum-ei-eda/mlonmcu
 Author: TUM Department of Electrical and Computer Engineering - Chair of Electronic Design Automation
 Author-email: philipp.van-kempen@tum.de
 License: Apache License 2.0
 Keywords: mlonmcu
-Platform: UNKNOWN
 Classifier: Development Status :: 2 - Pre-Alpha
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: Apache Software License
@@ -21,7 +20,6 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Requires-Python: >=3.7
 Description-Content-Type: text/markdown
-Provides-Extra: all-prod
 Provides-Extra: espidf
 Provides-Extra: etiss
 Provides-Extra: gvsoc_pulp
@@ -36,6 +34,7 @@ Provides-Extra: tvm-autotuning
 Provides-Extra: visualize
 Provides-Extra: visualize_tflite
 Provides-Extra: zephyr
+Provides-Extra: all-prod
 License-File: LICENSE
 License-File: NOTICE
 
@@ -260,5 +259,3 @@ the projects [Scale4Edge](https://www.edacentrum.de/scale4edge/) (grant number 1
 ## 0.1.0 (2021-11-12)
 
 * First closed-source release.
-
-

{mlonmcu-0.4.1 → mlonmcu-0.5.dev0}/mlonmcu/context/context.py

@@ -226,6 +226,7 @@ def resolve_environment_file(name: str = None, path: str = None) -> Path:
         env_file = lookup_environment()
         if not env_file:
             raise RuntimeError("Lookup for mlonmcu environment was not successful.")
+    assert env_file is not None, "Environment not found!"
     return Path(env_file)
 
 

{mlonmcu-0.4.1 → mlonmcu-0.5.dev0}/mlonmcu/feature/features.py

@@ -464,8 +464,8 @@ class Vext(SetupFeature, TargetFeature, PlatformFeature):
 
     def get_target_config(self, target):
         # TODO: enforce llvm toolchain using add_compile_config and CompileFeature?
-        assert is_power_of_two(self.vlen)
-        assert self.vlen >= VEXT_MIN_ALLOWED_VLEN
+        assert self.vlen is None or is_power_of_two(self.vlen)
+        assert self.vlen is None or self.vlen >= VEXT_MIN_ALLOWED_VLEN
         return filter_none(
             {
                 f"{target}.enable_vext": True,
@@ -752,6 +752,7 @@ class Usmp(BackendFeature):
     DEFAULTS = {
         **FeatureBase.DEFAULTS,
         "algorithm": "greedy_by_conflicts",  # options: greedy_by_conflicts, greedy_by_size, hill_climb
+        "use_workspace_io": False,
     }
 
     def __init__(self, features=None, config=None):
@@ -761,6 +762,11 @@ class Usmp(BackendFeature):
     def algorithm(self):
         return str(self.config["algorithm"])
 
+    @property
+    def use_workspace_io(self):
+        value = self.config["use_workspace_io"]
+        return str2bool(value) if not isinstance(value, (bool, int)) else value
+
     def add_backend_config(self, backend, config):
         assert backend in ["tvmaot"], f"Unsupported feature '{self.name}' for backend '{backend}'"
         if f"{backend}.extra_pass_config" in config:
@@ -775,6 +781,7 @@ class Usmp(BackendFeature):
             tmp = ast.literal_eval(tmp)
         assert isinstance(tmp, dict)
         tmp["tir.usmp.enable"] = self.enabled
+        tmp["tir.usmp.use_workspace_io"] = self.use_workspace_io
         if self.algorithm in ["greedy_by_size", "greedy_by_conflicts", "hill_climb"]:
             tmp["tir.usmp.algorithm"] = self.algorithm
         else:
@@ -1700,11 +1707,12 @@ class Benchmark(PlatformFeature, TargetFeature):
                 metrics_ = metrics[1:]  # drop first run (warmup)
 
                 # TODO: this currently processes all numeric metrics, should probably ignore stuff like MIPS etc.
+                candidates = ["cycle", "time", "instruction"]  # TODO: allow overriding via config
                 data_ = [
                     {
                         key: (float(value) / self.num_runs) if self.num_runs > 1 else value
                         for key, value in m.data.items()
-                        if "cycle" in key.lower() or "time" in key.lower()
+                        if any(x in key.lower() for x in candidates)
                     }
                     for m in metrics_
                 ]
@@ -1722,7 +1730,9 @@ class Benchmark(PlatformFeature, TargetFeature):
                 elif self.aggregate == "none":
                     aggs = []
 
-                if len(aggs) == 0:
+                if len(df.columns) == 0:
+                    data = {}
+                elif len(aggs) == 0:
                     data = {}
                 else:
                     df_ = df.agg(aggs)

{mlonmcu-0.4.1 → mlonmcu-0.5.dev0}/mlonmcu/flow/tflm/backend/tflmc.py

@@ -106,7 +106,7 @@ size_t model_outputs();
             args.append(str(self.model))
             args.append(str(Path(tmpdirname) / f"{self.prefix}.cc"))
             args.append(f"{self.prefix}_")
-            out = utils.exec_getout(tflmc_exe, *args, live=self.print_outputs)
+            out = utils.execute(tflmc_exe, *args, live=self.print_outputs)
             files = [f for f in os.listdir(tmpdirname) if os.path.isfile(os.path.join(tmpdirname, f))]
             # TODO: ensure that main file is processed first
             for filename in files:

{mlonmcu-0.4.1 → mlonmcu-0.5.dev0}/mlonmcu/flow/tflm/backend/tflmi.py

@@ -129,32 +129,32 @@ size_t {prefix}_outputs();
         reporter=True,
     ):
         arena_size = arena_size if arena_size is not None else TFLMIBackend.DEFAULTS["arena_size"]
-        if len(ops) > 0:
 
-            def convert_op_name(op):
-                new_name = ""
-                prev = None
-                for i, c in enumerate(op):
-                    if c == "_":
-                        prev = c
-                        continue
-                    elif prev is None:
-                        new_name += c
-                    elif (prev == "_") or prev.isdigit():
-                        new_name += c
-                    elif prev.isupper():
-                        new_name += c.lower()
-                    elif c.islower():
-                        new_name += c
+        def convert_op_name(op):
+            new_name = ""
+            prev = None
+            for i, c in enumerate(op):
+                if c == "_":
                     prev = c
-                # workarounds for strange op names
-                MAPPINGS = {
-                    "Lstm": "LSTM",
-                }
-                for key, value in MAPPINGS.items():
-                    new_name = new_name.replace(key, value)
-                return new_name
+                    continue
+                elif prev is None:
+                    new_name += c
+                elif (prev == "_") or prev.isdigit():
+                    new_name += c
+                elif prev.isupper():
+                    new_name += c.lower()
+                elif c.islower():
+                    new_name += c
+                prev = c
+            # workarounds for strange op names
+            MAPPINGS = {
+                "Lstm": "LSTM",
+            }
+            for key, value in MAPPINGS.items():
+                new_name = new_name.replace(key, value)
+            return new_name
 
+        if len(ops) > 0:
             op_names = list(map(convert_op_name, ops))
 
             ops = op_names
@@ -162,8 +162,34 @@ size_t {prefix}_outputs();
             raise NotImplementedError
         if len(registrations) > 0:
             raise NotImplementedError
-        if ops_resolver != "mutable":
-            raise NotImplementedError
+        if ops_resolver == "mutable":
+            assert (
+                len(ops) > 0
+            ), "No ops specified for ops_resolver=mutable!Set model ops in definition.yml or use ops_resolver=all"
+        elif ops_resolver == "all":
+            raise RuntimeError("AllOpsResolver was removed from TFLM!Use ops_resolver=mutable or ops_resolver=fallback")
+        elif ops_resolver == "fallback":
+            ops_resolver = "mutable"
+            # Defines common operators which are used in many models
+            default_ops = [
+                "ADD",
+                "AVERAGE_POOL_2D",
+                "CONCATENATION",
+                "CONV_2D",
+                "DEPTHWISE_CONV_2D",
+                "FULLY_CONNECTED",
+                # "GATHER",
+                # "LOGISTIC",
+                "MAX_POOL_2D",
+                # "MEAN",
+                # "REDUCE_MAX",
+                "RESHAPE",
+                "SOFTMAX",
+            ]
+            default_ops = list(map(convert_op_name, default_ops))
+            ops = list(set(ops + default_ops))  # remove duplicates
+        else:
+            raise ValueError(f"Unsupported ops_resolver: {ops_resolver}")
 
         model_data = None
         with open(model, "rb") as model_buf:
@@ -271,14 +297,17 @@ private:
         wrapper_content += """
     return 1;
   }
+"""
 
+        if ops_resolver == "mutable":
+            wrapper_content += self.make_op_registrations(ops, custom_ops, reporter=reporter)
+        elif ops_resolver == "all":
+            wrapper_content += """
   // This pulls in all the operation implementations we need.
   // NOLINTNEXTLINE(runtime-global-variables)
-  // static tflite::ops::micro::AllOpsResolver resolver;
-
+  static tflite::ops::micro::AllOpsResolver resolver;
 """
 
-        wrapper_content += self.make_op_registrations(ops, custom_ops, reporter=reporter)
         if reporter:
             wrapper_content += """
 

{mlonmcu-0.4.1 → mlonmcu-0.5.dev0}/mlonmcu/flow/tvm/backend/backend.py

@@ -154,14 +154,20 @@ class TVMBackend(Backend):
         return str2bool(temp)
 
     @property
-    def pass_config(self):
-        base = {"tir.disable_vectorize": self.disable_vectorize}
+    def extra_pass_config(self):
         extra = self.config["extra_pass_config"]
+        if extra is None:
+            extra = {}
         if isinstance(extra, str):
             import ast
-
             extra = ast.literal_eval(extra)
         assert isinstance(extra, dict)
+        return extra
+
+    @property
+    def pass_config(self):
+        base = {"tir.disable_vectorize": self.disable_vectorize}
+        extra = self.extra_pass_config
         base.update(extra)
         return base
 
@@ -394,7 +400,7 @@ class TVMBackend(Backend):
         )
         if self.use_tlcpack:
             pre = ["tvmc"]
-            return utils.exec_getout(*pre, command, *args, live=self.print_outputs, env=env, cwd=cwd)
+            return utils.execute(*pre, command, *args, live=self.print_outputs, env=env, cwd=cwd)
         else:
             if self.tvmc_custom_script is None:
                 pre = ["-m", "tvm.driver.tvmc"]
@@ -430,6 +436,8 @@ class TVMBackend(Backend):
                 self.model_format, self.model_info = get_fallback_model_info(
                     model, input_shapes, output_shapes, input_types, output_types, backend_name=self.name
                 )
+        else:
+            self.input_shapes = None  # Relevant for multiple subs using the same backend
         if need_model_info:
             try:
                 self.model_format, self.model_info = get_model_info(model, backend_name=self.name)
@@ -446,8 +454,11 @@ class TVMBackend(Backend):
             if self.model_info:
                 # TODO: also handle output_shapes
                 # TODO: take care of refresh_model_info
-                if input_shapes:
+                if self.input_shapes:
                     self.model_info.in_tensors = [t for t in self.model_info.in_tensors if t.name in self.input_shapes]
+                    assert (
+                        len(self.model_info.in_tensors) > 0
+                    ), "Missmatch between provided input names and detected ones"
                 else:
                     self.input_shapes = {tensor.name: tensor.shape for tensor in self.model_info.in_tensors}
         if self.model_info:

{mlonmcu-0.4.1 → mlonmcu-0.5.dev0}/mlonmcu/flow/tvm/backend/tvmaot.py

@@ -43,9 +43,6 @@ class TVMAOTBackend(TVMBackend):
         "arena_size": None,  # Determined automatically
         "unpacked_api": False,
         "alignment_bytes": 16,
-        "extra_pass_config": {
-            "tir.usmp.enable": False,
-        },
     }
 
     name = "tvmaot"
@@ -55,6 +52,13 @@ class TVMAOTBackend(TVMBackend):
             executor="aot", runtime=runtime, fmt=fmt, system_lib=system_lib, features=features, config=config
         )
 
+    @property
+    def extra_pass_config(self):
+        default = {"tir.usmp.enable": False}
+        extra = super().extra_pass_config
+        default.update(extra)
+        return default
+
     @property
     def arena_size(self):
         size = self.config["arena_size"]

{mlonmcu-0.4.1 → mlonmcu-0.5.dev0}/mlonmcu/flow/tvm/backend/tvmcg.py

@@ -74,7 +74,7 @@ class TVMCGBackend(TVMRTBackend):
                     args.append(params_bin_file)
                     args.append(out_file)
                     args.append(str(max_workspace_size))
-                    out = utils.exec_getout(tvmcg_exe, *args, live=self.print_outputs)
+                    out = utils.execute(tvmcg_exe, *args, live=self.print_outputs)
                     codegen_src = open(out_file, "r").read()
                     artifact = Artifact("staticrt.c", content=codegen_src, fmt=ArtifactFormat.SOURCE)
                     workspace_size_artifact = Artifact(

{mlonmcu-0.4.1 → mlonmcu-0.5.dev0}/mlonmcu/flow/tvm/backend/wrapper.py

@@ -71,6 +71,7 @@ def generate_common_includes():
 #include "tvm/runtime/crt/error_codes.h"
 #include "tvm/runtime/c_runtime_api.h"
 #include "printing.h"
+#include "exit.h"
 """
 
 
@@ -215,7 +216,7 @@ TVMModuleHandle TVMArgs_AsModuleHandle(const TVMArgs* args, size_t index);
 
 void __attribute__((noreturn)) TVMPlatformAbort(tvm_crt_error_t code)
 {
-    exit(1);
+    mlonmcu_exit(1);
 }
 
 void TVMLogf(const char* msg, ...)
@@ -534,7 +535,7 @@ tvm_crt_error_t TVMPlatformMemoryFree(void* ptr, DLDevice dev)
     mainCode += """
 void __attribute__((noreturn)) TVMPlatformAbort(tvm_crt_error_t code)
 {
-    exit(1);
+    mlonmcu_exit(1);
 }
 
 TVM_DLL int TVMFuncRegisterGlobal(const char* name, TVMFunctionHandle f, int override)

{mlonmcu-0.4.1 → mlonmcu-0.5.dev0}/mlonmcu/models/frontend.py

@@ -452,7 +452,7 @@ class TfLiteFrontend(SimpleFrontend):
 
                 def get_num_layers(file):
                     tflite_pack_args = [path, "--count-layers", "--noop"]
-                    out = utils.exec_getout(self.pack_script, *tflite_pack_args)
+                    out = utils.execute(self.pack_script, *tflite_pack_args)
                     matches = re.compile(r"Found\s(\d+)\slayers.").findall(out)
                     assert len(matches) == 1
                     num = int(matches[0])
@@ -476,7 +476,7 @@ class TfLiteFrontend(SimpleFrontend):
                         out_name = f"layer{i}"
                         out_file = Path(dest) / out_name
                         tflite_pack_args = [path, "-k", str(i), "--out", out_file]
-                        utils.exec_getout(self.pack_script, *tflite_pack_args)
+                        utils.execute(self.pack_script, *tflite_pack_args)
                         assert out_file.is_file()
                         results.append(out_file)
                     return results
@@ -702,7 +702,7 @@ class PackedFrontend(Frontend):  # Inherit from TFLiteFrontend? -> how to do con
                 with open(in_file, "wb") as handle:
                     handle.write(tflite_data)
                 out_file = Path(tmpdirname) / "out.tflm"
-                utils.exec_getout(packer_exe, in_file, out_file)
+                utils.execute(packer_exe, in_file, out_file)
                 with open(out_file, "rb") as handle:
                     packed_data = handle.read()
 

{mlonmcu-0.4.1 → mlonmcu-0.5.dev0}/mlonmcu/platform/espidf/espidf.py

@@ -116,7 +116,7 @@ class EspIdfPlatform(CompilePlatform, TargetPlatform):
             # + f" > /dev/null && {self.idf_exe} "
             + " ".join([str(arg) for arg in args])
         )
-        out = utils.exec_getout(
+        out = utils.execute(
             cmd, shell=True, env=env, **kwargs, executable="/bin/bash"
         )  # TODO: using shell=True is insecure but right now we can not avoid it?
         return out

{mlonmcu-0.4.1 → mlonmcu-0.5.dev0}/mlonmcu/platform/mlif/mlif.py

@@ -79,10 +79,13 @@ class MlifPlatform(CompilePlatform, TargetPlatform):
         "lto": False,
         "slim_cpp": True,
         "garbage_collect": True,
-        "fuse_ld": None,
         "strip_strings": False,
         "unroll_loops": None,
         "goal": "generic_mlonmcu",  # Use 'generic_mlif' for older version of MLIF
+        # llvm specific (TODO: move to toolchain components)
+        "fuse_ld": None,
+        "global_isel": False,
+        "extend_attrs": False,
     }
 
     REQUIRED = {"mlif.src_dir"}
@@ -268,6 +271,16 @@ class MlifPlatform(CompilePlatform, TargetPlatform):
         value = self.config["fuse_ld"]
         return value
 
+    @property
+    def global_isel(self):
+        value = self.config["global_isel"]
+        return str2bool(value) if not isinstance(value, (bool, int)) else value
+
+    @property
+    def extend_attrs(self):
+        value = self.config["extend_attrs"]
+        return str2bool(value) if not isinstance(value, (bool, int)) else value
+
     @property
     def strip_strings(self):
         value = self.config["strip_strings"]
@@ -316,6 +329,10 @@ class MlifPlatform(CompilePlatform, TargetPlatform):
             definitions["MODEL_SUPPORT_DIR"] = self.model_support_dir
         if self.fuse_ld is not None:
             definitions["FUSE_LD"] = self.fuse_ld
+        if self.global_isel is not None:
+            definitions["GLOBAL_ISEL"] = self.global_isel
+        if self.extend_attrs is not None:
+            definitions["EXTEND_ATTRS"] = self.extend_attrs
         if self.strip_strings is not None:
             definitions["STRIP_STRINGS"] = self.strip_strings
         if self.unroll_loops is not None:

{mlonmcu-0.4.1 → mlonmcu-0.5.dev0}/mlonmcu/platform/tvm/tvm_target.py

@@ -150,7 +150,7 @@ def create_tvm_platform_target(name, platform, base=Target):
                 metrics = {"default": metrics}
                 for item in extracted:
                     metrics_ = Metrics()
-                    metrics_.add("Runtime [s]", float(item["Duration (us)"]) / 1e6)
+                    metrics_.add("Runtime [s]", float(item["Duration (us)"].replace(",", "")) / 1e6)
                     metrics[item["Name"]] = metrics_
 
             return metrics, out, []

{mlonmcu-0.4.1 → mlonmcu-0.5.dev0}/mlonmcu/platform/zephyr/zephyr.py

@@ -111,7 +111,7 @@ class ZephyrPlatform(CompilePlatform, TargetPlatform):
         env["ZEPHYR_BASE"] = str(self.zephyr_install_dir / "zephyr")
         env["ZEPHYR_SDK_INSTALL_DIR"] = str(self.zephyr_sdk_dir)
         cmd = ". " + str(self.zephyr_venv_dir / "bin" / "activate") + " && west " + " ".join([str(arg) for arg in args])
-        out = utils.exec_getout(
+        out = utils.execute(
             cmd, shell=True, env=env, **kwargs, executable="/bin/bash"
         )  # TODO: using shell=True is insecure but right now we can not avoid it?
         return out

{mlonmcu-0.4.1 → mlonmcu-0.5.dev0}/mlonmcu/session/postprocess/postprocesses.py

@@ -648,7 +648,7 @@ class AnalyseInstructionsPostprocess(RunPostprocess):
             return dict(counts.head(top)), dict(probs.head(top))
 
         def _gen_csv(label, counts, probs):
-            lines = [f"{label},Count,Probablity"]
+            lines = [f"{label},Count,Probability"]
             for x in counts:
                 line = f"{x},{counts[x]},{probs[x]:.3f}"
                 lines.append(line)
@@ -1027,7 +1027,7 @@ class CompareRowsPostprocess(SessionPostprocess):
         post_df = report.post_df
         group_by = self.group_by
         if group_by is None:
-            group_by = [x for x in pre_df.columns if x != "Run"]
+            group_by = [x for x in pre_df.columns if x not in ["Run", "Sub"]]
         assert isinstance(group_by, list)
         assert all(col in list(pre_df.columns) + list(post_df.columns) for col in group_by), "Cols mssing in df"
         to_compare = self.to_compare

{mlonmcu-0.4.1 → mlonmcu-0.5.dev0}/mlonmcu/session/run.py

@@ -356,6 +356,7 @@ class Run:
     def add_model(self, model):
         """Setter for the model instance."""
         self.model = model
+        assert model is not None
         self.model.config = filter_config(self.config, self.model.name, self.model.DEFAULTS, set(), set())
         for platform in self.platforms:
             self.model.add_platform_config(platform, platform.config)
@@ -885,10 +886,15 @@ class Run:
                 model_artifact = model_artifact[0]
                 if not model_artifact.exported:
                     model_artifact.export(self.dir)
-                input_shapes = self.model.input_shapes
-                output_shapes = self.model.output_shapes
-                input_types = self.model.input_types
-                output_types = self.model.output_types
+                input_shapes = None
+                output_shapes = None
+                input_types = None
+                output_types = None
+                if model_artifact.name.split(".", 1)[0] == self.model.name:
+                    input_shapes = self.model.input_shapes
+                    output_shapes = self.model.output_shapes
+                    input_types = self.model.input_types
+                    output_types = self.model.output_types
                 self.backend.load_model(
                     model=model_artifact.path,
                     input_shapes=input_shapes,
@@ -910,10 +916,15 @@ class Run:
                 model_artifact = model_artifact[0]
                 if not model_artifact.exported:
                     model_artifact.export(self.dir)
-                input_shapes = self.model.input_shapes
-                output_shapes = self.model.output_shapes
-                input_types = self.model.input_types
-                output_types = self.model.output_types
+                input_shapes = None
+                output_shapes = None
+                input_types = None
+                output_types = None
+                if model_artifact.name.split(".", 1)[0] == self.model.name:
+                    input_shapes = self.model.input_shapes
+                    output_shapes = self.model.output_shapes
+                    input_types = self.model.input_types
+                    output_types = self.model.output_types
                 self.backend.load_model(
                     model=model_artifact.path,
                     input_shapes=input_shapes,

{mlonmcu-0.4.1 → mlonmcu-0.5.dev0}/mlonmcu/setup/gen_requirements.py

@@ -73,6 +73,7 @@ REQUIREMENTS_BY_PIECE: RequirementsByPieceType = [
                 "numpy",
                 "openpyxl",  # xlsx reports
                 "pandas",
+                "paramiko",  # ssh
                 "pyelftools",
                 "pyyaml",
                 "tqdm",
@@ -245,7 +246,7 @@ CONSTRAINTS = [
     ("reedsolo", ">=1.5.3,<=1.5.4"),
     ("scipy", None),
     ("synr", None),
-    ("tensorflow", ">=2.11.1"),
+    ("tensorflow", "~=2.13.0"),
     ("tflite", ">=2.4.0"),
     ("tornado", None),
     ("typing_extensions", None),

{mlonmcu-0.4.1 → mlonmcu-0.5.dev0}/mlonmcu/setup/tasks/ara.py

@@ -61,6 +61,6 @@ def clone_ara(context: MlonMcuContext, params=None, rebuild=False, verbose=False
         if rebuild or not utils.is_populated(araSrcDir):
             araRepo = context.environment.repos["ara"]
             utils.clone_wrapper(araRepo, araSrcDir, refresh=rebuild)
-            utils.exec_getout("make", "apply-patches", cwd=araSrcDir / "hardware")
-            utils.exec_getout("make", "bender", cwd=araSrcDir / "hardware")
+            utils.execute("make", "apply-patches", cwd=araSrcDir / "hardware")
+            utils.execute("make", "bender", cwd=araSrcDir / "hardware")
     context.cache["ara.src_dir", flags] = araSrcDir

{mlonmcu-0.4.1 → mlonmcu-0.5.dev0}/mlonmcu/setup/tasks/corstone300.py

@@ -58,7 +58,7 @@ def install_corstone300(
             fvpArchive = fvpFileName + ".tgz"
             utils.download_and_extract(fvpUrl, fvpArchive, fvpInstallDir, progress=verbose)
             fvpScript = fvpInstallDir / "FVP_Corstone_SSE-300.sh"
-            utils.exec_getout(
+            utils.execute(
                 fvpScript,
                 "--i-agree-to-the-contained-eula",
                 "--no-interactive",

{mlonmcu-0.4.1 → mlonmcu-0.5.dev0}/mlonmcu/setup/tasks/pulp.py

@@ -80,7 +80,7 @@ def install_pulp_gcc(
                     pulpGccArgs.append("--with-arch=rv32imc")
                     pulpGccArgs.append("--with-cmodel=medlow")
                     pulpGccArgs.append("--enable-multilib")
-                    utils.exec_getout(
+                    utils.execute(
                         str(pulpGccSrcDir / "configure"),
                         *pulpGccArgs,
                         cwd=pulpGccBuildDir,

{mlonmcu-0.4.1 → mlonmcu-0.5.dev0}/mlonmcu/setup/tasks/riscv_gcc.py

@@ -36,7 +36,7 @@ Tasks = get_task_factory()
 
 def check_multilibs(riscvInstallDir, gccName, live=False, vext=False, pext=False):
     gccExe = Path(riscvInstallDir) / "bin" / f"{gccName}-gcc"
-    out = utils.exec_getout(gccExe, "--print-multi-lib", live=live)
+    out = utils.execute(gccExe, "--print-multi-lib", live=live)
     multilibs = []
     if vext and pext:
         default_multilib = "rv32gcpv/ilp32d" if "32" in gccName else "rv64gcpv/lp64d"  # TODO: improve this
@@ -175,6 +175,14 @@ def install_riscv_gcc(
         # rebuild should only be triggered if the version/url changes but we can not detect that at the moment
         if not utils.is_populated(riscvInstallDir):
             utils.download_and_extract(riscvUrl, riscvArchive, riscvInstallDir, progress=verbose)
+        # workaround for gnu subdir ins tc downloads
+        gnu_dir = riscvInstallDir / "gnu"
+        if gnu_dir.is_dir():
+            import shutil
+
+            shutil.move(riscvInstallDir, riscvInstallDir.parent / f"{riscvInstallDir.name}.old")
+            shutil.move(riscvInstallDir.parent / f"{riscvInstallDir.name}.old" / "gnu", riscvInstallDir)
+
         multilib = user_vars.get("riscv_gcc.multilib", None)
         default_multilib = user_vars.get("riscv_gcc.default_multilib", None)
         multilibs = user_vars.get("riscv_gcc.multilibs", None)
@@ -182,7 +190,7 @@ def install_riscv_gcc(
     if "riscv_gcc.name" in user_vars:
         gccName = user_vars["riscv_gcc.name"]
     else:
-        gccNames = ["riscv64-unknown-elf", "riscv32-unknown-elf"]
+        gccNames = ["riscv64-unknown-elf", "riscv32-unknown-elf", "riscv64-unknown-linux-musl"]
         gccName = None
         for name in gccNames:
             if (Path(riscvInstallDir) / name).is_dir():

{mlonmcu-0.4.1 → mlonmcu-0.5.dev0}/mlonmcu/setup/tasks/spike.py

@@ -133,7 +133,7 @@ def build_spike_pk(
         spikepkArgs.append("--host=" + gccName)
         env = os.environ.copy()
         env["PATH"] = str(Path(riscv_gcc) / "bin") + ":" + env["PATH"]
-        utils.exec_getout(
+        utils.execute(
             str(spikepkSrcDir / "configure"),
             *spikepkArgs,
             cwd=spikepkBuildDir,
@@ -199,7 +199,7 @@ def build_spike(
         # spikeArgs.append("--prefix=" + str(context.cache["riscv_gcc.install_dir"]))
         spikeArgs.append("--prefix=" + str(spikeInstallDir))
         spikeArgs.append("--enable-misaligned")
-        utils.exec_getout(
+        utils.execute(
             str(Path(spikeSrcDir) / "configure"),
             *spikeArgs,
             cwd=spikeBuildDir,

{mlonmcu-0.4.1 → mlonmcu-0.5.dev0}/mlonmcu/setup/tasks/tf.py

@@ -133,5 +133,5 @@ def install_tflite_pack(
     installDir = context.environment.paths["deps"].path / "install" / name
     if rebuild or not utils.is_populated(installDir):
         installScript = srcDir / "install.sh"
-        utils.exec_getout(installScript, installDir, live=verbose)
+        utils.execute(installScript, installDir, live=verbose)
     context.cache["tflite_pack.exe"] = installDir / "run.sh"

{mlonmcu-0.4.1 → mlonmcu-0.5.dev0}/mlonmcu/setup/tasks/verilator.py

@@ -93,14 +93,14 @@ def build_verilator(
         if rebuild or not utils.is_populated(verilatorBuildDir):
             env = os.environ.copy()
             env["VERILATOR_ROOT"] = ""
-            utils.exec_getout(
+            utils.execute(
                 "autoconf",
                 env=env,
                 cwd=verilatorSrcDir,
                 live=verbose,
             )
             env = os.environ.copy()
-            utils.exec_getout(
+            utils.execute(
                 str(verilatorSrcDir / "configure"),
                 f"--prefix={verilatorInstallDir}",
                 env=env,
@@ -136,7 +136,7 @@ def install_verilator(
     else:
         if rebuild or not utils.is_populated(verilatorInstallDir):
             env = os.environ.copy()
-            utils.exec_getout(
+            utils.execute(
                 "make",
                 "install",
                 env=env,