Skip to content

Commit 8b1725b

Browse files
laudominikrw1nkler
laudominik
authored and
rw1nkler
committed
modules: zstd: bump fifo depth in mem_writer, mem_reader, axi_stream_remove_empty
1 parent 3a4878b commit 8b1725b

8 files changed

+29
-30
lines changed

‎xls/modules/zstd/huffman_axi_reader.x

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ pub proc HuffmanAxiReader<AXI_DATA_W: u32, AXI_ADDR_W: u32, AXI_ID_W: u32, AXI_D
6666
let (mem_rd_req_s, mem_rd_req_r) = chan<MemRdReq, u32:1>("mem_rd_req");
6767
let (mem_rd_resp_s, mem_rd_resp_r) = chan<MemRdResp, u32:1>("mem_rd_resp");
6868

69-
spawn mem_reader::MemReader<AXI_DATA_W, AXI_ADDR_W, AXI_DEST_W, AXI_ID_W, u32:1> (
69+
spawn mem_reader::MemReader<AXI_DATA_W, AXI_ADDR_W, AXI_DEST_W, AXI_ID_W> (
7070
mem_rd_req_r,
7171
mem_rd_resp_s,
7272
axi_ar_s,

‎xls/modules/zstd/huffman_literals_dec.x

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -204,27 +204,27 @@ pub proc HuffmanLiteralsDecoder<
204204
jump_table_mem_rd_resp_r,
205205
);
206206

207-
spawn mem_reader::MemReader<AXI_DATA_W, AXI_ADDR_W, AXI_DEST_W, AXI_ID_W, u32:1>(
207+
spawn mem_reader::MemReader<AXI_DATA_W, AXI_ADDR_W, AXI_DEST_W, AXI_ID_W>(
208208
jump_table_mem_rd_req_r, jump_table_mem_rd_resp_s,
209209
jump_table_axi_ar_s, jump_table_axi_r_r
210210
);
211211

212-
spawn mem_reader::MemReader<AXI_DATA_W, AXI_ADDR_W, AXI_DEST_W, AXI_ID_W, u32:1>(
212+
spawn mem_reader::MemReader<AXI_DATA_W, AXI_ADDR_W, AXI_DEST_W, AXI_ID_W>(
213213
weights_header_dec_mem_rd_req_r, weights_header_dec_mem_rd_resp_s,
214214
weights_header_dec_axi_ar_s, weights_header_dec_axi_r_r
215215
);
216216

217-
spawn mem_reader::MemReader<AXI_DATA_W, AXI_ADDR_W, AXI_DEST_W, AXI_ID_W, u32:1>(
217+
spawn mem_reader::MemReader<AXI_DATA_W, AXI_ADDR_W, AXI_DEST_W, AXI_ID_W>(
218218
weights_raw_dec_mem_rd_req_r, weights_raw_dec_mem_rd_resp_s,
219219
weights_raw_dec_axi_ar_s, weights_raw_dec_axi_r_r
220220
);
221221

222-
spawn mem_reader::MemReader<AXI_DATA_W, AXI_ADDR_W, AXI_DEST_W, AXI_ID_W, u32:1>(
222+
spawn mem_reader::MemReader<AXI_DATA_W, AXI_ADDR_W, AXI_DEST_W, AXI_ID_W>(
223223
weights_fse_lookup_dec_mem_rd_req_r, weights_fse_lookup_dec_mem_rd_resp_s,
224224
weights_fse_lookup_dec_axi_ar_s, weights_fse_lookup_dec_axi_r_r
225225
);
226226

227-
spawn mem_reader::MemReader<AXI_DATA_W, AXI_ADDR_W, AXI_DEST_W, AXI_ID_W, u32:1>(
227+
spawn mem_reader::MemReader<AXI_DATA_W, AXI_ADDR_W, AXI_DEST_W, AXI_ID_W>(
228228
weights_fse_decoder_dec_mem_rd_req_r, weights_fse_decoder_dec_mem_rd_resp_s,
229229
weights_fse_decoder_dec_axi_ar_s, weights_fse_decoder_dec_axi_r_r
230230
);

‎xls/modules/zstd/literals_decoder.x

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -802,7 +802,7 @@ pub proc LiteralsDecoder<
802802
let (lit_header_mem_rd_req_s, lit_header_mem_rd_req_r) = chan<MemReaderReq, CHANNEL_DEPTH>("lit_header_mem_rd_req");
803803
let (lit_header_mem_rd_resp_s, lit_header_mem_rd_resp_r) = chan<MemReaderResp, CHANNEL_DEPTH>("lit_header_mem_rd_resp");
804804

805-
spawn mem_reader::MemReader<AXI_DATA_W, AXI_ADDR_W, AXI_DEST_W, AXI_ID_W, CHANNEL_DEPTH>(
805+
spawn mem_reader::MemReader<AXI_DATA_W, AXI_ADDR_W, AXI_DEST_W, AXI_ID_W>(
806806
lit_header_mem_rd_req_r, lit_header_mem_rd_resp_s,
807807
lit_header_axi_ar_s, lit_header_axi_r_r
808808
);
@@ -819,7 +819,7 @@ pub proc LiteralsDecoder<
819819
let (raw_lit_mem_rd_req_s, raw_lit_mem_rd_req_r) = chan<MemReaderReq, CHANNEL_DEPTH>("raw_lit_mem_rd_req");
820820
let (raw_lit_mem_rd_resp_s, raw_lit_mem_rd_resp_r) = chan<MemReaderResp, CHANNEL_DEPTH>("raw_lit_mem_rd_resp");
821821

822-
spawn mem_reader::MemReader<AXI_DATA_W, AXI_ADDR_W, AXI_DEST_W, AXI_ID_W, CHANNEL_DEPTH>(
822+
spawn mem_reader::MemReader<AXI_DATA_W, AXI_ADDR_W, AXI_DEST_W, AXI_ID_W>(
823823
raw_lit_mem_rd_req_r, raw_lit_mem_rd_resp_s,
824824
raw_lit_axi_ar_s, raw_lit_axi_r_r
825825
);

‎xls/modules/zstd/memory/axi_stream_remove_empty.x

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,7 @@ pub proc AxiStreamRemoveEmpty<
364364
stream_in_r: chan<AxiStream> in,
365365
stream_out_s: chan<AxiStream> out,
366366
) {
367-
let (continuous_stream_s, continuous_stream_r) = chan<StrobedStream, u32:0>("continuous_stream");
367+
let (continuous_stream_s, continuous_stream_r) = chan<StrobedStream, u32:1>("continuous_stream");
368368

369369
spawn RemoveEmptyBytes<DATA_W, DEST_W, ID_W>(
370370
stream_in_r,

‎xls/modules/zstd/memory/mem_reader.x

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -237,12 +237,12 @@ pub proc MemReaderAdv<
237237
axi_ar_s: chan<AxiAr> out,
238238
axi_r_r: chan<AxiR> in
239239
) {
240-
let (reader_req_s, reader_req_r) = chan<AxiReaderReq, u32:0>("reader_req");
241-
let (reader_err_s, reader_err_r) = chan<AxiReaderError, u32:0>("reader_err");
240+
let (reader_req_s, reader_req_r) = chan<AxiReaderReq, u32:1>("reader_req");
241+
let (reader_err_s, reader_err_r) = chan<AxiReaderError, u32:1>("reader_err");
242242

243-
let (axi_st_in_s, axi_st_in_r) = chan<AxiStreamInput, u32:0>("axi_st_in");
244-
let (axi_st_remove_s, axi_st_remove_r) = chan<AxiStreamOutput, u32:0>("axi_st_remove");
245-
let (axi_st_out_s, axi_st_out_r) = chan<AxiStreamOutput, u32:0>("axi_st_out");
243+
let (axi_st_in_s, axi_st_in_r) = chan<AxiStreamInput, u32:1>("axi_st_in");
244+
let (axi_st_remove_s, axi_st_remove_r) = chan<AxiStreamOutput, u32:1>("axi_st_remove");
245+
let (axi_st_out_s, axi_st_out_r) = chan<AxiStreamOutput, u32:1>("axi_st_out");
246246

247247
spawn MemReaderInternal<
248248
DSLX_DATA_W, DSLX_ADDR_W,
@@ -273,7 +273,6 @@ pub proc MemReaderAdv<
273273
// AXI bus that has the same data width as DSLX-side of the design.
274274
pub proc MemReader<
275275
DATA_W: u32, ADDR_W: u32, DEST_W: u32, ID_W: u32,
276-
CHANNEL_DEPTH: u32 = {u32:0},
277276
DATA_W_DIV8: u32 = {DATA_W / u32:8},
278277
> {
279278
type Req = MemReaderReq<ADDR_W>;
@@ -292,11 +291,11 @@ pub proc MemReader<
292291
axi_ar_s: chan<AxiAr> out,
293292
axi_r_r: chan<AxiR> in
294293
) {
295-
let (reader_req_s, reader_req_r) = chan<AxiReaderReq, CHANNEL_DEPTH>("reader_req");
296-
let (reader_err_s, reader_err_r) = chan<AxiReaderError, CHANNEL_DEPTH>("reader_err");
294+
let (reader_req_s, reader_req_r) = chan<AxiReaderReq, u32:1>("reader_req");
295+
let (reader_err_s, reader_err_r) = chan<AxiReaderError, u32:1>("reader_err");
297296

298-
let (axi_st_in_s, axi_st_in_r) = chan<AxiStreamInput, CHANNEL_DEPTH>("axi_st_in");
299-
let (axi_st_out_s, axi_st_out_r) = chan<AxiStreamOutput, CHANNEL_DEPTH>("axi_st_out");
297+
let (axi_st_in_s, axi_st_in_r) = chan<AxiStreamInput, u32:1>("axi_st_in");
298+
let (axi_st_out_s, axi_st_out_r) = chan<AxiStreamOutput, u32:1>("axi_st_out");
300299

301300
spawn MemReaderInternal<
302301
DATA_W, ADDR_W, DATA_W, ADDR_W, DEST_W, ID_W

‎xls/modules/zstd/memory/mem_writer.x

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -232,11 +232,11 @@ pub proc MemWriter<
232232
axi_b_r: chan<AxiB> in,
233233
resp_s: chan<MemWriterResp> out,
234234
) {
235-
let (axi_writer_req_s, axi_writer_req_r) = chan<AxiWriterReq, u32:0>("axi_writer_req");
236-
let (padding_req_s, padding_req_r) = chan<PaddingReq, u32:0>("padding_req");
237-
let (axi_st_raw_s, axi_st_raw_r) = chan<AxiStream, u32:0>("axi_st_raw");
238-
let (axi_st_clean_s, axi_st_clean_r) = chan<AxiStream, u32:0>("axi_st_clean");
239-
let (axi_st_padded_s, axi_st_padded_r) = chan<AxiStream, u32:0>("axi_st_padded");
235+
let (axi_writer_req_s, axi_writer_req_r) = chan<AxiWriterReq, u32:1>("axi_writer_req");
236+
let (padding_req_s, padding_req_r) = chan<PaddingReq, u32:1>("padding_req");
237+
let (axi_st_raw_s, axi_st_raw_r) = chan<AxiStream, u32:1>("axi_st_raw");
238+
let (axi_st_clean_s, axi_st_clean_r) = chan<AxiStream, u32:1>("axi_st_clean");
239+
let (axi_st_padded_s, axi_st_padded_r) = chan<AxiStream, u32:1>("axi_st_padded");
240240

241241
spawn MemWriterInternal<
242242
ADDR_W, DATA_W, DEST_W, ID_W, WRITER_ID

‎xls/modules/zstd/sequence_dec.x

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -929,7 +929,7 @@ pub proc SequenceDecoder<
929929
let (scd_mem_rd_req_s, scd_mem_rd_req_r) = chan<MemReaderReq, CHANNEL_DEPTH>("scd_mem_rd_req");
930930
let (scd_mem_rd_resp_s, scd_mem_rd_resp_r) = chan<MemReaderResp, CHANNEL_DEPTH>("scd_mem_rd_resp");
931931

932-
spawn mem_reader::MemReader<AXI_DATA_W, AXI_ADDR_W, AXI_DEST_W, AXI_ID_W, CHANNEL_DEPTH>(
932+
spawn mem_reader::MemReader<AXI_DATA_W, AXI_ADDR_W, AXI_DEST_W, AXI_ID_W>(
933933
scd_mem_rd_req_r, scd_mem_rd_resp_s,
934934
scd_axi_ar_s, scd_axi_r_r,
935935
);
@@ -947,7 +947,7 @@ pub proc SequenceDecoder<
947947
let (fld_mem_rd_req_s, fld_mem_rd_req_r) = chan<MemReaderReq, CHANNEL_DEPTH>("fld_mem_rd_req");
948948
let (fld_mem_rd_resp_s, fld_mem_rd_resp_r) = chan<MemReaderResp, CHANNEL_DEPTH>("fld_mem_rd_resp");
949949

950-
spawn mem_reader::MemReader<AXI_DATA_W, AXI_ADDR_W, AXI_DEST_W, AXI_ID_W, CHANNEL_DEPTH>(
950+
spawn mem_reader::MemReader<AXI_DATA_W, AXI_ADDR_W, AXI_DEST_W, AXI_ID_W>(
951951
fld_mem_rd_req_r, fld_mem_rd_resp_s,
952952
fld_axi_ar_s, fld_axi_r_r,
953953
);
@@ -1069,7 +1069,7 @@ pub proc SequenceDecoder<
10691069
let (fd_mem_rd_req_s, fd_mem_rd_req_r) = chan<MemReaderReq, CHANNEL_DEPTH>("fd_mem_rd_req");
10701070
let (fd_mem_rd_resp_s, fd_mem_rd_resp_r) = chan<MemReaderResp, CHANNEL_DEPTH>("fd_mem_rd_resp");
10711071

1072-
spawn mem_reader::MemReader<AXI_DATA_W, AXI_ADDR_W, AXI_DEST_W, AXI_ID_W, CHANNEL_DEPTH>(
1072+
spawn mem_reader::MemReader<AXI_DATA_W, AXI_ADDR_W, AXI_DEST_W, AXI_ID_W>(
10731073
fd_mem_rd_req_r, fd_mem_rd_resp_s,
10741074
fd_axi_ar_s, fd_axi_r_r,
10751075
);

‎xls/modules/zstd/zstd_dec.x

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1254,7 +1254,7 @@ pub proc ZstdDecoder<
12541254
let (fh_mem_rd_req_s, fh_mem_rd_req_r) = chan<MemReaderReq, CHANNEL_DEPTH>("fh_mem_rd_req");
12551255
let (fh_mem_rd_resp_s, fh_mem_rd_resp_r) = chan<MemReaderResp, CHANNEL_DEPTH>("fh_mem_rd_resp");
12561256

1257-
spawn mem_reader::MemReader<AXI_DATA_W, AXI_ADDR_W, AXI_DEST_W, AXI_ID_W, CHANNEL_DEPTH>(
1257+
spawn mem_reader::MemReader<AXI_DATA_W, AXI_ADDR_W, AXI_DEST_W, AXI_ID_W>(
12581258
fh_mem_rd_req_r, fh_mem_rd_resp_s,
12591259
fh_axi_ar_s, fh_axi_r_r,
12601260
);
@@ -1272,7 +1272,7 @@ pub proc ZstdDecoder<
12721272
let (bh_mem_rd_req_s, bh_mem_rd_req_r) = chan<MemReaderReq, CHANNEL_DEPTH>("bh_mem_rd_req");
12731273
let (bh_mem_rd_resp_s, bh_mem_rd_resp_r) = chan<MemReaderResp, CHANNEL_DEPTH>("bh_mem_rd_resp");
12741274

1275-
spawn mem_reader::MemReader<AXI_DATA_W, AXI_ADDR_W, AXI_DEST_W, AXI_ID_W, CHANNEL_DEPTH>(
1275+
spawn mem_reader::MemReader<AXI_DATA_W, AXI_ADDR_W, AXI_DEST_W, AXI_ID_W>(
12761276
bh_mem_rd_req_r, bh_mem_rd_resp_s,
12771277
bh_axi_ar_s, bh_axi_r_r,
12781278
);
@@ -1290,7 +1290,7 @@ pub proc ZstdDecoder<
12901290
let (raw_mem_rd_req_s, raw_mem_rd_req_r) = chan<MemReaderReq, CHANNEL_DEPTH>("raw_mem_rd_req");
12911291
let (raw_mem_rd_resp_s, raw_mem_rd_resp_r) = chan<MemReaderResp, CHANNEL_DEPTH>("raw_mem_rd_resp");
12921292

1293-
spawn mem_reader::MemReader<AXI_DATA_W, AXI_ADDR_W, AXI_DEST_W, AXI_ID_W, CHANNEL_DEPTH>(
1293+
spawn mem_reader::MemReader<AXI_DATA_W, AXI_ADDR_W, AXI_DEST_W, AXI_ID_W>(
12941294
raw_mem_rd_req_r, raw_mem_rd_resp_s,
12951295
raw_axi_ar_s, raw_axi_r_r,
12961296
);

0 commit comments

Comments
 (0)