Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix integer cluster offloading #183

Merged
merged 3 commits into from
Oct 7, 2023
Merged

Fix integer cluster offloading #183

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
399d308
Bumping PULP cluster commit and adjusting default boot address.
Oct 6, 2023
6c68c6d
Bump PULP and redundancy cells, remove unneeded parameters override.
Oct 6, 2023
7d6c289
Restoring cluster default boot address to L2 Port 0 in sw_seq test.
Oct 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Bender.local
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ overrides:
axi_riscv_atomics: { git: https://github.com/pulp-platform/axi_riscv_atomics.git , version: 0.8.2 }
apb: { git: "https://github.com/pulp-platform/apb.git" , version: 0.2.3 }
register_interface: { git: "https://github.com/pulp-platform/register_interface.git" , version: 0.4.1 }
redundancy_cells: { git: "https://github.com/pulp-platform/redundancy_cells.git" , rev: "ecb92ca" } # branch: yt/rapidrecovery
redundancy_cells: { git: "https://github.com/pulp-platform/redundancy_cells.git" , rev: "f206f5ecbfaa028f9eae6f0efaed9e34631d9171" } # branch: yt/rapidrecovery
tech_cells_generic: { git: "https://github.com/pulp-platform/tech_cells_generic.git" , version: =0.2.13 }
riscv-dbg: { git: "https://github.com/pulp-platform/riscv-dbg.git" , version: =0.8.0 }
idma: { git: "https://github.com/pulp-platform/idma.git" , version: 0.5.1 }
Expand Down
6 changes: 3 additions & 3 deletions Bender.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ packages:
- axi
- common_verification
event_unit_flex:
revision: 53fb3a1093aaaedfe883739fd8a3155d601210bc
revision: 28e0499374117c7b0ef4c6ad81b60d7526af886f
version: null
source:
Git: https://github.com/pulp-platform/event_unit_flex.git
Expand Down Expand Up @@ -375,7 +375,7 @@ packages:
dependencies:
- axi_slice
pulp_cluster:
revision: 360c120c50d88a7ec6f32d84b0d48815039584d1
revision: 8356888056441d6cf5b94e348a0817264b9b1b8c
version: null
source:
Git: https://github.com/pulp-platform/pulp_cluster.git
Expand Down Expand Up @@ -416,7 +416,7 @@ packages:
- hwpe-stream
- tech_cells_generic
redundancy_cells:
revision: ecb92caca3f1872360623448397bb9a06d0c2c96
revision: f206f5ecbfaa028f9eae6f0efaed9e34631d9171
version: null
source:
Git: https://github.com/pulp-platform/redundancy_cells.git
Expand Down
2 changes: 1 addition & 1 deletion Bender.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ dependencies:
hyperbus: { git: https://github.com/pulp-platform/hyperbus.git, version: 0.0.3 }
car_l2: { git: [email protected]:carfield/carfield_l2_mem.git, rev: 0143fb296e3614adf8894ff7335cc3f9b92783bd } # branch: main
safety_island: { git: [email protected]:carfield/safety-island.git, rev: 620905a836a10ec1246bc392bb5af1cfdfd32d64 } # branch: michaero/carfield
pulp_cluster: { git: https://github.com/pulp-platform/pulp_cluster.git, rev: 360c120c50d88a7ec6f32d84b0d48815039584d1 } # branch: yt/rapidrecovery
pulp_cluster: { git: https://github.com/pulp-platform/pulp_cluster.git, rev: 8356888056441d6cf5b94e348a0817264b9b1b8c } # branch: yt/rapidrecovery
opentitan: { git: https://github.com/pulp-platform/opentitan.git, rev: 4a88413ebbc1bf09730112d0d2df5e51d5c21314 } # branch: carfield_soc
mailbox_unit: { git: [email protected]:pulp-platform/mailbox_unit.git, version: 1.1.0 }
apb: { git: https://github.com/pulp-platform/apb.git, version: 0.2.3 }
Expand Down
2 changes: 0 additions & 2 deletions hw/carfield.sv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1396,8 +1396,6 @@ pulp_cluster #(
.NB_DMAS ( IntClusterNumDmas ),
.NB_MPERIPHS ( IntClusterNumMstPer ),
.NB_SPERIPHS ( IntClusterNumSlvPer ),
.CLUSTER_ALIAS ( IntClusterAlias ),
.CLUSTER_ALIAS_BASE ( IntClusterAliasBase ),
.SynchStages ( SyncStages ),
.TCDM_SIZE ( IntClusterTcdmSize ),
.NB_TCDM_BANKS ( IntClusterTcdmBanks ),
Expand Down
4 changes: 1 addition & 3 deletions hw/carfield_pkg.sv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -451,8 +451,6 @@ localparam int unsigned IntClusterNumHwpePorts = 9;
localparam int unsigned IntClusterNumDmas = 4;
localparam int unsigned IntClusterNumMstPer = 1;
localparam int unsigned IntClusterNumSlvPer = 10;
localparam int unsigned IntClusterAlias = 1;
localparam int unsigned IntClusterAliasBase = 12'h000;
localparam int unsigned IntClusterTcdmSize = 256*1024;
localparam int unsigned IntClusterTcdmBanks = 16;
localparam int unsigned IntClusterHwpePresent = 1;
Expand All @@ -464,7 +462,7 @@ localparam int unsigned IntClusterCacheSize = 4*1024;
localparam int unsigned IntClusterDbgStart = SafetyIslandBase+
SafetyIslandPerOffset+
safety_island_pkg::DebugAddrOffset;
localparam int unsigned IntClusterBootAddr = L2Port1Base;
localparam int unsigned IntClusterBootAddr = L2Port0Base;
localparam int unsigned IntClusterInstrRdataWidth = 32;
localparam int unsigned IntClusterFpu = 0;
localparam int unsigned IntClusterFpuDivSqrt = 0;
Expand Down
2 changes: 1 addition & 1 deletion sw/tests/bare-metal/hostd/sw_rst_seq.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ int main(void)
if (readw(CAR_INT_CLUSTER_BOOT_ADDR_REG) != magic)
return EINTCLNOACCES;

volatile uint32_t pulp_boot_addr_rst_value = 0x78200000;
volatile uint32_t pulp_boot_addr_rst_value = 0x78000000;
car_reset_domain(CAR_PULP_RST);
if (readw(CAR_INT_CLUSTER_BOOT_ADDR_REG) != pulp_boot_addr_rst_value)
return EINTCLNOACCES;
Expand Down
Loading