utils/vlog: squashed commits from for vlog utility

Signed-off-by: Alessandro Comodi <acomodi@antmicro.com>
diff --git a/tests/dsp_combinational/dsp_comb.sim.v b/tests/dsp_combinational/dsp_combinational.sim.v
similarity index 91%
rename from tests/dsp_combinational/dsp_comb.sim.v
rename to tests/dsp_combinational/dsp_combinational.sim.v
index a1b1541..1598a43 100644
--- a/tests/dsp_combinational/dsp_comb.sim.v
+++ b/tests/dsp_combinational/dsp_combinational.sim.v
@@ -1,6 +1,6 @@
 `ifndef DSP_COMB
 `define DSP_COMB
-module dsp_comb (
+module dsp_combinational (
 	a, b, m,
 	out
 );
diff --git a/tests/dsp_combinational/dsp_comb.model.xml b/tests/dsp_combinational/golden.model.xml
similarity index 92%
rename from tests/dsp_combinational/dsp_comb.model.xml
rename to tests/dsp_combinational/golden.model.xml
index b7f6ad2..eab765a 100644
--- a/tests/dsp_combinational/dsp_comb.model.xml
+++ b/tests/dsp_combinational/golden.model.xml
@@ -1,6 +1,6 @@
 <models xmlns:xi="http://www.w3.org/2001/XInclude">
   <!-- https://docs.verilogtorouting.org/en/latest/tutorials/arch/timing_modeling/#sequential-block-no-internal-paths -->
-  <model name="dsp_comb">
+  <model name="dsp_combinational">
     <input_ports>
       <port name="a" combinational_sink_ports="out"/>
       <port name="b" combinational_sink_ports="out"/>
diff --git a/tests/dsp_combinational/golden.pb_type.xml b/tests/dsp_combinational/golden.pb_type.xml
new file mode 100644
index 0000000..ac2566f
--- /dev/null
+++ b/tests/dsp_combinational/golden.pb_type.xml
@@ -0,0 +1,6 @@
+<pb_type xmlns:xi="http://www.w3.org/2001/XInclude" name="dsp_combinational" blif_model=".subckt dsp_combinational" num_pb="1">
+  <input name="a" num_pins="32"/>
+  <input name="b" num_pins="32"/>
+  <input name="m" num_pins="1"/>
+  <output name="out" num_pins="64"/>
+</pb_type>
diff --git a/tests/dsp_in_registered/dsp_regi.sim.v b/tests/dsp_in_registered/dsp_in_registered.sim.v
similarity index 65%
rename from tests/dsp_in_registered/dsp_regi.sim.v
rename to tests/dsp_in_registered/dsp_in_registered.sim.v
index cc37128..f133aa3 100644
--- a/tests/dsp_in_registered/dsp_regi.sim.v
+++ b/tests/dsp_in_registered/dsp_in_registered.sim.v
@@ -1,6 +1,6 @@
-`include "../dsp_combinational/dsp_comb.sim.v"
+`include "../dsp_combinational/dsp_combinational.sim.v"
 
-module dsp_regi (clk, a, b, m, out);
+module dsp_in_registered (clk, a, b, m, out);
 	localparam DATA_WIDTH = 64;
 
 	input wire clk;
@@ -18,5 +18,5 @@
 		q_m <= m;
 	end
 
-	dsp_comb comb (.a(q_a), .b(q_b), .m(q_m), .out(out));
+	dsp_combinational comb (.a(q_a), .b(q_b), .m(q_m), .out(out));
 endmodule
diff --git a/tests/dsp_in_registered/dsp_regi.model.xml b/tests/dsp_in_registered/golden.model.xml
similarity index 78%
rename from tests/dsp_in_registered/dsp_regi.model.xml
rename to tests/dsp_in_registered/golden.model.xml
index 6934652..ea9a3b2 100644
--- a/tests/dsp_in_registered/dsp_regi.model.xml
+++ b/tests/dsp_in_registered/golden.model.xml
@@ -1,7 +1,7 @@
 <models xmlns:xi="http://www.w3.org/2001/XInclude">
-  <xi:include href="../dsp_combinational/dsp_comb.model.xml" xpointer="xpointer(models/child::node())"/>
+  <xi:include href="../dsp_combinational/dsp_combinational.model.xml" xpointer="xpointer(models/child::node())"/>
   <!-- https://docs.verilogtorouting.org/en/latest/tutorials/arch/timing_modeling/#mixed-sequential-combinational-block -->
-  <model name="dsp_regi">
+  <model name="dsp_in_registered">
     <input_ports>
       <port name="a" combinational_sink_ports="out" clock="clk"/>
       <port name="b" combinational_sink_ports="out" clock="clk"/>
diff --git a/tests/dsp_in_registered/dsp_regi.pb_type.xml b/tests/dsp_in_registered/golden.pb_type.xml
similarity index 100%
rename from tests/dsp_in_registered/dsp_regi.pb_type.xml
rename to tests/dsp_in_registered/golden.pb_type.xml
diff --git a/tests/dsp_inout_registered/dsp_regio.sim.v b/tests/dsp_inout_registered/dsp_inout_registered.sim.v
similarity index 73%
rename from tests/dsp_inout_registered/dsp_regio.sim.v
rename to tests/dsp_inout_registered/dsp_inout_registered.sim.v
index 0bc4ba7..d7cd2b4 100644
--- a/tests/dsp_inout_registered/dsp_regio.sim.v
+++ b/tests/dsp_inout_registered/dsp_inout_registered.sim.v
@@ -1,7 +1,7 @@
-`include "../dsp_combinational/dsp_comb.sim.v"
+`include "../dsp_combinational/dsp_combinational.sim.v"
 
 /* DSP Block with register on both the inputs and the output */
-module dsp_regio (clk, a, b, m, out);
+module dsp_inout_registered (clk, a, b, m, out);
 	localparam DATA_WIDTH = 64;
 
 	input wire clk;
@@ -17,11 +17,11 @@
 	always @(posedge clk) begin
 		q_a <= a;
 		q_b <= b;
+		q_m <= m;
 	end
 
 	wire [DATA_WIDTH-1:0] c_out;
-	dsp_comb comb (.a(a), .b(b), .m(m), .out(c_out));
-	//dsp_comb comb (.a(q_a), .b(q_b), .m(q_m), .out(c_out));
+	dsp_combinational comb (.a(q_a), .b(q_b), .m(q_m), .out(c_out));
 
 	/* Output register */
 	reg [DATA_WIDTH-1:0] q_out;
diff --git a/tests/dsp_inout_registered/dsp_regio.model.xml b/tests/dsp_inout_registered/golden.model.xml
similarity index 78%
rename from tests/dsp_inout_registered/dsp_regio.model.xml
rename to tests/dsp_inout_registered/golden.model.xml
index ca29c9c..d125cfc 100644
--- a/tests/dsp_inout_registered/dsp_regio.model.xml
+++ b/tests/dsp_inout_registered/golden.model.xml
@@ -1,7 +1,7 @@
 <models xmlns:xi="http://www.w3.org/2001/XInclude">
-  <xi:include href="../dsp_combinational/dsp_comb.model.xml" xpointer="xpointer(models/child::node())"/>
+  <xi:include href="../dsp_combinational/dsp_combinational.model.xml" xpointer="xpointer(models/child::node())"/>
   <!-- https://docs.verilogtorouting.org/en/latest/tutorials/arch/timing_modeling/#mixed-sequential-combinational-block -->
-  <model name="dsp_regio">
+  <model name="dsp_inout_registered">
     <input_ports>
       <port name="a" combinational_sink_ports="out" clock="clk"/>
       <port name="b" combinational_sink_ports="out" clock="clk"/>
diff --git a/tests/dsp_inout_registered/dsp_regio.pb_type.xml b/tests/dsp_inout_registered/golden.pb_type.xml
similarity index 100%
rename from tests/dsp_inout_registered/dsp_regio.pb_type.xml
rename to tests/dsp_inout_registered/golden.pb_type.xml
diff --git a/tests/dsp_inout_registered_dualclk/dsp_regio_dualclk.sim.v b/tests/dsp_inout_registered_dualclk/dsp_inout_registered_dualclk.sim.v
similarity index 76%
rename from tests/dsp_inout_registered_dualclk/dsp_regio_dualclk.sim.v
rename to tests/dsp_inout_registered_dualclk/dsp_inout_registered_dualclk.sim.v
index 13e3d15..5a68f69 100644
--- a/tests/dsp_inout_registered_dualclk/dsp_regio_dualclk.sim.v
+++ b/tests/dsp_inout_registered_dualclk/dsp_inout_registered_dualclk.sim.v
@@ -1,7 +1,7 @@
-`include "../dsp_combinational/dsp_comb.sim.v"
+`include "../dsp_combinational/dsp_combinational.sim.v"
 
 /* DSP Block with register on both the inputs and the output */
-module dsp_regio_dualclk (iclk, oclk, a, b, m, out);
+module dsp_inout_registered_dualclk (iclk, oclk, a, b, m, out);
 	localparam DATA_WIDTH = 64;
 
 	input wire iclk;
@@ -22,7 +22,7 @@
 	end
 
 	wire [DATA_WIDTH-1:0] c_out;
-	dsp_comb comb (.a(a), .b(b), .m(m), .out(c_out));
+	dsp_combinational comb (.a(a), .b(b), .m(m), .out(c_out));
 
 	/* Output register on oclk */
 	reg [DATA_WIDTH-1:0] q_out;
diff --git a/tests/dsp_inout_registered_dualclk/dsp_regio_dualclk.model.xml b/tests/dsp_inout_registered_dualclk/golden.model.xml
similarity index 78%
rename from tests/dsp_inout_registered_dualclk/dsp_regio_dualclk.model.xml
rename to tests/dsp_inout_registered_dualclk/golden.model.xml
index cd21824..38bcc37 100644
--- a/tests/dsp_inout_registered_dualclk/dsp_regio_dualclk.model.xml
+++ b/tests/dsp_inout_registered_dualclk/golden.model.xml
@@ -1,7 +1,7 @@
 <models xmlns:xi="http://www.w3.org/2001/XInclude">
-  <xi:include href="../dsp_combinational/dsp_comb.model.xml" xpointer="xpointer(models/child::node())"/>
+  <xi:include href="../dsp_combinational/dsp_combinational.model.xml" xpointer="xpointer(models/child::node())"/>
   <!-- https://docs.verilogtorouting.org/en/latest/tutorials/arch/timing_modeling/#mixed-sequential-combinational-block -->
-  <model name="dsp_regio_dualclk">
+  <model name="dsp_inout_registered_dualclk">
     <input_ports>
       <port name="a" combinational_sink_ports="out" clock="iclk"/>
       <port name="b" combinational_sink_ports="out" clock="iclk"/>
diff --git a/tests/dsp_inout_registered_dualclk/dsp_regio_dualclk.pb_type.xml b/tests/dsp_inout_registered_dualclk/golden.pb_type.xml
similarity index 100%
rename from tests/dsp_inout_registered_dualclk/dsp_regio_dualclk.pb_type.xml
rename to tests/dsp_inout_registered_dualclk/golden.pb_type.xml
diff --git a/tests/dsp_modes/dsp_modes.model.xml b/tests/dsp_modes/dsp_modes.model.xml
deleted file mode 100644
index 133ccd5..0000000
--- a/tests/dsp_modes/dsp_modes.model.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<models xmlns:xi="http://www.w3.org/2001/XInclude">
-  <xi:include href="../dsp_in_registered/dsp_regi.model.xml" xpointer="xpointer(models/child::node())"/>
-  <xi:include href="../dsp_inout_registered/dsp_regio.model.xml" xpointer="xpointer(models/child::node())"/>
-  <xi:include href="../dsp_out_registered/dsp_rego.model.xml" xpointer="xpointer(models/child::node())"/>
-  <model name="dsp_modes">
-    <input_ports>
-      <port clock="clk" combinational_sink_ports="out" name="a"/>
-      <port clock="clk" combinational_sink_ports="out" name="b"/>
-      <port is_clock="1" name="clk"/>
-      <port clock="clk" combinational_sink_ports="out" name="m"/>
-    </input_ports>
-    <output_ports>
-      <port clock="clk" name="out"/>
-    </output_ports>
-  </model>
-</models>
diff --git a/tests/dsp_modes/dsp_modes.sim.v b/tests/dsp_modes/dsp_modes.sim.v
index 9c82379..6048e77 100644
--- a/tests/dsp_modes/dsp_modes.sim.v
+++ b/tests/dsp_modes/dsp_modes.sim.v
@@ -1,9 +1,11 @@
-`include "../dsp_in_registered/dsp_regi.sim.v"
-`include "../dsp_out_registered/dsp_rego.sim.v"
-`include "../dsp_inout_registered/dsp_regio.sim.v"
+`include "../dsp_combinational/dsp_combinational.sim.v"
+`include "../dsp_in_registered/dsp_in_registered.sim.v"
+`include "../dsp_out_registered/dsp_out_registered.sim.v"
+`include "../dsp_inout_registered/dsp_inout_registered.sim.v"
+`include "../dsp_partial_registered/dsp_partial_registered.sim.v"
 
 /* DSP Block with register on both the inputs and the output */
-(* MODES="REGISTERED_IN; REGISTERED_OUT; REGISTERED_INOUT" *)
+(* MODES="REGISTERED_NONE; REGISTERED_IN; REGISTERED_OUT; REGISTERED_INOUT; REGISTERED_PARTIAL" *)
 module dsp_modes (clk, a, b, m, out);
 	localparam DATA_WIDTH = 64;
 
@@ -15,14 +17,18 @@
 	input wire m;
 	output wire [DATA_WIDTH-1:0] out;
 
-	/* Input registers */
+	/* Register modes */
 	generate
-		if (MODE == "REGISTERED_IN") begin
-			dsp_regi dsp_int_regi (.clk(clk), .a(a), .b(b), .m(m), .out(out));
+		if (MODE == "REGISTERED_NONE") begin
+			dsp_combinational dsp_int_comb (.clk(clk), .a(a), .b(b), .m(m), .out(out));
+		end if (MODE == "REGISTERED_IN") begin
+			dsp_in_registered dsp_int_regi (.clk(clk), .a(a), .b(b), .m(m), .out(out));
 		end if (MODE == "REGISTERED_OUT") begin
-			dsp_rego dsp_int_rego (.clk(clk), .a(a), .b(b), .m(m), .out(out));
+			dsp_out_registered dsp_int_rego (.clk(clk), .a(a), .b(b), .m(m), .out(out));
 		end if (MODE == "REGISTERED_INOUT") begin
-			dsp_regio dsp_int_regio (.clk(clk), .a(a), .b(b), .m(m), .out(out));
+			dsp_inout_registered dsp_int_regio (.clk(clk), .a(a), .b(b), .m(m), .out(out));
+		end if (MODE == "REGISTERED_PARTIAL") begin
+			dsp_partial_registered dsp_int_part (.clk(clk), .a(a), .b(b), .m(m), .out(out));
 		end
 	endgenerate
 endmodule
diff --git a/tests/dsp_modes/golden.model.xml b/tests/dsp_modes/golden.model.xml
new file mode 100644
index 0000000..147cf4d
--- /dev/null
+++ b/tests/dsp_modes/golden.model.xml
@@ -0,0 +1,17 @@
+<models xmlns:xi="http://www.w3.org/2001/XInclude">
+  <xi:include href="../dsp_in_registered/dsp_in_registered.model.xml" xpointer="xpointer(models/child::node())"/>
+  <xi:include href="../dsp_inout_registered/dsp_inout_registered.model.xml" xpointer="xpointer(models/child::node())"/>
+  <xi:include href="../dsp_out_registered/dsp_out_registered.model.xml" xpointer="xpointer(models/child::node())"/>
+  <xi:include href="../dsp_partial_registered/dsp_partial_registered.model.xml" xpointer="xpointer(models/child::node())"/>
+  <model name="dsp_modes">
+    <input_ports>
+      <port clock="clk" combinational_sink_ports="out" name="a"/>
+      <port clock="clk" combinational_sink_ports="out" name="b"/>
+      <port is_clock="1" name="clk"/>
+      <port clock="clk" combinational_sink_ports="out" name="m"/>
+    </input_ports>
+    <output_ports>
+      <port clock="clk" name="out"/>
+    </output_ports>
+  </model>
+</models>
diff --git a/tests/dsp_out_registered/dsp_rego.sim.v b/tests/dsp_out_registered/dsp_out_registered.sim.v
similarity index 68%
rename from tests/dsp_out_registered/dsp_rego.sim.v
rename to tests/dsp_out_registered/dsp_out_registered.sim.v
index 6557f03..cfef32e 100644
--- a/tests/dsp_out_registered/dsp_rego.sim.v
+++ b/tests/dsp_out_registered/dsp_out_registered.sim.v
@@ -1,7 +1,7 @@
-`include "../dsp_combinational/dsp_comb.sim.v"
+`include "../dsp_combinational/dsp_combinational.sim.v"
 
 /* DSP Block with register on the output */
-module dsp_rego (clk, a, b, m, out);
+module dsp_out_registered (clk, a, b, m, out);
 	localparam DATA_WIDTH = 64;
 
 	input wire clk;
@@ -11,7 +11,7 @@
 	output wire [DATA_WIDTH-1:0] out;
 
 	wire [DATA_WIDTH-1:0] c_out;
-	dsp_comb comb (.a(a), .b(b), .m(m), .out(c_out));
+	dsp_combinational comb (.a(a), .b(b), .m(m), .out(c_out));
 
 	reg [DATA_WIDTH-1:0] q_out;
 	always @(posedge clk) begin
diff --git a/tests/dsp_out_registered/dsp_rego.model.xml b/tests/dsp_out_registered/golden.model.xml
similarity index 77%
rename from tests/dsp_out_registered/dsp_rego.model.xml
rename to tests/dsp_out_registered/golden.model.xml
index 7b596e1..d9b9782 100644
--- a/tests/dsp_out_registered/dsp_rego.model.xml
+++ b/tests/dsp_out_registered/golden.model.xml
@@ -1,7 +1,7 @@
 <models xmlns:xi="http://www.w3.org/2001/XInclude">
-  <xi:include href="../dsp_combinational/dsp_comb.model.xml" xpointer="xpointer(models/child::node())"/>
+  <xi:include href="../dsp_combinational/dsp_combinational.model.xml" xpointer="xpointer(models/child::node())"/>
   <!-- https://docs.verilogtorouting.org/en/latest/tutorials/arch/timing_modeling/#mixed-sequential-combinational-block -->
-  <model name="dsp_rego">
+  <model name="dsp_out_registered">
     <input_ports>
       <port name="a" combinational_sink_ports="out"/>
       <port name="b" combinational_sink_ports="out"/>
diff --git a/tests/dsp_out_registered/dsp_rego.pb_type.xml b/tests/dsp_out_registered/golden.pb_type.xml
similarity index 100%
rename from tests/dsp_out_registered/dsp_rego.pb_type.xml
rename to tests/dsp_out_registered/golden.pb_type.xml
diff --git a/tests/dsp_partial_registered/dsp_partial_registered.sim.v b/tests/dsp_partial_registered/dsp_partial_registered.sim.v
index eab72c3..bac4cf6 100644
--- a/tests/dsp_partial_registered/dsp_partial_registered.sim.v
+++ b/tests/dsp_partial_registered/dsp_partial_registered.sim.v
@@ -1,4 +1,4 @@
-`include "../dsp_combinational/dsp_comb.sim.v"
+`include "../dsp_combinational/dsp_combinational.sim.v"
 
 /* DSP Block with register on both the inputs and the output */
 module dsp_partial_registered (clk, a, b, m, out);
@@ -20,7 +20,7 @@
 	end
 
 	wire [DATA_WIDTH-1:0] c_out;
-	dsp_comb comb (.a(a), .b(b), .m(m), .out(c_out));
+	dsp_combinational comb (.a(q_a), .b(q_b), .m(m), .out(c_out));
 
 	/* Output register */
 	reg [DATA_WIDTH-1:0] q_out;
diff --git a/tests/dsp_partial_registered/dsp_partial_registered.model.xml b/tests/dsp_partial_registered/golden.model.xml
similarity index 77%
rename from tests/dsp_partial_registered/dsp_partial_registered.model.xml
rename to tests/dsp_partial_registered/golden.model.xml
index f7d2be6..e65b240 100644
--- a/tests/dsp_partial_registered/dsp_partial_registered.model.xml
+++ b/tests/dsp_partial_registered/golden.model.xml
@@ -1,7 +1,7 @@
 <models xmlns:xi="http://www.w3.org/2001/XInclude">
-  <xi:include href="../dsp_combinational/dsp_comb.model.xml" xpointer="xpointer(models/child::node())"/>
+  <xi:include href="../dsp_combinational/dsp_combinational.model.xml" xpointer="xpointer(models/child::node())"/>
   <!-- https://docs.verilogtorouting.org/en/latest/tutorials/arch/timing_modeling/#mixed-sequential-combinational-block -->
-  <model name="dsp_regio">
+  <model name="dsp_partial_registered">
     <input_ports>
       <port name="a" combinational_sink_ports="out" clock="clk"/>
       <port name="b" combinational_sink_ports="out" clock="clk"/>
diff --git a/tests/dsp_partial_registered/dsp_partial_registered.pb_type.xml b/tests/dsp_partial_registered/golden.pb_type.xml
similarity index 100%
rename from tests/dsp_partial_registered/dsp_partial_registered.pb_type.xml
rename to tests/dsp_partial_registered/golden.pb_type.xml
diff --git a/tests/fig41-full-adder/adder.pb_type.xml b/tests/fig41-full-adder/adder.pb_type.xml
deleted file mode 100644
index 235a4a2..0000000
--- a/tests/fig41-full-adder/adder.pb_type.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<pb_type name="adder" blif_model=".subckt adder" num_pb="1">
-  <input name="a" num_pins="1"/>
-  <input name="b" num_pins="1"/>
-  <input name="cin" num_pins="1"/>
-  <output name="cout" num_pins="1"/>
-  <output name="sum" num_pins="1"/>
-
-  <delay_constant max="300e-12" in_port="adder.a" out_port="adder.sum"/>
-  <delay_constant max="300e-12" in_port="adder.b" out_port="adder.sum"/>
-  <delay_constant max="300e-12" in_port="adder.cin" out_port="adder.sum"/>
-  <delay_constant max="300e-12" in_port="adder.a" out_port="adder.cout"/>
-  <delay_constant max="300e-12" in_port="adder.b" out_port="adder.cout"/>
-  <delay_constant max="10e-12" in_port="adder.cin" out_port="adder.cout"/>
-</pb_type>
diff --git a/tests/fig41-full-adder/adder.sim.v b/tests/fig41-full-adder/adder.sim.v
index 8d6f351..fef38e1 100644
--- a/tests/fig41-full-adder/adder.sim.v
+++ b/tests/fig41-full-adder/adder.sim.v
@@ -6,7 +6,14 @@
 	input wire b;
 	input wire cin;
 
+	(* DELAY_CONST_a   = "300e-12" *)
+	(* DELAY_CONST_b   = "300e-12" *)
+	(* DELAY_CONST_cin = "300e-12" *)
 	output wire sum;
+
+	(* DELAY_CONST_a   = "300e-12" *)
+	(* DELAY_CONST_b   = "300e-12" *)
+	(* DELAY_CONST_cin =  "10e-12" *)
 	output wire cout;
 
 	// Full adder combinational logic
diff --git a/tests/fig41-full-adder/adder.model.xml b/tests/fig41-full-adder/golden.model.xml
similarity index 100%
rename from tests/fig41-full-adder/adder.model.xml
rename to tests/fig41-full-adder/golden.model.xml
diff --git a/tests/dsp_combinational/dsp_comb.pb_type.xml b/tests/fig41-full-adder/golden.pb_type.xml
similarity index 85%
rename from tests/dsp_combinational/dsp_comb.pb_type.xml
rename to tests/fig41-full-adder/golden.pb_type.xml
index 235a4a2..cb7d27e 100644
--- a/tests/dsp_combinational/dsp_comb.pb_type.xml
+++ b/tests/fig41-full-adder/golden.pb_type.xml
@@ -1,14 +1,13 @@
-<pb_type name="adder" blif_model=".subckt adder" num_pb="1">
+<pb_type xmlns:xi="http://www.w3.org/2001/XInclude" name="adder" blif_model=".subckt adder" num_pb="1">
   <input name="a" num_pins="1"/>
   <input name="b" num_pins="1"/>
   <input name="cin" num_pins="1"/>
   <output name="cout" num_pins="1"/>
   <output name="sum" num_pins="1"/>
-
-  <delay_constant max="300e-12" in_port="adder.a" out_port="adder.sum"/>
-  <delay_constant max="300e-12" in_port="adder.b" out_port="adder.sum"/>
-  <delay_constant max="300e-12" in_port="adder.cin" out_port="adder.sum"/>
   <delay_constant max="300e-12" in_port="adder.a" out_port="adder.cout"/>
   <delay_constant max="300e-12" in_port="adder.b" out_port="adder.cout"/>
   <delay_constant max="10e-12" in_port="adder.cin" out_port="adder.cout"/>
+  <delay_constant max="300e-12" in_port="adder.a" out_port="adder.sum"/>
+  <delay_constant max="300e-12" in_port="adder.b" out_port="adder.sum"/>
+  <delay_constant max="300e-12" in_port="adder.cin" out_port="adder.sum"/>
 </pb_type>
diff --git a/tests/fig42-dff/dff.model.xml b/tests/fig42-dff/golden.model.xml
similarity index 99%
rename from tests/fig42-dff/dff.model.xml
rename to tests/fig42-dff/golden.model.xml
index f830c23..afeaaca 100644
--- a/tests/fig42-dff/dff.model.xml
+++ b/tests/fig42-dff/golden.model.xml
@@ -2,8 +2,8 @@
   <!-- https://docs.verilogtorouting.org/en/latest/tutorials/arch/timing_modeling/#sequential-block-no-internal-paths -->
   <model name="dff">
     <input_ports>
-      <port name="d" clock="clk"/>
       <port name="clk" is_clock="1"/>
+      <port name="d" clock="clk"/>
     </input_ports>
     <output_ports>
       <port name="q" clock="clk"/>
diff --git a/tests/simple_pll/simple_pll.model.xml b/tests/simple_pll/golden.model.xml
similarity index 100%
rename from tests/simple_pll/simple_pll.model.xml
rename to tests/simple_pll/golden.model.xml
diff --git a/vlog_to_pbtype.py b/vlog_to_pbtype.py
index 09452aa..3db0126 100755
--- a/vlog_to_pbtype.py
+++ b/vlog_to_pbtype.py
@@ -119,6 +119,7 @@
 def mod_pb_name(mod):
     """Convert a Verilog module to a pb_type name in the format documented here:
     https://github.com/SymbiFlow/symbiflow-arch-defs/#names"""
+    return mod.name
     is_blackbox = (mod.attr("blackbox", 0) == 1)
     modes = mod.attr("MODES", None)
     has_modes = modes is not None
@@ -147,7 +148,7 @@
     return name
 
 
-def make_pb_content(mod, xml_parent, mod_pname, is_submode=False):
+def make_pb_content(yj, mod, xml_parent, mod_pname, is_submode=False):
     """Build the pb_type content - child pb_types, timing and direct interconnect,
     but not IO. This may be put directly inside <pb_type>, or inside <mode>."""
 
@@ -173,7 +174,7 @@
         )
 
     # Find out whether or not the module we are generating content for is a blackbox
