utils/vlog/tests: enabled additional vlog tests

Signed-off-by: Alessandro Comodi <acomodi@antmicro.com>
diff --git a/tests/dsp_in_registered/golden.pb_type.xml b/tests/dsp_in_registered/golden.pb_type.xml
index c1f9b7a..6f1213b 100644
--- a/tests/dsp_in_registered/golden.pb_type.xml
+++ b/tests/dsp_in_registered/golden.pb_type.xml
@@ -1,22 +1,266 @@
-<pb_type name="mem_sp" blif_model=".subckt single_port_ram_mixed" num_pb="1">
-  <input name="addr" num_pins="9"/>
-  <input name="data" num_pins="64"/>
-  <input name="we" num_pins="1"/>
-  <output name="out" num_pins="64"/>
+<pb_type xmlns:xi="http://www.w3.org/2001/XInclude" name="dsp_in_registered" num_pb="1">
+  <input name="a" num_pins="32"/>
+  <input name="b" num_pins="32"/>
   <clock name="clk" num_pins="1"/>
-
-  <!-- External input register timing -->
-  <T_setup value="50e-12" port="mem_sp.addr" clock="clk"/>
-  <T_setup value="50e-12" port="mem_sp.data" clock="clk"/>
-  <T_setup value="50e-12" port="mem_sp.we" clock="clk"/>
-
-  <!-- Internal input register timing -->
-  <T_clock_to_Q max="200e-12" port="mem_sp.addr" clock="clk"/>
-  <T_clock_to_Q max="200e-12" port="mem_sp.data" clock="clk"/>
-  <T_clock_to_Q max="200e-12" port="mem_sp.we" clock="clk"/>
-
-  <!-- Internal combinational delay -->
-  <delay_constant max="800e-12" in_port="mem_sp.addr" out_port="mem_sp.out"/>
-  <delay_constant max="800e-12" in_port="mem_sp.data" out_port="mem_sp.out"/>
-  <delay_constant max="800e-12" in_port="mem_sp.we" out_port="mem_sp.out"/>
+  <input name="m" num_pins="1"/>
+  <output name="out" num_pins="64"/>
+  <xi:include href="../dsp_combinational/dsp_combinational.pb_type.xml"/>
+  <interconnect>
+    <direct>
+      <port name="out[0]" type="input"/>
+      <port from="dsp_in_registered" name="out[0]" type="output"/>
+    </direct>
+    <direct>
+      <port name="out[1]" type="input"/>
+      <port from="dsp_in_registered" name="out[1]" type="output"/>
+    </direct>
+    <direct>
+      <port name="out[2]" type="input"/>
+      <port from="dsp_in_registered" name="out[2]" type="output"/>
+    </direct>
+    <direct>
+      <port name="out[3]" type="input"/>
+      <port from="dsp_in_registered" name="out[3]" type="output"/>
+    </direct>
+    <direct>
+      <port name="out[4]" type="input"/>
+      <port from="dsp_in_registered" name="out[4]" type="output"/>
+    </direct>
+    <direct>
+      <port name="out[5]" type="input"/>
+      <port from="dsp_in_registered" name="out[5]" type="output"/>
+    </direct>
+    <direct>
+      <port name="out[6]" type="input"/>
+      <port from="dsp_in_registered" name="out[6]" type="output"/>
+    </direct>
+    <direct>
+      <port name="out[7]" type="input"/>
+      <port from="dsp_in_registered" name="out[7]" type="output"/>
+    </direct>
+    <direct>
+      <port name="out[8]" type="input"/>
+      <port from="dsp_in_registered" name="out[8]" type="output"/>
+    </direct>
+    <direct>
+      <port name="out[9]" type="input"/>
+      <port from="dsp_in_registered" name="out[9]" type="output"/>
+    </direct>
+    <direct>
+      <port name="out[10]" type="input"/>
+      <port from="dsp_in_registered" name="out[10]" type="output"/>
+    </direct>
+    <direct>
+      <port name="out[11]" type="input"/>
+      <port from="dsp_in_registered" name="out[11]" type="output"/>
+    </direct>
+    <direct>
+      <port name="out[12]" type="input"/>
+      <port from="dsp_in_registered" name="out[12]" type="output"/>
+    </direct>
+    <direct>
+      <port name="out[13]" type="input"/>
+      <port from="dsp_in_registered" name="out[13]" type="output"/>
+    </direct>
+    <direct>
+      <port name="out[14]" type="input"/>
+      <port from="dsp_in_registered" name="out[14]" type="output"/>
+    </direct>
+    <direct>
+      <port name="out[15]" type="input"/>
+      <port from="dsp_in_registered" name="out[15]" type="output"/>
+    </direct>
+    <direct>
+      <port name="out[16]" type="input"/>
+      <port from="dsp_in_registered" name="out[16]" type="output"/>
+    </direct>
+    <direct>
+      <port name="out[17]" type="input"/>
+      <port from="dsp_in_registered" name="out[17]" type="output"/>
+    </direct>
+    <direct>
+      <port name="out[18]" type="input"/>
+      <port from="dsp_in_registered" name="out[18]" type="output"/>
+    </direct>
+    <direct>
+      <port name="out[19]" type="input"/>
+      <port from="dsp_in_registered" name="out[19]" type="output"/>
+    </direct>
+    <direct>
+      <port name="out[20]" type="input"/>
+      <port from="dsp_in_registered" name="out[20]" type="output"/>
+    </direct>
+    <direct>
+      <port name="out[21]" type="input"/>
+      <port from="dsp_in_registered" name="out[21]" type="output"/>
+    </direct>
+    <direct>
+      <port name="out[22]" type="input"/>
+      <port from="dsp_in_registered" name="out[22]" type="output"/>
+    </direct>
+    <direct>
+      <port name="out[23]" type="input"/>
+      <port from="dsp_in_registered" name="out[23]" type="output"/>
+    </direct>
+    <direct>
+      <port name="out[24]" type="input"/>
+      <port from="dsp_in_registered" name="out[24]" type="output"/>
+    </direct>
+    <direct>
+      <port name="out[25]" type="input"/>
+      <port from="dsp_in_registered" name="out[25]" type="output"/>
+    </direct>
+    <direct>
+      <port name="out[26]" type="input"/>
+      <port from="dsp_in_registered" name="out[26]" type="output"/>
+    </direct>
+    <direct>
+      <port name="out[27]" type="input"/>
+      <port from="dsp_in_registered" name="out[27]" type="output"/>
+    </direct>
+    <direct>
+      <port name="out[28]" type="input"/>
+      <port from="dsp_in_registered" name="out[28]" type="output"/>
+    </direct>
+    <direct>
+      <port name="out[29]" type="input"/>
+      <port from="dsp_in_registered" name="out[29]" type="output"/>
+    </direct>
+    <direct>
+      <port name="out[30]" type="input"/>
+      <port from="dsp_in_registered" name="out[30]" type="output"/>
+    </direct>
+    <direct>
+      <port name="out[31]" type="input"/>
+      <port from="dsp_in_registered" name="out[31]" type="output"/>
+    </direct>
+    <direct>
+      <port name="out[32]" type="input"/>
+      <port from="dsp_in_registered" name="out[32]" type="output"/>
+    </direct>
+    <direct>
+      <port name="out[33]" type="input"/>
+      <port from="dsp_in_registered" name="out[33]" type="output"/>
+    </direct>
+    <direct>
+      <port name="out[34]" type="input"/>
+      <port from="dsp_in_registered" name="out[34]" type="output"/>
+    </direct>
+    <direct>
+      <port name="out[35]" type="input"/>
+      <port from="dsp_in_registered" name="out[35]" type="output"/>
+    </direct>
+    <direct>
+      <port name="out[36]" type="input"/>
+      <port from="dsp_in_registered" name="out[36]" type="output"/>
+    </direct>
+    <direct>
+      <port name="out[37]" type="input"/>
+      <port from="dsp_in_registered" name="out[37]" type="output"/>
+    </direct>
+    <direct>
+      <port name="out[38]" type="input"/>
+      <port from="dsp_in_registered" name="out[38]" type="output"/>
+    </direct>
+    <direct>
+      <port name="out[39]" type="input"/>
+      <port from="dsp_in_registered" name="out[39]" type="output"/>
+    </direct>
+    <direct>
+      <port name="out[40]" type="input"/>
+      <port from="dsp_in_registered" name="out[40]" type="output"/>
+    </direct>
+    <direct>
+      <port name="out[41]" type="input"/>
+      <port from="dsp_in_registered" name="out[41]" type="output"/>
+    </direct>
+    <direct>
+      <port name="out[42]" type="input"/>
+      <port from="dsp_in_registered" name="out[42]" type="output"/>
+    </direct>
+    <direct>
+      <port name="out[43]" type="input"/>
+      <port from="dsp_in_registered" name="out[43]" type="output"/>
+    </direct>
+    <direct>
+      <port name="out[44]" type="input"/>
+      <port from="dsp_in_registered" name="out[44]" type="output"/>
+    </direct>
+    <direct>
+      <port name="out[45]" type="input"/>
+      <port from="dsp_in_registered" name="out[45]" type="output"/>
+    </direct>
+    <direct>
+      <port name="out[46]" type="input"/>
+      <port from="dsp_in_registered" name="out[46]" type="output"/>
+    </direct>
+    <direct>
+      <port name="out[47]" type="input"/>
+      <port from="dsp_in_registered" name="out[47]" type="output"/>
+    </direct>
+    <direct>
+      <port name="out[48]" type="input"/>
+      <port from="dsp_in_registered" name="out[48]" type="output"/>
+    </direct>
+    <direct>
+      <port name="out[49]" type="input"/>
+      <port from="dsp_in_registered" name="out[49]" type="output"/>
+    </direct>
+    <direct>
+      <port name="out[50]" type="input"/>
+      <port from="dsp_in_registered" name="out[50]" type="output"/>
+    </direct>
+    <direct>
+      <port name="out[51]" type="input"/>
+      <port from="dsp_in_registered" name="out[51]" type="output"/>
+    </direct>
+    <direct>
+      <port name="out[52]" type="input"/>
+      <port from="dsp_in_registered" name="out[52]" type="output"/>
+    </direct>
+    <direct>
+      <port name="out[53]" type="input"/>
+      <port from="dsp_in_registered" name="out[53]" type="output"/>
+    </direct>
+    <direct>
+      <port name="out[54]" type="input"/>
+      <port from="dsp_in_registered" name="out[54]" type="output"/>
+    </direct>
+    <direct>
+      <port name="out[55]" type="input"/>
+      <port from="dsp_in_registered" name="out[55]" type="output"/>
+    </direct>
+    <direct>
+      <port name="out[56]" type="input"/>
+      <port from="dsp_in_registered" name="out[56]" type="output"/>
+    </direct>
+    <direct>
+      <port name="out[57]" type="input"/>
+      <port from="dsp_in_registered" name="out[57]" type="output"/>
+    </direct>
+    <direct>
+      <port name="out[58]" type="input"/>
+      <port from="dsp_in_registered" name="out[58]" type="output"/>
+    </direct>
+    <direct>
+      <port name="out[59]" type="input"/>
+      <port from="dsp_in_registered" name="out[59]" type="output"/>
+    </direct>
+    <direct>
+      <port name="out[60]" type="input"/>
+      <port from="dsp_in_registered" name="out[60]" type="output"/>
+    </direct>
+    <direct>
+      <port name="out[61]" type="input"/>
+      <port from="dsp_in_registered" name="out[61]" type="output"/>
+    </direct>
+    <direct>
+      <port name="out[62]" type="input"/>
+      <port from="dsp_in_registered" name="out[62]" type="output"/>
+    </direct>
+    <direct>
+      <port name="out[63]" type="input"/>
+      <port from="dsp_in_registered" name="out[63]" type="output"/>
+    </direct>
+  </interconnect>
 </pb_type>
