diff --git a/wally-pipelined/regression/wave-dos/linux-waves.do b/wally-pipelined/regression/wave-dos/linux-waves.do
index a6af8daf2..2b3e30da6 100644
--- a/wally-pipelined/regression/wave-dos/linux-waves.do
+++ b/wally-pipelined/regression/wave-dos/linux-waves.do
@@ -14,6 +14,20 @@ add wave -noupdate /testbench/dut/hart/FlushD
 add wave -noupdate /testbench/dut/hart/FlushE
 add wave -noupdate /testbench/dut/hart/FlushM
 add wave -noupdate /testbench/dut/hart/FlushW
+add wave -noupdate -divider InstrTranslator
+add wave -noupdate -group InstrTranslator /testbench/SvMode
+add wave -noupdate -group InstrTranslator /testbench/PTE_R
+add wave -noupdate -group InstrTranslator /testbench/PTE_X
+add wave -noupdate -group InstrTranslator /testbench/SATP
+add wave -noupdate -group InstrTranslator /testbench/PTE
+add wave -noupdate -group InstrTranslator /testbench/BaseAdr
+add wave -noupdate -group InstrTranslator /testbench/PAdr
+add wave -noupdate -group InstrTranslator /testbench/VPN
+add wave -noupdate -group InstrTranslator /testbench/Offset
+add wave -noupdate -group InstrTranslator /testbench/readAdrExpected
+add wave -noupdate -group InstrTranslator /testbench/readAdrTranslated
+add wave -noupdate -group InstrTranslator /testbench/writeAdrExpected
+add wave -noupdate -group InstrTranslator /testbench/writeAdrTranslated
 add wave -noupdate -divider F
 add wave -noupdate -radix hexadecimal /testbench/dut/hart/ifu/PCF
 add wave -noupdate -divider D
@@ -168,7 +182,6 @@ add wave -noupdate -group DCache /testbench/dut/hart/lsu/dcache/CacheHit
 add wave -noupdate -group DCache /testbench/dut/hart/lsu/dcache/NewReplacement
 add wave -noupdate -group DCache /testbench/dut/hart/lsu/dcache/ReadDataBlockM
 add wave -noupdate -group DCache /testbench/dut/hart/lsu/dcache/ReadDataWordM
-add wave -noupdate -group DCache /testbench/dut/hart/lsu/dcache/FinalReadDataWordM
 add wave -noupdate -group DCache /testbench/dut/hart/lsu/dcache/ReadDataWordMuxM
 add wave -noupdate -group DCache /testbench/dut/hart/lsu/dcache/FinalWriteDataM
 add wave -noupdate -group DCache /testbench/dut/hart/lsu/dcache/FinalAMOWriteDataM
@@ -197,7 +210,6 @@ add wave -noupdate -group DCache /testbench/dut/hart/lsu/dcache/BasePAdrM
 add wave -noupdate -group DCache /testbench/dut/hart/lsu/dcache/BasePAdrOffsetM
 add wave -noupdate -group DCache /testbench/dut/hart/lsu/dcache/BasePAdrMaskedM
 add wave -noupdate -group DCache /testbench/dut/hart/lsu/dcache/VictimTag
-add wave -noupdate -group DCache /testbench/dut/hart/lsu/dcache/ReadDataWEn
 add wave -noupdate -group DCache /testbench/dut/hart/lsu/dcache/AnyCPUReqM
 add wave -noupdate -group DCache /testbench/dut/hart/lsu/dcache/FetchCountFlag
 add wave -noupdate -group DCache /testbench/dut/hart/lsu/dcache/PreCntEn
@@ -256,27 +268,6 @@ add wave -noupdate -group EBU /testbench/dut/hart/ebu/CaptureDataM
 add wave -noupdate -group EBU /testbench/dut/hart/ebu/CapturedDataAvailable
 add wave -noupdate -group EBU /testbench/dut/hart/ebu/BusState
 add wave -noupdate -group EBU /testbench/dut/hart/ebu/NextBusState
-add wave -noupdate -group boottim /testbench/dut/uncore/bootdtim/HCLK
-add wave -noupdate -group boottim /testbench/dut/uncore/bootdtim/HRESETn
-add wave -noupdate -group boottim /testbench/dut/uncore/bootdtim/HSELTim
-add wave -noupdate -group boottim /testbench/dut/uncore/bootdtim/HADDR
-add wave -noupdate -group boottim /testbench/dut/uncore/bootdtim/HWRITE
-add wave -noupdate -group boottim /testbench/dut/uncore/bootdtim/HREADY
-add wave -noupdate -group boottim /testbench/dut/uncore/bootdtim/HTRANS
-add wave -noupdate -group boottim /testbench/dut/uncore/bootdtim/HWDATA
-add wave -noupdate -group boottim /testbench/dut/uncore/bootdtim/HREADTim
-add wave -noupdate -group boottim /testbench/dut/uncore/bootdtim/HRESPTim
-add wave -noupdate -group boottim /testbench/dut/uncore/bootdtim/HREADYTim
-add wave -noupdate -group boottim /testbench/dut/uncore/bootdtim/HWADDR
-add wave -noupdate -group boottim /testbench/dut/uncore/bootdtim/A
-add wave -noupdate -group boottim /testbench/dut/uncore/bootdtim/HREADTim0
-add wave -noupdate -group boottim /testbench/dut/uncore/bootdtim/prevHREADYTim
-add wave -noupdate -group boottim /testbench/dut/uncore/bootdtim/risingHREADYTim
-add wave -noupdate -group boottim /testbench/dut/uncore/bootdtim/initTrans
-add wave -noupdate -group boottim /testbench/dut/uncore/bootdtim/entry
-add wave -noupdate -group boottim /testbench/dut/uncore/bootdtim/memread
-add wave -noupdate -group boottim /testbench/dut/uncore/bootdtim/memwrite
-add wave -noupdate -group boottim /testbench/dut/uncore/bootdtim/busycount
 add wave -noupdate -divider W
 add wave -noupdate -radix hexadecimal /testbench/PCW
 add wave -noupdate -radix hexadecimal /testbench/PCtextW
