Github_Repos/cvw
1
0
Fork 1
mirror of https://github.com/openhwgroup/cvw synced 2025-02-11 06:05:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

RAM declaration cleanup:

Browse Source
This commit is contained in:
David Harris 2023-01-19 14:47:51 -08:00
parent d1ad6b464d
commit a1b25e1039
3 changed files with 32 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pipelined/src/generic/mem/ram1p1rwbe.sv
View File

@ -38,9 +38,10 @@ module ram1p1rwbe #(parameter DEPTH=128, WIDTH=256) (
input logic [WIDTH-1:0] din, input logic [WIDTH-1:0] din,
input logic we, input logic we,
input logic [(WIDTH-1)/8:0] bwe, input logic [(WIDTH-1)/8:0] bwe,
output logic [WIDTH-1:0] dout); output logic [WIDTH-1:0] dout
);
logic [WIDTH-1:0] RAM[DEPTH-1:0]; logic [WIDTH-1:0] RAM[DEPTH-1:0];
// *************************************************************************** // ***************************************************************************
// TRUE SRAM macro // TRUE SRAM macro
@ -64,18 +65,18 @@ module ram1p1rwbe #(parameter DEPTH=128, WIDTH=256) (
integer i; integer i;
// Read // Read
always @(posedge clk) always_ff @(posedge clk)
if(ce) dout <= #1 RAM[addr]; if(ce) dout <= #1 RAM[addr];
// Write divided into part for bytes and part for extra msbs // Write divided into part for bytes and part for extra msbs
if(WIDTH >= 8) if(WIDTH >= 8)
always @(posedge clk) always_ff @(posedge clk)
if (ce & we) if (ce & we)
for(i = 0; i < WIDTH/8; i++) for(i = 0; i < WIDTH/8; i++)
if(bwe[i]) RAM[addr][i*8 +: 8] <= #1 din[i*8 +: 8]; if(bwe[i]) RAM[addr][i*8 +: 8] <= #1 din[i*8 +: 8];
if (WIDTH%8 != 0) // handle msbs if width not a multiple of 8 if (WIDTH%8 != 0) // handle msbs if width not a multiple of 8
always @(posedge clk) always_ff @(posedge clk)
if (ce & we & bwe[WIDTH/8]) if (ce & we & bwe[WIDTH/8])
RAM[addr][WIDTH-1:WIDTH-WIDTH%8] <= #1 din[WIDTH-1:WIDTH-WIDTH%8]; RAM[addr][WIDTH-1:WIDTH-WIDTH%8] <= #1 din[WIDTH-1:WIDTH-WIDTH%8];
end end

30
pipelined/src/generic/mem/ram2p1r1wb.sv
View File

@ -36,24 +36,20 @@
`include "wally-config.vh" `include "wally-config.vh"
module ram2p1r1wb module ram2p1r1wb #(parameter DEPTH = 10, WIDTH = 2) (
#(parameter int DEPTH = 10, input logic clk,
parameter int WIDTH = 2 input logic reset,
)
(input logic clk, // port 1 is read only
input logic reset, input logic [DEPTH-1:0] ra1,
output logic [WIDTH-1:0] rd1,
// port 1 is read only input logic ren1,
input logic [DEPTH-1:0] ra1,
output logic [WIDTH-1:0] rd1, // port 2 is write only
input logic ren1, input logic [DEPTH-1:0] wa2,
input logic [WIDTH-1:0] wd2,
// port 2 is write only input logic wen2,
input logic [DEPTH-1:0] wa2, input logic [WIDTH-1:0] bwe2
input logic [WIDTH-1:0] wd2,
input logic wen2,
input logic [WIDTH-1:0] bwe2
); );

25
pipelined/src/generic/mem/ram2p1rwbefix.sv
View File

@ -32,16 +32,17 @@
`include "wally-config.vh" `include "wally-config.vh"
module ram2p1r1wbefix #(parameter DEPTH=128, WIDTH=256) ( module ram2p1r1wbefix #(parameter DEPTH=128, WIDTH=256) (
input logic clk, input logic clk,
input logic ce1, ce2, input logic ce1, ce2,
input logic [$clog2(DEPTH)-1:0] ra1, input logic [$clog2(DEPTH)-1:0] ra1,
input logic [WIDTH-1:0] wd2, input logic [WIDTH-1:0] wd2,
input logic [$clog2(DEPTH)-1:0] wa2, input logic [$clog2(DEPTH)-1:0] wa2,
input logic we2, input logic we2,
input logic [(WIDTH-1)/8:0] bwe2, input logic [(WIDTH-1)/8:0] bwe2,
output logic [WIDTH-1:0] rd1); output logic [WIDTH-1:0] rd1
);
logic [WIDTH-1:0] mem[DEPTH-1:0]; logic [WIDTH-1:0] mem[DEPTH-1:0];
// *************************************************************************** // ***************************************************************************
// TRUE Smem macro // TRUE Smem macro
@ -53,18 +54,18 @@ module ram2p1r1wbefix #(parameter DEPTH=128, WIDTH=256) (
integer i; integer i;
// Read // Read
always @(posedge clk) always_ff @(posedge clk)
if(ce1) rd1 <= #1 mem[ra1]; if(ce1) rd1 <= #1 mem[ra1];
// Write divided into part for bytes and part for extra msbs // Write divided into part for bytes and part for extra msbs
if(WIDTH >= 8) if(WIDTH >= 8)
always @(posedge clk) always_ff @(posedge clk)
if (ce2 & we2) if (ce2 & we2)
for(i = 0; i < WIDTH/8; i++) for(i = 0; i < WIDTH/8; i++)
if(bwe2[i]) mem[wa2][i*8 +: 8] <= #1 wd2[i*8 +: 8]; if(bwe2[i]) mem[wa2][i*8 +: 8] <= #1 wd2[i*8 +: 8];
if (WIDTH%8 != 0) // handle msbs if width not a multiple of 8 if (WIDTH%8 != 0) // handle msbs if width not a multiple of 8
always @(posedge clk) always_ff @(posedge clk)
if (ce2 & we2 & bwe2[WIDTH/8]) if (ce2 & we2 & bwe2[WIDTH/8])
mem[wa2][WIDTH-1:WIDTH-WIDTH%8] <= #1 wd2[WIDTH-1:WIDTH-WIDTH%8]; mem[wa2][WIDTH-1:WIDTH-WIDTH%8] <= #1 wd2[WIDTH-1:WIDTH-WIDTH%8];