From 90429454f165b1466d05c04a2dc5d1815f9fa5db Mon Sep 17 00:00:00 2001 From: Cindy Chen Date: Mon, 18 Oct 2021 14:17:02 -0700 Subject: [PATCH] [fpv] prim_secded FPV testbench updates bind file naming The prim_secded related testbench's assertion binds on tb instead of the actual design, so we need to update the bind name. This PR also adds a missing FPV target in batch hjson cfg. Signed-off-by: Cindy Chen --- hw/ip/prim/fpv/tb/prim_secded_22_16_bind_fpv.sv | 2 +- hw/ip/prim/fpv/tb/prim_secded_28_22_bind_fpv.sv | 2 +- hw/ip/prim/fpv/tb/prim_secded_39_32_bind_fpv.sv | 2 +- hw/ip/prim/fpv/tb/prim_secded_64_57_bind_fpv.sv | 2 +- hw/ip/prim/fpv/tb/prim_secded_72_64_bind_fpv.sv | 2 +- hw/ip/prim/fpv/tb/prim_secded_hamming_22_16_bind_fpv.sv | 2 +- hw/ip/prim/fpv/tb/prim_secded_hamming_39_32_bind_fpv.sv | 2 +- hw/ip/prim/fpv/tb/prim_secded_hamming_72_64_bind_fpv.sv | 2 +- hw/top_earlgrey/formal/top_earlgrey_fpv_cfgs.hjson | 8 ++++++++ 9 files changed, 16 insertions(+), 8 deletions(-) diff --git a/hw/ip/prim/fpv/tb/prim_secded_22_16_bind_fpv.sv b/hw/ip/prim/fpv/tb/prim_secded_22_16_bind_fpv.sv index 096d3d1d74ed0..9953a00289460 100644 --- a/hw/ip/prim/fpv/tb/prim_secded_22_16_bind_fpv.sv +++ b/hw/ip/prim/fpv/tb/prim_secded_22_16_bind_fpv.sv @@ -6,7 +6,7 @@ module prim_secded_22_16_bind_fpv; - bind prim_secded_22_16_fpv + bind prim_secded_22_16_tb prim_secded_22_16_assert_fpv prim_secded_22_16_assert_fpv ( .clk_i, .rst_ni, diff --git a/hw/ip/prim/fpv/tb/prim_secded_28_22_bind_fpv.sv b/hw/ip/prim/fpv/tb/prim_secded_28_22_bind_fpv.sv index 24208d3f23038..81c0345c299cb 100644 --- a/hw/ip/prim/fpv/tb/prim_secded_28_22_bind_fpv.sv +++ b/hw/ip/prim/fpv/tb/prim_secded_28_22_bind_fpv.sv @@ -6,7 +6,7 @@ module prim_secded_28_22_bind_fpv; - bind prim_secded_28_22_fpv + bind prim_secded_28_22_tb prim_secded_28_22_assert_fpv prim_secded_28_22_assert_fpv ( .clk_i, .rst_ni, diff --git a/hw/ip/prim/fpv/tb/prim_secded_39_32_bind_fpv.sv b/hw/ip/prim/fpv/tb/prim_secded_39_32_bind_fpv.sv index 113dd56d70bb2..216412ee557d8 100644 --- a/hw/ip/prim/fpv/tb/prim_secded_39_32_bind_fpv.sv +++ b/hw/ip/prim/fpv/tb/prim_secded_39_32_bind_fpv.sv @@ -6,7 +6,7 @@ module prim_secded_39_32_bind_fpv; - bind prim_secded_39_32_fpv + bind prim_secded_39_32_tb prim_secded_39_32_assert_fpv prim_secded_39_32_assert_fpv ( .clk_i, .rst_ni, diff --git a/hw/ip/prim/fpv/tb/prim_secded_64_57_bind_fpv.sv b/hw/ip/prim/fpv/tb/prim_secded_64_57_bind_fpv.sv index 7d9542c078098..9852d521af1fe 100644 --- a/hw/ip/prim/fpv/tb/prim_secded_64_57_bind_fpv.sv +++ b/hw/ip/prim/fpv/tb/prim_secded_64_57_bind_fpv.sv @@ -6,7 +6,7 @@ module prim_secded_64_57_bind_fpv; - bind prim_secded_64_57_fpv + bind prim_secded_64_57_tb prim_secded_64_57_assert_fpv prim_secded_64_57_assert_fpv ( .clk_i, .rst_ni, diff --git a/hw/ip/prim/fpv/tb/prim_secded_72_64_bind_fpv.sv b/hw/ip/prim/fpv/tb/prim_secded_72_64_bind_fpv.sv index 9684f65eff730..2eaa49e955627 100644 --- a/hw/ip/prim/fpv/tb/prim_secded_72_64_bind_fpv.sv +++ b/hw/ip/prim/fpv/tb/prim_secded_72_64_bind_fpv.sv @@ -6,7 +6,7 @@ module prim_secded_72_64_bind_fpv; - bind prim_secded_72_64_fpv + bind prim_secded_72_64_tb prim_secded_72_64_assert_fpv prim_secded_72_64_assert_fpv ( .clk_i, .rst_ni, diff --git a/hw/ip/prim/fpv/tb/prim_secded_hamming_22_16_bind_fpv.sv b/hw/ip/prim/fpv/tb/prim_secded_hamming_22_16_bind_fpv.sv index e887a7cb1af7f..16bef297e72f5 100644 --- a/hw/ip/prim/fpv/tb/prim_secded_hamming_22_16_bind_fpv.sv +++ b/hw/ip/prim/fpv/tb/prim_secded_hamming_22_16_bind_fpv.sv @@ -6,7 +6,7 @@ module prim_secded_hamming_22_16_bind_fpv; - bind prim_secded_hamming_22_16_fpv + bind prim_secded_hamming_22_16_tb prim_secded_hamming_22_16_assert_fpv prim_secded_hamming_22_16_assert_fpv ( .clk_i, .rst_ni, diff --git a/hw/ip/prim/fpv/tb/prim_secded_hamming_39_32_bind_fpv.sv b/hw/ip/prim/fpv/tb/prim_secded_hamming_39_32_bind_fpv.sv index f4895e58e0427..2f70c08c9a20c 100644 --- a/hw/ip/prim/fpv/tb/prim_secded_hamming_39_32_bind_fpv.sv +++ b/hw/ip/prim/fpv/tb/prim_secded_hamming_39_32_bind_fpv.sv @@ -6,7 +6,7 @@ module prim_secded_hamming_39_32_bind_fpv; - bind prim_secded_hamming_39_32_fpv + bind prim_secded_hamming_39_32_tb prim_secded_hamming_39_32_assert_fpv prim_secded_hamming_39_32_assert_fpv ( .clk_i, .rst_ni, diff --git a/hw/ip/prim/fpv/tb/prim_secded_hamming_72_64_bind_fpv.sv b/hw/ip/prim/fpv/tb/prim_secded_hamming_72_64_bind_fpv.sv index c167775efc2f8..8574601b1ec9b 100644 --- a/hw/ip/prim/fpv/tb/prim_secded_hamming_72_64_bind_fpv.sv +++ b/hw/ip/prim/fpv/tb/prim_secded_hamming_72_64_bind_fpv.sv @@ -6,7 +6,7 @@ module prim_secded_hamming_72_64_bind_fpv; - bind prim_secded_hamming_72_64_fpv + bind prim_secded_hamming_72_64_tb prim_secded_hamming_72_64_assert_fpv prim_secded_hamming_72_64_assert_fpv ( .clk_i, .rst_ni, diff --git a/hw/top_earlgrey/formal/top_earlgrey_fpv_cfgs.hjson b/hw/top_earlgrey/formal/top_earlgrey_fpv_cfgs.hjson index c2b8d207da790..b5b975026bf81 100644 --- a/hw/top_earlgrey/formal/top_earlgrey_fpv_cfgs.hjson +++ b/hw/top_earlgrey/formal/top_earlgrey_fpv_cfgs.hjson @@ -146,6 +146,14 @@ rel_path: "hw/ip/prim/prim_secded_39_32/{sub_flow}/{tool}" cov: true } + { + name: prim_secded_64_57_fpv + dut: prim_secded_64_57_tb + fusesoc_core: lowrisc:fpv:prim_secded_64_57_fpv + import_cfgs: ["{proj_root}/hw/formal/tools/dvsim/common_fpv_cfg.hjson"] + rel_path: "hw/ip/prim/prim_secded_64_57/{sub_flow}/{tool}" + cov: true + } { name: prim_secded_72_64_fpv dut: prim_secded_72_64_tb