@@ -419,26 +410,6 @@ add wave -noupdate -radix hexadecimal /testbench/scan_file_memW
 add wave -noupdate -radix hexadecimal /testbench/totalCSR
 add wave -noupdate -radix hexadecimal /testbench/data_file_csr
 add wave -noupdate -radix hexadecimal /testbench/scan_file_csr
-add wave -noupdate -radix hexadecimal /testbench/expectedMCAUSE
-add wave -noupdate -radix hexadecimal /testbench/expectedMCOUNTEREN
-add wave -noupdate -radix hexadecimal /testbench/expectedMEDELEG
-add wave -noupdate -radix hexadecimal /testbench/expectedMEPC
-add wave -noupdate -radix hexadecimal /testbench/expectedMIDELEG
-add wave -noupdate -radix hexadecimal /testbench/expectedMIE
-add wave -noupdate -radix hexadecimal /testbench/expectedMISA
-add wave -noupdate -radix hexadecimal /testbench/expectedMSCRATCH
-add wave -noupdate -radix hexadecimal /testbench/expectedMSTATUS
-add wave -noupdate -radix hexadecimal /testbench/expectedMTVAL
-add wave -noupdate -radix hexadecimal /testbench/expectedMTVEC
-add wave -noupdate -radix hexadecimal /testbench/expectedSATP
-add wave -noupdate -radix hexadecimal /testbench/expectedSCAUSE
-add wave -noupdate -radix hexadecimal /testbench/expectedSCOUNTEREN
-add wave -noupdate -radix hexadecimal /testbench/expectedSEPC
-add wave -noupdate -radix hexadecimal /testbench/expectedSIE
-add wave -noupdate -radix hexadecimal /testbench/expectedSSCRATCH
-add wave -noupdate -radix hexadecimal /testbench/expectedSSTATUS
-add wave -noupdate -radix hexadecimal /testbench/expectedSTVAL
-add wave -noupdate -radix hexadecimal /testbench/expectedSTVEC
 add wave -noupdate -radix hexadecimal /testbench/InstrW
 add wave -noupdate -radix hexadecimal /testbench/adrTranslator/adrTranslator
 add wave -noupdate -radix hexadecimal /testbench/adrTranslator/adrIn
@@ -2836,15 +2807,12 @@ add wave -noupdate -radix hexadecimal /testbench/dut/hart/ifu/immu/pmpchecker/L
 add wave -noupdate -radix hexadecimal /testbench/dut/hart/ifu/immu/pmpchecker/X
 add wave -noupdate -radix hexadecimal /testbench/dut/hart/ifu/immu/pmpchecker/W
 add wave -noupdate -radix hexadecimal /testbench/dut/hart/ifu/immu/pmpchecker/R
