diff --git a/.github/workflows/gitlab-ci.yml b/.github/workflows/gitlab-ci.yml index 45b3e4a1..8b7298d8 100644 --- a/.github/workflows/gitlab-ci.yml +++ b/.github/workflows/gitlab-ci.yml @@ -9,19 +9,14 @@ name: gitlab-ci on: [ push, pull_request, workflow_dispatch ] jobs: - - check: + gitlab-ci: runs-on: ubuntu-latest steps: - - - name: Mirror and check - uses: pulp-platform/pulp-actions/gitlab-ci@v2 + - name: Check Gitlab CI + uses: pulp-platform/pulp-actions/gitlab-ci@v2.4.1 # update version as needed, not autoupdated # Skip on forks or pull requests from forks due to missing secrets. - if: > - github.repository == 'pulp-platform/pulp_cluster' && - (github.event_name != 'pull_request' || - github.event.pull_request.head.repo.full_name == github.repository) + if: github.repository == 'FondazioneChipsIT/pulp_cluster' && (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository) with: - domain: iis-git.ee.ethz.ch - repo: github-mirror/pulp_cluster - token: ${{ secrets.GITLAB_TOKEN }} + domain: gitlab.chips.it + repo: digitalresearchline/githubmirrors/pulp_cluster + token: ${{ secrets.GITLAB_TOKEN }} \ No newline at end of file diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 32c1cb3c..90dc4724 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,13 +13,15 @@ init: stage: nonfree script: make nonfree-init artifacts: - paths: [ nonfree/ci.yml ] + paths: [ nonfree/.gitlab-ci.yml ] subpipe: stage: nonfree needs: [ init ] + variables: + PARENT_PIPELINE_SOURCE: $CI_PIPELINE_SOURCE trigger: include: - - artifact: nonfree/ci.yml + - artifact: nonfree/.gitlab-ci.yml job: init strategy: depend diff --git a/Bender.lock b/Bender.lock index 34ed4ae2..6791f43f 100644 --- a/Bender.lock +++ b/Bender.lock @@ -179,7 +179,7 @@ packages: Git: https://github.com/pulp-platform/icache-intc.git dependencies: [] idma: - revision: 6be43a77c81e86c53e821dfbc618522c375ff28c + revision: 2e637216e0455d77706a50d0639b86891e2a83aa version: null source: Git: https://github.com/pulp-platform/iDMA.git diff --git a/Bender.yml b/Bender.yml index 393903e4..b996e5b3 100644 --- a/Bender.yml +++ b/Bender.yml @@ -18,25 +18,25 @@ dependencies: cluster_interconnect: { git: "https://github.com/pulp-platform/cluster_interconnect.git", rev: v1.3.0 } event_unit_flex: { git: "https://github.com/pulp-platform/event_unit_flex.git", rev: astral-v1.0 } mchan: { git: "https://github.com/pulp-platform/mchan.git", version: =1.2.4 } - idma: { git: "https://github.com/pulp-platform/iDMA.git", rev: 6be43a77c81e86c53e821dfbc618522c375ff28c } #devel + idma: { git: "https://github.com/FondazioneChipsIT/iDMA.git", rev: 7073edd83950232c12f900d2b6d65016b886a50a } obi: { git: "https://github.com/pulp-platform/obi.git", version: =0.1.7 } hier-icache: { git: "https://github.com/pulp-platform/hier-icache.git", version: =1.3.0 } cluster_icache: { git: "https://github.com/pulp-platform/cluster_icache.git", version: =0.2.0 } - cluster_peripherals: { git: "https://github.com/pulp-platform/cluster_peripherals.git", rev: "072ddd876c88324ef28856d4b2697424aaa231ce" } + cluster_peripherals: { git: "https://github.com/pulp-platform/cluster_peripherals.git", rev: 072ddd876c88324ef28856d4b2697424aaa231ce } axi: { git: "https://github.com/pulp-platform/axi.git", version: =0.39.8 } - timer_unit: { git: "https://github.com/pulp-platform/timer_unit.git", version: =1.0.2 } + timer_unit: { git: "https://github.com/pulp-platform/timer_unit.git", version: =1.0.3 } common_cells: { git: "https://github.com/pulp-platform/common_cells.git", version: =1.38.0 } tech_cells_generic: { git: "https://github.com/pulp-platform/tech_cells_generic.git", version: =0.2.3 } - flex-v: { git: "https://github.com/pulp-platform/flex-v.git", rev: e9355c2f6ec4c105abdff39489e5d1be93bc4374 } + flex-v: { git: "https://github.com/pulp-platform/flex-v.git", rev: astral-v1.1 } cv32e40p: { git: "https://github.com/pulp-platform/cv32e40p.git", rev: astral-v1.0 } ibex: { git: "https://github.com/pulp-platform/ibex.git", rev: "pulpissimo-v6.1.2" } - scm: { git: "https://github.com/pulp-platform/scm.git", rev: v1.2.0 } - hci: { git: "https://github.com/pulp-platform/hci.git", rev: 2a5a508 } # yt/wen-filter - register_interface: { git: "https://github.com/pulp-platform/register_interface.git", version: 0.4.4 } + scm: { git: "https://github.com/pulp-platform/scm.git", version: =1.2.0 } + hci: { git: "https://github.com/pulp-platform/hci.git", rev: 3e63936991569d0b1e315d6914478937b37bb338 } + register_interface: { git: "https://github.com/pulp-platform/register_interface.git", version: =0.4.7 } redundancy_cells: { git: "https://github.com/pulp-platform/redundancy_cells.git", rev: 6ba6f41 } # yt/redmule-v2 - redmule: { git: "https://github.com/pulp-platform/redmule.git", version: =2.0.4 } - neureka: { git: "https://github.com/pulp-platform/neureka.git", rev: f4e131c } # branch: lg/astral-v1.1 - softex: { git: "https://github.com/belanoa/softex.git" , rev: astral-v1.0 } + redmule: { git: "https://github.com/pulp-platform/redmule.git", rev: dbcba6b1efda24dc909ebdd4ace132f798c8c12b } + neureka: { git: "https://github.com/pulp-platform/neureka.git", rev: 2e076f7d25cdfba38821ee95595bb27aec53c764 } + softex: { git: "https://github.com/belanoa/softex.git", rev: 11dd29e85d40e29fea0481b471f1c0cc967df1a4 } export_include_dirs: - include @@ -54,12 +54,7 @@ sources: - rtl/cluster_event_map.sv - rtl/cluster_timer_wrap.sv - rtl/obi_pulp_adapter.sv - - target: mchan - files: - - rtl/mchan_wrap.sv - - target: idma - files: - - rtl/idma_wrap.sv + - rtl/idma_wrap.sv - rtl/hwpe_subsystem.sv - rtl/instr_width_converter.sv - rtl/per2axi_wrap.sv @@ -94,6 +89,6 @@ sources: - target: pulp_standalone_synth files: - - nonfree/gf12/sourcecode/tc_sram.sv - - nonfree/gf12/sourcecode/tc_clk.sv + - gf22/sourcecode/tc_sram.sv + - gf22/sourcecode/tc_clk.sv diff --git a/CHANGELOG.md b/CHANGELOG.md index 4543a057..63586ac0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## v0.0.0 +## ChipsIt-v0.0.0 ### Added * iDMA: integrated iDMA wrap supporting up to 3D transfers with 2 physical channels and parametric burst length diff --git a/Makefile b/Makefile index 215d5f0b..f5117696 100644 --- a/Makefile +++ b/Makefile @@ -30,7 +30,6 @@ VENV := venv top_level ?= pulp_cluster library ?= work elf-bin ?= stimuli.riscv -bwruntest = $(ROOT_DIR)/pulp-runtime/scripts/bwruntests.py REGRESSIONS := $(ROOT_DIR)/regression_tests @@ -47,8 +46,8 @@ endef # Nonfree components # ###################### -NONFREE_REMOTE ?= git@iis-git.ee.ethz.ch:pulp-restricted/pulp-cluster-nonfree.git -NONFREE_COMMIT ?= aad59d36bfef6b74f03ffed28903a44cb86b9497 +NONFREE_REMOTE ?= git@gitlab.chips.it:digitalresearchline/chips-restricted/pulp-cluster-nonfree.git +NONFREE_COMMIT ?= e0e713be4a9215484e07d6f1244c21352e71a4bd nonfree-init: git clone $(NONFREE_REMOTE) nonfree @@ -79,17 +78,17 @@ Bender.lock: .PHONY: sw-init sw-clean -sw-init: pulp-runtime fault_injection_sim regression_tests +sw-init: pulp-sdk fault_injection_sim sw-clean: - @rm -rf pulp-runtime fault_injection_sim regression_tests + @rm -rf pulp-sdk fault_injection_sim -## Clone pulp-runtime as SW stack -PULP_RUNTIME_REMOTE ?= https://github.com/pulp-platform/pulp-runtime.git -PULP_RUNTIME_COMMIT ?= 3b48b0c6872cc01ba169a2c9c886ebb815d22cdc +### Clone pulp-sdk as SW stack +PULP_SDK_REMOTE ?= https://github.com/FondazioneChipsIT/pulp-sdk.git +PULP_SDK_COMMIT ?= 55fedf856aafa0a305c6bcd02b7e62b69bc74246 -pulp-runtime: - git clone $(PULP_RUNTIME_REMOTE) $@ - cd $@ && git checkout $(PULP_RUNTIME_COMMIT) +pulp-sdk: + git clone ${PULP_SDK_REMOTE} $@ + cd $@ && git checkout ${PULP_SDK_COMMIT} && git submodule update --init --recursive ## Clone fault injection scripts FAULT_SIM_REMOTE ?= https://github.com/pulp-platform/InjectaFault.git @@ -100,8 +99,8 @@ fault_injection_sim: cd $@ && git checkout $(FAULT_SIM_COMMIT) ## Clone regression tests -REGRESSION_TESTS_REMOTE ?= https://github.com/pulp-platform/regression_tests.git -REGRESSION_TESTS_COMMIT ?= f173611e3e8f15e7f526d40712135e7ff976f805 # branch: lg/upstream +REGRESSION_TESTS_REMOTE ?= https://github.com/FondazioneChipsIT/regression_tests.git +REGRESSION_TESTS_COMMIT ?= a795d6a318c5aa5842e61e2e2daf2d2c6cb89454 # branch: chips-it regression_tests: git clone $(REGRESSION_TESTS_REMOTE) $@ @@ -121,13 +120,9 @@ sim-clean: include bender-common.mk include bender-sim.mk scripts/compile.tcl: | Bender.lock - $(call generate_vsim, $@, $(common_defs) $(common_targs) -t idma $(sim_defs) $(sim_targs),..) + $(call generate_vsim, $@, $(common_defs) $(common_targs) $(sim_defs) $(sim_targs),..) echo 'vlog "$(realpath $(ROOT_DIR))/tb/dpi/elfloader.cpp" -ccflags "-std=c++11"' >> $@ -scripts/compile.tcl-mchan: | Bender.lock - $(call generate_vsim, scripts/compile.tcl, $(common_defs) $(common_targs) -t mchan $(sim_defs) $(sim_targs),..) - echo 'vlog "$(realpath $(ROOT_DIR))/tb/dpi/elfloader.cpp" -ccflags "-std=c++11"' >> scripts/compile.tcl - include bender-synth.mk scripts/synth-compile.tcl: | Bender.lock $(BENDER) script synopsys $(common_targs) $(common_defs) $(synth_targs) $(synth_defs) > $@ @@ -141,13 +136,14 @@ $(library): $(QUESTA) vlib $(library) -uv: - cd $(shell bender path idma) && \ - curl -LsSf https://astral.sh/uv/install.sh | sh && \ - uv sync --locked +idma_venv: + python3 -m venv $(VENV) && \ + $(VENV)/bin/python -m pip install -U pip && \ + $(VENV)/bin/python -m pip install -r $(shell $(BENDER) path idma)/requirements.txt && \ + $(VENV)/bin/python -m pip install "setuptools<81" -generate_idma_rtl: uv - . "$(shell bender path idma)/.venv/bin/activate" && $(MAKE) -C $(shell bender path idma) idma_hw_all +generate_idma_rtl: idma_venv + . "$(VENV)/bin/activate" && $(MAKE) -C $(shell $(BENDER) path idma) idma_hw_all compile: $(library) @test -f Bender.lock || { echo "ERROR: Bender.lock file does not exist. Did you run make checkout in bender mode?"; exit 1; } @@ -155,7 +151,7 @@ compile: $(library) $(VSIM) -c -do 'quit -code [source scripts/compile.tcl]' build_qone: compile - $(QOPT) $(compile_flag) -debug +designfile -suppress 3053 -suppress 8885 -work $(library) $(top_level)_tb -o $(top_level)_tb_optimized + $(QOPT) $(compile_flag) -debug +designfile -access=rw+/$(top_level)_tb. -suppress 3053 -suppress 8885 -work $(library) $(top_level)_tb -o $(top_level)_tb_optimized build: compile diff --git a/bender-synth.mk b/bender-synth.mk index ea5f9756..7ac7377d 100644 --- a/bender-synth.mk +++ b/bender-synth.mk @@ -6,4 +6,3 @@ synth_defs := # Don't add the following for linting synth_targs := -t pulp_standalone_synth -synth_targs += -t idma diff --git a/include/pulp_soc_defines.sv b/include/pulp_soc_defines.sv index 965fef4a..4df4aca6 100644 --- a/include/pulp_soc_defines.sv +++ b/include/pulp_soc_defines.sv @@ -19,6 +19,10 @@ * */ +`ifndef PULP_SOC_DEFINES_SV +`define PULP_SOC_DEFINES_SV + + `define CLUSTER_ALIAS `define PRIVATE_ICACHE `define HIERARCHY_ICACHE_32BIT @@ -51,3 +55,33 @@ `define NB_DMAS 4 `define NB_MPERIPHS 1 `define NB_SPERIPHS 12 + +// Width of byte enable for a given data width +`define EVAL_BE_WIDTH(DATAWIDTH) (DATAWIDTH/8) + +`define NB_L2_CHANNELS 4 + +// Default JTAG ID code type +typedef struct packed { + bit [ 3:0] version; + bit [15:0] part_num; + bit [10:0] manufacturer; + bit _one; +} jtag_idcode_t; + +// PULP Platform manufacturer and default PulpOpen part number +localparam bit [10:0] JtagPulpManufacturer = 11'h6d9; +localparam bit [15:0] JtagPulpOpenPartNum = 16'hc5e5; +localparam bit [ 3:0] JtagPulpOpenVersion = 4'h1; +localparam jtag_idcode_t PulpOpenIdCode = '{ + _one : 1, + manufacturer : JtagPulpManufacturer, + part_num : JtagPulpOpenPartNum, + version : JtagPulpOpenVersion +}; + +// JTAG +`define DMI_JTAG_IDCODE PulpOpenIdCode +// `define DMI_JTAG_IDCODE 32'h249511C3 + +`endif diff --git a/rtl/idma_wrap.sv b/rtl/idma_wrap.sv index 26c787d9..2be85c4f 100644 --- a/rtl/idma_wrap.sv +++ b/rtl/idma_wrap.sv @@ -271,25 +271,34 @@ module dmac_wrap #( // Here, another clock gating level is applied: // - completely hw-controlled, this clock gating cell controls the datapath clock, disabling it when not needed. - logic keep_datapath_clocked, datapath_clk_en; - - // Register to keep the clock active until event completion - // Once the transfer has started its execution (busy_o == 1'b1) - // the datapath needs to be clocked until the completion event - // has been received (|trans_complete). Then the datapath - // can be gated again. + // The maximum inflight number of transfers is computed as: (FIFO DEPTH + number of outstanding bursts held by the backend + + // the transfer currently handled by the midend) * number of streams + localparam int unsigned MaxInflight = NumStreams * (GLOBAL_QUEUE_DEPTH + NB_OUTSND_BURSTS + 2); + localparam int unsigned InflightWidth = $clog2(MaxInflight + 1); + + logic datapath_clk_en; + logic [InflightWidth-1:0] inflight_d, inflight_q; + + // This counter keeps track of any ongoing transfers on the streams. + always_comb begin : proc_inflight + inflight_d = inflight_q; + for (int unsigned s = 0; s < NumStreams; s++) begin + if (fe_valid[s] & fe_ready[s]) inflight_d = inflight_d + 1'b1; + if (trans_complete[s]) inflight_d = inflight_d - 1'b1; + end + end always_ff @(posedge clk_i, negedge rst_ni) begin if (rst_ni == 1'b0) begin - keep_datapath_clocked <= 1'b0; - end else if (busy_o == 1'b1) begin - keep_datapath_clocked <= 1'b1; - end else if (|trans_complete) begin - keep_datapath_clocked <= 1'b0; + inflight_q <= '0; + end else begin + inflight_q <= inflight_d; end end - assign datapath_clk_en = (one_fe_valid | (|trans_complete) | keep_datapath_clocked); + // Check if the datapath needs to be clocked. + + assign datapath_clk_en = one_fe_valid | (|trans_complete) | (inflight_q != '0); // // ---------------------------------------------------------------------------------------------------------- // // DATAPATH CLOCK GATING CELL --> This gates everything except for the frontend and the periph_to_reg modules @@ -507,7 +516,7 @@ module dmac_wrap #( .HardwareLegalizer ( 1'b1 ), .RejectZeroTransfers ( 1'b1 ), .ErrorHandling ( 1'b0 ), - .BurstLen ( IDMA_BURST_LENGTH ) + .Burst_len ( IDMA_BURST_LENGTH ) ) i_idma_backend_r_obi_rw_init_w_axi ( .clk_i ( datapath_clk_gated ), .rst_ni ( rst_ni ), @@ -519,8 +528,6 @@ module dmac_wrap #( .req_dst_addr_i ( idma_req[s].dst_addr ), .req_src_protocol_i ( idma_req[s].opt.src_protocol ), .req_dst_protocol_i ( idma_req[s].opt.dst_protocol ), - .req_src_head_i ( '0 ), - .req_dst_head_i ( '0 ), .req_axi_id_i ( idma_req[s].opt.axi_id ), .req_src_burst_i ( idma_req[s].opt.src.burst ), .req_src_cache_i ( idma_req[s].opt.src.cache ), @@ -724,20 +731,21 @@ module dmac_wrap #( assign obi_write_req_from_dma[s/2].rready = obi2axi_write_req_from_dma[s/2].rready ; idma_backend_synth_r_axi_rw_init_rw_obi #( - .DataWidth (AXI_DATA_WIDTH), - .AddrWidth (AXI_ADDR_WIDTH), - .UserWidth (AXI_USER_WIDTH), - .AxiIdWidth (AXI_ID_WIDTH), - .NumAxInFlight (NB_OUTSND_BURSTS), - .BufferDepth (32'd3), - .TFLenWidth (TFLenWidth), - .MemSysDepth (32'd0), - .CombinedShifter (1'b0), - .RAWCouplingAvail (1'b0), - .MaskInvalidData (1'b0), - .HardwareLegalizer (1'b1), - .RejectZeroTransfers (1'b1), - .ErrorHandling (1'b0) + .DataWidth ( AXI_DATA_WIDTH ), + .AddrWidth ( AXI_ADDR_WIDTH ), + .UserWidth ( AXI_USER_WIDTH ), + .AxiIdWidth ( AXI_ID_WIDTH ), + .NumAxInFlight ( NB_OUTSND_BURSTS ), + .BufferDepth ( 32'd3 ), + .TFLenWidth ( TFLenWidth ), + .MemSysDepth ( 32'd0 ), + .CombinedShifter ( 1'b0 ), + .RAWCouplingAvail ( 1'b0 ), + .MaskInvalidData ( 1'b0 ), + .HardwareLegalizer ( 1'b1 ), + .RejectZeroTransfers ( 1'b1 ), + .ErrorHandling ( 1'b0 ), + .Burst_len ( IDMA_BURST_LENGTH ) ) i_idma_backend_r_axi_rw_init_rw_obi ( .clk_i ( datapath_clk_gated ), .rst_ni ( rst_ni ), @@ -749,8 +757,6 @@ module dmac_wrap #( .req_dst_addr_i ( idma_req[s].dst_addr ), .req_src_protocol_i ( idma_req[s].opt.src_protocol ), .req_dst_protocol_i ( idma_req[s].opt.dst_protocol ), - .req_src_head_i ( '0 ), - .req_dst_head_i ( '0 ), .req_axi_id_i ( idma_req[s].opt.axi_id ), .req_src_burst_i ( idma_req[s].opt.src.burst ), .req_src_cache_i ( idma_req[s].opt.src.cache ), diff --git a/rtl/mchan_wrap.sv b/rtl/mchan_wrap.sv deleted file mode 100644 index 45ea8c08..00000000 --- a/rtl/mchan_wrap.sv +++ /dev/null @@ -1,250 +0,0 @@ -// Copyright 2018 ETH Zurich and University of Bologna. -// Copyright and related rights are licensed under the Solderpad Hardware -// License, Version 0.51 (the "License"); you may not use this file except in -// compliance with the License. You may obtain a copy of the License at -// http://solderpad.org/licenses/SHL-0.51. Unless required by applicable law -// or agreed to in writing, software, hardware and materials distributed under -// this License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -// CONDITIONS OF ANY KIND, either express or implied. See the License for the -// specific language governing permissions and limitations under the License. - -/* - * dmac_wrap.sv - * Davide Rossi - * Antonio Pullini - * Igor Loi - * Francesco Conti - */ - -module dmac_wrap -#( - parameter int unsigned NB_CTRLS = 2, - parameter int unsigned NB_CORES = 8, - parameter int unsigned NB_OUTSND_BURSTS = 8, - parameter int unsigned MCHAN_BURST_LENGTH = 256, - parameter int unsigned AXI_ADDR_WIDTH = 32, - parameter int unsigned AXI_DATA_WIDTH = 64, - parameter int unsigned AXI_USER_WIDTH = 6, - parameter int unsigned AXI_ID_WIDTH = 4, - parameter int unsigned PE_ID_WIDTH = 1, - parameter int unsigned TCDM_ADD_WIDTH = 13, - parameter int unsigned DATA_WIDTH = 32, - parameter int unsigned ADDR_WIDTH = 32, - parameter int unsigned BE_WIDTH = DATA_WIDTH/8, - parameter type axi_req_t = logic, - parameter type axi_resp_t = logic -) -( - input logic clk_i, - input logic rst_ni, - input logic test_mode_i, - - hci_core_intf.target ctrl_slave[0:NB_CORES-1], - XBAR_PERIPH_BUS.Slave pe_ctrl_slave[1:0], - - hci_core_intf.initiator tcdm_master[3:0], - output axi_req_t ext_master_req_o, - input axi_resp_t ext_master_resp_i, - output logic [1:0] term_event_pe_o, - output logic [1:0] term_irq_pe_o, - output logic [NB_CORES-1:0] term_event_o, - output logic [NB_CORES-1:0] term_irq_o, - output logic busy_o -); - - // CORE --> MCHAN CTRL INTERFACE BUS SIGNALS - logic [NB_CTRLS-1:0][DATA_WIDTH-1:0] s_ctrl_bus_wdata; - logic [NB_CTRLS-1:0][ADDR_WIDTH-1:0] s_ctrl_bus_add; - logic [NB_CTRLS-1:0] s_ctrl_bus_req; - logic [NB_CTRLS-1:0] s_ctrl_bus_wen; - logic [NB_CTRLS-1:0][BE_WIDTH-1:0] s_ctrl_bus_be; - logic [NB_CTRLS-1:0][PE_ID_WIDTH-1:0] s_ctrl_bus_id; - logic [NB_CTRLS-1:0] s_ctrl_bus_gnt; - logic [NB_CTRLS-1:0][DATA_WIDTH-1:0] s_ctrl_bus_r_rdata; - logic [NB_CTRLS-1:0] s_ctrl_bus_r_valid; - logic [NB_CTRLS-1:0] s_ctrl_bus_r_opc; - logic [NB_CTRLS-1:0][PE_ID_WIDTH-1:0] s_ctrl_bus_r_id; - - - // MCHAN TCDM INIT --> TCDM MEMORY BUS SIGNALS - logic [3:0][DATA_WIDTH-1:0] s_tcdm_bus_wdata; - logic [3:0][ADDR_WIDTH-1:0] s_tcdm_bus_add; - logic [3:0] s_tcdm_bus_req; - logic [3:0] s_tcdm_bus_wen; - logic [3:0][BE_WIDTH-1:0] s_tcdm_bus_be; - logic [3:0] s_tcdm_bus_gnt; - logic [3:0][DATA_WIDTH-1:0] s_tcdm_bus_r_rdata; - logic [3:0] s_tcdm_bus_r_valid; - - // CLUSTER CORE PORT BINDING - generate - for (genvar i=0; i> sections; @@ -154,13 +158,19 @@ extern "C" { char read_elf(const char *filename); } -static void write (uint64_t address, uint64_t len, uint8_t *buf) +// Publish [start, end) as one section, filling gaps with zeros +static void emit_run (uint64_t start, uint64_t end, const std::map &img) { - std::vector mem; - for (int i = 0; i < len; i++) { - mem.push_back(buf[i]); + std::vector mem(end - start, 0); + + for (uint64_t addr = start; addr < end; addr++) { + std::map::const_iterator byte = img.find(addr); + if (byte != img.end()) + mem[addr - start] = byte->second; } - mems.insert(std::make_pair(address, mem)); + + sections.push_back(std::make_pair(start, end - start)); + mems[start] = mem; } // Return the entry point reported by the ELF file @@ -191,24 +201,22 @@ extern "C" char read_section(long long address, const svOpenArrayHandle buffer, { // get actual pointer char *buf = (char *) svGetArrayPtr(buffer); - + // check that the address points to a section - if (!mems.count(address)) { + std::map>::const_iterator sec = mems.find(address); + if (sec == mems.end()) { printf("[ELF] ERROR: No section found for address %p\n", address); return -1; } - - // copy array - long long int len_tmp = len; - for (auto &datum : mems.find(address)->second) { - if(len_tmp-- == 0){ - printf("[ELF] ERROR: Copied 0x%lx bytes. Buffer is full but there is still data available.\n", len); - return -1; - } - *buf++ = datum; + if ((long long)sec->second.size() > len) { + printf("[ELF] ERROR: Buffer holds 0x%llx bytes but the section is 0x%lx bytes.\n", + len, sec->second.size()); + return -1; } + memcpy(buf, sec->second.data(), sec->second.size()); + return 0; } @@ -229,24 +237,54 @@ static void load_elf(char *buf, size_t size) entry = eh->e_entry; printf("[ELF] INFO: Entrypoint at %p\n", entry); - // Iterate over all program header entries + // Flatten every loadable segment into a byte-accurate image. Segment addresses + // are only 4-byte aligned in practice (e.g. .data_tiny_l1 @ 0x1c01c19c), so they + // cannot be handed to the TB as-is: its preload writes whole BUS_BYTES words and + // would round the base down, shifting the payload and clobbering the neighbour. + std::map img; + for (unsigned int i = 0; i < eh->e_phnum; i++) { - // Check whether the current program header entry contains a loadable section of nonzero size if(ph[i].p_type == PT_LOAD && ph[i].p_memsz) { - // Is this section something else than zeros? - if (ph[i].p_filesz) { - assert(size >= ph[i].p_offset + ph[i].p_filesz); - sections.push_back(std::make_pair(ph[i].p_paddr, ph[i].p_memsz)); - write(ph[i].p_paddr, ph[i].p_filesz, (uint8_t*)buf + ph[i].p_offset); - } - - if(ph[i].p_memsz > ph[i].p_filesz){ - printf("[ELF] WARNING: The section starting @ %p contains 0x%lx zero bytes which will NOT be preloaded!\n", - ph[i].p_paddr, (ph[i].p_memsz - ph[i].p_filesz)); - } + assert(size >= ph[i].p_offset + ph[i].p_filesz); + const uint8_t *src = (const uint8_t *)buf + ph[i].p_offset; + + for (uint64_t k = 0; k < ph[i].p_filesz; k++) + img[ph[i].p_paddr + k] = src[k]; + + // .bss-style tail: preloaded as zeros + for (uint64_t k = ph[i].p_filesz; k < ph[i].p_memsz; k++) + img[ph[i].p_paddr + k] = 0; } } + // Coalesce into BUS_BYTES-aligned, non-overlapping runs. Rounding a run outwards + // can make it touch its neighbour (two segments sharing one bus word); merging + // them here is what keeps the shared word from being written twice. + uint64_t run_start = 0, run_end = 0; + bool in_run = false; + + for (std::map::const_iterator it = img.begin(); it != img.end(); ) { + uint64_t start = it->first, end = start; + while (it != img.end() && it->first == end) { end++; it++; } + + uint64_t aligned_start = start & ~(uint64_t)(BUS_BYTES - 1); + uint64_t aligned_end = (end + BUS_BYTES - 1) & ~(uint64_t)(BUS_BYTES - 1); + + if (in_run && aligned_start <= run_end) { + if (aligned_end > run_end) + run_end = aligned_end; + } else { + if (in_run) + emit_run(run_start, run_end, img); + run_start = aligned_start; + run_end = aligned_end; + in_run = true; + } + } + + if (in_run) + emit_run(run_start, run_end, img); + if(size < eh->e_shoff + (eh->e_shnum * sizeof(Sh))){ printf("[ELF] ERROR: Filesize is smaller than advertised section headers (0x%lx vs 0x%lx)\n", size, eh->e_shoff + (eh->e_shnum * sizeof(Sh)));