Skip to content

Commit

Permalink
Merge pull request #45 from micprog/sram_update
Browse files Browse the repository at this point in the history
Bender integration, sram update
  • Loading branch information
meggiman authored Feb 2, 2021
2 parents f5e42d9 + 429970b commit 83deb03
Show file tree
Hide file tree
Showing 8 changed files with 262 additions and 172 deletions.
111 changes: 111 additions & 0 deletions Bender.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,111 @@
package:
name: pulp_soc
authors:
- "Robert Balas <[email protected]>"
- "Pasquale Davide Schiavone <[email protected]>"
- "Germain Haugou <[email protected]>"
- "Francesco Conti <[email protected]>"
- "Pirmin Vogel <[email protected]>"
- "Stefan Mach <[email protected]>"
- "Antonio Pullini <[email protected]>"
- "Gianmarco Ottavi <[email protected]>"
- "Manuel Eggimann <[email protected]>"
- "Luca Valente <[email protected]>"

dependencies:
L2_tcdm_hybrid_interco: { git: "https://github.com/pulp-platform/L2_tcdm_hybrid_interco.git", version: 1.0.0 }
adv_dbg_if: { git: "https://github.com/pulp-platform/adv_dbg_if.git", version: 0.0.2 }
apb2per: { git: "https://github.com/pulp-platform/apb2per.git", version: 0.1.0 }
apb_adv_timer: { git: "https://github.com/pulp-platform/apb_adv_timer.git", version: 1.0.3 } # To be updated for tech_cells_generic versioning
apb_fll_if: { git: "https://github.com/pulp-platform/apb_fll_if.git", version: 0.1.3 }
apb_gpio: { git: "https://github.com/pulp-platform/apb_gpio.git", rev: "0e9f142f2f11278445c953ad011fce1c7ed85b66" }
apb_node: { git: "https://github.com/pulp-platform/apb_node.git", version: 0.1.1 }
apb_interrupt_cntrl: { git: "https://github.com/pulp-platform/apb_interrupt_cntrl.git", version: 0.1.1 }
axi: { git: "https://github.com/pulp-platform/axi.git", version: 0.27.0 }
# axi_node: { git: "https://github.com/pulp-platform/axi_node.git", version: 1.1.4 } # deprecated, replaced by axi_xbar (in axi repo)
axi_slice: { git: "https://github.com/pulp-platform/axi_slice.git", version: 1.1.4 } # deprecated, replaced by axi_cut (in axi repo)
axi_slice_dc: { git: "https://github.com/pulp-platform/axi_slice_dc.git", version: 1.1.3 } # deprecated, replaced by axi_cdc (in axi repo)
timer_unit: { git: "https://github.com/pulp-platform/timer_unit.git", version: 1.0.2 }
common_cells: { git: "https://github.com/pulp-platform/common_cells.git", version: 1.21.0 }
cluster_interconnect: { git: "https://github.com/pulp-platform/cluster_interconnect.git", version: 1.1.1 }
fpnew: { git: "https://github.com/pulp-platform/fpnew.git", version: 0.6.5 }
jtag_pulp: { git: "https://github.com/pulp-platform/jtag_pulp.git", rev: "v0.1" }
riscv: { git: "https://github.com/pulp-platform/cv32e40p.git", rev: "pulpissimo-v3.4.0-rev2"}
ibex: { git: "https://github.com/lowRISC/ibex.git", rev: "pulpissimo-v6.1.1" }
scm: { git: "https://github.com/pulp-platform/scm.git", version: 1.0.1}
generic_FLL: { git: "https://github.com/pulp-platform/generic_FLL.git", rev: "1c92dc73a940392182fd4cb7b86f35649b349595" }
tech_cells_generic: { git: "https://github.com/pulp-platform/tech_cells_generic.git", version: 0.2.3 }
udma_core: { git: "https://github.com/pulp-platform/udma_core.git", version: 1.0.2 }
udma_uart: { git: "https://github.com/pulp-platform/udma_uart.git", version: 1.0.1 }
udma_i2c: { git: "https://github.com/pulp-platform/udma_i2c.git", version: 1.0.0 }
udma_i2s: { git: "https://github.com/pulp-platform/udma_i2s.git", version: 1.1.1 } # To be updated for tech_cells_generic versioning
udma_qspi: { git: "https://github.com/pulp-platform/udma_qspi.git", version: 1.0.3 } # To be updated for tech_cells_generic versioning
udma_sdio: { git: "https://github.com/pulp-platform/udma_sdio.git", version: 1.1.0 } # To be updated for tech_cells_generic versioning
udma_camera: { git: "https://github.com/pulp-platform/udma_camera.git", version: 1.1.1 } # To be updated for tech_cells_generic versioning
udma_filter: { git: "https://github.com/pulp-platform/udma_filter.git", version: 1.0.2 }
udma_external_per: { git: "https://github.com/pulp-platform/udma_external_per.git", version: 1.0.3 }
hwpe-mac-engine: { git: "https://github.com/pulp-platform/hwpe-mac-engine.git", version: 1.3.3 }
riscv-dbg: { git: "https://github.com/pulp-platform/riscv-dbg.git", rev: "v0.2" }
register_interface: { git: "https://github.com/pulp-platform/register_interface.git", rev: "b1bc9c22e0c2a5801107070c022904498dbae34b" }
# apb for interface?