-add wave -noupdate -radix hexadecimal /testbench/dut/hart/ifu/immu/pmpchecker/NoLowerMatch
 add wave -noupdate -radix hexadecimal /testbench/dut/hart/ifu/immu/pmpchecker/PAgePMPAdr
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[15]/PhysicalAddress}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[15]/PMPCfg}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[15]/PMPAdr}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[15]/PAgePMPAdrIn}
-add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[15]/NoLowerMatchIn}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[15]/PAgePMPAdrOut}
-add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[15]/NoLowerMatchOut}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[15]/Match}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[15]/Active}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[15]/L}
@@ -2862,9 +2830,7 @@ add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/p
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[14]/PMPCfg}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[14]/PMPAdr}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[14]/PAgePMPAdrIn}
-add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[14]/NoLowerMatchIn}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[14]/PAgePMPAdrOut}
-add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[14]/NoLowerMatchOut}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[14]/Match}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[14]/Active}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[14]/L}
@@ -2882,9 +2848,7 @@ add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/p
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[13]/PMPCfg}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[13]/PMPAdr}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[13]/PAgePMPAdrIn}
-add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[13]/NoLowerMatchIn}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[13]/PAgePMPAdrOut}
-add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[13]/NoLowerMatchOut}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[13]/Match}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[13]/Active}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[13]/L}
@@ -2902,9 +2866,7 @@ add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/p
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[12]/PMPCfg}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[12]/PMPAdr}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[12]/PAgePMPAdrIn}
-add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[12]/NoLowerMatchIn}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[12]/PAgePMPAdrOut}
-add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[12]/NoLowerMatchOut}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[12]/Match}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[12]/Active}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[12]/L}
@@ -2922,9 +2884,7 @@ add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/p
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[11]/PMPCfg}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[11]/PMPAdr}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[11]/PAgePMPAdrIn}
-add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[11]/NoLowerMatchIn}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[11]/PAgePMPAdrOut}
-add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[11]/NoLowerMatchOut}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[11]/Match}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[11]/Active}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[11]/L}
@@ -2942,9 +2902,7 @@ add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/p
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[10]/PMPCfg}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[10]/PMPAdr}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[10]/PAgePMPAdrIn}
-add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[10]/NoLowerMatchIn}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[10]/PAgePMPAdrOut}
-add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[10]/NoLowerMatchOut}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[10]/Match}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[10]/Active}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[10]/L}
@@ -2962,9 +2920,7 @@ add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/p
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[9]/PMPCfg}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[9]/PMPAdr}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[9]/PAgePMPAdrIn}
-add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[9]/NoLowerMatchIn}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[9]/PAgePMPAdrOut}
-add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[9]/NoLowerMatchOut}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[9]/Match}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[9]/Active}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[9]/L}
@@ -2982,9 +2938,7 @@ add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/p
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[8]/PMPCfg}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[8]/PMPAdr}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[8]/PAgePMPAdrIn}
-add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[8]/NoLowerMatchIn}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[8]/PAgePMPAdrOut}
-add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[8]/NoLowerMatchOut}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[8]/Match}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[8]/Active}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[8]/L}
@@ -3002,9 +2956,7 @@ add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/p
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[7]/PMPCfg}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[7]/PMPAdr}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[7]/PAgePMPAdrIn}
-add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[7]/NoLowerMatchIn}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[7]/PAgePMPAdrOut}
-add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[7]/NoLowerMatchOut}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[7]/Match}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[7]/Active}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[7]/L}
@@ -3022,9 +2974,7 @@ add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/p
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[6]/PMPCfg}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[6]/PMPAdr}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[6]/PAgePMPAdrIn}
-add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[6]/NoLowerMatchIn}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[6]/PAgePMPAdrOut}
-add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[6]/NoLowerMatchOut}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[6]/Match}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[6]/Active}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[6]/L}
@@ -3042,9 +2992,7 @@ add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/p
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[5]/PMPCfg}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[5]/PMPAdr}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[5]/PAgePMPAdrIn}
-add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[5]/NoLowerMatchIn}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[5]/PAgePMPAdrOut}
-add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[5]/NoLowerMatchOut}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[5]/Match}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[5]/Active}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[5]/L}
@@ -3062,9 +3010,7 @@ add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/p
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[4]/PMPCfg}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[4]/PMPAdr}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[4]/PAgePMPAdrIn}
-add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[4]/NoLowerMatchIn}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[4]/PAgePMPAdrOut}
-add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[4]/NoLowerMatchOut}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[4]/Match}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[4]/Active}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[4]/L}
@@ -3082,9 +3028,7 @@ add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/p
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[3]/PMPCfg}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[3]/PMPAdr}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[3]/PAgePMPAdrIn}
-add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[3]/NoLowerMatchIn}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[3]/PAgePMPAdrOut}
-add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[3]/NoLowerMatchOut}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[3]/Match}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[3]/Active}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[3]/L}
@@ -3102,9 +3046,7 @@ add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/p
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[2]/PMPCfg}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[2]/PMPAdr}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[2]/PAgePMPAdrIn}
-add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[2]/NoLowerMatchIn}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[2]/PAgePMPAdrOut}
-add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[2]/NoLowerMatchOut}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[2]/Match}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[2]/Active}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[2]/L}
@@ -3122,9 +3064,7 @@ add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/p
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[1]/PMPCfg}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[1]/PMPAdr}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[1]/PAgePMPAdrIn}
-add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[1]/NoLowerMatchIn}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[1]/PAgePMPAdrOut}
-add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[1]/NoLowerMatchOut}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[1]/Match}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[1]/Active}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[1]/L}
@@ -3142,9 +3082,7 @@ add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/p
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[0]/PMPCfg}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[0]/PMPAdr}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[0]/PAgePMPAdrIn}
-add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[0]/NoLowerMatchIn}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[0]/PAgePMPAdrOut}
-add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[0]/NoLowerMatchOut}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[0]/Match}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[0]/Active}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/ifu/immu/pmpchecker/pmpadrdecs[0]/L}
@@ -6311,15 +6249,12 @@ add wave -noupdate -radix hexadecimal /testbench/dut/hart/lsu/dmmu/pmpchecker/L
 add wave -noupdate -radix hexadecimal /testbench/dut/hart/lsu/dmmu/pmpchecker/X
 add wave -noupdate -radix hexadecimal /testbench/dut/hart/lsu/dmmu/pmpchecker/W
 add wave -noupdate -radix hexadecimal /testbench/dut/hart/lsu/dmmu/pmpchecker/R