-    is_blackbox = (mod.attr("blackbox", 0) == 1)
+    is_blackbox = (mod.attr("blackbox", 0) == 1) or not mod.cells
 
     # List of entries in format ((from_cell, from_pin), (to_cell, to_pin))
     interconn = []
@@ -204,12 +205,12 @@
             inp_cons = mod.cell_conns(cname, "input")
             for pin, net in inp_cons:
                 drvs = mod.net_drivers(net)
-                assert len(drvs) > 0, (
-                    "ERROR: pin {}.{} has no driver, interconnect will be missing\n{}".
-                    format(pb_name, pin, mod))
-                assert len(drvs) < 2, (
-                    "ERROR: pin {}.{} has multiple drivers, interconnect will be overspecified".
-                    format(pb_name, pin))
+                #assert len(drvs) > 0, (
+                #    "ERROR: pin {}.{} has no driver, interconnect will be missing\n{}".
+                #    format(pb_name, pin, mod))
+                #assert len(drvs) < 2, (
+                #    "ERROR: pin {}.{} has multiple drivers, interconnect will be overspecified".
+                #    format(pb_name, pin))
                 for drv_cell, drv_pin in drvs:
                     interconn.append(((drv_cell, drv_pin), (cname, pin)))
 
@@ -228,7 +229,7 @@
             if not drv:
                 continue
             assert len(drv) == 1, (
-                    "ERROR: net {} has multiple drivers {}, interconnect will be overspecified".
+                    "ERROR: net {} has multiple drivers {}, interconnect will be over specified".
                     format(net, drv))
             for snk in mod.conn_io(net, "output"):
                 conn = ((mod.name, drv[0]), (mod.name,snk))