sources:
# pulp_soc
- include_dirs:
- rtl/include
files:
- rtl/pulp_soc/pkg_soc_interconnect.sv
- rtl/pulp_soc/axi64_2_lint32_wrap.sv
- rtl/pulp_soc/lint_2_axi_wrap.sv
- rtl/pulp_soc/contiguous_crossbar.sv
- rtl/pulp_soc/interleaved_crossbar.sv
- rtl/pulp_soc/tcdm_demux.sv
- rtl/pulp_soc/boot_rom.sv
- rtl/pulp_soc/l2_ram_multi_bank.sv
- rtl/pulp_soc/lint_jtag_wrap.sv
- rtl/pulp_soc/periph_bus_wrap.sv
- rtl/pulp_soc/soc_clk_rst_gen.sv
- rtl/pulp_soc/soc_event_arbiter.sv
- rtl/pulp_soc/soc_event_generator.sv
- rtl/pulp_soc/soc_event_queue.sv
- rtl/pulp_soc/tcdm_error_slave.sv
- rtl/pulp_soc/soc_interconnect.sv
- rtl/pulp_soc/soc_interconnect_wrap.sv
- rtl/pulp_soc/soc_peripherals.sv
- rtl/pulp_soc/pulp_soc.sv
# udma_subsystem
- files:
- rtl/udma_subsystem/udma_subsystem.sv
# fc
- target: rtl
defines:
TRACE_EXECUTION: ~
files:
- rtl/fc/fc_demux.sv
- rtl/fc/fc_subsystem.sv
- rtl/fc/fc_hwpe.sv
- target: not(rtl)
files:
- rtl/fc/fc_demux.sv
- rtl/fc/fc_subsystem.sv
- rtl/fc/fc_hwpe.sv
# components
- files:
- rtl/components/apb_clkdiv.sv
- rtl/components/apb_soc_ctrl.sv
- rtl/components/memory_models.sv
- rtl/components/pulp_interfaces.sv
- rtl/components/glitch_free_clk_mux.sv
- rtl/components/scm_2048x32.sv
- rtl/components/scm_512x32.sv
- rtl/components/tcdm_arbiter_2x1.sv
- rtl/components/obi_pulp_adapter.sv
# components_rtl
- files:
- rtl/components/glitch_free_clk_mux.sv
- rtl/components/apb_dummy.sv
target: rtl
# components_behav
- files:
- rtl/components/freq_meter.sv
target: all(rtl, not(synthesis))
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]
### Added
- Added `Bender.yml` file for bender compatibility
- Added `obi_pulp_adapter`

### Changed
- updated `ibex`
- change from deprecated `generic_memory` to `tc_sram` tech cell, bump `tech_cells_generic` accordingly
- Expose L2 Bank sizes to improve consistency
- updated `apb_fll_if`, removed local interface definition to use the one defined externally
- updated `hwpe-mac-engine`

