Merge pull request #1705 from YosysHQ/logger_pass

Logger pass

3 files changed, 100 insertions, 2 deletions

diff --git a/kernel/driver.cc b/kernel/driver.cc
index 9040408bc..398c89e03 100644
--- a/kernel/driver.cc
+++ b/kernel/driver.cc
@@ -558,6 +558,10 @@ int main(int argc, char **argv)
 		fprintf(f, "\n");
 	}
 
+	if (log_expect_no_warnings && log_warnings_count_noexpect)
+		log_error("Unexpected warnings found: %d unique messages, %d total, %d expected\n", GetSize(log_warnings),
+					log_warnings_count, log_warnings_count - log_warnings_count_noexpect);
+
 	if (print_stats)
 	{
 		std::string hash = log_hasher->final().substr(0, 10);
@@ -664,6 +668,8 @@ int main(int argc, char **argv)
 	}
 #endif
 
+	log_check_expected();
+
 	yosys_atexit();
 
 	memhasher_off();
diff --git a/kernel/log.cc b/kernel/log.cc
index f5d6c488e..72181ebe8 100644
--- a/kernel/log.cc
+++ b/kernel/log.cc
@@ -42,8 +42,11 @@ std::vector<FILE*> log_files;
 std::vector<std::ostream*> log_streams;
 std::map<std::string, std::set<std::string>> log_hdump;
 std::vector<std::regex> log_warn_regexes, log_nowarn_regexes, log_werror_regexes;
+std::vector<std::pair<std::regex,LogExpectedItem>> log_expect_log, log_expect_warning, log_expect_error;
 std::set<std::string> log_warnings, log_experimentals, log_experimentals_ignored;
 int log_warnings_count = 0;
+int log_warnings_count_noexpect = 0;
+bool log_expect_no_warnings = false;
 bool log_hdump_all = false;
 FILE *log_errfile = NULL;
 SHA1 *log_hasher = NULL;
@@ -68,6 +71,8 @@ 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()
 {
@@ -162,7 +167,7 @@ void logv(const char *format, va_list ap)
 	{
 		log_warn_regex_recusion_guard = true;
 
-		if (log_warn_regexes.empty())
+		if (log_warn_regexes.empty() && log_expect_log.empty())
 		{
 			linebuffer.clear();
 		}
@@ -174,6 +179,11 @@ void logv(const char *format, va_list ap)
 				for (auto &re : log_warn_regexes)
 					if (std::regex_search(linebuffer, re))
 						log_warning("Found log message matching -W regex:\n%s", str.c_str());
+
+				for (auto &item : log_expect_log)
+					if (std::regex_search(linebuffer, item.first))
+						item.second.current_count++;
+
 				linebuffer.clear();
 			}
 		}
