logger: Add -check-expected subcommand.

This allows us to have multiple "expect this warning" calls in a single
long script, covering only as many passes as necessary.

diff --git a/kernel/log.cc b/kernel/log.cc
index 8d3bdd15be37fb1b99172d1f30b8c757e2a64e74..e7ce4cc466c0a81450bd523ae98bc4e73000c81b 100644 (file)
--- a/kernel/log.cc
+++ b/kernel/log.cc
@@ -71,7 +71,6 @@ int string_buf_index = -1;
 static struct timeval initial_tv = { 0, 0 };
 static bool next_print_log = false;
 static int log_newline_count = 0;
-static bool check_expected_logs = true;
 static bool display_error_log_msg = true;
 
 static void log_id_cache_clear()
@@ -349,8 +348,7 @@ static void logv_error_with_prefix(const char *prefix,
                if (YS_REGEX_NS::regex_search(log_last_error, item.second.pattern))
                        item.second.current_count++;
 
-       if (check_expected_logs)
-               log_check_expected();
+       log_check_expected();
 
        if (log_error_atexit)
                log_error_atexit();
@@ -667,8 +665,6 @@ void log_wire(RTLIL::Wire *wire, std::string indent)
 
 void log_check_expected()
 {
-       check_expected_logs = false;
-
        for (auto &item : log_expect_warning) {
                if (item.second.current_count == 0) {
                        log_warn_regexes.clear();
@@ -709,6 +705,10 @@ void log_check_expected()
                        log_warn_regexes.clear();
                        log_error("Expected error pattern '%s' not found !\n", item.first.c_str());
                }
+
+       log_expect_warning.clear();
+       log_expect_log.clear();
+       log_expect_error.clear();
 }
 
 // ---------------------------------------------------

diff --git a/passes/cmds/logger.cc b/passes/cmds/logger.cc
index d06939c2e59ff575a1725f9db915ccdbe3d2275b..ec92f1d013ce39b36643a2ebc5948646ccffd869 100644 (file)
--- a/passes/cmds/logger.cc
+++ b/passes/cmds/logger.cc
@@ -64,6 +64,11 @@ struct LoggerPass : public Pass {
                log("    -expect-no-warnings\n");
                log("        gives error in case there is at least one warning that is not expected.\n");
                log("\n");
+               log("    -check-expected\n");
+               log("        verifies that the patterns previously set up by -expect have actually\n");
+               log("        been met, then clears the expected log list.  If this is not called\n");
+               log("        manually, the check will happen at yosys exist time instead.\n");
+               log("\n");
        }
 
        void execute(std::vector<std::string> args, RTLIL::Design * design) override
@@ -176,6 +181,10 @@ struct LoggerPass : public Pass {
                                log_expect_no_warnings = true;
                                continue;
                        }
+                       if (args[argidx] == "-check-expected") {
+                               log_check_expected();
+                               continue;
+                       }
                        break;
                }
                extra_args(args, argidx, design, false);