testsuite/synth: add a test for #2073

4 files changed, 185 insertions, 0 deletions

diff --git a/testsuite/synth/issue2073/ivoice.vhdl b/testsuite/synth/issue2073/ivoice.vhdl
new file mode 100644
index 000000000..4fd2ee6b6
--- /dev/null
+++ b/testsuite/synth/issue2073/ivoice.vhdl
@@ -0,0 +1,105 @@
+-- Massively reduced testcase - the actual file I'm attempting to build is here:
+-- https://github.com/MiSTer-devel/Intv_MiSTer/blob/master/rtl/intv/ivoice.vhd
+
+LIBRARY ieee;
+USE ieee.std_logic_1164.ALL;
+USE ieee.numeric_std.ALL;
+
+ENTITY ivoice IS
+  PORT (
+    sound     : OUT signed(15 downto 0);
+    clksys    : IN  std_logic; --- 43MHz ... 48MHz
+    reset_na  : IN std_logic
+    );
+END ENTITY ivoice;
+
+ARCHITECTURE rtl OF ivoice IS
+  SUBTYPE sv16   IS signed(15  DOWNTO 0);
+  SUBTYPE uv8    IS unsigned(7   DOWNTO 0);
+  SUBTYPE uv16   IS unsigned(15  DOWNTO 0);
+  SUBTYPE uv19   IS unsigned(18  DOWNTO 0);
+  SUBTYPE uv20   IS unsigned(19  DOWNTO 0);
+  SUBTYPE int16 IS integer RANGE -32768 TO 32767;
+  SUBTYPE uint4  IS natural RANGE 0 TO 15;
+  SUBTYPE uint5  IS natural RANGE 0 TO 31;
+  SUBTYPE uint16 IS natural RANGE 0 TO 65535;
+
+  TYPE enum_state IS (
+    sIDLE,sDECODE1,sDECODE2,sDECODE3,sMICROCODE,
+    sGENE1,sGENE2,sGENE3,sGENE4,
+    sCALC01,sCALC02,sCALC11,sCALC12,sCALC21,sCALC22,
+    sCALC31,sCALC32,sCALC41,sCALC42,sCALC51,sCALC52,
+    sSOUND);
+  SIGNAL state,state2 : enum_state;
+
+  FUNCTION bswap(v : unsigned) RETURN unsigned IS
+    VARIABLE u,x: unsigned(0 TO v'length-1) :=v;
+  BEGIN
+    FOR i IN 0 TO v'length-1 LOOP
+      x(v'length-1-i):=u(i);
+    END LOOP;
+    return x;
+  END FUNCTION;
+
+  SIGNAL pc,ret_pc : uv19;
+
+  FUNCTION sat(i : integer) RETURN integer IS
+  BEGIN
+    IF i>127 THEN RETURN 127; END IF;
+    IF i<-128 THEN  RETURN -128; END IF;
+    RETURN i;
+  END FUNCTION;
+
+  SIGNAL samp : int16 := 0;
+
+  SIGNAL fifoptr : uint5;
+  SIGNAL romd : uv16;
+  SIGNAL fifod : uv20;
+  SIGNAL rom_a : uint16;
+  SIGNAL rom_dr : uv8;
+
+BEGIN
+
+  ------------------------------------------------------------------------------
+  -- Sequencer
+  Machine:PROCESS(clksys,reset_na) IS
+    VARIABLE romd_v,fifod_v,imm_v,inst_v,code_v : uv8;
+    VARIABLE tmp_v : uv16;
+    VARIABLE len_v : uint4;
+    VARIABLE pc_v : uv19;
+    VARIABLE branch_v : boolean;
+  BEGIN
+    IF rising_edge(clksys) THEN
+      ------------------------------------------------------
+
+      romd_v:=romd(7+to_integer(pc(2 DOWNTO 0)) DOWNTO
+                     to_integer(pc(2 DOWNTO 0)));
+
+      code_v:=romd_v;
+
+        CASE state IS
+
+            -------------------------------------------------
+          WHEN sDECODE1 =>
+            inst_v:=bswap(code_v);
+            state<=sDECODE2;
+            IF inst_v(7 DOWNTO 4)="0000" THEN
+              state<=sGENE1; -- If Zero repeat, skip instruction
+            END IF;
+
+          -----------------------------------------------
+          -- Sound output.
+          WHEN sSOUND =>
+              sound<=to_signed(sat(samp/4)*256,16);
+
+            when others =>
+            	null;
+
+          -----------------------------------------------
+        END CASE;
+
+      ---------------------------------------------------
+    END IF;
+  END PROCESS;
+
+END ARCHITECTURE rtl;
diff --git a/testsuite/synth/issue2073/ivoice2.vhdl b/testsuite/synth/issue2073/ivoice2.vhdl
new file mode 100644
index 000000000..995c245fe
--- /dev/null
+++ b/testsuite/synth/issue2073/ivoice2.vhdl
@@ -0,0 +1,18 @@
+-- Massively reduced testcase - the actual file I'm attempting to build is:
+-- https://github.com/MiSTer-devel/Intv_MiSTer/blob/master/rtl/intv/ivoice.vhd
+
+LIBRARY ieee;
+USE ieee.std_logic_1164.ALL;
+
+ENTITY ivoice2 IS
+  PORT (
+    pc : natural range 0 to 7;
+    romd : std_logic_vector(15  DOWNTO 0);
+    sound     : OUT std_logic_vector(7 downto 0)
+    );
+END ;
+
+ARCHITECTURE rtl OF ivoice2 IS
+BEGIN
+  sound <=romd(7+pc downto pc);
+END ARCHITECTURE rtl;
diff --git a/testsuite/synth/issue2073/tb_ivoice2.vhdl b/testsuite/synth/issue2073/tb_ivoice2.vhdl
new file mode 100644
index 000000000..133a3ca2a
--- /dev/null
+++ b/testsuite/synth/issue2073/tb_ivoice2.vhdl
@@ -0,0 +1,51 @@
+entity tb_ivoice2 is
+end tb_ivoice2;
+
+library ieee;
+use ieee.std_logic_1164.all;
+
+architecture behav of tb_ivoice2 is
+  signal romd : std_logic_vector (15 downto 0) := b"1010_0100_0100_0011";
+  signal pc : natural range 0 to 7;
+  signal res : std_logic_vector (7 downto 0);
+begin
+  dut: entity work.ivoice2
+    port map (pc, romd, res);
+
+  process
+  begin
+    pc <= 0;
+    wait for 1 ns;
+    assert res = b"0100_0011" severity failure;
+
+    pc <= 1;
+    wait for 1 ns;
+    assert res = b"0_0100_001" severity failure;
+
+    pc <= 2;
+    wait for 1 ns;
+    assert res = b"00_0100_00" severity failure;
+
+    pc <= 3;
+    wait for 1 ns;
+    assert res = b"100_0100_0" severity failure;
+
+    pc <= 4;
+    wait for 1 ns;
+    assert res = b"0100_0100" severity failure;
+
+    pc <= 5;
+    wait for 1 ns;
+    assert res = b"0_0100_010" severity failure;
+
+    pc <= 6;
+    wait for 1 ns;
+    assert res = b"10_0100_01" severity failure;
+
+    pc <= 7;
+    wait for 1 ns;
+    assert res = b"010_0100_0" severity failure;
+
+    wait;
+  end process;
+end behav;
diff --git a/testsuite/synth/issue2073/testsuite.sh b/testsuite/synth/issue2073/testsuite.sh
new file mode 100755
index 000000000..73683bc8c
--- /dev/null
+++ b/testsuite/synth/issue2073/testsuite.sh
@@ -0,0 +1,11 @@
+#! /bin/sh
+
+. ../../testenv.sh
+
+synth_only ivoice
+
+synth_tb ivoice2
+
+clean
+
+echo "Test successful"