Revert "[lint] Rename tool warnings to flow warnings and reduce their severity"
This reverts commit 56a7558970bf5685f860e6d133cd35325c4e747e.
Signed-off-by: Michael Schaffner <msf@opentitan.org>
diff --git a/hw/lint/tools/ascentlint/parse-lint-report.py b/hw/lint/tools/ascentlint/parse-lint-report.py
index 1c0080e..b05884c 100755
--- a/hw/lint/tools/ascentlint/parse-lint-report.py
+++ b/hw/lint/tools/ascentlint/parse-lint-report.py
@@ -111,14 +111,13 @@
for_json=True,
use_decimal=True)
- # Pass/fail status is determined in the LintCfg class.
- log.info(("Found %d flow warnings, %d flow errors, %d lint infos,\n"
- "%d lint warnings and %d lint errors."),
- len(results["warnings"]),
- len(results["errors"]),
- len(results["lint_infos"]),
- len(results["lint_warnings"]),
- len(results["lint_errors"]))
+ # return nonzero status if any warnings or errors are present
+ # lint infos do not count as failures
+ n_errors = len(results["errors"]) + len(results["lint_errors"])
+ n_warnings = len(results["warnings"]) + len(results["lint_warnings"])
+ if n_errors > 0 or n_warnings > 0:
+ log.info("Found %d lint errors and %d lint warnings", n_errors, n_warnings)
+ sys.exit(1)
log.info("Lint logfile parsed succesfully")
sys.exit(0)
diff --git a/hw/lint/tools/veriblelint/parse-lint-report.py b/hw/lint/tools/veriblelint/parse-lint-report.py
index fc9809b..b8fd393 100755
--- a/hw/lint/tools/veriblelint/parse-lint-report.py
+++ b/hw/lint/tools/veriblelint/parse-lint-report.py
@@ -113,14 +113,13 @@
for_json=True,
use_decimal=True)
- # Pass/fail status is determined in the LintCfg class.
- log.info(("Found %d flow warnings, %d flow errors, %d lint infos,\n"
- "%d lint warnings and %d lint errors."),
- len(results["warnings"]),
- len(results["errors"]),
- len(results["lint_infos"]),
- len(results["lint_warnings"]),
- len(results["lint_errors"]))
+ # return nonzero status if any warnings or errors are present
+ # lint infos do not count as failures
+ n_errors = len(results["errors"]) + len(results["lint_errors"])
+ n_warnings = len(results["warnings"]) + len(results["lint_warnings"])
+ if n_errors > 0 or n_warnings > 0:
+ log.info("Found %d lint errors and %d lint warnings", n_errors, n_warnings)
+ sys.exit(1)
log.info("Lint logfile parsed succesfully")
sys.exit(0)
diff --git a/hw/lint/tools/verilator/parse-lint-report.py b/hw/lint/tools/verilator/parse-lint-report.py
index c9711dc..f656af1 100755
--- a/hw/lint/tools/verilator/parse-lint-report.py
+++ b/hw/lint/tools/verilator/parse-lint-report.py
@@ -115,14 +115,13 @@
for_json=True,
use_decimal=True)
- # Pass/fail status is determined in the LintCfg class.
- log.info(("Found %d flow warnings, %d flow errors, %d lint infos,\n"
- "%d lint warnings and %d lint errors."),
- len(results["warnings"]),
- len(results["errors"]),
- len(results["lint_infos"]),
- len(results["lint_warnings"]),
- len(results["lint_errors"]))
+ # return nonzero status if any warnings or errors are present
+ # lint infos do not count as failures
+ n_errors = len(results["errors"]) + len(results["lint_errors"])
+ n_warnings = len(results["warnings"]) + len(results["lint_warnings"])
+ if n_errors > 0 or n_warnings > 0:
+ log.info("Found %d lint errors and %d lint warnings", n_errors, n_warnings)
+ sys.exit(1)
log.info("Lint logfile parsed succesfully")
sys.exit(0)
diff --git a/util/dvsim/LintCfg.py b/util/dvsim/LintCfg.py
index c40966d..f1f460c 100644
--- a/util/dvsim/LintCfg.py
+++ b/util/dvsim/LintCfg.py
@@ -54,7 +54,7 @@
results_str += "\n"
header = [
- "Name", "Flow Warnings", "Flow Errors", "Lint Warnings",
+ "Name", "Tool Warnings", "Tool Errors", "Lint Warnings",
"Lint Errors"
]
colalign = ("center", ) * len(header)
@@ -180,25 +180,22 @@
self.result_summary["lint_errors"] += self.result["lint_errors"]
# Append detailed messages if they exist
- # Indicate whether message leads to failure or not.
- hdr_key_pairs = [("Flow Warnings", "warnings", False),
- ("Flow Errors", "errors", True),
- ("Lint Warnings", "lint_warnings", True),
- ("Lint Errors", "lint_errors", True)]
+ hdr_key_pairs = [("Tool Warnings", "warnings"),
+ ("Tool Errors", "errors"),
+ ("Lint Warnings", "lint_warnings"),
+ ("Lint Errors", "lint_errors")]
# Lint fails if any warning or error message has occurred
self.errors_seen = False
- errors_to_report = False
- for _, key, fail in hdr_key_pairs:
+ for _, key in hdr_key_pairs:
if key in self.result:
if self.result.get(key):
- self.errors_seen = fail
- errors_to_report = True
+ self.errors_seen = True
break
- if errors_to_report:
+ if self.errors_seen:
fail_msgs += "\n### Errors and Warnings for Build Mode `'" + mode.name + "'`\n"
- for hdr, key, _ in hdr_key_pairs:
+ for hdr, key in hdr_key_pairs:
msgs = self.result.get(key)
fail_msgs += print_msg_list("#### " + hdr, msgs, self.max_msg_count)
