dcache: Simplify data input to improve timing

Signed-off-by: Paul Mackerras <paulus@ozlabs.org>
dcache-nc-fix
Paul Mackerras 3 years ago
parent 1a9834c506
commit 0b23a5e760

@ -578,6 +578,7 @@ begin
r.doall := m_in.doall; r.doall := m_in.doall;
r.tlbld := m_in.tlbld; r.tlbld := m_in.tlbld;
r.mmu_req := '1'; r.mmu_req := '1';
r.d_valid := '1';
else else
r.req := d_in; r.req := d_in;
r.req.data := (others => '0'); r.req.data := (others => '0');
@ -585,21 +586,19 @@ begin
r.doall := '0'; r.doall := '0';
r.tlbld := '0'; r.tlbld := '0';
r.mmu_req := '0'; r.mmu_req := '0';
end if;
r.d_valid := '0'; r.d_valid := '0';
end if;
if rst = '1' then if rst = '1' then
r0_full <= '0'; r0_full <= '0';
elsif (r1.full = '0' and d_in.hold = '0') or r0_full = '0' then elsif (r1.full = '0' and d_in.hold = '0') or r0_full = '0' then
r0 <= r; r0 <= r;
r0_full <= r.req.valid; r0_full <= r.req.valid;
end if; elsif r0.d_valid = '0' then
-- Sample data the cycle after a request comes in from loadstore1. -- Sample data the cycle after a request comes in from loadstore1.
-- If another request has come in already then the data will get -- If this request is already moving into r1 then the data will get
-- put directly into req.data below. -- put directly into req.data in the dcache_slow process below.
if r0.req.valid = '1' and r.req.valid = '0' and r0.d_valid = '0' and
r0.mmu_req = '0' then
r0.req.data <= d_in.data; r0.req.data <= d_in.data;
r0.d_valid <= '1'; r0.d_valid <= r0.req.valid;
end if; end if;
end if; end if;
end process; end process;

Loading…
Cancel
Save