mirror of
				https://github.com/openhwgroup/cvw
				synced 2025-02-11 06:05:49 +00:00 
			
		
		
		
	Buildroot regression passing
This commit is contained in:
		
							parent
							
								
									3c855e3e90
								
							
						
					
					
						commit
						d3d39d39d0
					
				@ -20,6 +20,7 @@ from multiprocessing import Pool, TimeoutError
 | 
			
		||||
# Define lists of configurations and tests to run on each configuration
 | 
			
		||||
##################################
 | 
			
		||||
 | 
			
		||||
INSTR_LIMIT = 1000000 # multiple of 100000; 4M is interesting because it gets into the kernel and enabling VM
 | 
			
		||||
tests = [
 | 
			
		||||
        ["rv32e", ["arch32e"]],
 | 
			
		||||
        ["rv32i", ["arch32i"]],
 | 
			
		||||
@ -30,7 +31,7 @@ tests = [
 | 
			
		||||
                    "arch32zfh_divsqrt", "arch32zfaf", "wally32a", "wally32priv", "wally32periph", 
 | 
			
		||||
                    "arch32zbkb", "arch32zbkc", "arch32zbkx", "arch32zknd", "arch32zkne", "arch32zknh"]], # "arch32zcb", "arch32zfad",
 | 
			
		||||
        ["rv64i", ["arch64i"]],
 | 
			
		||||
        ["buildroot", ["buildroot"], "+INSTR_LIMIT=1000000"]
 | 
			
		||||
        ["buildroot", ["buildroot"], [f"+INSTR_LIMIT={INSTR_LIMIT}"], str(INSTR_LIMIT)+" instructions"]
 | 
			
		||||
        ]
 | 
			
		||||
 | 
			
		||||
# Separate out floating-point tests for RV64 to speed up coverage
 | 
			
		||||
@ -220,27 +221,20 @@ def addTests(tests, sim):
 | 
			
		||||
        config = test[0];
 | 
			
		||||
        suites = test[1];
 | 
			
		||||
        if (len(test) > 2):
 | 
			
		||||
            args = " ".join(test[2::])
 | 
			
		||||
            #args = str(test[2])
 | 
			
		||||
            print("args = ", args)
 | 
			
		||||
            args = " --args " + args
 | 
			
		||||
            #cmdPrefix = "wsim -s " + sim + " " + config + " --args " + args
 | 
			
		||||
        #if(len(test) >= 4 and test[2] == "configOptions"):
 | 
			
		||||
        #    configOptions = test[3]
 | 
			
		||||
        #    cmdPrefix = "vsim > {} -c <<!\ndo wally-batch.do "+config
 | 
			
		||||
 | 
			
		||||
            args = " --args " + " ".join(test[2])
 | 
			
		||||
        else:
 | 
			
		||||
            args = ""
 | 
			
		||||
            configOptions = ""
 | 
			
		||||
            #cmdPrefix = "vsim > {} -c <<!\ndo wally-batch.do "+config
 | 
			
		||||
        if (len(test) > 3):
 | 
			
		||||
            gs = test[3]
 | 
			
		||||
        else:
 | 
			
		||||
            gs = "All tests ran without failures"
 | 
			
		||||
        cmdPrefix="wsim -s " + sim + " " + config
 | 
			
		||||
        for t in suites:
 | 
			
		||||
            tc = TestCase(
 | 
			
		||||
                    name=t,
 | 
			
		||||
                    variant=config,
 | 
			
		||||
                    #cmd=cmdPrefix+" "+t+" configOptions "+configOptions+"\n!",
 | 
			
		||||
                    cmd=cmdPrefix + " " + t + args,
 | 
			
		||||
                    grepstr="All tests ran without failures")
 | 
			
		||||
                    grepstr=gs)
 | 
			
		||||
            configs.append(tc)
 | 
			
		||||
 | 
			
		||||
def search_log_for_text(text, logfile):
 | 
			
		||||
 | 
			
		||||
		Loading…
	
		Reference in New Issue
	
	Block a user