-add wave -noupdate -radix hexadecimal /testbench/dut/hart/lsu/dmmu/pmpchecker/NoLowerMatch
 add wave -noupdate -radix hexadecimal /testbench/dut/hart/lsu/dmmu/pmpchecker/PAgePMPAdr
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[15]/PhysicalAddress}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[15]/PMPCfg}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[15]/PMPAdr}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[15]/PAgePMPAdrIn}
-add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[15]/NoLowerMatchIn}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[15]/PAgePMPAdrOut}
-add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[15]/NoLowerMatchOut}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[15]/Match}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[15]/Active}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[15]/L}
@@ -6337,9 +6272,7 @@ add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/p
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[14]/PMPCfg}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[14]/PMPAdr}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[14]/PAgePMPAdrIn}
-add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[14]/NoLowerMatchIn}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[14]/PAgePMPAdrOut}
-add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[14]/NoLowerMatchOut}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[14]/Match}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[14]/Active}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[14]/L}
@@ -6357,9 +6290,7 @@ add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/p
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[13]/PMPCfg}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[13]/PMPAdr}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[13]/PAgePMPAdrIn}
-add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[13]/NoLowerMatchIn}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[13]/PAgePMPAdrOut}
-add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[13]/NoLowerMatchOut}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[13]/Match}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[13]/Active}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[13]/L}
@@ -6377,9 +6308,7 @@ add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/p
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[12]/PMPCfg}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[12]/PMPAdr}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[12]/PAgePMPAdrIn}
-add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[12]/NoLowerMatchIn}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[12]/PAgePMPAdrOut}
-add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[12]/NoLowerMatchOut}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[12]/Match}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[12]/Active}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[12]/L}
@@ -6397,9 +6326,7 @@ add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/p
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[11]/PMPCfg}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[11]/PMPAdr}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[11]/PAgePMPAdrIn}
-add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[11]/NoLowerMatchIn}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[11]/PAgePMPAdrOut}
-add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[11]/NoLowerMatchOut}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[11]/Match}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[11]/Active}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[11]/L}
@@ -6417,9 +6344,7 @@ add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/p
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[10]/PMPCfg}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[10]/PMPAdr}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[10]/PAgePMPAdrIn}
-add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[10]/NoLowerMatchIn}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[10]/PAgePMPAdrOut}
-add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[10]/NoLowerMatchOut}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[10]/Match}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[10]/Active}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[10]/L}
@@ -6437,9 +6362,7 @@ add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/p
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[9]/PMPCfg}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[9]/PMPAdr}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[9]/PAgePMPAdrIn}
-add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[9]/NoLowerMatchIn}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[9]/PAgePMPAdrOut}
-add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[9]/NoLowerMatchOut}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[9]/Match}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[9]/Active}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[9]/L}
@@ -6457,9 +6380,7 @@ add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/p
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[8]/PMPCfg}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[8]/PMPAdr}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[8]/PAgePMPAdrIn}
-add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[8]/NoLowerMatchIn}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[8]/PAgePMPAdrOut}
-add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[8]/NoLowerMatchOut}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[8]/Match}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[8]/Active}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[8]/L}
@@ -6477,9 +6398,7 @@ add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/p
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[7]/PMPCfg}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[7]/PMPAdr}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[7]/PAgePMPAdrIn}
-add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[7]/NoLowerMatchIn}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[7]/PAgePMPAdrOut}
-add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[7]/NoLowerMatchOut}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[7]/Match}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[7]/Active}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[7]/L}
@@ -6497,9 +6416,7 @@ add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/p
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[6]/PMPCfg}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[6]/PMPAdr}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[6]/PAgePMPAdrIn}
-add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[6]/NoLowerMatchIn}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[6]/PAgePMPAdrOut}
-add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[6]/NoLowerMatchOut}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[6]/Match}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[6]/Active}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[6]/L}
@@ -6517,9 +6434,7 @@ add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/p
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[5]/PMPCfg}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[5]/PMPAdr}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[5]/PAgePMPAdrIn}
-add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[5]/NoLowerMatchIn}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[5]/PAgePMPAdrOut}
-add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[5]/NoLowerMatchOut}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[5]/Match}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[5]/Active}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[5]/L}
@@ -6537,9 +6452,7 @@ add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/p
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[4]/PMPCfg}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[4]/PMPAdr}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[4]/PAgePMPAdrIn}
-add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[4]/NoLowerMatchIn}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[4]/PAgePMPAdrOut}
-add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[4]/NoLowerMatchOut}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[4]/Match}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[4]/Active}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[4]/L}
@@ -6557,9 +6470,7 @@ add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/p
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[3]/PMPCfg}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[3]/PMPAdr}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[3]/PAgePMPAdrIn}
-add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[3]/NoLowerMatchIn}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[3]/PAgePMPAdrOut}
-add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[3]/NoLowerMatchOut}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[3]/Match}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[3]/Active}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[3]/L}
@@ -6577,9 +6488,7 @@ add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/p
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[2]/PMPCfg}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[2]/PMPAdr}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[2]/PAgePMPAdrIn}
-add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[2]/NoLowerMatchIn}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[2]/PAgePMPAdrOut}
-add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[2]/NoLowerMatchOut}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[2]/Match}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[2]/Active}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[2]/L}
@@ -6597,9 +6506,7 @@ add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/p
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[1]/PMPCfg}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[1]/PMPAdr}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[1]/PAgePMPAdrIn}
-add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[1]/NoLowerMatchIn}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[1]/PAgePMPAdrOut}
-add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[1]/NoLowerMatchOut}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[1]/Match}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[1]/Active}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[1]/L}
@@ -6617,9 +6524,7 @@ add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/p
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[0]/PMPCfg}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[0]/PMPAdr}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[0]/PAgePMPAdrIn}
-add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[0]/NoLowerMatchIn}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[0]/PAgePMPAdrOut}
-add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[0]/NoLowerMatchOut}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[0]/Match}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[0]/Active}
 add wave -noupdate -radix hexadecimal {/testbench/dut/hart/lsu/dmmu/pmpchecker/pmpadrdecs[0]/L}
@@ -6679,7 +6584,6 @@ add wave -noupdate -radix hexadecimal /testbench/dut/hart/lsu/dcache/CacheHit
 add wave -noupdate -radix hexadecimal /testbench/dut/hart/lsu/dcache/NewReplacement
 add wave -noupdate -radix hexadecimal /testbench/dut/hart/lsu/dcache/ReadDataBlockM
 add wave -noupdate -radix hexadecimal /testbench/dut/hart/lsu/dcache/ReadDataWordM
-add wave -noupdate -radix hexadecimal /testbench/dut/hart/lsu/dcache/FinalReadDataWordM
 add wave -noupdate -radix hexadecimal /testbench/dut/hart/lsu/dcache/ReadDataWordMuxM
 add wave -noupdate -radix hexadecimal /testbench/dut/hart/lsu/dcache/FinalWriteDataM
 add wave -noupdate -radix hexadecimal /testbench/dut/hart/lsu/dcache/FinalAMOWriteDataM
