diff --git a/wally-pipelined/regression/regression-wally.py b/wally-pipelined/regression/regression-wally.py index f97202d4..531d0e8c 100755 --- a/wally-pipelined/regression/regression-wally.py +++ b/wally-pipelined/regression/regression-wally.py @@ -9,27 +9,37 @@ ################################## # edit this line to add more configurations -confignames = ["rv32ic", "rv64ic"] +confignames = ["rv32ic", "rv64ic", "busybear"] import multiprocessing, os fail = 0 +def search_log_for_text(text, logfile): + """Search through the given log file for text, returning True if it is found or False if it is not""" + grepcmd = "grep -e '%s' '%s' > /dev/null" % (text, logfile) + return os.system(grepcmd) == 0 + def test_config(config, print_res=True): """Run the given config, and return 0 if it suceeds and 1 if it fails""" logname = "wally_"+config+".log" - cmd = "vsim -c >" + logname +" < /dev/null" - grepval = os.system(cmd) - if (grepval): - if print_res:print(logname+": failures detected") - return 1 + if config == "busybear": + cmd = "echo 'quit' | vsim -do wally-busybear.do -c >" + logname + os.system(cmd) + # check for success. grep returns 0 if found, 1 if not found + passed = search_log_for_text("no more .* to read", logname) else: + cmd = "vsim -c >" + logname +" <