Addings tests for #1836 and #3205

3 files changed, 120 insertions, 0 deletions

diff --git a/tests/arch/ecp5/bug1836.mem b/tests/arch/ecp5/bug1836.mem
new file mode 100644
index 000000000..1e904d87c
--- /dev/null
+++ b/tests/arch/ecp5/bug1836.mem
@@ -0,0 +1,32 @@
+0x8000,0x8324,0x8647,0x896a,0x8c8b,0x8fab,0x92c7,0x95e1,

+0x98f8,0x9c0b,0x9f19,0xa223,0xa527,0xa826,0xab1f,0xae10,

+0xb0fb,0xb3de,0xb6b9,0xb98c,0xbc56,0xbf17,0xc1cd,0xc47a,

+0xc71c,0xc9b3,0xcc3f,0xcebf,0xd133,0xd39a,0xd5f5,0xd842,

+0xda82,0xdcb3,0xded7,0xe0eb,0xe2f1,0xe4e8,0xe6cf,0xe8a6,

+0xea6d,0xec23,0xedc9,0xef5e,0xf0e2,0xf254,0xf3b5,0xf504,

+0xf641,0xf76b,0xf884,0xf989,0xfa7c,0xfb5c,0xfc29,0xfce3,

+0xfd89,0xfe1d,0xfe9c,0xff09,0xff61,0xffa6,0xffd8,0xfff5,

+0xffff,0xfff5,0xffd8,0xffa6,0xff61,0xff09,0xfe9c,0xfe1d,

+0xfd89,0xfce3,0xfc29,0xfb5c,0xfa7c,0xf989,0xf884,0xf76b,

+0xf641,0xf504,0xf3b5,0xf254,0xf0e2,0xef5e,0xedc9,0xec23,

+0xea6d,0xe8a6,0xe6cf,0xe4e8,0xe2f1,0xe0eb,0xded7,0xdcb3,

+0xda82,0xd842,0xd5f5,0xd39a,0xd133,0xcebf,0xcc3f,0xc9b3,

+0xc71c,0xc47a,0xc1cd,0xbf17,0xbc56,0xb98c,0xb6b9,0xb3de,

+0xb0fb,0xae10,0xab1f,0xa826,0xa527,0xa223,0x9f19,0x9c0b,

+0x98f8,0x95e1,0x92c7,0x8fab,0x8c8b,0x896a,0x8647,0x8324,

+0x8000,0x7cdb,0x79b8,0x7695,0x7374,0x7054,0x6d38,0x6a1e,

+0x6707,0x63f4,0x60e6,0x5ddc,0x5ad8,0x57d9,0x54e0,0x51ef,

+0x4f04,0x4c21,0x4946,0x4673,0x43a9,0x40e8,0x3e32,0x3b85,

+0x38e3,0x364c,0x33c0,0x3140,0x2ecc,0x2c65,0x2a0a,0x27bd,

+0x257d,0x234c,0x2128,0x1f14,0x1d0e,0x1b17,0x1930,0x1759,

+0x1592,0x13dc,0x1236,0x10a1,0xf1d,0xdab,0xc4a,0xafb,

+0x9be,0x894,0x77b,0x676,0x583,0x4a3,0x3d6,0x31c,

+0x276,0x1e2,0x163,0xf6,0x9e,0x59,0x27,0xa,

+0x0,0xa,0x27,0x59,0x9e,0xf6,0x163,0x1e2,

+0x276,0x31c,0x3d6,0x4a3,0x583,0x676,0x77b,0x894,

+0x9be,0xafb,0xc4a,0xdab,0xf1d,0x10a1,0x1236,0x13dc,

+0x1592,0x1759,0x1930,0x1b17,0x1d0e,0x1f14,0x2128,0x234c,

+0x257d,0x27bd,0x2a0a,0x2c65,0x2ecc,0x3140,0x33c0,0x364c,

+0x38e3,0x3b85,0x3e32,0x40e8,0x43a9,0x4673,0x4946,0x4c21,

+0x4f04,0x51ef,0x54e0,0x57d9,0x5ad8,0x5ddc,0x60e6,0x63f4,

+0x6707,0x6a1e,0x6d38,0x7054,0x7374,0x7695,0x79b8,0x7cdb,
\ No newline at end of file
diff --git a/tests/arch/ecp5/bug1836.ys b/tests/arch/ecp5/bug1836.ys
new file mode 100644
index 000000000..d8533441e
--- /dev/null
+++ b/tests/arch/ecp5/bug1836.ys
@@ -0,0 +1,31 @@
+read_verilog <<EOT
+module dds(input clk, output reg [15:0] signal1, output reg [15:0] signal2);
+	reg [9:0] phase_accumulator_1;
+	reg [9:0] phase_accumulator_2;
+	reg [15:0] sine_table [0:255];
+
+	initial begin
+		$readmemh("bug1836.mem",sine_table);
+	end
+
+	always @(posedge clk) begin
+		phase_accumulator_1 <= phase_accumulator_1 + 1;
+		phase_accumulator_2 <= phase_accumulator_2 + 2;
+	end
+
+	always @(posedge clk) begin
+		signal1 <= sine_table[phase_accumulator_1[9:2]];
+		//signal2 <= sine_table[phase_accumulator_2[9:2]];
+	end
+
+	//comment out this always block below to test for single port read
+	always @(posedge clk) begin
+		//signal1 <= sine_table[phase_accumulator_1[9:2]];
+		signal2 <= sine_table[phase_accumulator_2[9:2]];
+	end
+
+endmodule
+EOT
+
+synth_ecp5 -top dds
+select -assert-count 1 t:DP16KD
diff --git a/tests/arch/ecp5/bug3205.ys b/tests/arch/ecp5/bug3205.ys
new file mode 100644
index 000000000..f2e936530
--- /dev/null
+++ b/tests/arch/ecp5/bug3205.ys
@@ -0,0 +1,57 @@
+read_verilog <<EOT
+`timescale 100fs/100fs
+module TopEntity_topEntity_trueDualPortBlockRamWrapper
+	( // Inputs
+	  input  clkA // clock
+	, input  enA
+	, input  weA
+	, input [15:0] addrA
+	, input [23:0] datA
+	, input  clkB // clock
+	, input  enB
+	, input  weB
+	, input [15:0] addrB
+	, input [23:0] datB
+
+	  // Outputs
+	, output wire [47:0] result
+	);
+
+
+	// trueDualPortBlockRam begin
+	// Shared memory
+	// 24*64k = 1.5M = 96*DP16KD
+	reg [24-1:0] mem [65536-1:0];
+
+	reg [23:0] data_slow;
+	reg [23:0] data_fast;
+
+	// Port A
+	always @(posedge clkA) begin
+		if(enA) begin
+			data_slow <= mem[addrA];
+			if(weA) begin
+				data_slow <= datA;
+				mem[addrA] <= datA;
+			end
+		end
+	end
+
+	// Port B
+	always @(posedge clkB) begin
+		if(enB) begin
+			data_fast <= mem[addrB];
+			if(weB) begin
+				data_fast <= datB;
+				mem[addrB] <= datB;
+			end
+		end
+	end
+
+	assign result = {data_slow, data_fast};
+
+	// end trueDualPortBlockRam
+endmodule
+EOT
+synth_ecp5 -top TopEntity_topEntity_trueDualPortBlockRamWrapper
+select -assert-count 96 t:DP16KD