@@ -6708,7 +6612,6 @@ add wave -noupdate -radix hexadecimal /testbench/dut/hart/lsu/dcache/BasePAdrM
 add wave -noupdate -radix hexadecimal /testbench/dut/hart/lsu/dcache/BasePAdrOffsetM
 add wave -noupdate -radix hexadecimal /testbench/dut/hart/lsu/dcache/BasePAdrMaskedM
 add wave -noupdate -radix hexadecimal /testbench/dut/hart/lsu/dcache/VictimTag
-add wave -noupdate -radix hexadecimal /testbench/dut/hart/lsu/dcache/ReadDataWEn
 add wave -noupdate -radix hexadecimal /testbench/dut/hart/lsu/dcache/AnyCPUReqM
 add wave -noupdate -radix hexadecimal /testbench/dut/hart/lsu/dcache/FetchCountFlag
 add wave -noupdate -radix hexadecimal /testbench/dut/hart/lsu/dcache/PreCntEn
@@ -24643,305 +24546,6 @@ add wave -noupdate -radix hexadecimal /testbench/dut/uncore/HSELNoneD
 add wave -noupdate -radix hexadecimal /testbench/dut/uncore/MemRWboottim
 add wave -noupdate -radix hexadecimal /testbench/dut/uncore/UARTIntr
 add wave -noupdate -radix hexadecimal /testbench/dut/uncore/GPIOIntr
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/HCLK
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/HRESETn
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/HSELUART
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/HADDR
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/HWRITE
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/HWDATA
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/HREADUART
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/HRESPUART
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/HREADYUART
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/SIN
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/DSRb
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/DCDb
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/CTSb
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/RIb
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/SOUT
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/RTSb
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/DTRb
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/OUT1b
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/OUT2b
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/INTR
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/TXRDYb
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/RXRDYb
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/A
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/MEMRb
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/MEMWb
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/memread
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/memwrite
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/Din
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/Dout
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/BAUDOUTb
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/memreadreg/clk
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/memreadreg/reset
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/memreadreg/d
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/memreadreg/q
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/memwritereg/clk
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/memwritereg/reset
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/memwritereg/d
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/memwritereg/q
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/haddrreg/clk
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/haddrreg/reset
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/haddrreg/d
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/haddrreg/q
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/HCLK
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/HRESETn
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/A
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/Din
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/Dout
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/MEMRb
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/MEMWb
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/INTR
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/TXRDYb
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/RXRDYb
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/BAUDOUTb
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/RCLK
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/SIN
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/DSRb
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/DCDb
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/CTSb
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/RIb
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/SOUT
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/RTSb
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/DTRb
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/OUT1b
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/OUT2b
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/RBR
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/FCR
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/LCR
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/LSR
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/SCR
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/DLL
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/DLM
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/IER
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/MSR
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/MCR
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/SINd
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/DSRbd
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/DCDbd
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/CTSbd
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/RIbd
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/SINsync
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/DSRbsync
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/DCDbsync
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/CTSbsync
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/RIbsync
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/DSRb2
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/DCDb2
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/CTSb2
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/RIb2
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/SOUTbit
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/loop
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/DLAB
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/baudpulse
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/txbaudpulse
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/rxbaudpulse
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/baudcount
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/rxoversampledcnt
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/txoversampledcnt
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/rxbitsreceived
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/txbitssent
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/rxstate
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/txstate
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/rxshiftreg
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/rxfifohead
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/rxfifotail
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/txfifohead
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/txfifotail
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/rxfifotriggerlevel
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/rxfifoentries
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/txfifoentries
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/rxbitsexpected
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/txbitsexpected
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/RXBR
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/rxtimeoutcnt
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/rxcentered
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/rxparity
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/rxparitybit
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/rxstopbit
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/rxparityerr
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/rxoverrunerr
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/rxframingerr
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/rxbreak
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/rxfifohaserr
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/rxdataready
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/rxfifoempty
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/rxfifotriggered
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/rxfifotimeout
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/rxfifodmaready
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/rxdata9
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/rxdata
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/RXerrbit
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/rxfullbit
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/TXHR
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/nexttxdata
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/txdata
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/txsr
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/txnextbit
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/txhrfull
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/txsrfull
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/txparity
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/txfifoempty
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/txfifofull
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/txfifodmaready
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/fifoenabled
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/fifodmamodesel
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/evenparitysel
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/RXerr
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/RXerrIP
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/squashRXerrIP
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/prevSquashRXerrIP
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/setSquashRXerrIP
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/resetSquashRXerrIP
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/THRE
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/THRE_IP
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/squashTHRE_IP
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/prevSquashTHRE_IP
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/setSquashTHRE_IP
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/resetSquashTHRE_IP
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/rxdataavailintr
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/modemstatusintr
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/intrpending
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/intrID
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/squashRXerrIPreg/clk
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/squashRXerrIPreg/reset
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/squashRXerrIPreg/d
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/squashRXerrIPreg/q
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/squashTHRE_IPreg/clk
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/squashTHRE_IPreg/reset
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/squashTHRE_IPreg/d
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk4/uart/u/squashTHRE_IPreg/q
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk3/gpio/HCLK
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk3/gpio/HRESETn
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk3/gpio/HSELGPIO
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk3/gpio/HADDR
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk3/gpio/HWDATA
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk3/gpio/HWRITE
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk3/gpio/HREADY
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk3/gpio/HTRANS
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk3/gpio/HREADGPIO
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk3/gpio/HRESPGPIO
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk3/gpio/HREADYGPIO
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk3/gpio/GPIOPinsIn
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk3/gpio/GPIOPinsOut
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk3/gpio/GPIOPinsEn
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk3/gpio/GPIOIntr
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk3/gpio/input0d
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk3/gpio/input1d
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk3/gpio/input2d
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk3/gpio/input3d
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk3/gpio/input_val
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk3/gpio/input_en
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk3/gpio/output_en
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk3/gpio/output_val
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk3/gpio/rise_ie
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk3/gpio/rise_ip
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk3/gpio/fall_ie
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk3/gpio/fall_ip
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk3/gpio/high_ie
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk3/gpio/high_ip
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk3/gpio/low_ie
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk3/gpio/low_ip
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk3/gpio/initTrans
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk3/gpio/memread
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk3/gpio/memwrite
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk3/gpio/entry
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk3/gpio/entryd
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk3/gpio/HADDRd
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk3/gpio/Din
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk3/gpio/Dout
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk3/gpio/memwriteflop/clk
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk3/gpio/memwriteflop/reset
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk3/gpio/memwriteflop/d
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk3/gpio/memwriteflop/q
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk3/gpio/entrydflop/clk
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk3/gpio/entrydflop/reset
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk3/gpio/entrydflop/d
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk3/gpio/entrydflop/q
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk3/gpio/sync1/clk
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk3/gpio/sync1/d
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk3/gpio/sync1/q
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk3/gpio/sync2/clk
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk3/gpio/sync2/d
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk3/gpio/sync2/q
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk3/gpio/sync3/clk
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk3/gpio/sync3/d
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk3/gpio/sync3/q
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk2/plic/HCLK
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk2/plic/HRESETn
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk2/plic/HSELPLIC
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk2/plic/HADDR
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk2/plic/HWRITE
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk2/plic/HREADY
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk2/plic/HTRANS
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk2/plic/HWDATA
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk2/plic/UARTIntr
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk2/plic/GPIOIntr
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk2/plic/HREADPLIC
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk2/plic/HRESPPLIC
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk2/plic/HREADYPLIC
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk2/plic/ExtIntM
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk2/plic/memwrite
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk2/plic/memread
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk2/plic/initTrans
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk2/plic/entry
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk2/plic/entryd
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk2/plic/Din
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk2/plic/Dout
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk2/plic/requests
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk2/plic/intThreshold
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk2/plic/intPending
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk2/plic/nextIntPending
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk2/plic/intEn
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk2/plic/intInProgress
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk2/plic/intClaim
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk2/plic/pendingPGrouped
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk2/plic/pendingMaxP
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk2/plic/pendingRequestsAtMaxP
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk2/plic/threshMask
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk2/plic/k
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk2/plic/memwriteflop/clk
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk2/plic/memwriteflop/reset
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk2/plic/memwriteflop/d
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk2/plic/memwriteflop/q
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk2/plic/entrydflop/clk
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk2/plic/entrydflop/reset
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk2/plic/entrydflop/d
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk2/plic/entrydflop/q
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk2/plic/intPendingFlop/clk
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk2/plic/intPendingFlop/reset
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk2/plic/intPendingFlop/d
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk2/plic/intPendingFlop/q
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk1/clint/HCLK
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk1/clint/HRESETn
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk1/clint/HSELCLINT
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk1/clint/HADDR
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk1/clint/HWRITE
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk1/clint/HWDATA
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk1/clint/HREADY
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk1/clint/HTRANS
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk1/clint/HREADCLINT
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk1/clint/HRESPCLINT
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk1/clint/HREADYCLINT
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk1/clint/MTIME
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk1/clint/MTIMECMP
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk1/clint/TimerIntM
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk1/clint/SwIntM
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk1/clint/MSIP
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk1/clint/entry
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk1/clint/entryd
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk1/clint/memread
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk1/clint/memwrite
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk1/clint/initTrans
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk1/clint/memwriteflop/clk
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk1/clint/memwriteflop/reset
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk1/clint/memwriteflop/d
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk1/clint/memwriteflop/q
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk1/clint/entrydflop/clk
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk1/clint/entrydflop/reset
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk1/clint/entrydflop/d
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/genblk1/clint/entrydflop/q
 add wave -noupdate -radix hexadecimal /testbench/dut/uncore/adrdecs/PhysicalAddress
 add wave -noupdate -radix hexadecimal /testbench/dut/uncore/adrdecs/AccessRW
 add wave -noupdate -radix hexadecimal /testbench/dut/uncore/adrdecs/AccessRX
