mirror of
				https://github.com/openhwgroup/cvw
				synced 2025-02-11 06:05:49 +00:00 
			
		
		
		
	add checkpoints to regression
This commit is contained in:
		
							parent
							
								
									cf27cc7fcd
								
							
						
					
					
						commit
						4e96d0f1db
					
				| @ -5,42 +5,42 @@ add wave -noupdate /testbench/reset | ||||
| add wave -noupdate /testbench/reset_ext | ||||
| add wave -noupdate -radix unsigned /testbench/InstrCountW | ||||
| add wave -noupdate /testbench/dut/hart/SATP_REGW | ||||
| add wave -noupdate -group HDU -expand -group traps /testbench/dut/hart/priv/trap/InstrMisalignedFaultM | ||||
| add wave -noupdate -group HDU -expand -group traps /testbench/dut/hart/priv/trap/InstrAccessFaultM | ||||
| add wave -noupdate -group HDU -expand -group traps /testbench/dut/hart/priv/trap/IllegalInstrFaultM | ||||
| add wave -noupdate -group HDU -expand -group traps /testbench/dut/hart/priv/trap/BreakpointFaultM | ||||
| add wave -noupdate -group HDU -expand -group traps /testbench/dut/hart/priv/trap/LoadMisalignedFaultM | ||||
| add wave -noupdate -group HDU -expand -group traps /testbench/dut/hart/priv/trap/StoreMisalignedFaultM | ||||
| add wave -noupdate -group HDU -expand -group traps /testbench/dut/hart/priv/trap/LoadAccessFaultM | ||||
| add wave -noupdate -group HDU -expand -group traps /testbench/dut/hart/priv/trap/StoreAccessFaultM | ||||
| add wave -noupdate -group HDU -expand -group traps /testbench/dut/hart/priv/trap/EcallFaultM | ||||
| add wave -noupdate -group HDU -expand -group traps /testbench/dut/hart/priv/trap/InstrPageFaultM | ||||
| add wave -noupdate -group HDU -expand -group traps /testbench/dut/hart/priv/trap/LoadPageFaultM | ||||
| add wave -noupdate -group HDU -expand -group traps /testbench/dut/hart/priv/trap/StorePageFaultM | ||||
| add wave -noupdate -group HDU -expand -group traps /testbench/dut/hart/priv/trap/InterruptM | ||||
| add wave -noupdate -group HDU -group interrupts /testbench/dut/hart/priv/trap/PendingIntsM | ||||
| add wave -noupdate -group HDU -group interrupts /testbench/dut/hart/priv/trap/CommittedM | ||||
| add wave -noupdate -group HDU -group interrupts /testbench/dut/hart/priv/trap/InstrValidM | ||||
| add wave -noupdate -group HDU -group hazards /testbench/dut/hart/hzu/BPPredWrongE | ||||
| add wave -noupdate -group HDU -group hazards /testbench/dut/hart/hzu/CSRWritePendingDEM | ||||
| add wave -noupdate -group HDU -group hazards /testbench/dut/hart/hzu/RetM | ||||
| add wave -noupdate -group HDU -group hazards -color Pink /testbench/dut/hart/hzu/TrapM | ||||
| add wave -noupdate -group HDU -group hazards /testbench/dut/hart/hzu/LoadStallD | ||||
| add wave -noupdate -group HDU -group hazards /testbench/dut/hart/hzu/StoreStallD | ||||
| add wave -noupdate -group HDU -group hazards /testbench/dut/hart/hzu/ICacheStallF | ||||
| add wave -noupdate -group HDU -group hazards /testbench/dut/hart/hzu/LSUStall | ||||
| add wave -noupdate -group HDU -group hazards /testbench/dut/hart/MulDivStallD | ||||
| add wave -noupdate -group HDU -group hazards /testbench/dut/hart/hzu/DivBusyE | ||||
| add wave -noupdate -group HDU -expand -group Flush -color Yellow /testbench/dut/hart/hzu/FlushF | ||||
| add wave -noupdate -group HDU -expand -group Flush -color Yellow /testbench/dut/hart/FlushD | ||||
| add wave -noupdate -group HDU -expand -group Flush -color Yellow /testbench/dut/hart/FlushE | ||||
| add wave -noupdate -group HDU -expand -group Flush -color Yellow /testbench/dut/hart/FlushM | ||||
| add wave -noupdate -group HDU -expand -group Flush -color Yellow /testbench/dut/hart/FlushW | ||||
| add wave -noupdate -group HDU -group Stall -color Orange /testbench/dut/hart/StallF | ||||
| add wave -noupdate -group HDU -group Stall -color Orange /testbench/dut/hart/StallD | ||||
| add wave -noupdate -group HDU -group Stall -color Orange /testbench/dut/hart/StallE | ||||
| add wave -noupdate -group HDU -group Stall -color Orange /testbench/dut/hart/StallM | ||||
| add wave -noupdate -group HDU -group Stall -color Orange /testbench/dut/hart/StallW | ||||
| add wave -noupdate -expand -group HDU -expand -group traps /testbench/dut/hart/priv/trap/InstrMisalignedFaultM | ||||
| add wave -noupdate -expand -group HDU -expand -group traps /testbench/dut/hart/priv/trap/InstrAccessFaultM | ||||
| add wave -noupdate -expand -group HDU -expand -group traps /testbench/dut/hart/priv/trap/IllegalInstrFaultM | ||||
| add wave -noupdate -expand -group HDU -expand -group traps /testbench/dut/hart/priv/trap/BreakpointFaultM | ||||
| add wave -noupdate -expand -group HDU -expand -group traps /testbench/dut/hart/priv/trap/LoadMisalignedFaultM | ||||
| add wave -noupdate -expand -group HDU -expand -group traps /testbench/dut/hart/priv/trap/StoreMisalignedFaultM | ||||
| add wave -noupdate -expand -group HDU -expand -group traps /testbench/dut/hart/priv/trap/LoadAccessFaultM | ||||
| add wave -noupdate -expand -group HDU -expand -group traps /testbench/dut/hart/priv/trap/StoreAccessFaultM | ||||
| add wave -noupdate -expand -group HDU -expand -group traps /testbench/dut/hart/priv/trap/EcallFaultM | ||||
| add wave -noupdate -expand -group HDU -expand -group traps /testbench/dut/hart/priv/trap/InstrPageFaultM | ||||
| add wave -noupdate -expand -group HDU -expand -group traps /testbench/dut/hart/priv/trap/LoadPageFaultM | ||||
| add wave -noupdate -expand -group HDU -expand -group traps /testbench/dut/hart/priv/trap/StorePageFaultM | ||||
| add wave -noupdate -expand -group HDU -expand -group traps /testbench/dut/hart/priv/trap/InterruptM | ||||
| add wave -noupdate -expand -group HDU -group interrupts /testbench/dut/hart/priv/trap/PendingIntsM | ||||
| add wave -noupdate -expand -group HDU -group interrupts /testbench/dut/hart/priv/trap/CommittedM | ||||
| add wave -noupdate -expand -group HDU -group interrupts /testbench/dut/hart/priv/trap/InstrValidM | ||||
| add wave -noupdate -expand -group HDU -expand -group hazards /testbench/dut/hart/hzu/BPPredWrongE | ||||
| add wave -noupdate -expand -group HDU -expand -group hazards /testbench/dut/hart/hzu/CSRWritePendingDEM | ||||
| add wave -noupdate -expand -group HDU -expand -group hazards /testbench/dut/hart/hzu/RetM | ||||
| add wave -noupdate -expand -group HDU -expand -group hazards -color Pink /testbench/dut/hart/hzu/TrapM | ||||
| add wave -noupdate -expand -group HDU -expand -group hazards /testbench/dut/hart/hzu/LoadStallD | ||||
| add wave -noupdate -expand -group HDU -expand -group hazards /testbench/dut/hart/hzu/StoreStallD | ||||
| add wave -noupdate -expand -group HDU -expand -group hazards /testbench/dut/hart/hzu/ICacheStallF | ||||
| add wave -noupdate -expand -group HDU -expand -group hazards /testbench/dut/hart/hzu/LSUStall | ||||
| add wave -noupdate -expand -group HDU -expand -group hazards /testbench/dut/hart/MulDivStallD | ||||
| add wave -noupdate -expand -group HDU -expand -group hazards /testbench/dut/hart/hzu/DivBusyE | ||||
| add wave -noupdate -expand -group HDU -expand -group Flush -color Yellow /testbench/dut/hart/hzu/FlushF | ||||
| add wave -noupdate -expand -group HDU -expand -group Flush -color Yellow /testbench/dut/hart/FlushD | ||||
| add wave -noupdate -expand -group HDU -expand -group Flush -color Yellow /testbench/dut/hart/FlushE | ||||
| add wave -noupdate -expand -group HDU -expand -group Flush -color Yellow /testbench/dut/hart/FlushM | ||||
| add wave -noupdate -expand -group HDU -expand -group Flush -color Yellow /testbench/dut/hart/FlushW | ||||
| add wave -noupdate -expand -group HDU -expand -group Stall -color Orange /testbench/dut/hart/StallF | ||||
| add wave -noupdate -expand -group HDU -expand -group Stall -color Orange /testbench/dut/hart/StallD | ||||
| add wave -noupdate -expand -group HDU -expand -group Stall -color Orange /testbench/dut/hart/StallE | ||||
| add wave -noupdate -expand -group HDU -expand -group Stall -color Orange /testbench/dut/hart/StallM | ||||
| add wave -noupdate -expand -group HDU -expand -group Stall -color Orange /testbench/dut/hart/StallW | ||||
| add wave -noupdate -group PCS /testbench/dut/hart/ifu/PCNextF | ||||
| add wave -noupdate -group PCS /testbench/dut/hart/PCF | ||||
| add wave -noupdate -group PCS /testbench/dut/hart/ifu/PCD | ||||
| @ -61,8 +61,11 @@ add wave -noupdate -group {Decode Stage} /testbench/dut/hart/ieu/dp/RdD | ||||
| add wave -noupdate -group {Decode Stage} /testbench/dut/hart/ieu/dp/Rs1D | ||||
| add wave -noupdate -group {Decode Stage} /testbench/dut/hart/ieu/dp/Rs2D | ||||
| add wave -noupdate -expand -group {Execution Stage} /testbench/dut/hart/ifu/PCE | ||||
| add wave -noupdate -expand -group {Execution Stage} /testbench/ExpectedPCE | ||||
| add wave -noupdate -expand -group {Execution Stage} /testbench/MepcExpected | ||||
| add wave -noupdate -expand -group {Execution Stage} /testbench/dut/hart/ifu/InstrE | ||||
| add wave -noupdate -expand -group {Execution Stage} /testbench/InstrEName | ||||
| add wave -noupdate -expand -group {Execution Stage} /testbench/dut/hart/ieu/c/InstrValidE | ||||
| add wave -noupdate -expand -group {Execution Stage} /testbench/textE | ||||
| add wave -noupdate -expand -group {Execution Stage} -color {Cornflower Blue} /testbench/FunctionName/FunctionName | ||||
| add wave -noupdate -expand -group {Memory Stage} /testbench/checkInstrM | ||||
| @ -177,8 +180,6 @@ add wave -noupdate -group {alu execution stage} /testbench/dut/hart/ieu/dp/Write | ||||
| add wave -noupdate -group {alu execution stage} /testbench/dut/hart/ieu/dp/ALUResultE | ||||
| add wave -noupdate -group {alu execution stage} /testbench/dut/hart/ieu/dp/SrcAE | ||||
| add wave -noupdate -group {alu execution stage} /testbench/dut/hart/ieu/dp/SrcBE | ||||
| add wave -noupdate -group muldiv /testbench/dut/hart/mdu/SrcAE | ||||
| add wave -noupdate -group muldiv /testbench/dut/hart/mdu/SrcBE | ||||
| add wave -noupdate -group muldiv /testbench/dut/hart/mdu/Funct3E | ||||
| add wave -noupdate -group muldiv /testbench/dut/hart/mdu/MulDivE | ||||
| add wave -noupdate -group muldiv /testbench/dut/hart/mdu/W64E | ||||
| @ -397,23 +398,24 @@ add wave -noupdate -group lsu -expand -group ptwalker -expand -group types /test | ||||
| add wave -noupdate -group lsu -expand -group ptwalker -expand -group types /testbench/dut/hart/lsu/hptw/WalkerInstrPageFaultF | ||||
| add wave -noupdate -group lsu -expand -group ptwalker -expand -group types /testbench/dut/hart/lsu/hptw/WalkerLoadPageFaultM | ||||
| add wave -noupdate -group lsu -expand -group ptwalker -expand -group types /testbench/dut/hart/lsu/hptw/WalkerStorePageFaultM | ||||
| add wave -noupdate -group csr -color Gray90 -radix unsigned /testbench/dut/hart/priv/csr/genblk1/counters/genblk1/INSTRET_REGW | ||||
| add wave -noupdate -group csr /testbench/dut/hart/priv/csr/genblk1/counters/genblk1/HPMCOUNTER_REGW | ||||
| add wave -noupdate -group csr -expand -group machine /testbench/dut/hart/priv/csr/genblk1/csrm/MIE_REGW | ||||
| add wave -noupdate -group csr -expand -group machine /testbench/dut/hart/priv/csr/MIP_REGW | ||||
| add wave -noupdate -group csr -expand -group machine /testbench/dut/hart/priv/csr/genblk1/csrm/MSTATUS_REGW | ||||
| add wave -noupdate -group csr -expand -group machine /testbench/dut/hart/priv/csr/genblk1/csrm/MEPC_REGW | ||||
| add wave -noupdate -group csr -expand -group machine /testbench/dut/hart/priv/csr/genblk1/csrm/MTVAL_REGW | ||||
| add wave -noupdate -group csr -expand -group machine /testbench/dut/hart/priv/csr/MTVEC_REGW | ||||
| add wave -noupdate -group csr -expand -group machine /testbench/dut/hart/priv/csr/genblk1/csrm/MCAUSE_REGW | ||||
| add wave -noupdate -group csr -expand -group machine /testbench/dut/hart/priv/csr/genblk1/csrm/MEDELEG_REGW | ||||
| add wave -noupdate -group csr -expand -group machine /testbench/dut/hart/priv/csr/genblk1/csrm/MIDELEG_REGW | ||||
| add wave -noupdate -group csr -expand -group machine -color Brown /testbench/dut/hart/priv/PrivilegeModeW | ||||
| add wave -noupdate -group csr -expand -group supervisor /testbench/dut/hart/priv/csr/STVEC_REGW | ||||
| add wave -noupdate -group csr -expand -group supervisor /testbench/dut/hart/priv/csr/genblk1/csrs/genblk1/SCAUSE_REGW | ||||
| add wave -noupdate -group csr -expand -group supervisor /testbench/dut/hart/priv/csr/genblk1/csrs/SIP_REGW | ||||
| add wave -noupdate -group csr -expand -group supervisor /testbench/dut/hart/priv/csr/genblk1/csrs/SIE_REGW | ||||
| add wave -noupdate -group csr -expand -group supervisor /testbench/dut/hart/priv/csr/genblk1/csrs/SEPC_REGW | ||||
| add wave -noupdate -expand -group csr -color Gray90 -radix unsigned /testbench/dut/hart/priv/csr/genblk1/counters/genblk1/INSTRET_REGW | ||||
| add wave -noupdate -expand -group csr /testbench/dut/hart/priv/csr/genblk1/counters/genblk1/HPMCOUNTER_REGW | ||||
| add wave -noupdate -expand -group csr -expand -group machine /testbench/dut/hart/priv/csr/genblk1/csrm/MIE_REGW | ||||
| add wave -noupdate -expand -group csr -expand -group machine /testbench/dut/hart/priv/csr/MIP_REGW | ||||
| add wave -noupdate -expand -group csr -expand -group machine /testbench/dut/hart/priv/csr/genblk1/csrm/MSTATUS_REGW | ||||
| add wave -noupdate -expand -group csr -expand -group machine /testbench/dut/hart/priv/csr/genblk1/csrm/MEPC_REGW | ||||
| add wave -noupdate -expand -group csr -expand -group machine /testbench/dut/hart/priv/csr/genblk1/csrm/MTVAL_REGW | ||||
| add wave -noupdate -expand -group csr -expand -group machine /testbench/dut/hart/priv/csr/MTVEC_REGW | ||||
| add wave -noupdate -expand -group csr -expand -group machine /testbench/dut/hart/priv/csr/genblk1/csrm/MCAUSE_REGW | ||||
| add wave -noupdate -expand -group csr -expand -group machine /testbench/dut/hart/priv/csr/genblk1/csrm/MEDELEG_REGW | ||||
| add wave -noupdate -expand -group csr -expand -group machine /testbench/dut/hart/priv/csr/genblk1/csrm/MIDELEG_REGW | ||||
| add wave -noupdate -expand -group csr -expand -group machine -color Brown /testbench/dut/hart/priv/PrivilegeModeW | ||||
| add wave -noupdate -expand -group csr -expand -group supervisor /testbench/dut/hart/priv/csr/STVEC_REGW | ||||
| add wave -noupdate -expand -group csr -expand -group supervisor /testbench/dut/hart/priv/csr/genblk1/csrs/STVAL | ||||
| add wave -noupdate -expand -group csr -expand -group supervisor /testbench/dut/hart/priv/csr/genblk1/csrs/genblk1/SCAUSE_REGW | ||||
| add wave -noupdate -expand -group csr -expand -group supervisor /testbench/dut/hart/priv/csr/genblk1/csrs/SIP_REGW | ||||
| add wave -noupdate -expand -group csr -expand -group supervisor /testbench/dut/hart/priv/csr/genblk1/csrs/SIE_REGW | ||||
| add wave -noupdate -expand -group csr -expand -group supervisor /testbench/dut/hart/priv/csr/genblk1/csrs/SEPC_REGW | ||||
| add wave -noupdate -group itlb /testbench/dut/hart/ifu/immu/TLBWrite | ||||
| add wave -noupdate -group itlb /testbench/dut/hart/ifu/ITLBMissF | ||||
| add wave -noupdate -group itlb /testbench/dut/hart/ifu/immu/PhysicalAddress | ||||
| @ -515,8 +517,8 @@ add wave -noupdate /testbench/dut/uncore/dtim/memwrite | ||||
| add wave -noupdate /testbench/dut/uncore/dtim/HWDATA | ||||
| add wave -noupdate /testbench/dut/uncore/dtim/risingHREADYTim | ||||
| TreeUpdate [SetDefaultTree] | ||||
| WaveRestoreCursors {{Cursor 23} {209183247 ns} 0} {{Cursor 5} {5672440 ns} 0} | ||||
| quietly wave cursor active 2 | ||||
| WaveRestoreCursors {{Cursor 23} {29707 ns} 0} {{Cursor 3} {29725 ns} 1} | ||||
| quietly wave cursor active 1 | ||||
| configure wave -namecolwidth 250 | ||||
| configure wave -valuecolwidth 314 | ||||
| configure wave -justifyvalue left | ||||
| @ -531,4 +533,4 @@ configure wave -griddelta 40 | ||||
| configure wave -timeline 0 | ||||
| configure wave -timelineunits ns | ||||
| update | ||||
| WaveRestoreZoom {5672937 ns} {5673085 ns} | ||||
| WaveRestoreZoom {29429 ns} {30021 ns} | ||||
|  | ||||
| @ -41,6 +41,12 @@ def getBuildrootTC(short): | ||||
|         BRgrepstr=str(MAX_EXPECTED)+" instructions" | ||||
|     return  TestCase(name="buildroot",cmd=BRcmd,grepstr=BRgrepstr) | ||||
| 
 | ||||
| tc = TestCase( | ||||
|       name="buildroot-checkpoint", | ||||
|       cmd="vsim > {} -c <<!\ndo wally-buildroot-batch.do 400100000 400000001 400000000\n!", | ||||
|       grepstr="400100000 instructions") | ||||
| configs.append(tc) | ||||
| 
 | ||||
| tests64 = ["wally64i", "arch64i", "arch64priv", "arch64c",  "arch64m", "imperas64i", "imperas64p", "imperas64mmu", "imperas64f", "imperas64d", "imperas64m", "imperas64a",  "imperas64c"] #,  "testsBP64"] | ||||
| for test in tests64: | ||||
|   tc = TestCase( | ||||
|  | ||||
		Loading…
	
		Reference in New Issue
	
	Block a user