Skip to content

Commit e22e4fc

Browse files
authored
Merge pull request #3103 from Pinata-Consulting/genmetrics-explicitly-pass-logs-reports-results-dir
make: metadata-generate now explicitly passes results, logs and reports folder
2 parents a8a56ba + dabaedf commit e22e4fc

File tree

2 files changed

+38
-7
lines changed

2 files changed

+38
-7
lines changed

flow/util/genMetrics.py

Lines changed: 31 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,17 @@ def parse_args():
5151
"--output", "-o", required=False, default="metadata.json", help="Output file"
5252
)
5353
parser.add_argument("--hier", "-x", action="store_true", help="Hierarchical JSON")
54+
parser.add_argument("--logs", help="Path to logs", default=None)
55+
parser.add_argument(
56+
"--reports",
57+
help="Path to reports",
58+
default=None,
59+
)
60+
parser.add_argument(
61+
"--results",
62+
help="Path to results",
63+
default=None,
64+
)
5465
args = parser.parse_args()
5566

5667
return args
@@ -190,13 +201,11 @@ def merge_jsons(root_path, output, files):
190201
file.close()
191202

192203

193-
def extract_metrics(cwd, platform, design, flow_variant, output, hier_json):
204+
def extract_metrics(
205+
cwd, platform, design, flow_variant, output, hier_json, logPath, rptPath, resultPath
206+
):
194207
baseRegEx = "^{}\n^-*\n^{}"
195208

196-
logPath = os.path.join(cwd, "logs", platform, design, flow_variant)
197-
rptPath = os.path.join(cwd, "reports", platform, design, flow_variant)
198-
resultPath = os.path.join(cwd, "results", platform, design, flow_variant)
199-
200209
metrics_dict = defaultdict(dict)
201210
metrics_dict["run__flow__generate_date"] = now.strftime("%Y-%m-%d %H:%M")
202211
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):
404413
continue
405414
print(f"Extract Metrics for {plt}, {des}, {variant}")
406415
file = "/".join(["reports", plt, des, variant, "metrics.json"])
407-
metrics, df = extract_metrics(cwd, plt, des, variant, file, args.hier)
416+
logPath = os.path.join(cwd, "logs", plt, des, variant)
417+
rptPath = os.path.join(cwd, "reports", plt, des, variant)
418+
resultPath = os.path.join(cwd, "results", plt, des, variant)
419+
metrics, df = extract_metrics(
420+
cwd,
421+
plt,
422+
des,
423+
variant,
424+
file,
425+
args.hier,
426+
logPath,
427+
rptPath,
428+
resultPath,
429+
)
408430
all_d.append(metrics)
409431
if all_df.shape[0] == 0:
410432
all_df = df
@@ -424,4 +446,7 @@ def extract_metrics(cwd, platform, design, flow_variant, output, hier_json):
424446
args.flowVariant,
425447
args.output,
426448
args.hier,
449+
args.logs,
450+
args.reports,
451+
args.results,
427452
)

flow/util/utils.mk

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,12 @@ metadata: finish metadata-generate metadata-check
77
metadata-generate:
88
@mkdir -p $(REPORTS_DIR)
99
@echo $(DESIGN_DIR) > $(REPORTS_DIR)/design-dir.txt
10-
@$(UTILS_DIR)/genMetrics.py -d $(DESIGN_NICKNAME) \
10+
$(UTILS_DIR)/genMetrics.py -d $(DESIGN_NICKNAME) \
1111
-p $(PLATFORM) \
1212
-v $(FLOW_VARIANT) \
13+
--logs $(LOG_DIR) \
14+
--reports $(REPORTS_DIR) \
15+
--results $(RESULTS_DIR) \
1316
-o $(REPORTS_DIR)/metadata.json 2>&1 \
1417
| tee $(abspath $(REPORTS_DIR)/metadata-generate.log)
1518

@@ -74,6 +77,9 @@ update_metadata_autotuner:
7477
@$(UTILS_DIR)/genMetrics.py -d $(DESIGN_NICKNAME) \
7578
-p $(PLATFORM) \
7679
-v $(FLOW_VARIANT) \
80+
--logs $(LOG_DIR) \
81+
--reports $(REPORTS_DIR) \
82+
--results $(RESULTS_DIR) \
7783
-o $(DESIGN_DIR)/metadata-$(FLOW_VARIANT)-at.json -x
7884

7985
#-------------------------------------------------------------------------------

0 commit comments

Comments
 (0)