diff --git a/tests/dsp_inout_registered/golden.pb_type.xml b/tests/dsp_inout_registered/golden.pb_type.xml
index c1f9b7a..bddf373 100644
--- a/tests/dsp_inout_registered/golden.pb_type.xml
+++ b/tests/dsp_inout_registered/golden.pb_type.xml
@@ -1,22 +1,9 @@
-<pb_type name="mem_sp" blif_model=".subckt single_port_ram_mixed" num_pb="1">
-  <input name="addr" num_pins="9"/>
-  <input name="data" num_pins="64"/>
-  <input name="we" num_pins="1"/>
-  <output name="out" num_pins="64"/>
+<pb_type xmlns:xi="http://www.w3.org/2001/XInclude" name="dsp_inout_registered" num_pb="1">
+  <input name="a" num_pins="32"/>
+  <input name="b" num_pins="32"/>
   <clock name="clk" num_pins="1"/>
-
-  <!-- External input register timing -->
-  <T_setup value="50e-12" port="mem_sp.addr" clock="clk"/>
-  <T_setup value="50e-12" port="mem_sp.data" clock="clk"/>
-  <T_setup value="50e-12" port="mem_sp.we" clock="clk"/>
-
-  <!-- Internal input register timing -->
-  <T_clock_to_Q max="200e-12" port="mem_sp.addr" clock="clk"/>
-  <T_clock_to_Q max="200e-12" port="mem_sp.data" clock="clk"/>
-  <T_clock_to_Q max="200e-12" port="mem_sp.we" clock="clk"/>
-
-  <!-- Internal combinational delay -->
-  <delay_constant max="800e-12" in_port="mem_sp.addr" out_port="mem_sp.out"/>
-  <delay_constant max="800e-12" in_port="mem_sp.data" out_port="mem_sp.out"/>
-  <delay_constant max="800e-12" in_port="mem_sp.we" out_port="mem_sp.out"/>
+  <input name="m" num_pins="1"/>
+  <output name="out" num_pins="64"/>
+  <xi:include href="../dsp_combinational/dsp_combinational.pb_type.xml"/>
+  <interconnect/>
 </pb_type>
