Add causal checks
This commit is contained in:
parent
2a9ddf0868
commit
a6b4891a38
|
@ -0,0 +1,49 @@
|
||||||
|
from nmigen import *
|
||||||
|
from nmigen.asserts import *
|
||||||
|
|
||||||
|
"""
|
||||||
|
Causal Check
|
||||||
|
"""
|
||||||
|
|
||||||
|
class CausalCheck(Elaboratable):
|
||||||
|
def __init__(self):
|
||||||
|
# Input ports
|
||||||
|
self.reset = Signal(1)
|
||||||
|
self.check = Signal(1)
|
||||||
|
self.rvfi_valid = Signal(1)
|
||||||
|
self.rvfi_rd_addr = Signal(5)
|
||||||
|
self.rvfi_order = Signal(64)
|
||||||
|
self.rvfi_rs1_addr = Signal(5)
|
||||||
|
self.rvfi_rs2_addr = Signal(5)
|
||||||
|
def ports(self):
|
||||||
|
input_ports = [
|
||||||
|
self.reset,
|
||||||
|
self.check,
|
||||||
|
self.rvfi_valid,
|
||||||
|
self.rvfi_rd_addr,
|
||||||
|
self.rvfi_order,
|
||||||
|
self.rvfi_rs1_addr,
|
||||||
|
self.rvfi_rs2_addr
|
||||||
|
]
|
||||||
|
return input_ports
|
||||||
|
def elaborate(self, platform):
|
||||||
|
m = Module()
|
||||||
|
|
||||||
|
insn_order = AnyConst(64)
|
||||||
|
register_index = AnyConst(5)
|
||||||
|
found_non_causal = Signal(1, reset=0)
|
||||||
|
|
||||||
|
with m.If(self.reset):
|
||||||
|
m.d.sync += found_non_causal.eq(0)
|
||||||
|
with m.Else():
|
||||||
|
with m.If(self.check):
|
||||||
|
m.d.comb += Assume(register_index != 0)
|
||||||
|
m.d.comb += Assume(self.rvfi_valid)
|
||||||
|
m.d.comb += Assume(register_index == self.rvfi_rd_addr)
|
||||||
|
m.d.comb += Assume(insn_order == self.rvfi_order)
|
||||||
|
m.d.comb += Assert(~found_non_causal)
|
||||||
|
with m.Else():
|
||||||
|
with m.If(self.rvfi_valid & (self.rvfi_order > insn_order) & ((register_index == self.rvfi_rs1_addr) | (register_index == self.rvfi_rs2_addr))):
|
||||||
|
m.d.sync += found_non_causal.eq(1)
|
||||||
|
|
||||||
|
return m
|
|
@ -0,0 +1,25 @@
|
||||||
|
from nmigen import *
|
||||||
|
from ..core import *
|
||||||
|
from nmigen.test.utils import *
|
||||||
|
from ....checks.causal_check import *
|
||||||
|
|
||||||
|
class CausalSpec(Elaboratable):
|
||||||
|
def elaborate(self, platform):
|
||||||
|
m = Module()
|
||||||
|
|
||||||
|
m.submodules.cpu = cpu = Minerva(with_rvfi=True)
|
||||||
|
m.submodules.causal_spec = causal_spec = CausalCheck()
|
||||||
|
|
||||||
|
m.d.comb += causal_spec.reset.eq(0)
|
||||||
|
m.d.comb += causal_spec.check.eq(1)
|
||||||
|
m.d.comb += causal_spec.rvfi_valid.eq(cpu.rvfi.valid)
|
||||||
|
m.d.comb += causal_spec.rvfi_rd_addr.eq(cpu.rvfi.rd_addr)
|
||||||
|
m.d.comb += causal_spec.rvfi_order.eq(cpu.rvfi.order)
|
||||||
|
m.d.comb += causal_spec.rvfi_rs1_addr.eq(cpu.rvfi.rs1_addr)
|
||||||
|
m.d.comb += causal_spec.rvfi_rs2_addr.eq(cpu.rvfi.rs2_addr)
|
||||||
|
|
||||||
|
return m
|
||||||
|
|
||||||
|
class CausalTestCase(FHDLTestCase):
|
||||||
|
def verify(self):
|
||||||
|
self.assertFormal(CausalSpec(), mode="bmc", depth=12, engine="smtbmc --nopresat")
|
|
@ -4,6 +4,7 @@ from .test.test_instructions import *
|
||||||
from .test.test_pc_forward import *
|
from .test.test_pc_forward import *
|
||||||
from .test.test_pc_backward import *
|
from .test.test_pc_backward import *
|
||||||
from .test.test_register import *
|
from .test.test_register import *
|
||||||
|
from .test.test_causal import *
|
||||||
from .test.test_units_divider import *
|
from .test.test_units_divider import *
|
||||||
from .test.test_units_multiplier import *
|
from .test.test_units_multiplier import *
|
||||||
|
|
||||||
|
@ -60,5 +61,8 @@ PcBwdTestCase().verify()
|
||||||
print("Verifying register checks ...")
|
print("Verifying register checks ...")
|
||||||
RegTestCase().verify()
|
RegTestCase().verify()
|
||||||
|
|
||||||
|
print("Verifying causal checks ...")
|
||||||
|
CausalTestCase().verify()
|
||||||
|
|
||||||
print("Testing multiplier and divider ...")
|
print("Testing multiplier and divider ...")
|
||||||
unittest.main()
|
unittest.main()
|
||||||
|
|
Loading…
Reference in New Issue