Get sim working, make some changes to the final addition

ChaCha20_Poly1305_64/sim/chacha20.yaml

@@ -4,3 +4,4 @@ tests:
     modules:
       - "chacha20_block"
     sources: "sources.list"
+    waves: True

ChaCha20_Poly1305_64/sim/chacha20_block.py

@@ -1,5 +1,11 @@
 import cocotb
 
+import logging
+
+from chacha_helpers import chacha_block
+
+import struct
+
 
 from cocotb.clock import Clock
 from cocotb.triggers import Timer, RisingEdge, FallingEdge
@@ -11,11 +17,60 @@ class TB:
     def __init__(self, dut):
         self.dut = dut
 
+        self.log = logging.getLogger("cocotb.tb")
+        self.log.setLevel(logging.INFO)
+
+
         cocotb.start_soon(Clock(self.dut.i_clk, CLK_PERIOD, units="ns").start())
 
+
+    async def cycle_reset(self):
+        await self._cycle_reset(self.dut.i_rst, self.dut.i_clk)
+
+    async def _cycle_reset(self, rst, clk):
+        rst.setimmediatevalue(0)
+        await RisingEdge(clk)
+        await RisingEdge(clk)
+        rst.value = 1
+        await RisingEdge(clk)
+        await RisingEdge(clk)
+        rst.value = 0
+        await RisingEdge(clk)
+        await RisingEdge(clk)
+
+
+
 @cocotb.test
 async def test_sanity(dut):
     tb = TB(dut)
 
+    await tb.cycle_reset()
+
+    data_in = [0x65787061, 0x6e642033, 0x322d6279, 0x7465206b,
+               0, 0, 0, 0,
+               0, 0, 0, 0,
+               0, 0, 0, 0]
+    
+    data_out = chacha_block(data_in)
+
+    tb.dut.i_counter.value = 0
+    tb.dut.i_nonce.value = 0
+    tb.dut.i_key.value = 0
+    tb.dut.i_ready.value = 1
+    tb.dut.i_valid.value = 1
     await RisingEdge(tb.dut.i_clk)
-    await RisingEdge(tb.dut.i_clk)
+    tb.dut.i_valid.value = 0
+
+    await RisingEdge(tb.dut.o_valid)
+    state = tb.dut.o_state.value.integer
+
+    state_bytes = int.to_bytes(state, 64, "little")
+    state_words = struct.unpack("16I", state_bytes)
+
+    fail = False
+    for i, (sim_val, dut_val) in enumerate(zip(data_out, state_words)):
+        if sim_val != dut_val:
+            tb.log.info(f"{i}: {sim_val:x} -> {dut_val:x}")
+            fail = True
+
+    assert not fail

ChaCha20_Poly1305_64/sim/chacha_helpers.py

@@ -0,0 +1,42 @@
+from typing import Sequence
+
+def ROTL(a,b):
+    return (((a) << (b)) | ((a) >> (32 - (b))))
+
+def QR(a, b, c, d):
+    a = (a + b) & 0xffffffff
+    d = (d ^ a) & 0xffffffff
+    d = ROTL(d, 16) & 0xffffffff
+    c = (c + d) & 0xffffffff
+    b = (b ^ c) & 0xffffffff
+    b = ROTL(b, 12)
+    a = (a + b) & 0xffffffff
+    d = (d ^ a) & 0xffffffff
+    d = ROTL(d,  8) & 0xffffffff
+    c = (c + d) & 0xffffffff
+    b = (b ^ c) & 0xffffffff
+    b = ROTL(b,  7) & 0xffffffff
+
+    return a, b, c, d
+
+ROUNDS = 20
+def chacha_block(data_in: Sequence[int]) -> Sequence[int]:
+    # make sure to copy this list so it doesn't get modified
+    data = data_in[:]
+
+
+    for i in range(0, ROUNDS, 2):
+        data[0], data[4], data[8],  data[12] = QR(data[0], data[4], data[8],  data[12])
+        data[1], data[5], data[9],  data[13] = QR(data[1], data[5], data[9],  data[13])
+        data[2], data[6], data[10], data[14] = QR(data[2], data[6], data[10], data[14])
+        data[3], data[7], data[11], data[15] = QR(data[3], data[7], data[11], data[15])
+
+        data[0], data[5], data[10], data[15] = QR(data[0], data[5], data[10], data[15])
+        data[1], data[6], data[11], data[12] = QR(data[1], data[6], data[11], data[12])
+        data[2], data[7], data[8],  data[13] = QR(data[2], data[7], data[8],  data[13])
+        data[3], data[4], data[9],  data[14] = QR(data[3], data[4], data[9],  data[14])
+
+    for i in range(16):
+        data[i] = (data[i] + data_in[i]) & 0xffffffff
+
+    return data