@@ -297,7 +298,7 @@
                 xml_mat.text = mat
 
 
-def make_pb_type(mod):
+def make_pb_type(yj, mod):
     """Build the pb_type for a given module. mod is the YosysModule object to
     generate."""
 
@@ -309,8 +310,11 @@
     pb_xml_attrs = dict()
     pb_xml_attrs["name"] = mod_pname
     # If we are a blackbox with no modes, then generate a blif_model
-    is_blackbox = (mod.attr("blackbox", 0) == 1)
+    is_blackbox = mod.attr("blackbox", 0) == 1 or not mod.cells
     has_modes = modes is not None
+
+    print("is_blackbox", is_blackbox, "has_modes?", has_modes)
+
     # Process type and class of module
     mod_cls = mod.CLASS
     if mod_cls is not None:
@@ -369,16 +373,69 @@
                 )
             )
             mode_mod = mode_yj.module(mod.name)
-            make_pb_content(mode_mod, mode_xml, mod_pname, True)
+            make_pb_content(yj, mode_mod, mode_xml, mod_pname, True)
     else:
-        make_pb_content(mod, pb_type_xml, mod_pname)
+        make_pb_content(yj, mod, pb_type_xml, mod_pname)
 
     return pb_type_xml
 
 
-pb_type_xml = make_pb_type(tmod)
 
