Merge pull request #1603 from whitequark/ice40-ram_style

ice40/ecp5: add support for both 1364.1 and Synplify/LSE RAM/ROM attributes

1 files changed, 22 insertions, 20 deletions

diff --git a/tests/arch/common/blockram.v b/tests/arch/common/blockram.v
index dbc6ca65c..5ed0736d0 100644
--- a/tests/arch/common/blockram.v
+++ b/tests/arch/common/blockram.v
@@ -5,19 +5,20 @@ module sync_ram_sp #(parameter DATA_WIDTH=8, ADDRESS_WIDTH=10)
     input  wire  [ADDRESS_WIDTH-1:0] address_in,
     output wire  [DATA_WIDTH-1:0]    data_out);
 
-   localparam WORD  = (DATA_WIDTH-1);
-   localparam DEPTH = (2**ADDRESS_WIDTH-1);
+  localparam WORD  = (DATA_WIDTH-1);
+  localparam DEPTH = (2**ADDRESS_WIDTH-1);
 
-   reg [WORD:0] data_out_r;
-   reg [WORD:0] memory [0:DEPTH];
+  reg [WORD:0] data_out_r;
+  reg [WORD:0] memory [0:DEPTH];
 
-   always @(posedge clk) begin
-      if (write_enable)
-        memory[address_in] <= data_in;
-      data_out_r <= memory[address_in];
-   end
+  always @(posedge clk) begin
+    if (write_enable)
+      memory[address_in] <= data_in;
+    data_out_r <= memory[address_in];
+  end
+
+  assign data_out = data_out_r;
 
-   assign data_out = data_out_r;
 endmodule // sync_ram_sp
 
 
@@ -28,18 +29,19 @@ module sync_ram_sdp #(parameter DATA_WIDTH=8, ADDRESS_WIDTH=10)
     input  wire  [ADDRESS_WIDTH-1:0] address_in_r, address_in_w,
     output wire  [DATA_WIDTH-1:0]    data_out);
 
-   localparam WORD  = (DATA_WIDTH-1);
-   localparam DEPTH = (2**ADDRESS_WIDTH-1);
+  localparam WORD  = (DATA_WIDTH-1);
+  localparam DEPTH = (2**ADDRESS_WIDTH-1);
+
+  reg [WORD:0] data_out_r;
+  reg [WORD:0] memory [0:DEPTH];
 
-   reg [WORD:0] data_out_r;
-   reg [WORD:0] memory [0:DEPTH];
+  always @(posedge clk) begin
+    if (write_enable)
+      memory[address_in_w] <= data_in;
+    data_out_r <= memory[address_in_r];
+  end
 
-   always @(posedge clk) begin
-      if (write_enable)
-        memory[address_in_w] <= data_in;
-      data_out_r <= memory[address_in_r];
-   end
+  assign data_out = data_out_r;
 
-   assign data_out = data_out_r;
 endmodule // sync_ram_sdp