Output resource usage from model

Author: tanner-andrulis

accelforge/mapper/FFM/_make_pmappings/make_pmappings_from_templates/run_model.py

@@ -72,6 +72,8 @@ def run_model(
             usage = used_fanout.get(s.name, 1) / s.fanout
             scaled_usage = usage * s.usage_scale
             usage_df[f"usage<SEP>spatial<SEP>{node.name}<SEP>{s.name}"] = scaled_usage
+            if metrics & Metrics.ACTIONS:
+                df[f"usage<SEP>spatial<SEP>{node.name}<SEP>{s.name}"] = scaled_usage
             non_power_gated_instances *= usage
         component_to_non_power_gated_porp[node.name] = non_power_gated_instances
 
@@ -156,11 +158,15 @@ def run_model(
     per_memory_usage_df = {}
     for memory, occupancies in total_occupancy.items():
         ignored = job.ignored_resources is not None and memory in job.ignored_resources
-        if not ignored or metrics & Metrics.ACTIONS:
-            key = f"usage<SEP>memory<SEP>{memory}"
+        key = f"usage<SEP>memory<SEP>{memory}"
+        if not ignored:
             per_memory_usage_df[key] = (
                 sum(occupancies.values()) / memory_to_size[memory]
             )
+        if metrics & Metrics.ACTIONS:
+            df[key] = (
+                sum(occupancies.values()) / memory_to_size[memory]
+            )
 
     return (
         reuse.symbols,

accelforge/model/main.py

@@ -188,6 +188,9 @@ def evaluate_mapping(
         for key, value in df.items():
             if not col_used_in_joining(key):
                 key = f"{job.einsum_name}<SEP>{key}"
+            # Want usage both for joining & for per-einsum info
+            if key.startswith("usage<SEP>"):
+                new_df[f"{job.einsum_name}<SEP>{key}"] = value
             new_df[key] = value
         df = new_df
         df[f"{job.einsum_name}<SEP>mapping"] = pmapping_id