aboutsummaryrefslogtreecommitdiffstats
path: root/passes
diff options
context:
space:
mode:
Diffstat (limited to 'passes')
-rw-r--r--passes/cmds/logger.cc39
-rw-r--r--passes/techmap/abc9_ops.cc2
2 files changed, 7 insertions, 34 deletions
diff --git a/passes/cmds/logger.cc b/passes/cmds/logger.cc
index 50b89d92f..c9532eced 100644
--- a/passes/cmds/logger.cc
+++ b/passes/cmds/logger.cc
@@ -159,39 +159,12 @@ struct LoggerPass : public Pass {
log_cmd_error("Expected error message occurrences must be 1 !\n");
log("Added regex '%s' for warnings to expected %s list.\n", pattern.c_str(), type.c_str());
try {
- if (type=="error") {
- auto it = log_expect_error.begin();
- auto ie = log_expect_error.end();
- for (; it != ie; it++)
- if (it->second.pattern == pattern) {
- it->second.expected_count = count;
- break;
- }
- if (it == ie)
- log_expect_error.emplace_back(YS_REGEX_COMPILE(pattern), LogExpectedItem(pattern, count));
- }
- else if (type=="warning") {
- auto it = log_expect_warning.begin();
- auto ie = log_expect_warning.end();
- for (; it != ie; it++)
- if (it->second.pattern == pattern) {
- it->second.expected_count = count;
- break;
- }
- if (it == ie)
- log_expect_warning.emplace_back(YS_REGEX_COMPILE(pattern), LogExpectedItem(pattern, count));
- }
- else if (type=="log") {
- auto it = log_expect_log.begin();
- auto ie = log_expect_log.end();
- for (; it != ie; it++)
- if (it->second.pattern == pattern) {
- it->second.expected_count = count;
- break;
- }
- if (it == ie)
- log_expect_log.emplace_back(YS_REGEX_COMPILE(pattern), LogExpectedItem(pattern, count));
- }
+ if (type == "error")
+ log_expect_error[pattern] = LogExpectedItem(YS_REGEX_COMPILE(pattern), count);
+ else if (type == "warning")
+ log_expect_warning[pattern] = LogExpectedItem(YS_REGEX_COMPILE(pattern), count);
+ else if (type == "log")
+ log_expect_log[pattern] = LogExpectedItem(YS_REGEX_COMPILE(pattern), count);
else log_abort();
}
catch (const YS_REGEX_NS::regex_error& e) {
diff --git a/passes/techmap/abc9_ops.cc b/passes/techmap/abc9_ops.cc
index 10c980f73..8d55b18a0 100644
--- a/passes/techmap/abc9_ops.cc
+++ b/passes/techmap/abc9_ops.cc
@@ -547,7 +547,7 @@ void mark_scc(RTLIL::Module *module)
// For every unique SCC found, (arbitrarily) find the first
// cell in the component, and replace its output connections
// with a new wire driven by the old connection but with a
- // special (* abc9_scc *) attribute set (which is used by
+ // special (* abc9_keep *) attribute set (which is used by
// write_xaiger to break this wire into PI and POs)
pool<RTLIL::Const> ids_seen;
for (auto cell : module->cells()) {