diff --git a/tests/dsp_inout_registered_dualclk/dsp_inout_registered_dualclk.sim.v b/tests/dsp_inout_registered_dualclk/dsp_inout_registered_dualclk.sim.v
index 5a68f69..6fb63df 100644
--- a/tests/dsp_inout_registered_dualclk/dsp_inout_registered_dualclk.sim.v
+++ b/tests/dsp_inout_registered_dualclk/dsp_inout_registered_dualclk.sim.v
@@ -1,6 +1,6 @@
 `include "../dsp_combinational/dsp_combinational.sim.v"
 
-/* DSP Block with register on both the inputs and the output */
+/* DSP Block with register on both the inputs and the output, which use different clocks*/
 module dsp_inout_registered_dualclk (iclk, oclk, a, b, m, out);
 	localparam DATA_WIDTH = 64;
 
@@ -22,7 +22,7 @@
 	end
 
 	wire [DATA_WIDTH-1:0] c_out;
-	dsp_combinational comb (.a(a), .b(b), .m(m), .out(c_out));
+	dsp_combinational comb (.a(q_a), .b(q_b), .m(q_m), .out(c_out));
 
 	/* Output register on oclk */
 	reg [DATA_WIDTH-1:0] q_out;
diff --git a/tests/dsp_inout_registered_dualclk/golden.pb_type.xml b/tests/dsp_inout_registered_dualclk/golden.pb_type.xml
index c1f9b7a..83cc0a9 100644
--- a/tests/dsp_inout_registered_dualclk/golden.pb_type.xml
+++ b/tests/dsp_inout_registered_dualclk/golden.pb_type.xml
@@ -1,22 +1,10 @@
-<pb_type name="mem_sp" blif_model=".subckt single_port_ram_mixed" num_pb="1">
-  <input name="addr" num_pins="9"/>
-  <input name="data" num_pins="64"/>
-  <input name="we" num_pins="1"/>
+<pb_type xmlns:xi="http://www.w3.org/2001/XInclude" name="dsp_inout_registered_dualclk" num_pb="1">
+  <input name="a" num_pins="32"/>
+  <input name="b" num_pins="32"/>
+  <clock name="iclk" num_pins="1"/>
+  <input name="m" num_pins="1"/>
+  <clock name="oclk" num_pins="1"/>
   <output name="out" num_pins="64"/>
-  <clock name="clk" num_pins="1"/>
-
-  <!-- External input register timing -->
-  <T_setup value="50e-12" port="mem_sp.addr" clock="clk"/>
-  <T_setup value="50e-12" port="mem_sp.data" clock="clk"/>
-  <T_setup value="50e-12" port="mem_sp.we" clock="clk"/>
-
-  <!-- Internal input register timing -->
-  <T_clock_to_Q max="200e-12" port="mem_sp.addr" clock="clk"/>
-  <T_clock_to_Q max="200e-12" port="mem_sp.data" clock="clk"/>
-  <T_clock_to_Q max="200e-12" port="mem_sp.we" clock="clk"/>
-
-  <!-- Internal combinational delay -->
-  <delay_constant max="800e-12" in_port="mem_sp.addr" out_port="mem_sp.out"/>
-  <delay_constant max="800e-12" in_port="mem_sp.data" out_port="mem_sp.out"/>
-  <delay_constant max="800e-12" in_port="mem_sp.we" out_port="mem_sp.out"/>
+  <xi:include href="../dsp_combinational/dsp_combinational.pb_type.xml"/>
+  <interconnect/>
 </pb_type>
diff --git a/tests/dsp_out_registered/golden.pb_type.xml b/tests/dsp_out_registered/golden.pb_type.xml
index c1f9b7a..e35bbad 100644
--- a/tests/dsp_out_registered/golden.pb_type.xml
+++ b/tests/dsp_out_registered/golden.pb_type.xml
@@ -1,22 +1,270 @@
-<pb_type name="mem_sp" blif_model=".subckt single_port_ram_mixed" num_pb="1">
-  <input name="addr" num_pins="9"/>
-  <input name="data" num_pins="64"/>
-  <input name="we" num_pins="1"/>
-  <output name="out" num_pins="64"/>
+<pb_type xmlns:xi="http://www.w3.org/2001/XInclude" name="dsp_out_registered" num_pb="1">
+  <input name="a" num_pins="32"/>
+  <input name="b" num_pins="32"/>
   <clock name="clk" num_pins="1"/>
-
-  <!-- External input register timing -->
-  <T_setup value="50e-12" port="mem_sp.addr" clock="clk"/>
-  <T_setup value="50e-12" port="mem_sp.data" clock="clk"/>
-  <T_setup value="50e-12" port="mem_sp.we" clock="clk"/>
-
-  <!-- Internal input register timing -->
-  <T_clock_to_Q max="200e-12" port="mem_sp.addr" clock="clk"/>
-  <T_clock_to_Q max="200e-12" port="mem_sp.data" clock="clk"/>
-  <T_clock_to_Q max="200e-12" port="mem_sp.we" clock="clk"/>
-
-  <!-- Internal combinational delay -->
-  <delay_constant max="800e-12" in_port="mem_sp.addr" out_port="mem_sp.out"/>
-  <delay_constant max="800e-12" in_port="mem_sp.data" out_port="mem_sp.out"/>
-  <delay_constant max="800e-12" in_port="mem_sp.we" out_port="mem_sp.out"/>
+  <input name="m" num_pins="1"/>
+  <output name="out" num_pins="64"/>
+  <xi:include href="../dsp_combinational/dsp_combinational.pb_type.xml"/>
+  <interconnect>
+    <direct>
+      <port name="a[0]" type="input"/>
+      <port from="dsp_combinational" name="a[0]" type="output"/>
+    </direct>
+    <direct>
+      <port name="a[1]" type="input"/>
+      <port from="dsp_combinational" name="a[1]" type="output"/>
+    </direct>
+    <direct>
+      <port name="a[2]" type="input"/>
+      <port from="dsp_combinational" name="a[2]" type="output"/>
+    </direct>
+    <direct>
+      <port name="a[3]" type="input"/>
+      <port from="dsp_combinational" name="a[3]" type="output"/>
+    </direct>
+    <direct>
+      <port name="a[4]" type="input"/>
+      <port from="dsp_combinational" name="a[4]" type="output"/>
+    </direct>
+    <direct>
+      <port name="a[5]" type="input"/>
+      <port from="dsp_combinational" name="a[5]" type="output"/>
+    </direct>
+    <direct>
+      <port name="a[6]" type="input"/>
+      <port from="dsp_combinational" name="a[6]" type="output"/>
+    </direct>
+    <direct>
+      <port name="a[7]" type="input"/>
+      <port from="dsp_combinational" name="a[7]" type="output"/>
+    </direct>
+    <direct>
+      <port name="a[8]" type="input"/>
+      <port from="dsp_combinational" name="a[8]" type="output"/>
+    </direct>
+    <direct>
+      <port name="a[9]" type="input"/>
+      <port from="dsp_combinational" name="a[9]" type="output"/>
+    </direct>
+    <direct>
+      <port name="a[10]" type="input"/>
+      <port from="dsp_combinational" name="a[10]" type="output"/>
+    </direct>
+    <direct>
+      <port name="a[11]" type="input"/>
+      <port from="dsp_combinational" name="a[11]" type="output"/>
+    </direct>
+    <direct>
+      <port name="a[12]" type="input"/>
+      <port from="dsp_combinational" name="a[12]" type="output"/>
+    </direct>
+    <direct>
+      <port name="a[13]" type="input"/>
+      <port from="dsp_combinational" name="a[13]" type="output"/>
+    </direct>
+    <direct>
+      <port name="a[14]" type="input"/>
+      <port from="dsp_combinational" name="a[14]" type="output"/>
+    </direct>
+    <direct>
+      <port name="a[15]" type="input"/>
+      <port from="dsp_combinational" name="a[15]" type="output"/>
+    </direct>
+    <direct>
+      <port name="a[16]" type="input"/>
+      <port from="dsp_combinational" name="a[16]" type="output"/>
+    </direct>
+    <direct>
+      <port name="a[17]" type="input"/>
+      <port from="dsp_combinational" name="a[17]" type="output"/>
+    </direct>
+    <direct>
+      <port name="a[18]" type="input"/>
+      <port from="dsp_combinational" name="a[18]" type="output"/>
+    </direct>
+    <direct>
+      <port name="a[19]" type="input"/>
+      <port from="dsp_combinational" name="a[19]" type="output"/>
+    </direct>
+    <direct>
+      <port name="a[20]" type="input"/>
+      <port from="dsp_combinational" name="a[20]" type="output"/>
+    </direct>
+    <direct>
+      <port name="a[21]" type="input"/>
+      <port from="dsp_combinational" name="a[21]" type="output"/>
+    </direct>
+    <direct>
+      <port name="a[22]" type="input"/>
+      <port from="dsp_combinational" name="a[22]" type="output"/>
+    </direct>
+    <direct>
+      <port name="a[23]" type="input"/>
+      <port from="dsp_combinational" name="a[23]" type="output"/>
+    </direct>
+    <direct>
+      <port name="a[24]" type="input"/>
+      <port from="dsp_combinational" name="a[24]" type="output"/>
+    </direct>
+    <direct>
+      <port name="a[25]" type="input"/>
+      <port from="dsp_combinational" name="a[25]" type="output"/>
+    </direct>
+    <direct>
+      <port name="a[26]" type="input"/>
+      <port from="dsp_combinational" name="a[26]" type="output"/>
+    </direct>
+    <direct>
+      <port name="a[27]" type="input"/>
+      <port from="dsp_combinational" name="a[27]" type="output"/>
+    </direct>
+    <direct>
+      <port name="a[28]" type="input"/>
+      <port from="dsp_combinational" name="a[28]" type="output"/>
+    </direct>
+    <direct>
+      <port name="a[29]" type="input"/>
+      <port from="dsp_combinational" name="a[29]" type="output"/>
+    </direct>
+    <direct>
+      <port name="a[30]" type="input"/>
+      <port from="dsp_combinational" name="a[30]" type="output"/>
+    </direct>
+    <direct>
+      <port name="a[31]" type="input"/>
+      <port from="dsp_combinational" name="a[31]" type="output"/>
+    </direct>
+    <direct>
+      <port name="b[0]" type="input"/>
+      <port from="dsp_combinational" name="b[0]" type="output"/>
+    </direct>
+    <direct>
+      <port name="b[1]" type="input"/>
+      <port from="dsp_combinational" name="b[1]" type="output"/>
+    </direct>
+    <direct>
+      <port name="b[2]" type="input"/>
+      <port from="dsp_combinational" name="b[2]" type="output"/>
+    </direct>
+    <direct>
+      <port name="b[3]" type="input"/>
+      <port from="dsp_combinational" name="b[3]" type="output"/>
+    </direct>
+    <direct>
+      <port name="b[4]" type="input"/>
+      <port from="dsp_combinational" name="b[4]" type="output"/>
+    </direct>
+    <direct>
+      <port name="b[5]" type="input"/>
+      <port from="dsp_combinational" name="b[5]" type="output"/>
+    </direct>
+    <direct>
+      <port name="b[6]" type="input"/>
+      <port from="dsp_combinational" name="b[6]" type="output"/>
+    </direct>
+    <direct>
+      <port name="b[7]" type="input"/>
+      <port from="dsp_combinational" name="b[7]" type="output"/>
+    </direct>
+    <direct>
+      <port name="b[8]" type="input"/>
+      <port from="dsp_combinational" name="b[8]" type="output"/>
+    </direct>
+    <direct>
+      <port name="b[9]" type="input"/>
+      <port from="dsp_combinational" name="b[9]" type="output"/>
+    </direct>
+    <direct>
+      <port name="b[10]" type="input"/>
+      <port from="dsp_combinational" name="b[10]" type="output"/>
+    </direct>
+    <direct>
+      <port name="b[11]" type="input"/>
+      <port from="dsp_combinational" name="b[11]" type="output"/>
+    </direct>
+    <direct>
+      <port name="b[12]" type="input"/>
+      <port from="dsp_combinational" name="b[12]" type="output"/>
+    </direct>
+    <direct>
+      <port name="b[13]" type="input"/>
+      <port from="dsp_combinational" name="b[13]" type="output"/>
+    </direct>
+    <direct>
+      <port name="b[14]" type="input"/>
+      <port from="dsp_combinational" name="b[14]" type="output"/>
+    </direct>
+    <direct>
+      <port name="b[15]" type="input"/>
+      <port from="dsp_combinational" name="b[15]" type="output"/>
+    </direct>
+    <direct>
+      <port name="b[16]" type="input"/>
+      <port from="dsp_combinational" name="b[16]" type="output"/>
+    </direct>
+    <direct>
+      <port name="b[17]" type="input"/>
+      <port from="dsp_combinational" name="b[17]" type="output"/>
+    </direct>
+    <direct>
+      <port name="b[18]" type="input"/>
+      <port from="dsp_combinational" name="b[18]" type="output"/>
+    </direct>
+    <direct>
+      <port name="b[19]" type="input"/>
+      <port from="dsp_combinational" name="b[19]" type="output"/>
+    </direct>
+    <direct>
+      <port name="b[20]" type="input"/>
+      <port from="dsp_combinational" name="b[20]" type="output"/>
+    </direct>
+    <direct>
+      <port name="b[21]" type="input"/>
+      <port from="dsp_combinational" name="b[21]" type="output"/>
+    </direct>
+    <direct>
+      <port name="b[22]" type="input"/>
+      <port from="dsp_combinational" name="b[22]" type="output"/>
+    </direct>
+    <direct>
+      <port name="b[23]" type="input"/>
+      <port from="dsp_combinational" name="b[23]" type="output"/>
+    </direct>
+    <direct>
+      <port name="b[24]" type="input"/>
+      <port from="dsp_combinational" name="b[24]" type="output"/>
+    </direct>
+    <direct>
+      <port name="b[25]" type="input"/>
+      <port from="dsp_combinational" name="b[25]" type="output"/>
+    </direct>
+    <direct>
+      <port name="b[26]" type="input"/>
+      <port from="dsp_combinational" name="b[26]" type="output"/>
+    </direct>
+    <direct>
+      <port name="b[27]" type="input"/>
+      <port from="dsp_combinational" name="b[27]" type="output"/>
+    </direct>
+    <direct>
+      <port name="b[28]" type="input"/>
+      <port from="dsp_combinational" name="b[28]" type="output"/>
+    </direct>
+    <direct>
+      <port name="b[29]" type="input"/>
+      <port from="dsp_combinational" name="b[29]" type="output"/>
+    </direct>
+    <direct>
+      <port name="b[30]" type="input"/>
+      <port from="dsp_combinational" name="b[30]" type="output"/>
+    </direct>
+    <direct>
+      <port name="b[31]" type="input"/>
+      <port from="dsp_combinational" name="b[31]" type="output"/>
+    </direct>
+    <direct>
+      <port name="m" type="input"/>
+      <port from="dsp_combinational" name="m" type="output"/>
+    </direct>
+  </interconnect>
 </pb_type>
diff --git a/tests/dsp_partial_registered/golden.pb_type.xml b/tests/dsp_partial_registered/golden.pb_type.xml
index c1f9b7a..77f2559 100644
--- a/tests/dsp_partial_registered/golden.pb_type.xml
+++ b/tests/dsp_partial_registered/golden.pb_type.xml
@@ -1,22 +1,15 @@
-<pb_type name="mem_sp" blif_model=".subckt single_port_ram_mixed" num_pb="1">
-  <input name="addr" num_pins="9"/>
-  <input name="data" num_pins="64"/>
-  <input name="we" num_pins="1"/>
-  <output name="out" num_pins="64"/>
+<?xml version="1.0"?>
+<pb_type xmlns:xi="http://www.w3.org/2001/XInclude" name="dsp_partial_registered" num_pb="1">
+  <input name="a" num_pins="32"/>
+  <input name="b" num_pins="32"/>
   <clock name="clk" num_pins="1"/>
-
-  <!-- External input register timing -->
-  <T_setup value="50e-12" port="mem_sp.addr" clock="clk"/>
-  <T_setup value="50e-12" port="mem_sp.data" clock="clk"/>
-  <T_setup value="50e-12" port="mem_sp.we" clock="clk"/>
-
-  <!-- Internal input register timing -->
-  <T_clock_to_Q max="200e-12" port="mem_sp.addr" clock="clk"/>
-  <T_clock_to_Q max="200e-12" port="mem_sp.data" clock="clk"/>
-  <T_clock_to_Q max="200e-12" port="mem_sp.we" clock="clk"/>
-
-  <!-- Internal combinational delay -->
-  <delay_constant max="800e-12" in_port="mem_sp.addr" out_port="mem_sp.out"/>
-  <delay_constant max="800e-12" in_port="mem_sp.data" out_port="mem_sp.out"/>
-  <delay_constant max="800e-12" in_port="mem_sp.we" out_port="mem_sp.out"/>
+  <input name="m" num_pins="1"/>
+  <output name="out" num_pins="64"/>
+  <xi:include href="../dsp_combinational/dsp_combinational.pb_type.xml"/>
+  <interconnect>
+    <direct>
+      <port name="m" type="input"/>
+      <port from="dsp_combinational" name="m" type="output"/>
+    </direct>
+  </interconnect>
 </pb_type>