make: metadata-generate now explicitly passes results, logs and reports folder

ORFS does not mandate a layout that genMetrics.py assumed,
simply pass in folders to genMetrics.py to fix problem
and have a single source of truth(RESULT/REPORTS/LOGS_DIR)
in ORFS.

Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>

Author: oharboe

flow/util/genMetrics.py

@@ -51,6 +51,17 @@ def parse_args():
         "--output", "-o", required=False, default="metadata.json", help="Output file"
     )
     parser.add_argument("--hier", "-x", action="store_true", help="Hierarchical JSON")
+    parser.add_argument("--logs", help="Path to logs", default=None)
+    parser.add_argument(
+        "--reports",
+        help="Path to reports",
+        default=None,
+    )
+    parser.add_argument(
+        "--results",
+        help="Path to results",
+        default=None,
+    )
     args = parser.parse_args()
 
     return args
@@ -190,13 +201,11 @@ def merge_jsons(root_path, output, files):
         file.close()
 
 
-def extract_metrics(cwd, platform, design, flow_variant, output, hier_json):
+def extract_metrics(
+    cwd, platform, design, flow_variant, output, hier_json, logPath, rptPath, resultPath
+):
     baseRegEx = "^{}\n^-*\n^{}"
 
-    logPath = os.path.join(cwd, "logs", platform, design, flow_variant)
-    rptPath = os.path.join(cwd, "reports", platform, design, flow_variant)
-    resultPath = os.path.join(cwd, "results", platform, design, flow_variant)
-
     metrics_dict = defaultdict(dict)
     metrics_dict["run__flow__generate_date"] = now.strftime("%Y-%m-%d %H:%M")
     metrics_dict["run__flow__metrics_version"] = "Metrics_2.1.2"
@@ -404,7 +413,20 @@ def extract_metrics(cwd, platform, design, flow_variant, output, hier_json):
                     continue
                 print(f"Extract Metrics for {plt}, {des}, {variant}")
                 file = "/".join(["reports", plt, des, variant, "metrics.json"])
-                metrics, df = extract_metrics(cwd, plt, des, variant, file, args.hier)
+                logPath = os.path.join(cwd, "logs", plt, des, variant)
+                rptPath = os.path.join(cwd, "reports", plt, des, variant)
+                resultPath = os.path.join(cwd, "results", plt, des, variant)
+                metrics, df = extract_metrics(
+                    cwd,
+                    plt,
+                    des,
+                    variant,
+                    file,
+                    args.hier,
+                    logPath,
+                    rptPath,
+                    resultPath,
+                )
                 all_d.append(metrics)
                 if all_df.shape[0] == 0:
                     all_df = df
@@ -424,4 +446,7 @@ def extract_metrics(cwd, platform, design, flow_variant, output, hier_json):
         args.flowVariant,
         args.output,
         args.hier,
+        args.logs,
+        args.reports,
+        args.results,
     )

flow/util/utils.mk

@@ -7,9 +7,12 @@ metadata: finish metadata-generate metadata-check
 metadata-generate:
 	@mkdir -p $(REPORTS_DIR)
 	@echo $(DESIGN_DIR) > $(REPORTS_DIR)/design-dir.txt
-	@$(UTILS_DIR)/genMetrics.py -d $(DESIGN_NICKNAME) \
+	$(UTILS_DIR)/genMetrics.py -d $(DESIGN_NICKNAME) \
 	    -p $(PLATFORM) \
 	    -v $(FLOW_VARIANT) \
+	    --logs $(LOG_DIR) \
+	    --reports $(REPORTS_DIR) \
+	    --results $(RESULTS_DIR) \
 	    -o $(REPORTS_DIR)/metadata.json 2>&1 \
 	    | tee $(abspath $(REPORTS_DIR)/metadata-generate.log)
 
@@ -74,6 +77,9 @@ update_metadata_autotuner:
 	@$(UTILS_DIR)/genMetrics.py -d $(DESIGN_NICKNAME) \
 	    -p $(PLATFORM) \
 	    -v $(FLOW_VARIANT) \
+	    --logs $(LOG_DIR) \
+	    --reports $(REPORTS_DIR) \
+	    --results $(RESULTS_DIR) \
 	    -o $(DESIGN_DIR)/metadata-$(FLOW_VARIANT)-at.json -x
 
 #-------------------------------------------------------------------------------