github.com/antonblanchard.microwatt
1
0
Fork 0
mirror of https://github.com/antonblanchard/microwatt.git synced 2026-01-11 23:43:15 +00:00
Code Releases Activity

icache_tb: Update for recent icache changes

Browse Source 
- Provide next_nia before clock edge where req is asserted
- Set rpn and next_rpn to zero
- There is no longer an input to the icache from the MMU

Signed-off-by: Paul Mackerras <paulus@ozlabs.org>
This commit is contained in:
Paul Mackerras 2023-09-20 09:41:16 +10:00
parent 73b6004ac6
commit 73a2fcbc7f
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
icache_tb.vhdl
View File

@ -15,8 +15,6 @@ architecture behave of icache_tb is
signal i_out : Fetch1ToIcacheType; signal i_out : Fetch1ToIcacheType;
signal i_in : IcacheToDecode1Type; signal i_in : IcacheToDecode1Type;
signal m_out : MmuToIcacheType;
signal wb_bram_in : wishbone_master_out; signal wb_bram_in : wishbone_master_out;
signal wb_bram_out : wishbone_slave_out; signal wb_bram_out : wishbone_slave_out;
@ -32,7 +30,6 @@ begin
rst => rst, rst => rst,
i_in => i_out, i_in => i_out,
i_out => i_in, i_out => i_in,
m_in => m_out,
stall_in => '0', stall_in => '0',
flush_in => '0', flush_in => '0',
inval_in => '0', inval_in => '0',
@ -77,19 +74,21 @@ begin
i_out.priv_mode <= '1'; i_out.priv_mode <= '1';
i_out.virt_mode <= '0'; i_out.virt_mode <= '0';
i_out.big_endian <= '0'; i_out.big_endian <= '0';
i_out.fetch_fail <= '0';
m_out.tlbld <= '0'; i_out.predicted <= '0';
m_out.tlbie <= '0'; i_out.pred_ntaken <= '0';
m_out.addr <= (others => '0');
m_out.pte <= (others => '0');
wait until rising_edge(clk); wait until rising_edge(clk);
wait until rising_edge(clk); wait until rising_edge(clk);
wait until rising_edge(clk); wait until rising_edge(clk);
i_out.next_nia <= x"0000000000000004";
i_out.next_rpn <= (others => '0');
wait until rising_edge(clk); wait until rising_edge(clk);
i_out.req <= '1'; i_out.req <= '1';
i_out.nia <= x"0000000000000004"; i_out.nia <= x"0000000000000004";
i_out.rpn <= (others => '0');
wait for 30*clk_period; wait for 30*clk_period;
wait until rising_edge(clk); wait until rising_edge(clk);
@ -102,6 +101,7 @@ begin
severity failure; severity failure;
i_out.req <= '0'; i_out.req <= '0';
i_out.next_nia <= x"0000000000000008";
wait until rising_edge(clk); wait until rising_edge(clk);
@ -116,6 +116,8 @@ begin
"=" & to_hstring(i_in.insn) & "=" & to_hstring(i_in.insn) &
" expected 00000002" " expected 00000002"
severity failure; severity failure;
i_out.next_nia <= x"0000000000000040";
wait until rising_edge(clk); wait until rising_edge(clk);
-- another miss -- another miss
@ -133,6 +135,9 @@ begin
severity failure; severity failure;
-- test something that aliases -- test something that aliases
i_out.next_nia <= x"0000000000000100";
wait until rising_edge(clk);
i_out.req <= '1'; i_out.req <= '1';
i_out.nia <= x"0000000000000100"; i_out.nia <= x"0000000000000100";
wait until rising_edge(clk); wait until rising_edge(clk);