### Removed
### Fixed
Expand Down
46 changes: 23 additions & 23 deletions ips_list.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,25 +18,25 @@
# work, make sure to checkout a branch.
#
common_cells:
commit: v1.20.0
commit: v1.21.0
domain: [cluster, soc]
L2_tcdm_hybrid_interco:
commit: pulpissimo-v1.0
commit: v1.0.0
domain: [soc]
cluster_interconnect:
commit: v1.1.0
commit: v1.1.1
domain: [soc]
adv_dbg_if:
commit: v0.0.1
commit: v0.0.2
domain: [cluster, soc]
apb/apb2per:
commit: v0.0.1
commit: v0.1.0
domain: [soc]
apb/apb_adv_timer:
commit: v1.0.2
commit: v1.0.3
domain: [soc]
apb/apb_fll_if:
commit: pulpissimo-v1.0
commit: v0.1.3
domain: [soc]
apb/apb_gpio:
commit: 0e9f142f2f11278445c953ad011fce1c7ed85b66
Expand All @@ -45,10 +45,10 @@ apb/apb_node:
commit: v0.1.1
domain: [soc]
apb_interrupt_cntrl:
commit: v0.0.1
commit: v0.1.1
domain: [soc]
axi/axi:
commit: v0.24.1
commit: v0.27.0
domain: [cluster, soc]
# axi/axi_node:
# commit: v1.1.4
Expand All @@ -68,8 +68,8 @@ fpnew:
jtag_pulp:
commit: v0.1
domain: [soc]
riscv:
commit: pulpissimo-v3.4.0
cv32e40p:
commit: pulpissimo-v3.4.0-rev2
domain: [cluster, soc]
ibex:
commit: pulpissimo-v6.1.1
Expand All @@ -79,40 +79,40 @@ scm:
commit: v1.0.1
domain: [cluster, soc]
generic_FLL:
commit: v0.1
commit: 1c92dc73a940392182fd4cb7b86f35649b349595
domain: [soc]
tech_cells_generic:
commit: v0.1.6
commit: v0.2.3
domain: [cluster, soc]
udma/udma_core:
commit: v1.0.0
commit: v1.0.2
domain: [soc]
udma/udma_uart:
commit: v1.0.0
commit: v1.0.1
domain: [soc]
udma/udma_i2c:
commit: vega_v1.0.0
commit: v1.0.0
domain: [soc]
udma/udma_i2s:
commit: v1.1.0
commit: v1.1.1
domain: [soc]
udma/udma_qspi:
commit: v1.0.0
commit: v1.0.3
domain: [soc]
udma/udma_sdio:
commit: vega_v1.0.5
commit: v1.1.0
domain: [soc]
udma/udma_camera:
commit: v1.0.0
commit: v1.1.1
domain: [soc]
udma/udma_filter:
commit: v1.0.0
commit: v1.0.2
domain: [soc]
udma/udma_external_per:
commit: v1.0.0
commit: v1.0.3
domain: [soc]
hwpe-mac-engine:
commit: v1.3.2
commit: v1.3.3
domain: [cluster, soc]
riscv-dbg:
commit: v0.2
Expand Down
33 changes: 0 additions & 33 deletions rtl/components/pulp_interfaces.sv
Original file line number Diff line number Diff line change
Expand Up @@ -1189,39 +1189,6 @@ endinterface
// ╚██████╗ ╚████╔╝ ██║ ██████╔╝╚██████╔╝███████║
// ╚═════╝ ╚═══╝ ╚═╝ ╚═════╝ ╚═════╝ ╚══════╝

interface FLL_BUS
#(
parameter FLL_ADDR_WIDTH = 2,
parameter FLL_DATA_WIDTH = 32
);

logic req;
logic wrn;
logic [FLL_ADDR_WIDTH-1:0] add;
logic [FLL_DATA_WIDTH-1:0] data;
logic ack;
logic [FLL_DATA_WIDTH-1:0] r_data;
logic lock;


// Master Side
//***************************************
modport Master
(
output req, wrn, add, data,
input ack, r_data, lock
);

// Slave Side
//***************************************
modport Slave
(
input req, wrn, add, data,
output ack, r_data, lock
);

endinterface


//**********************************************************
//**************** CORE PREF BUS ***************************
Expand Down
Loading

0 comments on commit 83deb03

Please sign in to comment.