Merge pull request #3307 from siliconcompiler/hist-reports

histogram report in metrics

Author: gadfort

siliconcompiler/report/dashboard/components/__init__.py

@@ -433,7 +433,7 @@ def node_file_tree_viewer(chip, step, index):
     lookup = {}
     tree_items = []
 
-    file_metrics = report.get_metrics_source(chip, step, index)
+    metrics_source, file_metrics = report.get_metrics_source(chip, step, index)
     work_dir = chip.getworkdir(step=step, index=index)
 
     def make_item(file):
@@ -446,12 +446,22 @@ def make_item(file):
 
         check_file = os.path.relpath(file['value'], work_dir)
         if check_file in file_metrics:
-            for metric in file_metrics[check_file]:
-                if len(item.tag) < 5:
-                    item.tag.append(sac.Tag(metric, color='green'))
-                else:
-                    item.tag.append(sac.Tag('metrics...', color='geekblue'))
+            metrics = set(file_metrics[check_file])
+            primary_source = set()
+            if check_file in metrics_source:
+                primary_source = set(metrics_source[check_file])
+            metrics = metrics - primary_source
+
+            for color, metric_set in (('blue', primary_source), ('green', metrics)):
+                if len(item.tag) >= 5:
                     break
+
+                for metric in metric_set:
+                    if len(item.tag) < 5:
+                        item.tag.append(sac.Tag(metric, color=color))
+                    else:
+                        item.tag.append(sac.Tag('metrics...', color='geekblue'))
+                        break
             item.tooltip = "metrics: " + ", ".join(file_metrics[check_file])
 
         if 'children' in file:

siliconcompiler/report/report.py

@@ -302,20 +302,20 @@ def get_metrics_source(chip, step, index):
         index (string) : Index of node.
     '''
     file_to_metric = {}
+    metric_primary_source = {}
     tool, task = get_tool_task(chip, step, index)
     if not chip.valid('tool', tool, 'task', task, 'report'):
-        return file_to_metric
+        return metric_primary_source, file_to_metric
 
     metrics = chip.getkeys('tool', tool, 'task', task, 'report')
 
     for metric in metrics:
         sources = chip.get('tool', tool, 'task', task, 'report', metric, step=step, index=index)
+        if sources:
+            metric_primary_source.setdefault(sources[0], []).append(metric)
         for source in sources:
-            if source in file_to_metric:
-                file_to_metric[source].append(metric)
-            else:
-                file_to_metric[source] = [metric]
-    return file_to_metric
+            file_to_metric.setdefault(source, []).append(metric)
+    return metric_primary_source, file_to_metric
 
 
 def get_files(chip, step, index):

siliconcompiler/tools/openroad/_apr.py

@@ -84,12 +84,14 @@ def extract_metrics(chip):
     metric_reports = {
         "setuptns": [
             "timing/total_negative_slack.rpt",
-            "timing/setup.rpt"
+            "timing/setup.rpt",
+            "timing/setup.histogram.rpt"
         ],
         "setupslack": [
             "timing/worst_slack.setup.rpt",
             "timing/setup.rpt",
-            "timing/setup.topN.rpt"
+            "timing/setup.topN.rpt",
+            "timing/setup.histogram.rpt"
         ],
         "setupskew": [
             "timing/skew.setup.rpt",
@@ -99,12 +101,14 @@ def extract_metrics(chip):
         ],
         "setuppaths": [
             "timing/setup.rpt",
-            "timing/setup.topN.rpt"
+            "timing/setup.topN.rpt",
+            "timing/setup.histogram.rpt"
         ],
         "holdslack": [
             "timing/worst_slack.hold.rpt",
             "timing/hold.rpt",
-            "timing/hold.topN.rpt"
+            "timing/hold.topN.rpt",
+            "timing/hold.histogram.rpt"
         ],
         "holdskew": [
             "timing/skew.hold.rpt",
@@ -114,7 +118,8 @@ def extract_metrics(chip):
         ],
         "holdpaths": [
             "timing/hold.rpt",
-            "timing/hold.topN.rpt"
+            "timing/hold.topN.rpt",
+            "timing/hold.histogram.rpt"
         ],
         "unconstrained": [
             "timing/unconstrained.rpt",

tests/core/test_reports.py

@@ -312,11 +312,13 @@ def test_get_metrics_source():
     chip = Chip(design='')
     chip.use(freepdk45_demo)
     chip.set('tool', 'openroad', 'task', 'pin_placement', 'report',
-             'metric', 'this file', step='floorplan.pin_placement', index='0')
+             'metric', ['this file', 'that file'],
+             step='floorplan.pin_placement', index='0')
 
-    test = report.get_metrics_source(chip, 'floorplan.pin_placement', '0')
+    primary, sources = report.get_metrics_source(chip, 'floorplan.pin_placement', '0')
 
-    assert test == {'this file': ['metric']}
+    assert primary == {'this file': ['metric']}
+    assert sources == {'this file': ['metric'], 'that file': ['metric']}
 
 
 def add_file_to_reports(filepath, chip):