@@ -25055,46 +24659,6 @@ add wave -noupdate -radix hexadecimal /testbench/dut/uncore/dtim/prevhreadytimre
 add wave -noupdate -radix hexadecimal /testbench/dut/uncore/dtim/prevhreadytimreg/reset
 add wave -noupdate -radix hexadecimal /testbench/dut/uncore/dtim/prevhreadytimreg/d
 add wave -noupdate -radix hexadecimal /testbench/dut/uncore/dtim/prevhreadytimreg/q
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/bootdtim/HCLK
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/bootdtim/HRESETn
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/bootdtim/HSELTim
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/bootdtim/HADDR
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/bootdtim/HWRITE
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/bootdtim/HREADY
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/bootdtim/HTRANS
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/bootdtim/HWDATA
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/bootdtim/HREADTim
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/bootdtim/HRESPTim
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/bootdtim/HREADYTim
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/bootdtim/HWADDR
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/bootdtim/A
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/bootdtim/HREADTim0
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/bootdtim/prevHREADYTim
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/bootdtim/risingHREADYTim
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/bootdtim/initTrans
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/bootdtim/entry
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/bootdtim/memread
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/bootdtim/memwrite
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/bootdtim/busycount
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/bootdtim/memreadreg/clk
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/bootdtim/memreadreg/reset
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/bootdtim/memreadreg/en
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/bootdtim/memreadreg/d
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/bootdtim/memreadreg/q
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/bootdtim/memwritereg/clk
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/bootdtim/memwritereg/reset
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/bootdtim/memwritereg/en
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/bootdtim/memwritereg/d
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/bootdtim/memwritereg/q
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/bootdtim/haddrreg/clk
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/bootdtim/haddrreg/reset
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/bootdtim/haddrreg/en
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/bootdtim/haddrreg/d
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/bootdtim/haddrreg/q
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/bootdtim/prevhreadytimreg/clk
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/bootdtim/prevhreadytimreg/reset
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/bootdtim/prevhreadytimreg/d
-add wave -noupdate -radix hexadecimal /testbench/dut/uncore/bootdtim/prevhreadytimreg/q
 add wave -noupdate -radix hexadecimal /testbench/dut/uncore/hseldelayreg/clk
 add wave -noupdate -radix hexadecimal /testbench/dut/uncore/hseldelayreg/reset
 add wave -noupdate -radix hexadecimal /testbench/dut/uncore/hseldelayreg/d
