From: Luke Kenneth Casson Leighton <lkcl@lkcl.net>
Date: Mon, 15 Jun 2020 19:51:56 +0000 (+0100)
Subject: more whitespace on minerva (no unit tests, so cannot check it)
X-Git-Tag: div_pipeline~371
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=49e1bc724e559cb8a7e27ef140c1a18afc82ec6a;p=soc.git

more whitespace on minerva (no unit tests, so cannot check it)
---

diff --git a/src/soc/minerva/cache.py b/src/soc/minerva/cache.py
index 47442911..57b7ba55 100644
--- a/src/soc/minerva/cache.py
+++ b/src/soc/minerva/cache.py
@@ -11,9 +11,11 @@ __all__ = ["L1Cache"]
 class L1Cache(Elaboratable):
     def __init__(self, nways, nlines, nwords, base, limit):
         if not nlines or nlines & nlines-1:
-            raise ValueError("nlines must be a power of 2, not {!r}".format(nlines))
+            raise ValueError("nlines must be a power "\
+                             "of 2, not {!r}".format(nlines))
         if nwords not in {4, 8, 16}:
-            raise ValueError("nwords must be 4, 8 or 16, not {!r}".format(nwords))
+            raise ValueError("nwords must be 4, 8 or 16, "\
+                             "not {!r}".format(nwords))
         if nways not in {1, 2}:
             raise ValueError("nways must be 1 or 2, not {!r}".format(nways))
 
@@ -27,7 +29,9 @@ class L1Cache(Elaboratable):
         linebits = log2_int(nlines)
         tagbits = log2_int(limit-base) - log2_int(nlines) - log2_int(nwords) - 2
 
-        self.s1_addr = Record([("offset", offsetbits), ("line", linebits), ("tag", tagbits)])
+        self.s1_addr = Record([("offset", offsetbits),
+                               ("line", linebits),
+                               ("tag", tagbits)])
         self.s1_flush = Signal()
         self.s1_stall = Signal()
         self.s1_valid = Signal()
@@ -58,36 +62,39 @@ class L1Cache(Elaboratable):
             way_lru = Const(0)
         elif self.nways == 2:
             way_lru = Signal()
-            with m.If(self.bus_re & self.bus_valid & self.bus_last & ~self.bus_error):
+            with m.If(self.bus_re & self.bus_valid & self.bus_last &
+                      ~self.bus_error):
                 m.d.sync += way_lru.eq(~way_lru)
 
         m.d.comb += ways[way_lru].bus_re.eq(self.bus_re)
 
         way_hit = m.submodules.way_hit = Encoder(self.nways)
         for j, way in enumerate(ways):
-            m.d.comb += way_hit.i[j].eq((way.tag == self.s2_addr.tag) & way.valid)
+            hit = (way.tag == self.s2_addr.tag) & way.valid
+            m.d.comb += way_hit.i[j].eq(hit)
 
         m.d.comb += [
+            rdata = ways[way_hit.o].data.word_select(self.s2_addr.offset, 32)
             self.s2_miss.eq(way_hit.n),
-            self.s2_rdata.eq(ways[way_hit.o].data.word_select(self.s2_addr.offset, 32))
+            self.s2_rdata.eq(rdata)
         ]
 
         with m.FSM() as fsm:
-            last_offset = Signal.like(self.s2_addr.offset)
+            last_offs = Signal.like(self.s2_addr.offset)
 
             with m.State("CHECK"):
                 with m.If(self.s2_re & self.s2_miss & self.s2_valid):
                     m.d.sync += [
                         self.bus_addr.eq(self.s2_addr),
                         self.bus_re.eq(1),
-                        last_offset.eq(self.s2_addr.offset - 1)
+                        last_offs.eq(self.s2_addr.offset - 1)
                     ]
                     m.next = "REFILL"
 
             with m.State("REFILL"):
-                m.d.comb += self.bus_last.eq(self.bus_addr.offset == last_offset)
+                m.d.comb += self.bus_last.eq(self.bus_addr.offset == last_offs)
                 with m.If(self.bus_valid):
-                    m.d.sync += self.bus_addr.offset.eq(self.bus_addr.offset + 1)
+                    m.d.sync += self.bus_addr.offset.eq(self.bus_addr.offset+1)
                 with m.If(self.bus_valid & self.bus_last | self.bus_error):
                     m.d.sync += self.bus_re.eq(0)
                 with m.If(~self.bus_re & ~self.s1_stall):
@@ -106,7 +113,8 @@ class L1Cache(Elaboratable):
                 m.d.sync += valid_lines.bit_select(self.bus_addr.line, 1).eq(0)
             with m.Elif(way.bus_re & self.bus_valid & self.bus_last):
                 m.d.sync += valid_lines.bit_select(self.bus_addr.line, 1).eq(1)
-            with m.Elif(self.s2_evict & self.s2_valid & (way.tag == self.s2_addr.tag)):
+            with m.Elif(self.s2_evict & self.s2_valid &
+                        (way.tag == self.s2_addr.tag)):
                 m.d.sync += valid_lines.bit_select(self.s2_addr.line, 1).eq(0)
 
             tag_mem = Memory(width=len(way.tag), depth=self.nlines)
@@ -119,16 +127,19 @@ class L1Cache(Elaboratable):
             data_wp = data_mem.write_port(granularity=32)
             m.submodules += data_rp, data_wp
 
+            taddr = Mux(self.s1_stall, self.s2_addr.line, self.s1_addr.line)
+            daddr = Mux(self.s1_stall, self.s2_addr.line, self.s1_addr.line)
+            den = way.bus_re & self.bus_valid
             m.d.comb += [
-                tag_rp.addr.eq(Mux(self.s1_stall, self.s2_addr.line, self.s1_addr.line)),
-                data_rp.addr.eq(Mux(self.s1_stall, self.s2_addr.line, self.s1_addr.line)),
+                tag_rp.addr.eq(taddr),
+                data_rp.addr.eq(daddr),
 
                 tag_wp.addr.eq(self.bus_addr.line),
                 tag_wp.en.eq(way.bus_re & self.bus_valid & self.bus_last),
                 tag_wp.data.eq(self.bus_addr.tag),
 
                 data_wp.addr.eq(self.bus_addr.line),
-                data_wp.en.bit_select(self.bus_addr.offset, 1).eq(way.bus_re & self.bus_valid),
+                data_wp.en.bit_select(self.bus_addr.offset, 1).eq(den),
                 data_wp.data.eq(self.bus_rdata << self.bus_addr.offset*32),
 
                 way.valid.eq(valid_lines.bit_select(self.s2_addr.line, 1)),