From 406b0ceff02fe703d30d818ebebe4a6e3de3bf52 Mon Sep 17 00:00:00 2001 From: Tim Fischer Date: Mon, 29 Jul 2024 15:14:09 +0200 Subject: [PATCH 1/6] vcs: Use `timescale` directive --- target/common/common.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/target/common/common.mk b/target/common/common.mk index 04ae65077..6f01e364f 100644 --- a/target/common/common.mk +++ b/target/common/common.mk @@ -124,6 +124,7 @@ VLOGAN_FLAGS := -assert svaext VLOGAN_FLAGS += -assert disable_cover VLOGAN_FLAGS += -full64 VLOGAN_FLAGS += -kdb +VLOGAN_FLAGS += -timescale=1ns/1ps VHDLAN_FLAGS := -full64 VHDLAN_FLAGS += -kdb From ab1a7884a4f65af49eb25f9c4747de59c98e40d9 Mon Sep 17 00:00:00 2001 From: Tim Fischer Date: Mon, 29 Jul 2024 15:14:32 +0200 Subject: [PATCH 2/6] hw: Remove weird declaration statement --- hw/snitch_cluster/src/snitch_cc.sv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/snitch_cluster/src/snitch_cc.sv b/hw/snitch_cluster/src/snitch_cc.sv index 0040a5654..913787ce7 100644 --- a/hw/snitch_cluster/src/snitch_cc.sv +++ b/hw/snitch_cluster/src/snitch_cc.sv @@ -854,7 +854,7 @@ module snitch_cc #( // pragma translate_off int f; string fn; - logic [63:0] cycle = 0; + logic [63:0] cycle; initial begin // We need to schedule the assignment into a safe region, otherwise // `hart_id_i` won't have a value assigned at the beginning of the first From f738eb6e60bf1b973ecf97a5e692a81ff5bf8e50 Mon Sep 17 00:00:00 2001 From: Tim Fischer Date: Mon, 29 Jul 2024 15:14:45 +0200 Subject: [PATCH 3/6] deps: Bump `axi` version --- Bender.local | 2 +- Bender.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Bender.local b/Bender.local index d69b62af2..565a00b6b 100644 --- a/Bender.local +++ b/Bender.local @@ -4,4 +4,4 @@ overrides: # Some of our dependencies have false conflicts with our new AXI version; force our version. - axi: {git: https://github.com/pulp-platform/axi.git, version: 0.39.2 } + axi: {git: https://github.com/pulp-platform/axi.git, version: 0.39.4 } diff --git a/Bender.yml b/Bender.yml index bfea9e6a4..9e781e315 100644 --- a/Bender.yml +++ b/Bender.yml @@ -19,7 +19,7 @@ package: - Matheus Cavalcante dependencies: - axi: { git: https://github.com/pulp-platform/axi, version: 0.39.2 } + axi: { git: https://github.com/pulp-platform/axi, version: 0.39.4 } axi_riscv_atomics: { git: https://github.com/pulp-platform/axi_riscv_atomics, version: 0.6.0 } common_cells: { git: https://github.com/pulp-platform/common_cells, version: 1.35.0 } FPnew: { git: "https://github.com/pulp-platform/cvfpu.git", rev: pulp-v0.1.3 } From 194a60077ac9f744931ab78519b6c4de83971279 Mon Sep 17 00:00:00 2001 From: Tim Fischer Date: Mon, 29 Jul 2024 15:17:50 +0200 Subject: [PATCH 4/6] REVERT: use dependencies with fixes --- Bender.local | 2 +- Bender.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Bender.local b/Bender.local index 565a00b6b..f92f20789 100644 --- a/Bender.local +++ b/Bender.local @@ -4,4 +4,4 @@ overrides: # Some of our dependencies have false conflicts with our new AXI version; force our version. - axi: {git: https://github.com/pulp-platform/axi.git, version: 0.39.4 } + axi: {git: https://github.com/pulp-platform/axi.git, rev: vcs-fixes } diff --git a/Bender.yml b/Bender.yml index 9e781e315..cda4b988a 100644 --- a/Bender.yml +++ b/Bender.yml @@ -19,7 +19,7 @@ package: - Matheus Cavalcante dependencies: - axi: { git: https://github.com/pulp-platform/axi, version: 0.39.4 } + axi: { git: https://github.com/pulp-platform/axi, rev: vcs-fixes } axi_riscv_atomics: { git: https://github.com/pulp-platform/axi_riscv_atomics, version: 0.6.0 } common_cells: { git: https://github.com/pulp-platform/common_cells, version: 1.35.0 } FPnew: { git: "https://github.com/pulp-platform/cvfpu.git", rev: pulp-v0.1.3 } From 41467b1a58c30a4d1ed9396099e99066a04f8225 Mon Sep 17 00:00:00 2001 From: Tim Fischer Date: Mon, 29 Jul 2024 18:37:14 +0200 Subject: [PATCH 5/6] Remove `Bender.local` in favor of `Bender.lock` --- Bender.local | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 Bender.local diff --git a/Bender.local b/Bender.local deleted file mode 100644 index f92f20789..000000000 --- a/Bender.local +++ /dev/null @@ -1,7 +0,0 @@ -# Copyright 2020 ETH Zurich and University of Bologna. -# Licensed under the Apache License, Version 2.0, see LICENSE for details. -# SPDX-License-Identifier: Apache-2.0 - -overrides: - # Some of our dependencies have false conflicts with our new AXI version; force our version. - axi: {git: https://github.com/pulp-platform/axi.git, rev: vcs-fixes } From d0cc05280275fb0f4154164e9478685e24d8b0d0 Mon Sep 17 00:00:00 2001 From: Tim Fischer Date: Mon, 29 Jul 2024 18:38:38 +0200 Subject: [PATCH 6/6] Track `Bender.lock` --- .gitignore | 3 +- Bender.lock | 123 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 124 insertions(+), 2 deletions(-) create mode 100644 Bender.lock diff --git a/.gitignore b/.gitignore index aebe02fa1..2fc617106 100644 --- a/.gitignore +++ b/.gitignore @@ -3,7 +3,6 @@ # Dependency files /.bender/ -/Bender.lock # Modelsim Files *.wlf @@ -22,4 +21,4 @@ gmon.out # Installation directories /.venv/ -/tools/ \ No newline at end of file +/tools/ diff --git a/Bender.lock b/Bender.lock new file mode 100644 index 000000000..f7b6b0080 --- /dev/null +++ b/Bender.lock @@ -0,0 +1,123 @@ +packages: + apb: + revision: 77ddf073f194d44b9119949d2421be59789e69ae + version: 0.2.4 + source: + Git: https://github.com/pulp-platform/apb.git + dependencies: + - common_cells + axi: + revision: 41859549968db0147062b6c3cdbe4af00080cc09 + version: null + source: + Git: https://github.com/pulp-platform/axi + dependencies: + - common_cells + - common_verification + - tech_cells_generic + axi_riscv_atomics: + revision: 430838a10a9bdf1e381d4fcb33907428f3273420 + version: 0.6.0 + source: + Git: https://github.com/pulp-platform/axi_riscv_atomics + dependencies: + - axi + - common_cells + - common_verification + axi_stream: + revision: 54891ff40455ca94a37641b9da4604647878cc07 + version: 0.1.1 + source: + Git: https://github.com/pulp-platform/axi_stream.git + dependencies: + - common_cells + cluster_icache: + revision: 0e1fb6751d9684d968ba7fb40836e6118b448ecd + version: 0.1.1 + source: + Git: https://github.com/pulp-platform/cluster_icache.git + dependencies: + - axi + - common_cells + - scm + - tech_cells_generic + common_cells: + revision: c27bce39ebb2e6bae52f60960814a2afca7bd4cb + version: 1.37.0 + source: + Git: https://github.com/pulp-platform/common_cells + dependencies: + - common_verification + - tech_cells_generic + common_verification: + revision: 9c07fa860593b2caabd9b5681740c25fac04b878 + version: 0.2.3 + source: + Git: https://github.com/pulp-platform/common_verification.git + dependencies: [] + fpnew: + revision: a8e0cba6dd50f357ece73c2c955d96efc3c6c315 + version: null + source: + Git: https://github.com/pulp-platform/cvfpu.git + dependencies: + - common_cells + - fpu_div_sqrt_mvp + fpu_div_sqrt_mvp: + revision: 86e1f558b3c95e91577c41b2fc452c86b04e85ac + version: 1.0.4 + source: + Git: https://github.com/pulp-platform/fpu_div_sqrt_mvp.git + dependencies: + - common_cells + idma: + revision: c12caf59bb482fe44b27361f6924ad346b2d22fe + version: 0.6.3 + source: + Git: https://github.com/pulp-platform/iDMA + dependencies: + - axi + - axi_stream + - common_cells + - common_verification + - obi + - register_interface + obi: + revision: c2141a653c755461ff44f61d12aeb5d99fc8e760 + version: 0.1.3 + source: + Git: https://github.com/pulp-platform/obi.git + dependencies: + - common_cells + - common_verification + register_interface: + revision: ae616e5a1ec2b41e72d200e5ab09c65e94aebd3d + version: 0.4.4 + source: + Git: https://github.com/pulp-platform/register_interface + dependencies: + - apb + - axi + - common_cells + - common_verification + riscv-dbg: + revision: 358f90110220adf7a083f8b65d157e836d706236 + version: 0.8.1 + source: + Git: https://github.com/pulp-platform/riscv-dbg + dependencies: + - common_cells + - tech_cells_generic + scm: + revision: 998466d2a3c2d7d572e43d2666d93c4f767d8d60 + version: 1.1.1 + source: + Git: https://github.com/pulp-platform/scm.git + dependencies: [] + tech_cells_generic: + revision: 7968dd6e6180df2c644636bc6d2908a49f2190cf + version: 0.2.13 + source: + Git: https://github.com/pulp-platform/tech_cells_generic + dependencies: + - common_verification