Skip to content

Commit d78dd89

Browse files
committed
Merge branch 'isa_psl_info' into 'devel'
fix(vhdl-psl): change informational assert to report See merge request ndk/ndk-fpga!242
2 parents 825a8be + c6930aa commit d78dd89

File tree

2 files changed

+20
-7
lines changed

2 files changed

+20
-7
lines changed

comp/base/misc/crossbarx/crossbarx.vhd

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -511,10 +511,16 @@ begin
511511
TX_TRANS_DST_RDY => trsr_trans_comp_dst_rdy(s)
512512
);
513513

514-
-- psl assert_trcg :
515-
-- assert always (((or trcg_trans_vld)='1' and trcg_trans_src_rdy='1' and trcg_trans_dst_rdy='1' and trsr_trans_dst_rdy(s)='0')=false) @rising_edge(CLK)
516-
-- report "WARNING: CROSSBARX: Internal Transaction FIFO is FULL causing a decrease in throughput! Consider increasing value of generic TRANS_FIFO_ITEMS (currently to_string(TRANS_FIFO_ITEMS)).";
517-
514+
-- synthesis translate_off
515+
process(CLK)
516+
begin
517+
if (rising_edge(CLK)) then
518+
if (not (((or trcg_trans_vld)='1' and trcg_trans_src_rdy='1' and trcg_trans_dst_rdy='1' and trsr_trans_dst_rdy(s)='0')=false)) then
519+
report "WARNING: CROSSBARX: Internal Transaction FIFO is FULL causing a decrease in throughput! Consider increasing value of generic TRANS_FIFO_ITEMS currently (" & to_string(TRANS_FIFO_ITEMS) & ")." severity warning;
520+
end if;
521+
end if;
522+
end process;
523+
-- synthesis translate_on
518524
-- ------------------------------------------------------------------------
519525

520526
-- ------------------------------------------------------------------------

comp/base/misc/event_counter/event_counter_mi_wrapper.vhd

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -187,9 +187,16 @@ begin
187187
MI_ARDY <= MI_WR or MI_RD;
188188
MI_DRDY <= MI_RD;
189189

190-
-- psl assert_empty_flag :
191-
-- assert always (total_events'length+1<=MI_WIDTH)
192-
-- report "WARNING: EVENT COUNTER MI WRAPPER: The width of register for counting number of events (to_string(total_events'length)) is higher or equal to the total width of the connected MI interface (to_string(MI_WIDTH))! This might cause overflow of the value read from this register!";
190+
-- synthesis translate_off
191+
process(CLK)
192+
begin
193+
if (rising_edge(CLK)) then
194+
if (total_events'length+1 > MI_WIDTH) then
195+
report "WARNING: EVENT COUNTER MI WRAPPER: The width of register for counting number of events " & to_string(total_events'length) & " is higher or equal to the total width of the connected MI interface " & to_string(MI_WIDTH) & "! This might cause overflow of the value read from this register!" severity warning;
196+
end if;
197+
end if;
198+
end process;
199+
-- synthesis translate_on
193200

194201
MI_DRD <= std_logic_vector(resize_left(unsigned(total_events),MI_WIDTH))
195202
when (MI_ADDR and MI_ADDR_MASK)=(MI_EVENTS_ADDR and MI_ADDR_MASK) else

0 commit comments

Comments
 (0)