|
| 1 | +diff --git a/data/entropy_src_testplan.hjson b/data/entropy_src_testplan.hjson |
| 2 | +index 4d296d9..29a4c0c 100644 |
| 3 | +--- a/data/entropy_src_testplan.hjson |
| 4 | ++++ b/data/entropy_src_testplan.hjson |
| 5 | +@@ -3,11 +3,11 @@ |
| 6 | + // SPDX-License-Identifier: Apache-2.0 |
| 7 | + { |
| 8 | + name: "entropy_src" |
| 9 | +- import_testplans: ["hw/dv/tools/dvsim/testplans/csr_testplan.hjson", |
| 10 | +- "hw/dv/tools/dvsim/testplans/intr_test_testplan.hjson", |
| 11 | +- "hw/dv/tools/dvsim/testplans/alert_test_testplan.hjson", |
| 12 | +- "hw/dv/tools/dvsim/testplans/tl_device_access_types_testplan.hjson", |
| 13 | +- "hw/dv/tools/dvsim/testplans/stress_all_with_reset_testplan.hjson", |
| 14 | ++ import_testplans: ["hw/vendor/lowrisc_ip/dv/tools/dvsim/testplans/csr_testplan.hjson", |
| 15 | ++ "hw/vendor/lowrisc_ip/dv/tools/dvsim/testplans/intr_test_testplan.hjson", |
| 16 | ++ "hw/vendor/lowrisc_ip/dv/tools/dvsim/testplans/alert_test_testplan.hjson", |
| 17 | ++ "hw/vendor/lowrisc_ip/dv/tools/dvsim/testplans/tl_device_access_types_testplan.hjson", |
| 18 | ++ "hw/vendor/lowrisc_ip/dv/tools/dvsim/testplans/stress_all_with_reset_testplan.hjson", |
| 19 | + "entropy_src_sec_cm_testplan.hjson"] |
| 20 | + testpoints: [ |
| 21 | + { |
| 22 | +diff --git a/dv/entropy_src_base_sim_cfg.hjson b/dv/entropy_src_base_sim_cfg.hjson |
| 23 | +index 3a79a86..df6660a 100644 |
| 24 | +--- a/dv/entropy_src_base_sim_cfg.hjson |
| 25 | ++++ b/dv/entropy_src_base_sim_cfg.hjson |
| 26 | +@@ -18,22 +18,22 @@ |
| 27 | + fusesoc_core: lowrisc:dv:entropy_src_sim:0.1 |
| 28 | + |
| 29 | + // Testplan hjson file. |
| 30 | +- testplan: "{proj_root}/hw/ip/entropy_src/data/entropy_src_testplan.hjson" |
| 31 | ++ testplan: "{proj_root}/hw/vendor/lowrisc_ip/ip/entropy_src/data/entropy_src_testplan.hjson" |
| 32 | + |
| 33 | + // RAL spec - used to generate the RAL model. |
| 34 | +- ral_spec: "{proj_root}/hw/ip/entropy_src/data/entropy_src.hjson" |
| 35 | ++ ral_spec: "{proj_root}/hw/vendor/lowrisc_ip/ip/entropy_src/data/entropy_src.hjson" |
| 36 | + |
| 37 | + // Import additional common sim cfg files. |
| 38 | + import_cfgs: [// Project wide common sim cfg file |
| 39 | +- "{proj_root}/hw/dv/tools/dvsim/common_sim_cfg.hjson", |
| 40 | ++ "{proj_root}/hw/vendor/lowrisc_ip/dv/tools/dvsim/common_sim_cfg.hjson", |
| 41 | + // Common CIP test lists |
| 42 | +- "{proj_root}/hw/dv/tools/dvsim/tests/csr_tests.hjson", |
| 43 | +- "{proj_root}/hw/dv/tools/dvsim/tests/intr_test.hjson", |
| 44 | +- "{proj_root}/hw/dv/tools/dvsim/tests/alert_test.hjson", |
| 45 | +- "{proj_root}/hw/dv/tools/dvsim/tests/tl_access_tests.hjson", |
| 46 | +- "{proj_root}/hw/dv/tools/dvsim/tests/sec_cm_tests.hjson", |
| 47 | ++ "{proj_root}/hw/vendor/lowrisc_ip/dv/tools/dvsim/tests/csr_tests.hjson", |
| 48 | ++ "{proj_root}/hw/vendor/lowrisc_ip/dv/tools/dvsim/tests/intr_test.hjson", |
| 49 | ++ "{proj_root}/hw/vendor/lowrisc_ip/dv/tools/dvsim/tests/alert_test.hjson", |
| 50 | ++ "{proj_root}/hw/vendor/lowrisc_ip/dv/tools/dvsim/tests/tl_access_tests.hjson", |
| 51 | ++ "{proj_root}/hw/vendor/lowrisc_ip/dv/tools/dvsim/tests/sec_cm_tests.hjson", |
| 52 | + // TODO: import `stress_tests.hjson` once hanging issue is resolved. |
| 53 | +- "{proj_root}/hw/dv/tools/dvsim/tests/stress_all_test.hjson"] |
| 54 | ++ "{proj_root}/hw/vendor/lowrisc_ip/dv/tools/dvsim/tests/stress_all_test.hjson"] |
| 55 | + |
| 56 | + // Add additional tops for simulation. |
| 57 | + sim_tops: ["entropy_src_bind", "entropy_src_cov_bind", "sec_cm_prim_onehot_check_bind"] |
| 58 | +@@ -43,18 +43,18 @@ |
| 59 | + |
| 60 | + xcelium_cov_refine_files: [ |
| 61 | + // TODO(#16276): Finalize coverage on ExtHT ports & remove the following exclusion file |
| 62 | +- "{proj_root}/hw/ip/entropy_src/dv/cov/entropy_src_extht_exclusions.vRefine" |
| 63 | ++ "{proj_root}/hw/vendor/lowrisc_ip/ip/entropy_src/dv/cov/entropy_src_extht_exclusions.vRefine" |
| 64 | + // Leave the following as a separate refinement, to support potential DV enhancements. |
| 65 | + // (See the comments within the file for more detail) |
| 66 | +- "{proj_root}/hw/ip/entropy_src/dv/cov/entropy_src_cnt_err_excl.vRefine", |
| 67 | ++ "{proj_root}/hw/vendor/lowrisc_ip/ip/entropy_src/dv/cov/entropy_src_cnt_err_excl.vRefine", |
| 68 | + // Waive toggle coverage for the prim_count and fifo_cnt inputs. |
| 69 | +- "{proj_root}/hw/ip/entropy_src/dv/cov/entropy_src_cnt_in_excl.vRefine", |
| 70 | ++ "{proj_root}/hw/vendor/lowrisc_ip/ip/entropy_src/dv/cov/entropy_src_cnt_in_excl.vRefine", |
| 71 | + // Waive toggle coverage for the prim_count outputs. (MoreSB's not exercised) |
| 72 | +- "{proj_root}/hw/ip/entropy_src/dv/cov/entropy_src_cnt_out_excl.vRefine", |
| 73 | ++ "{proj_root}/hw/vendor/lowrisc_ip/ip/entropy_src/dv/cov/entropy_src_cnt_out_excl.vRefine", |
| 74 | + // Output of --cov-unr, with `prim_count` error exclusions removed. |
| 75 | +- "{proj_root}/hw/ip/entropy_src/dv/cov/entropy_src_UNR.vRefine", |
| 76 | ++ "{proj_root}/hw/vendor/lowrisc_ip/ip/entropy_src/dv/cov/entropy_src_UNR.vRefine", |
| 77 | + // Waive toggle coverage for the prim_fifo_sync inputs. |
| 78 | +- "{proj_root}/hw/ip/entropy_src/dv/cov/entropy_src_fifo_in_excl.vRefine", |
| 79 | ++ "{proj_root}/hw/vendor/lowrisc_ip/ip/entropy_src/dv/cov/entropy_src_fifo_in_excl.vRefine", |
| 80 | + ] |
| 81 | + |
| 82 | + // Default UVM test and seq class name. |
| 83 | +diff --git a/dv/entropy_src_rng16bits_sim_cfg.hjson b/dv/entropy_src_rng16bits_sim_cfg.hjson |
| 84 | +index 0c2743b..bb36ab4 100644 |
| 85 | +--- a/dv/entropy_src_rng16bits_sim_cfg.hjson |
| 86 | ++++ b/dv/entropy_src_rng16bits_sim_cfg.hjson |
| 87 | +@@ -7,7 +7,7 @@ |
| 88 | + variant: rng_16bits |
| 89 | + |
| 90 | + // Import the base entropy_src sim_cfg file |
| 91 | +- import_cfgs: ["{proj_root}/hw/ip/entropy_src/dv/entropy_src_base_sim_cfg.hjson"] |
| 92 | ++ import_cfgs: ["{proj_root}/hw/vendor/lowrisc_ip/ip/entropy_src/dv/entropy_src_base_sim_cfg.hjson"] |
| 93 | + |
| 94 | + build_opts: ["+define+RNG_BUS_WIDTH=16", |
| 95 | + "+define+RNG_BUS_BIT_SEL_WIDTH=4", |
| 96 | +diff --git a/dv/entropy_src_rng4bits_sim_cfg.hjson b/dv/entropy_src_rng4bits_sim_cfg.hjson |
| 97 | +index cc7ccb7..d0a21ca 100644 |
| 98 | +--- a/dv/entropy_src_rng4bits_sim_cfg.hjson |
| 99 | ++++ b/dv/entropy_src_rng4bits_sim_cfg.hjson |
| 100 | +@@ -7,7 +7,7 @@ |
| 101 | + variant: rng_4bits |
| 102 | + |
| 103 | + // Import the base entropy_src sim_cfg file |
| 104 | +- import_cfgs: ["{proj_root}/hw/ip/entropy_src/dv/entropy_src_base_sim_cfg.hjson"] |
| 105 | ++ import_cfgs: ["{proj_root}/hw/vendor/lowrisc_ip/ip/entropy_src/dv/entropy_src_base_sim_cfg.hjson"] |
| 106 | + |
| 107 | + build_opts: ["+define+RNG_BUS_WIDTH=4", |
| 108 | + "+define+RNG_BUS_BIT_SEL_WIDTH=2", |
0 commit comments