Arm backend: Make compile_spec serialization helpers private

Rename `from_list()` and `to_list()` to `_from_list()` and `_to_list()`
so they remain internal backend plumbing instead of public API.

Change-Id: I87047e3b3c90b7836bf8bc9d0d8fbcf092c6f1c0
Signed-off-by: Sebastian Larsson <sebastian.larsson@arm.com>

Author: Sebastian-Larsson

backends/arm/common/arm_compile_spec.py

@@ -58,7 +58,7 @@ def _set_compile_specs(
         self._pipeline_config = pipeline_config
 
     @classmethod
-    def from_list(cls, compile_specs: list[CompileSpec]):  # noqa: C901
+    def _from_list(cls, compile_specs: list[CompileSpec]):  # noqa: C901
         tosa_spec: TosaSpecification | None = None
         output_format: str | None = None
         compiler_flags: list[str] | None = None
@@ -147,10 +147,10 @@ def _from_list_hook(cls, compile_spec, specs: dict[str, str]):  # noqa: B027
     def _validate(self):
         """Throws an error if the compile spec is not valid."""
 
-    def to_list(self):
+    def _to_list(self):
         """Get the ArmCompileSpec in list form."""
         if not self.tosa_spec:
-            raise ValueError("tosa_spec must be set before calling to_list()")
+            raise ValueError("tosa_spec must be set before calling _to_list()")
 
         # Always supply a TOSA version
         compile_spec = [

backends/arm/ethosu/backend.py

@@ -96,7 +96,7 @@ def preprocess(
         """
         logger.info(f"{EthosUBackend.__name__} preprocess")
 
-        compile_spec = EthosUCompileSpec.from_list(compile_specs)
+        compile_spec = EthosUCompileSpec._from_list(compile_specs)
         # deduce TOSA compile_spec from Ethos-U compile spec. We get a new
         # compile spec list, containing only elements relevant for the
         # TOSABackend.

backends/arm/ethosu/compile_spec.py

@@ -121,9 +121,9 @@ def __init__(
         self._set_compile_specs(tosa_spec, compiler_flags)
         self._validate()
 
-    def to_list(self):
+    def _to_list(self):
         """Return compile specs including the encoded Ethos-U target."""
-        compile_specs = super().to_list()
+        compile_specs = super()._to_list()
         compile_specs.append(CompileSpec(self._TARGET_KEY, self.target.encode()))
         return compile_specs
 

backends/arm/ethosu/partitioner.py

@@ -29,7 +29,7 @@ def __init__(
     ) -> None:
         # Override the delegation spec for Ethos-U
         self.delegation_spec = DelegationSpec(
-            EthosUBackend.__name__, compile_spec.to_list()
+            EthosUBackend.__name__, compile_spec._to_list()
         )
         self.additional_checks = additional_checks
         self.tosa_spec = compile_spec.tosa_spec

backends/arm/test/misc/test_compile_spec.py

@@ -16,17 +16,17 @@ def test_compile_spec_u55_INT():
         .dump_intermediate_artifacts_to("my_path")
         .dump_debug_info(EthosUCompileSpec.DebugMode.TOSA)
     )
-    spec_list = compile_spec.to_list()
+    spec_list = compile_spec._to_list()
 
-    assert EthosUCompileSpec.from_list(spec_list) == compile_spec
+    assert EthosUCompileSpec._from_list(spec_list) == compile_spec
     assert "--my-flag" in compile_spec.compiler_flags
     assert "--output-format=raw" in compile_spec.compiler_flags
     with raises(ValueError, match="Incorrect output format"):
-        VgfCompileSpec.from_list(spec_list)
+        VgfCompileSpec._from_list(spec_list)
 
     spec_list.pop(0)
     with raises(ValueError, match="No tosa_spec in compile spec."):
-        EthosUCompileSpec.from_list(spec_list)
+        EthosUCompileSpec._from_list(spec_list)
 
 
 def test_ethos_u55_defaults_to_stable_softmax_u55_INT():
@@ -53,18 +53,18 @@ def test_compile_spec_vgf_no_quant():
         compiler_flags=["--my-flag2"]
     ).dump_intermediate_artifacts_to("my_path")
 
-    spec_list = compile_spec.to_list()
+    spec_list = compile_spec._to_list()
 
-    assert VgfCompileSpec.from_list(spec_list) == compile_spec
-    assert VgfCompileSpec.from_list(spec_list) != compile_spec2
+    assert VgfCompileSpec._from_list(spec_list) == compile_spec
+    assert VgfCompileSpec._from_list(spec_list) != compile_spec2
     with raises(ValueError, match="Incorrect output format"):
-        EthosUCompileSpec.from_list(spec_list)
+        EthosUCompileSpec._from_list(spec_list)
 
 
 def test_compile_spec_tosa_INT():
     compile_spec = TosaCompileSpec("TOSA-1.0+INT")
-    spec_list = compile_spec.to_list()
+    spec_list = compile_spec._to_list()
 
-    assert TosaCompileSpec.from_list(spec_list) == compile_spec
+    assert TosaCompileSpec._from_list(spec_list) == compile_spec
     with raises(ValueError, match="Incorrect output format"):
-        VgfCompileSpec.from_list(spec_list)
+        VgfCompileSpec._from_list(spec_list)

backends/arm/test/runner_utils.py

@@ -221,7 +221,7 @@ def __init__(self):
 
     def _tosa_dispatch(self, lowered_backend_module: LoweredBackendModule, inputs):
         tosa_buffer = lowered_backend_module.processed_bytes
-        compile_spec = TosaCompileSpec.from_list(lowered_backend_module.compile_specs)
+        compile_spec = TosaCompileSpec._from_list(lowered_backend_module.compile_specs)
 
         output_node = lowered_backend_module.original_module.graph.output_node()
         return run_tosa_graph(tosa_buffer, compile_spec.tosa_spec, inputs, output_node)

backends/arm/tosa/backend.py

@@ -170,7 +170,7 @@ def preprocess(edge_program: ExportedProgram, compile_specs: List[CompileSpec]):
 
         """
         return TOSABackend._preprocess(
-            edge_program, TosaCompileSpec.from_list(compile_specs)
+            edge_program, TosaCompileSpec._from_list(compile_specs)
         )
 
     @staticmethod

backends/arm/tosa/partitioner.py

@@ -145,7 +145,7 @@ def __init__(
 
         """
         self.delegation_spec = DelegationSpec(
-            TOSABackend.__name__, compile_spec.to_list()
+            TOSABackend.__name__, compile_spec._to_list()
         )
         self.tosa_spec = compile_spec.tosa_spec
         self.additional_checks = additional_checks

backends/arm/util/_factory.py

@@ -26,11 +26,11 @@ def parse_compile_spec(compile_specs: list[CompileSpec]) -> ArmCompileSpec:
     else:
         raise ValueError("Compile spec without output format.")
     if output_format == TosaCompileSpec._get_output_format():
-        return TosaCompileSpec.from_list(compile_specs)
+        return TosaCompileSpec._from_list(compile_specs)
     if output_format == EthosUCompileSpec._get_output_format():
-        return EthosUCompileSpec.from_list(compile_specs)
+        return EthosUCompileSpec._from_list(compile_specs)
     if output_format == VgfCompileSpec._get_output_format():
-        return VgfCompileSpec.from_list(compile_specs)
+        return VgfCompileSpec._from_list(compile_specs)
     raise ValueError(f"Unknown output format {output_format}")
 
 

backends/arm/vgf/backend.py

@@ -95,7 +95,7 @@ def preprocess(
         """
         logger.info(f"{VgfBackend.__name__} preprocess")
 
-        compile_spec = VgfCompileSpec.from_list(compile_specs)
+        compile_spec = VgfCompileSpec._from_list(compile_specs)
         # deduce TOSA compile_spec from VGF compile spec. We get a new
         # compile spec list, containing only elements relevant for the
         # TOSABackend.