Arm backend: Rebase aot_arm_compiler

Signed-off-by: Martin Lindström <Martin.Lindstroem@arm.com>
Change-Id: I2a7f00efc9c7648c2944840bcf7427a5d801591b

Author: martinlsm

backends/arm/scripts/aot_arm_compiler.py

@@ -1093,12 +1093,6 @@ def main() -> None:  # noqa: C901
             os.makedirs(args.output, exist_ok=True)
             output_file_name = os.path.join(args.output, output_file_name)
 
-    if args.bundleio or args.etrecord:
-        etrecord_file_name = os.path.splitext(output_file_name)[0] + "_etrecord.bin"
-        # Generate ETRecord
-        generate_etrecord(etrecord_file_name, edge_program_manager_copy, exec_prog)
-        print(f"ETRecord saved as {etrecord_file_name}")
-
     if args.bundleio:
         # Realize the quantization impact on numerics when generating reference output
         reference_model = original_model if not model_quant else model_quant
@@ -1110,6 +1104,19 @@ def main() -> None:  # noqa: C901
         save_pte_program(exec_prog, output_file_name)
         print(f"PTE file saved as {output_file_name}")
 
+    if args.bundleio or args.etrecord:
+        etrecord_file_name = os.path.splitext(output_file_name)[0] + "_etrecord.bin"
+        try:
+            generate_etrecord(etrecord_file_name, edge_program_manager_copy, exec_prog)
+            print(f"ETRecord saved as {etrecord_file_name}")
+        except Exception as e:
+            # Treat ETRecord failures as non-fatal only when generated as a side-effect
+            # of --bundleio. When --etrecord is explicitly requested, fail loudly.
+            if args.bundleio and not args.etrecord:
+                logging.warning(f"ETRecord generation failed (non-fatal): {e}")
+            else:
+                raise
+
 
 if __name__ == "__main__":
     main()