@@ -244,6 +254,13 @@ static void logv_warning_with_prefix(const char *prefix,
 			if (std::regex_search(message, re))
 				log_error("%s",  message.c_str());
 
+		bool warning_match = false;
+		for (auto &item : log_expect_warning)
+			if (std::regex_search(message, item.first)) {
+				item.second.current_count++;
+				warning_match = true;
+			}
+
 		if (log_warnings.count(message))
 		{
 			log("%s%s", prefix, message.c_str());
@@ -263,6 +280,8 @@ static void logv_warning_with_prefix(const char *prefix,
 			log_warnings.insert(message);
 		}
 
+		if (!warning_match)
+			log_warnings_count_noexpect++;
 		log_warnings_count++;
 		log_make_debug = bak_log_make_debug;
 	}
@@ -320,7 +339,8 @@ static void logv_error_with_prefix(const char *prefix,
 				f = stderr;
 
 	log_last_error = vstringf(format, ap);
-	log("%s%s", prefix, log_last_error.c_str());
+	if (display_error_log_msg)
+		log("%s%s", prefix, log_last_error.c_str());
 	log_flush();
 
 	log_make_debug = bak_log_make_debug;
@@ -328,6 +348,12 @@ static void logv_error_with_prefix(const char *prefix,
 	if (log_error_atexit)
 		log_error_atexit();
 
+	for (auto &item : log_expect_error)
+		if (std::regex_search(log_last_error, item.first))
+			item.second.current_count++;
+
+	if (check_expected_logs)
+		log_check_expected();
 #ifdef EMSCRIPTEN
 	log_files = backup_log_files;
 	throw 0;
@@ -636,6 +662,53 @@ void log_wire(RTLIL::Wire *wire, std::string indent)
 	log("%s", buf.str().c_str());
 }
 
+void log_check_expected()
+{
+	check_expected_logs = false;
+
+	for (auto &item : log_expect_warning) {
+		if (item.second.current_count == 0) {
+			log_warn_regexes.clear();
+			log_error("Expected warning pattern '%s' not found !\n", item.second.pattern.c_str());
+		}
+		if (item.second.current_count != item.second.expected_count) {
+			log_warn_regexes.clear();
+			log_error("Expected warning pattern '%s' found %d time(s), instead of %d time(s) !\n", 
+				item.second.pattern.c_str(), item.second.current_count, item.second.expected_count);
+		}
+	}
+
+	for (auto &item : log_expect_log) {
+		if (item.second.current_count == 0) {
+			log_warn_regexes.clear();
+			log_error("Expected log pattern '%s' not found !\n", item.second.pattern.c_str());
+		}
+		if (item.second.current_count != item.second.expected_count) {
+			log_warn_regexes.clear();
+			log_error("Expected log pattern '%s' found %d time(s), instead of %d time(s) !\n",
+				item.second.pattern.c_str(), item.second.current_count, item.second.expected_count);
+		}
+	}
+
+	for (auto &item : log_expect_error)
+		if (item.second.current_count == item.second.expected_count) {
+			log_warn_regexes.clear();
+			log("Expected error pattern '%s' found !!!\n", item.second.pattern.c_str());
+			#ifdef EMSCRIPTEN
+				log_files = backup_log_files;
+				throw 0;
+			#elif defined(_MSC_VER)
+				_exit(0);
+			#else
+				_Exit(0);
+			#endif			
+		} else {
+			display_error_log_msg = false;
+			log_warn_regexes.clear();
+			log_error("Expected error pattern '%s' not found !\n", item.second.pattern.c_str());
+		}
+}
+
 // ---------------------------------------------------
 // This is the magic behind the code coverage counters
 // ---------------------------------------------------
diff --git a/kernel/log.h b/kernel/log.h
index 9db8efaa5..603938f4c 100644
--- a/kernel/log.h
+++ b/kernel/log.h
@@ -52,6 +52,8 @@ extern std::map<std::string, std::set<std::string>> log_hdump;
 extern std::vector<std::regex> log_warn_regexes, log_nowarn_regexes, log_werror_regexes;
 extern std::set<std::string> log_warnings, log_experimentals, log_experimentals_ignored;
 extern int log_warnings_count;
+extern int log_warnings_count_noexpect;
+extern bool log_expect_no_warnings;
 extern bool log_hdump_all;
 extern FILE *log_errfile;
 extern SHA1 *log_hasher;
@@ -135,6 +137,23 @@ void log_backtrace(const char *prefix, int levels);
 void log_reset_stack();
 void log_flush();
 
+struct LogExpectedItem
+{
+	LogExpectedItem(std::string pattern, int expected) :
+		expected_count(expected),
+		current_count(0),
+		pattern(pattern)
+	{
+	}
+
+	int expected_count;
+	int current_count;
+	std::string pattern;
+};
+
+extern std::vector<std::pair<std::regex,LogExpectedItem>> log_expect_log, log_expect_warning, log_expect_error;
+void log_check_expected();
+
 const char *log_signal(const RTLIL::SigSpec &sig, bool autoint = true);
 const char *log_const(const RTLIL::Const &value, bool autoint = true);
 const char *log_id(RTLIL::IdString id);