-f = open(outfile, 'w')
-f.write(ET.tostring(pb_type_xml, pretty_print=True).decode('utf-8'))
-f.close()
-print("Generated {} from {}".format(outfile, iname))
+parser = argparse.ArgumentParser(
+    description=__doc__.strip(), formatter_class=argparse.RawTextHelpFormatter)
+parser.add_argument(
+    'infiles',
+    metavar='input.v',
+    type=str,
+    nargs='+',
+    help="""\
+One or more Verilog input files, that will be passed to Yosys internally.
+They should be enough to generate a flattened representation of the model,
+so that paths through the model can be determined.
+""")
+parser.add_argument(
+    '--top',
+    help="""\
+Top level module, will usually be automatically determined from the file name
+%.sim.v
+""")
+parser.add_argument(
+    '--outfile', '-o',
+    type=argparse.FileType('w'),
+    default="pb_type.xml",
+    help="""\
+Output filename, default 'model.xml'
+""")
+
+def main(args):
+    iname = os.path.basename(args.infiles[0])
+
+    yosys.run.add_define("PB_TYPE")
+    vjson = yosys.run.vlog_to_json(args.infiles, flatten=False, aig=False)
+    yj = YosysJSON(vjson)
+
+    if args.top is not None:
+        top = args.top
+    else:
+        wm = re.match(r"([A-Za-z0-9_]+)\.sim\.v", iname)
+        if wm:
+            top = wm.group(1).upper()
+        else:
+            print(
+                "ERROR file name not of format %.sim.v ({}), cannot detect top level. Manually specify the top level module using --top".
+                format(iname))
+            sys.exit(1)
+
+    tmod = yj.module(top)
+    print("cells", tmod.cells)
+
+    pb_type_xml = make_pb_type(yj, tmod)
+
+    args.outfile.write(ET.tostring(pb_type_xml, pretty_print=True).decode('utf-8'))
+    print("Generated {} from {}".format(args.outfile.name, iname))
+    args.outfile.close()
+
+
+if __name__ == "__main__":
+    args = parser.parse_args()
+    sys.exit(main(args))
diff --git a/yosys/json.py b/yosys/json.py
index d3ce457..e2371f6 100755
--- a/yosys/json.py
+++ b/yosys/json.py
@@ -49,6 +49,7 @@
         """
         clist = []
         for cell, cdata in sorted(self.data["cells"].items()):
+            print(cell, cdata)
             if cell.startswith("$"):
                 continue
             clist.append((cell, cdata["type"]))