From 3cf1a5074bf6ad15cf371e8525d78abef37fba35 Mon Sep 17 00:00:00 2001
From: Blaise Tine <tinebp@yahoo.com>
Date: Thu, 23 Apr 2020 12:50:02 -0400
Subject: [PATCH] RTL code refactoring

---
 hw/opae/sources.txt                           | 19 ++++++++-----------
 hw/rtl/VX_gpr.v                               |  2 +-
 ...e_enabled_dual_port_ram.v => VX_gpr_ram.v} |  2 +-
 3 files changed, 10 insertions(+), 13 deletions(-)
 rename hw/rtl/{libs/VX_byte_enabled_dual_port_ram.v => VX_gpr_ram.v} (96%)

diff --git a/hw/opae/sources.txt b/hw/opae/sources.txt
index 10fcecab..fc428133 100644
--- a/hw/opae/sources.txt
+++ b/hw/opae/sources.txt
@@ -18,27 +18,24 @@ vortex_afu.json
 ../rtl/interfaces/VX_branch_rsp_if.v
 ../rtl/interfaces/VX_inst_meta_if.v
 ../rtl/interfaces/VX_join_if.v
-../rtl/interfaces/VX_icache_rsp_if.v
 ../rtl/interfaces/VX_inst_exec_wb_if.v
-../rtl/interfaces/VX_gpu_dcache_dram_req_if.v
-../rtl/interfaces/VX_csr_req_if.v
-../rtl/interfaces/VX_gpu_dcache_rsp_if.v
+../rtl/interfaces/VX_cache_dram_req_if.v
+../rtl/interfaces/VX_cache_dram_rsp_if.v
+../rtl/interfaces/VX_cache_core_req_if.v
+../rtl/interfaces/VX_cache_core_rsp_if.v
 ../rtl/interfaces/VX_frE_to_bckE_req_if.v
 ../rtl/interfaces/VX_gpr_data_if.v
 ../rtl/interfaces/VX_csr_wb_if.v
-../rtl/interfaces/VX_gpu_dcache_req_if.v
+../rtl/interfaces/VX_csr_req_if.v
 ../rtl/interfaces/VX_lsu_req_if.v
-../rtl/interfaces/VX_gpu_snp_req_rsp_if.v
-../rtl/interfaces/VX_mw_wb_if.v
+../rtl/interfaces/VX_cache_snp_req_rsp_if.v
 ../rtl/interfaces/VX_gpr_jal_if.v
-../rtl/interfaces/VX_gpu_inst_req_if.v
+../rtl/interfaces/VX_gpgpu_inst_req_if.v
 ../rtl/interfaces/VX_wstall_if.v
 ../rtl/interfaces/VX_wb_if.v
 ../rtl/interfaces/VX_gpr_read_if.v
 ../rtl/interfaces/VX_jal_rsp_if.v
 ../rtl/interfaces/VX_warp_ctl_if.v
-../rtl/interfaces/VX_gpu_dcache_snp_req_if.v
-../rtl/interfaces/VX_gpu_dcache_dram_rsp_if.v
 ../rtl/interfaces/VX_inst_mem_wb_if.v
 
 ../rtl/libs/VX_priority_encoder_w_mask.v
@@ -49,7 +46,6 @@ vortex_afu.json
 ../rtl/libs/VX_generic_priority_encoder.v
 ../rtl/libs/VX_priority_encoder.v
 ../rtl/libs/VX_generic_queue.v
-../rtl/libs/VX_byte_enabled_dual_port_ram.v
 ../rtl/libs/VX_countones.v
 
 ../rtl/Vortex_Socket.v
@@ -68,6 +64,7 @@ vortex_afu.json
 ../rtl/VX_csr_pipe.v
 ../rtl/VX_warp_sched.v
 ../rtl/VX_gpr.v
+../rtl/VX_gpr_ram.v
 ../rtl/VX_gpr_stage.v
 ../rtl/VX_dmem_ctrl.v
 ../rtl/VX_alu_unit.v
diff --git a/hw/rtl/VX_gpr.v b/hw/rtl/VX_gpr.v
index 00c3e427..94fc22c4 100644
--- a/hw/rtl/VX_gpr.v
+++ b/hw/rtl/VX_gpr.v
@@ -15,7 +15,7 @@ module VX_gpr (
     `ifndef ASIC
         assign write_enable = valid_write_request && ((writeback_if.wb != 0)) && (writeback_if.rd != 0);
 
-        VX_byte_enabled_dual_port_ram be_dp_ram (
+        VX_gpr_ram gpr_ram (
             .we    (write_enable),
             .clk   (clk),
             .reset (reset),
diff --git a/hw/rtl/libs/VX_byte_enabled_dual_port_ram.v b/hw/rtl/VX_gpr_ram.v
similarity index 96%
rename from hw/rtl/libs/VX_byte_enabled_dual_port_ram.v
rename to hw/rtl/VX_gpr_ram.v
index 351a9c3e..65b8f81b 100644
--- a/hw/rtl/libs/VX_byte_enabled_dual_port_ram.v
+++ b/hw/rtl/VX_gpr_ram.v
@@ -1,6 +1,6 @@
 `include "VX_define.vh"
 
-module VX_byte_enabled_dual_port_ram (
+module VX_gpr_ram (
     input wire                          clk,
     input wire                          reset,
 	input wire                          we,