@@ -25406,7 +24970,6 @@ add wave -noupdate -group lsu -expand -group dcache -expand -group {Cache SRAM r
 add wave -noupdate -group lsu -expand -group dcache -expand -group {Cache SRAM read} /testbench/dut/hart/lsu/dcache/ReadDataBlockWayMaskedM
 add wave -noupdate -group lsu -expand -group dcache -expand -group {Cache SRAM read} /testbench/dut/hart/lsu/dcache/ReadDataBlockM
 add wave -noupdate -group lsu -expand -group dcache -expand -group {Cache SRAM read} /testbench/dut/hart/lsu/dcache/ReadDataWordM
-add wave -noupdate -group lsu -expand -group dcache -expand -group {Cache SRAM read} /testbench/dut/hart/lsu/dcache/FinalReadDataWordM
 add wave -noupdate -group lsu -expand -group dcache -expand -group {Cache SRAM read} -expand /testbench/dut/hart/lsu/dcache/ReadTag
 add wave -noupdate -group lsu -expand -group dcache -expand -group {Cache SRAM read} /testbench/dut/hart/lsu/dcache/WayHit
 add wave -noupdate -group lsu -expand -group dcache -expand -group {Cache SRAM read} /testbench/dut/hart/lsu/dcache/Dirty
@@ -25463,81 +25026,13 @@ add wave -noupdate -group lsu -expand -group pmp /testbench/dut/hart/lsu/dmmu/PM
 add wave -noupdate -group lsu -expand -group pmp /testbench/dut/hart/lsu/dmmu/PMPLoadAccessFaultM
 add wave -noupdate -group lsu -expand -group pmp /testbench/dut/hart/lsu/dmmu/PMPStoreAccessFaultM
 add wave -noupdate -group lsu -expand -group ptwalker -divider data
-add wave -noupdate -group plic /testbench/dut/uncore/genblk2/plic/HCLK
-add wave -noupdate -group plic /testbench/dut/uncore/genblk2/plic/HSELPLIC
-add wave -noupdate -group plic /testbench/dut/uncore/genblk2/plic/HADDR
-add wave -noupdate -group plic /testbench/dut/uncore/genblk2/plic/HWRITE
-add wave -noupdate -group plic /testbench/dut/uncore/genblk2/plic/HREADY
-add wave -noupdate -group plic /testbench/dut/uncore/genblk2/plic/HTRANS
-add wave -noupdate -group plic /testbench/dut/uncore/genblk2/plic/HWDATA
-add wave -noupdate -group plic /testbench/dut/uncore/genblk2/plic/UARTIntr
-add wave -noupdate -group plic /testbench/dut/uncore/genblk2/plic/GPIOIntr
-add wave -noupdate -group plic /testbench/dut/uncore/genblk2/plic/HREADPLIC
-add wave -noupdate -group plic /testbench/dut/uncore/genblk2/plic/HRESPPLIC
-add wave -noupdate -group plic /testbench/dut/uncore/genblk2/plic/HREADYPLIC
-add wave -noupdate -group plic /testbench/dut/uncore/genblk2/plic/ExtIntM
-add wave -noupdate -group GPIO /testbench/dut/uncore/genblk3/gpio/HCLK
-add wave -noupdate -group GPIO /testbench/dut/uncore/genblk3/gpio/HSELGPIO
-add wave -noupdate -group GPIO /testbench/dut/uncore/genblk3/gpio/HADDR
-add wave -noupdate -group GPIO /testbench/dut/uncore/genblk3/gpio/HWDATA
-add wave -noupdate -group GPIO /testbench/dut/uncore/genblk3/gpio/HWRITE
-add wave -noupdate -group GPIO /testbench/dut/uncore/genblk3/gpio/HREADY
-add wave -noupdate -group GPIO /testbench/dut/uncore/genblk3/gpio/HTRANS
-add wave -noupdate -group GPIO /testbench/dut/uncore/genblk3/gpio/HREADGPIO
-add wave -noupdate -group GPIO /testbench/dut/uncore/genblk3/gpio/HRESPGPIO
-add wave -noupdate -group GPIO /testbench/dut/uncore/genblk3/gpio/HREADYGPIO
-add wave -noupdate -group GPIO /testbench/dut/uncore/genblk3/gpio/GPIOPinsIn
-add wave -noupdate -group GPIO /testbench/dut/uncore/genblk3/gpio/GPIOPinsOut
-add wave -noupdate -group GPIO /testbench/dut/uncore/genblk3/gpio/GPIOPinsEn
-add wave -noupdate -group GPIO /testbench/dut/uncore/genblk3/gpio/GPIOIntr
-add wave -noupdate -group CLINT /testbench/dut/uncore/genblk1/clint/HCLK
-add wave -noupdate -group CLINT /testbench/dut/uncore/genblk1/clint/HSELCLINT
-add wave -noupdate -group CLINT /testbench/dut/uncore/genblk1/clint/HADDR
-add wave -noupdate -group CLINT /testbench/dut/uncore/genblk1/clint/HWRITE
-add wave -noupdate -group CLINT /testbench/dut/uncore/genblk1/clint/HWDATA
-add wave -noupdate -group CLINT /testbench/dut/uncore/genblk1/clint/HREADY
-add wave -noupdate -group CLINT /testbench/dut/uncore/genblk1/clint/HTRANS
-add wave -noupdate -group CLINT /testbench/dut/uncore/genblk1/clint/HREADCLINT
-add wave -noupdate -group CLINT /testbench/dut/uncore/genblk1/clint/HRESPCLINT
-add wave -noupdate -group CLINT /testbench/dut/uncore/genblk1/clint/HREADYCLINT
-add wave -noupdate -group CLINT /testbench/dut/uncore/genblk1/clint/MTIME
-add wave -noupdate -group CLINT /testbench/dut/uncore/genblk1/clint/MTIMECMP
-add wave -noupdate -group CLINT /testbench/dut/uncore/genblk1/clint/TimerIntM
-add wave -noupdate -group CLINT /testbench/dut/uncore/genblk1/clint/SwIntM
 add wave -noupdate -group csr /testbench/dut/hart/priv/csr/MIP_REGW
-add wave -noupdate -group uart /testbench/dut/uncore/genblk4/uart/HCLK
-add wave -noupdate -group uart /testbench/dut/uncore/genblk4/uart/HRESETn
-add wave -noupdate -group uart /testbench/dut/uncore/genblk4/uart/HSELUART
-add wave -noupdate -group uart /testbench/dut/uncore/genblk4/uart/HADDR
-add wave -noupdate -group uart /testbench/dut/uncore/genblk4/uart/HWRITE
-add wave -noupdate -group uart /testbench/dut/uncore/genblk4/uart/HWDATA
-add wave -noupdate -group uart /testbench/dut/uncore/genblk4/uart/HREADUART
-add wave -noupdate -group uart /testbench/dut/uncore/genblk4/uart/HRESPUART
-add wave -noupdate -group uart /testbench/dut/uncore/genblk4/uart/HREADYUART
-add wave -noupdate -group uart /testbench/dut/uncore/genblk4/uart/SIN
-add wave -noupdate -group uart /testbench/dut/uncore/genblk4/uart/DSRb
-add wave -noupdate -group uart /testbench/dut/uncore/genblk4/uart/DCDb
-add wave -noupdate -group uart /testbench/dut/uncore/genblk4/uart/CTSb
-add wave -noupdate -group uart /testbench/dut/uncore/genblk4/uart/RIb
-add wave -noupdate -group uart -expand -group outputs /testbench/dut/uncore/genblk4/uart/SOUT
-add wave -noupdate -group uart -expand -group outputs /testbench/dut/uncore/genblk4/uart/RTSb
-add wave -noupdate -group uart -expand -group outputs /testbench/dut/uncore/genblk4/uart/DTRb
-add wave -noupdate -group uart -expand -group outputs /testbench/dut/uncore/genblk4/uart/OUT1b
-add wave -noupdate -group uart -expand -group outputs /testbench/dut/uncore/genblk4/uart/OUT2b
-add wave -noupdate -group uart -expand -group outputs /testbench/dut/uncore/genblk4/uart/INTR
-add wave -noupdate -group uart -expand -group outputs /testbench/dut/uncore/genblk4/uart/TXRDYb
-add wave -noupdate -group uart -expand -group outputs /testbench/dut/uncore/genblk4/uart/RXRDYb
 add wave -noupdate -expand -group itlb /testbench/dut/hart/ifu/immu/TLBWrite
 add wave -noupdate -expand -group itlb /testbench/dut/hart/ifu/ITLBMissF
 add wave -noupdate -expand -group itlb /testbench/dut/hart/ifu/immu/PhysicalAddress
 add wave -noupdate -expand -group itlb /testbench/dut/hart/ifu/immu/Address
-add wave -noupdate -group UART /testbench/dut/uncore/genblk4/uart/HCLK
-add wave -noupdate -group UART /testbench/dut/uncore/genblk4/uart/HSELUART
-add wave -noupdate -group UART /testbench/dut/uncore/genblk4/uart/HADDR
-add wave -noupdate -group UART /testbench/dut/uncore/genblk4/uart/HWRITE
-add wave -noupdate -group UART /testbench/dut/uncore/genblk4/uart/HWDATA
 TreeUpdate [SetDefaultTree]
-WaveRestoreCursors {{Cursor 8} {203758 ns} 0} {{Cursor 2} {203765 ns} 1}
+WaveRestoreCursors {{Cursor 8} {42748876 ns} 0} {{Cursor 2} {203765 ns} 1}
 quietly wave cursor active 1
 configure wave -namecolwidth 250
 configure wave -valuecolwidth 297
@@ -25553,4 +25048,4 @@ configure wave -griddelta 40
 configure wave -timeline 0
 configure wave -timelineunits ns
 update
-WaveRestoreZoom {203642 ns} {203852 ns}
+WaveRestoreZoom {42748860 ns} {42749070 ns}