Mmu unify pr (#1876)

openhwgroup · Feb 29, 2024 · 9fb5db2 · 9fb5db2
1 parent ce0ab81
commit 9fb5db2
Show file tree

Hide file tree

Showing 18 changed files with 2,238 additions and 2,669 deletions.
diff --git a/Bender.yml b/Bender.yml
@@ -25,59 +25,65 @@ sources:
           - core/include/cv64a6_imafdcv_sv39_config_pkg.sv
           - core/include/riscv_pkg.sv
           - core/include/ariane_pkg.sv
-          - core/mmu_sv39/tlb.sv
-          - core/mmu_sv39/mmu.sv
-          - core/mmu_sv39/ptw.sv
+          - core/cva6_mmu/cva6_tlb.sv
+          - core/cva6_mmu/cva6_shared_tlb.sv
+          - core/cva6_mmu/cva6_mmu.sv
+          - core/cva6_mmu/cva6_ptw.sv
           - corev_apu/tb/common/mock_uart.sv
 
       - target: cv64a6_imafdc_sv39
         files:
           - core/include/cv64a6_imafdc_sv39_config_pkg.sv
           - core/include/riscv_pkg.sv
           - core/include/ariane_pkg.sv
-          - core/mmu_sv39/tlb.sv
-          - core/mmu_sv39/mmu.sv
-          - core/mmu_sv39/ptw.sv
+          - core/cva6_mmu/cva6_tlb.sv
+          - core/cva6_mmu/cva6_shared_tlb.sv
+          - core/cva6_mmu/cva6_mmu.sv
+          - core/cva6_mmu/cva6_ptw.sv
           - core/cva6_accel_first_pass_decoder_stub.sv
 
       - target: cv64a6_imafdc_sv39_wb
         files:
           - core/include/cv64a6_imafdc_sv39_wb_config_pkg.sv
           - core/include/riscv_pkg.sv
           - core/include/ariane_pkg.sv
-          - core/mmu_sv39/tlb.sv
-          - core/mmu_sv39/mmu.sv
-          - core/mmu_sv39/ptw.sv
+          - core/cva6_mmu/cva6_tlb.sv
+          - core/cva6_mmu/cva6_shared_tlb.sv
+          - core/cva6_mmu/cva6_mmu.sv
+          - core/cva6_mmu/cva6_ptw.sv
           - core/cva6_accel_first_pass_decoder_stub.sv
 
       - target: cv32a6_imac_sv0
         files:
           - core/include/cv32a6_imac_sv0_config_pkg.sv
           - core/include/riscv_pkg.sv
           - core/include/ariane_pkg.sv
-          - core/mmu_sv32/cva6_tlb_sv32.sv
-          - core/mmu_sv32/cva6_mmu_sv32.sv
-          - core/mmu_sv32/cva6_ptw_sv32.sv
+          - core/cva6_mmu/cva6_tlb.sv
+          - core/cva6_mmu/cva6_shared_tlb.sv
+          - core/cva6_mmu/cva6_mmu.sv
+          - core/cva6_mmu/cva6_ptw.sv
           - core/cva6_accel_first_pass_decoder_stub.sv
 
       - target: cv32a6_imac_sv32
         files:
           - core/include/cv32a6_imac_sv32_config_pkg.sv
           - core/include/riscv_pkg.sv
           - core/include/ariane_pkg.sv
-          - core/mmu_sv32/cva6_tlb_sv32.sv
-          - core/mmu_sv32/cva6_mmu_sv32.sv
-          - core/mmu_sv32/cva6_ptw_sv32.sv
+          - core/cva6_mmu/cva6_tlb.sv
+          - core/cva6_mmu/cva6_shared_tlb.sv
+          - core/cva6_mmu/cva6_mmu.sv
+          - core/cva6_mmu/cva6_ptw.sv
           - core/cva6_accel_first_pass_decoder_stub.sv
 
       - target: cv32a6_imafc_sv32
         files:
           - core/include/cv32a6_imafc_sv32_config_pkg.sv
           - core/include/riscv_pkg.sv
           - core/include/ariane_pkg.sv
-          - core/mmu_sv32/cva6_tlb_sv32.sv
-          - core/mmu_sv32/cva6_mmu_sv32.sv
-          - core/mmu_sv32/cva6_ptw_sv32.sv
+          - core/cva6_mmu/cva6_tlb.sv
+          - core/cva6_mmu/cva6_shared_tlb.sv
+          - core/cva6_mmu/cva6_mmu.sv
+          - core/cva6_mmu/cva6_ptw.sv
           - core/cva6_accel_first_pass_decoder_stub.sv
 
       # included via target core/include/${TARGET_CFG}_config_pkg.sv

diff --git a/Flist.ariane b/Flist.ariane
@@ -82,19 +82,20 @@ core/issue_stage.sv
 core/load_unit.sv
 core/load_store_unit.sv
 core/lsu_bypass.sv
-core/mmu_sv39/mmu.sv
+core/cva6_mmu/cva6_mmu.sv
 core/mult.sv
 core/multiplier.sv
 core/serdiv.sv
 core/perf_counters.sv
-core/mmu_sv39/ptw.sv
+core/cva6_mmu/cva6_ptw.sv
 core/ariane_regfile_ff.sv
 core/re_name.sv
 core/scoreboard.sv
 core/store_buffer.sv
 core/amo_buffer.sv
 core/store_unit.sv
-core/mmu_sv39/tlb.sv
+core/cva6_mmu/cva6_tlb.sv
+core/cva6_mmu/cva6_shared_tlb.sv
 core/commit_stage.sv
 core/cache_subsystem/wt_dcache_ctrl.sv
 core/cache_subsystem/wt_dcache_mem.sv

diff --git a/ariane.core b/ariane.core
@@ -33,20 +33,18 @@ filesets:
       - src/lsu_arbiter.sv
       - src/lsu.sv
       - src/miss_handler.sv
-      - src/mmu_sv39/mmu.sv
-      - src/mmu_sv32/cva6_mmu_sv32.sv
+      - src/cva6_mmu/cva6_mmu.sv
       - src/mult.sv
       - src/nbdcache.sv
       - src/pcgen_stage.sv
       - src/perf_counters.sv
-      - src/mmu_sv39/ptw.sv
-      - src/mmu_sv32/cva6_ptw_sv32.sv
+      - src/cva6_mmu/cva6_ptw.sv
       - src/regfile_ff.sv
       - src/scoreboard.sv
       - src/store_buffer.sv
       - src/store_unit.sv
-      - src/mmu_sv39/tlb.sv
-      - src/mmu_sv32/cva6_tlb_sv32.sv
+      - src/cva6_mmu/cva6_tlb.sv
+      - src/cva6_mmu/cva6_shared_tlb.sv
     file_type : systemVerilogSource
     depend :
       - pulp-platform.org::axi_mem_if

diff --git a/core/Flist.cva6 b/core/Flist.cva6
@@ -182,15 +182,10 @@ ${CVA6_REPO_DIR}/common/local/util/tc_sram_wrapper.sv
 ${CVA6_REPO_DIR}/vendor/pulp-platform/tech_cells_generic/src/rtl/tc_sram.sv
 ${CVA6_REPO_DIR}/common/local/util/sram.sv
 
-// MMU Sv39
-${CVA6_REPO_DIR}/core/mmu_sv39/mmu.sv
-${CVA6_REPO_DIR}/core/mmu_sv39/ptw.sv
-${CVA6_REPO_DIR}/core/mmu_sv39/tlb.sv
-
-// MMU Sv32
-${CVA6_REPO_DIR}/core/mmu_sv32/cva6_mmu_sv32.sv
-${CVA6_REPO_DIR}/core/mmu_sv32/cva6_ptw_sv32.sv
-${CVA6_REPO_DIR}/core/mmu_sv32/cva6_tlb_sv32.sv
-${CVA6_REPO_DIR}/core/mmu_sv32/cva6_shared_tlb_sv32.sv
+// MMU 
+${CVA6_REPO_DIR}/core/cva6_mmu/cva6_mmu.sv
+${CVA6_REPO_DIR}/core/cva6_mmu/cva6_ptw.sv
+${CVA6_REPO_DIR}/core/cva6_mmu/cva6_tlb.sv
+${CVA6_REPO_DIR}/core/cva6_mmu/cva6_shared_tlb.sv
 
 // end of manifest