axi_dmac: Revert EOT memory to FIFO structure

This reverts commit 4b1d9fc "axi_dmac: Modified in order to avoid vivado crash". Vivado no longer crashes and this structure is much more efficient when it comes to resource usage and timing. The intention here is to create a 1-bit memory that is N entries deep and not a N bit signal. Signed-off-by: Lars-Peter Clausen <[email protected]>
analogdevicesinc · Jun 5, 2018 · 80e7ba5 · 80e7ba5
1 parent 8b8df70
commit 80e7ba5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/library/axi_dmac/axi_dmac_constr.ttcl b/library/axi_dmac/axi_dmac_constr.ttcl
@@ -54,8 +54,9 @@ set_max_delay -quiet -datapath_only \
 	[get_property -min PERIOD $src_clk]
 
 set_max_delay -quiet -datapath_only \
-	-from [get_cells -quiet -hier *eot_mem_reg* \
-		-filter {NAME =~ *i_request_arb* && IS_SEQUENTIAL}] \
+  -from $req_clk \
+  -through [get_cells -quiet -hier DP \
+    -filter {NAME =~ *i_request_arb/eot_mem_reg*}] \
 	-to $src_clk \
 	[get_property -min PERIOD $src_clk]
 
@@ -113,8 +114,9 @@ set_max_delay -quiet -datapath_only \
 	[get_property -min PERIOD $req_clk]
 
 set_max_delay -quiet -datapath_only \
-	-from [get_cells -quiet -hier *eot_mem_reg* \
-		-filter {NAME =~ *i_request_arb* && IS_SEQUENTIAL}] \
+  -from $req_clk \
+  -through [get_cells -quiet -hier DP \
+    -filter {NAME =~ *i_request_arb/eot_mem_reg*}] \
 	-to $dest_clk \
 	[get_property -min PERIOD $dest_clk]
 

diff --git a/library/axi_dmac/request_arb.v b/library/axi_dmac/request_arb.v
@@ -189,7 +189,7 @@ localparam BEATS_PER_BURST_WIDTH_DEST = BYTES_PER_BURST_WIDTH - BYTES_PER_BEAT_W
 
 localparam BURSTS_PER_TRANSFER_WIDTH = DMA_LENGTH_WIDTH - BYTES_PER_BURST_WIDTH;
 
-reg [0:2**ID_WIDTH-1] eot_mem;
+reg eot_mem[0:2**ID_WIDTH-1];
 wire request_eot;
 
 wire [ID_WIDTH-1:0] request_id;