diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b7dc184e..e6903979 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -71,3 +71,13 @@ tiny-dma-run: job: prepare-non-free strategy: depend +frontend-descriptor-run: + stage: iDMA + needs: + - prepare-non-free + trigger: + include: + - artifact: idma-non-free/ci/gitlab-frontend-descriptor-ci.yml + job: prepare-non-free + strategy: depend + diff --git a/Bender.lock b/Bender.lock index c9a15d8b..c8e112a0 100644 --- a/Bender.lock +++ b/Bender.lock @@ -1,7 +1,7 @@ packages: axi: - revision: 9a53b3c66d32725e5c5656b02e1caf07c5f79a97 - version: 0.37.0 + revision: a25b415958e83e232096aa3863da56887abd5991 + version: 0.39.0-beta source: Git: https://github.com/pulp-platform/axi.git dependencies: @@ -17,14 +17,14 @@ packages: - common_verification - tech_cells_generic common_verification: - revision: 5def6fee3f010b603357d7b941661892aeafcc5d - version: 0.2.2 + revision: 9c07fa860593b2caabd9b5681740c25fac04b878 + version: 0.2.3 source: Git: https://github.com/pulp-platform/common_verification.git dependencies: [] register_interface: - revision: 1e23b79db80cb89b4d27fdbd10776df33d6a2ff4 - version: 0.3.3 + revision: d59b4f1c77469dcb23f370f32769af309c4add6a + version: 0.3.4 source: Git: https://github.com/pulp-platform/register_interface.git dependencies: diff --git a/Bender.yml b/Bender.yml index 610786d6..6d417789 100644 --- a/Bender.yml +++ b/Bender.yml @@ -11,7 +11,7 @@ package: dependencies: common_cells: { git: "https://github.com/pulp-platform/common_cells.git", version: 1.26.0 } common_verification: { git: "https://github.com/pulp-platform/common_verification.git", version: 0.2.2 } - axi: { git: "https://github.com/pulp-platform/axi.git", version: 0.37.0 } + axi: { git: "https://github.com/pulp-platform/axi.git", version: 0.39.0-beta } register_interface: { git: "https://github.com/pulp-platform/register_interface.git", version: 0.3.1 } export_include_dirs: @@ -61,13 +61,23 @@ sources: - files: # 64bit descriptor frontend # Level 0 + - src/frontends/desc64/idma_desc64_synth_pkg.sv + - src/frontends/desc64/idma_desc64_ar_gen.sv + - src/frontends/desc64/idma_desc64_ar_gen_prefetch.sv + - src/frontends/desc64/idma_desc64_reader.sv + - src/frontends/desc64/idma_desc64_reader_gater.sv - src/frontends/desc64/idma_desc64_reg_pkg.sv - src/frontends/desc64/idma_desc64_reg_top.sv - - src/frontends/desc64/idma_desc64_shared_counter.sv + - src/frontends/desc64/idma_desc64_reshaper.sv # Level 1 - src/frontends/desc64/idma_desc64_reg_wrapper.sv # Level 2 - src/frontends/desc64/idma_desc64_top.sv + - src/systems/cva6_desc/dma_desc_wrap.sv + - src/systems/cva6_desc/dma_desc_synth_pkg.sv + - src/systems/cva6_desc/dma_desc_synth.sv + # Level 3 + - src/frontends/desc64/idma_desc64_synth.sv # Systems - target: all(pulp, not(mchan)) @@ -99,3 +109,4 @@ sources: files: # Level 0 - test/frontends/tb_idma_desc64_top.sv + - test/frontends/tb_idma_desc64_bench.sv diff --git a/Makefile b/Makefile index 2479e7ae..e996ae15 100644 --- a/Makefile +++ b/Makefile @@ -146,7 +146,7 @@ VLT_ARGS += --no-skip-identical VLT_TOP ?= verilator/files_raw.txt: Bender.yml Bender.lock - $(BENDER) script verilator -t synthesis > $@ + $(BENDER) script verilator -t synthesis -t pulp -t cva6 > $@ verilator/files.txt: verilator/scripts/preprocess.py verilator/files_raw.txt $(PYTHON) $^ > $@ @@ -291,39 +291,39 @@ REG_HTML_STRING = "\n\n
\n $(REG32_2D_FE_DIR)/idma_reg32_2d_frontend.h - printf $(REG_HTML_STRING) > $(REG32_2D_FE_DIR)/idma_reg32_2d_frontend.html - $(PYTHON) $(REG_TOOL) $(REG32_2D_HJSON) -d >> $(REG32_2D_FE_DIR)/idma_reg32_2d_frontend.html - printf "\n" >> $(REG32_2D_FE_DIR)/idma_reg32_2d_frontend.html - cp $(REG_PATH)/vendor/lowrisc_opentitan/util/reggen/reg_html.css $(REG32_2D_FE_DIR) + "$(PYTHON)" "$(REG_TOOL)" "$(REG32_2D_HJSON)" -t "$(REG32_2D_FE_DIR)" -r + "$(PYTHON)" "$(REG_TOOL)" "$(REG32_2D_HJSON)" -D > "$(REG32_2D_FE_DIR)/idma_reg32_2d_frontend.h" + printf $(REG_HTML_STRING) > "$(REG32_2D_FE_DIR)/idma_reg32_2d_frontend.html" + "$(PYTHON)" "$(REG_TOOL)" "$(REG32_2D_HJSON)" -d >> "$(REG32_2D_FE_DIR)/idma_reg32_2d_frontend.html" + printf "\n" >> "$(REG32_2D_FE_DIR)/idma_reg32_2d_frontend.html" + cp "$(REG_PATH)/vendor/lowrisc_opentitan/util/reggen/reg_html.css" "$(REG32_2D_FE_DIR)" reg64_regs: - $(PYTHON) $(REG_TOOL) $(REG64_HJSON) -t $(REG64_FE_DIR) -r - $(PYTHON) $(REG_TOOL) $(REG64_HJSON) -D > $(REG64_FE_DIR)/idma_reg64_frontend.h - printf $(REG_HTML_STRING) > $(REG64_FE_DIR)/idma_reg64_frontend.html - $(PYTHON) $(REG_TOOL) $(REG64_HJSON) -d >> $(REG64_FE_DIR)/idma_reg64_frontend.html - printf "