From: Tobias Platen <tplaten@posteo.de>
Date: Thu, 30 Jul 2020 17:40:09 +0000 (+0200)
Subject: begin work on TestCase for two DataMergers/Cache
X-Git-Tag: semi_working_ecp5~482
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e5095e31e406901dbcc77bd8cab0af68a733f7eb;p=soc.git

begin work on TestCase for two DataMergers/Cache
---

diff --git a/src/soc/experiment/l0_cache.py b/src/soc/experiment/l0_cache.py
index dffb5ae7..42d4ddc7 100644
--- a/src/soc/experiment/l0_cache.py
+++ b/src/soc/experiment/l0_cache.py
@@ -188,6 +188,32 @@ class DataMerger(Elaboratable):
 
         return m
 
+class TstDataMerger2(Elaboratable):
+    def __init__(self):
+        self.data_odd = Signal(128,reset_less=True)
+        self.data_even = Signal(128,reset_less=True)
+        self.n_units = 8
+        ul = []
+        for i in range(self.n_units):
+            ul.append(CacheRecord())
+        self.input_array = Array(ul)
+
+    def elaborate(self, platform):
+        m = Module()
+        m.submodules.dm_odd = dm_odd = DataMerger(self.n_units)
+        m.submodules.dm_even = dm_even = DataMerger(self.n_units)
+
+        #TODO assign data and address match
+        #m.d.comb += dm_even.addr_array_i.eq(TODO)
+        #m.d.comb += dm_odd.addr_array_i.eq(TODO)
+        #m.d.comb += dm_even.data_i.eq(TODO)
+        #m.d.comb += dm_odd.data_i.eq(TODO)
+
+        m.d.comb += self.data_odd.eq(dm_odd.data_o.data)
+        m.d.comb += self.data_even.eq(dm_even.data_o.data)
+        self.data
+        return m
+
 
 class L0CacheBuffer(Elaboratable):
     """L0 Cache / Buffer