From 2994e607e3769f4e8454f3be5956198ef3f59bf9 Mon Sep 17 00:00:00 2001
From: "Lyons, Ethan Tyler" <ethan.lyons@gatech.edu>
Date: Wed, 13 Nov 2019 10:06:13 -0500
Subject: [PATCH] Shared Memory Implemented

---
 rtl/VX_define.v          | 22 +++++++++++++++++++---
 rtl/VX_dmem_controller.v | 25 +++++++++++++++++++++----
 2 files changed, 40 insertions(+), 7 deletions(-)

diff --git a/rtl/VX_define.v b/rtl/VX_define.v
index 34a8deba..059d4397 100644
--- a/rtl/VX_define.v
+++ b/rtl/VX_define.v
@@ -182,7 +182,7 @@
 
 //Cache configurations
 //Bytes
-`define DCACHE_SIZE  4096 
+`define DCACHE_SIZE  4096
 `define DCACHE_WAYS  2
 
 //Bytes
@@ -241,9 +241,25 @@
 
 ///////
 
-
-`define SHARED_MEMORY_SIZE 4096
+//`define SHARED_MEMORY_SIZE 4096
+`define SHARED_MEMORY_SIZE 8192
 `define SHARED_MEMORY_BANKS 4
+//`define SHARED_MEMORY_BYTES_PER_READ 16
+//`define SHARED_MEMORY_HEIGHT ((`SHARED_MEMORY_SIZE) / (`SHARED_MEMORY_BANKS * `SHARED_MEMORY_BYTES_PER_READ))
+
+//`define SHARED_MEMORY_SIZE 16384
+//`define SHARED_MEMORY_BANKS 8
 `define SHARED_MEMORY_BYTES_PER_READ 16
+//`define SHARED_MEMORY_BITS_PER_BANK 3
+`define SHARED_MEMORY_BITS_PER_BANK `CLOG2(`SHARED_MEMORY_BANKS)
+`define SHARED_MEMORY_NUM_REQ    `NT
+`define SHARED_MEMORY_WORDS_PER_READ (`SHARED_MEMORY_BYTES_PER_READ / 4)
+`define SHARED_MEMORY_LOG_WORDS_PER_READ $clog2(`SHARED_MEMORY_WORDS_PER_READ)
 `define SHARED_MEMORY_HEIGHT ((`SHARED_MEMORY_SIZE) / (`SHARED_MEMORY_BANKS * `SHARED_MEMORY_BYTES_PER_READ))
 
+`define SHARED_MEMORY_BANK_OFFSET_ST  (2)
+`define SHARED_MEMORY_BANK_OFFSET_ED  (2+$clog2(`DCACHE_BANKS)-1)
+`define SHARED_MEMORY_BLOCK_OFFSET_ST (`SHARED_MEMORY_BANK_OFFSET_ED + 1)
+`define SHARED_MEMORY_BLOCK_OFFSET_ED (`SHARED_MEMORY_BLOCK_OFFSET_ST +$clog2(`SHARED_MEMORY_LOG_WORDS_PER_READ)-1)
+`define SHARED_MEMORY_INDEX_OFFSET_ST  (`SHARED_MEMORY_BLOCK_OFFSET_ED + 1)
+`define SHARED_MEMORY_INDEX_OFFSET_ED  (`SHARED_MEMORY_INDEX_OFFSET_ST + $clog2(`SHARED_MEMORY_HEIGHT)-1)
diff --git a/rtl/VX_dmem_controller.v b/rtl/VX_dmem_controller.v
index 798591d7..39d10b64 100644
--- a/rtl/VX_dmem_controller.v
+++ b/rtl/VX_dmem_controller.v
@@ -19,7 +19,7 @@ module VX_dmem_controller (
 
 	wire[`NT_M1:0]       sm_driver_in_valid     = VX_dcache_req.out_cache_driver_in_valid & {`NT{to_shm}};
 	wire[`NT_M1:0]       cache_driver_in_valid  = VX_dcache_req.out_cache_driver_in_valid & {`NT{~to_shm}};
-	
+
 	wire read_or_write   = (VX_dcache_req.out_cache_driver_in_mem_write != `NO_MEM_WRITE) && (|cache_driver_in_valid);
 
 
@@ -55,7 +55,24 @@ module VX_dmem_controller (
 	wire valid_read_cache = !cache_delay && cache_driver_in_valid[0];
 
 
-	VX_shared_memory #(.NB(7), .BITS_PER_BANK(3)) shared_memory (
+	VX_shared_memory #(
+		.SM_SIZE                (`SHARED_MEMORY_SIZE),
+	  .SM_BANKS 				      (`SHARED_MEMORY_BANKS),
+	  .SM_BYTES_PER_READ      (`SHARED_MEMORY_BYTES_PER_READ),
+	  .SM_WORDS_PER_READ      (`SHARED_MEMORY_WORDS_PER_READ),
+	  .SM_LOG_WORDS_PER_READ  (`SHARED_MEMORY_LOG_WORDS_PER_READ),
+	  .SM_BANK_OFFSET_START   (`SHARED_MEMORY_BANK_OFFSET_ST),
+	  .SM_BANK_OFFSET_END     (`SHARED_MEMORY_BANK_OFFSET_ED),
+	  .SM_BLOCK_OFFSET_START  (`SHARED_MEMORY_BLOCK_OFFSET_ST),
+	  .SM_BLOCK_OFFSET_END    (`SHARED_MEMORY_BLOCK_OFFSET_ED),
+	  .SM_INDEX_START         (`SHARED_MEMORY_INDEX_OFFSET_ST),
+	  .SM_INDEX_END           (`SHARED_MEMORY_INDEX_OFFSET_ED),
+	  .SM_HEIGHT 				      (`SHARED_MEMORY_HEIGHT),
+	  .NUM_REQ                (`SHARED_MEMORY_NUM_REQ),
+	  .BITS_PER_BANK 			    (`SHARED_MEMORY_BITS_PER_BANK) 
+		)
+		shared_memory
+		(
 		.clk       (clk),
 		.reset     (reset),
 		.in_valid  (sm_driver_in_valid),
@@ -98,7 +115,7 @@ module VX_dmem_controller (
 	(
 		.clk                (clk),
 		.rst                (reset),
-		.i_p_valid          (cache_driver_in_valid), 
+		.i_p_valid          (cache_driver_in_valid),
 		.i_p_addr           (cache_driver_in_address),
 		.i_p_writedata      (cache_driver_in_data),
 		.i_p_read_or_write  (read_or_write),
@@ -168,4 +185,4 @@ VX_d_cache#(
 	assign VX_icache_rsp.delay                    = icache_delay;
 
 
-endmodule
\ No newline at end of file
+endmodule