tests: vlog: update muxes model and pb_type Signed-off-by: Tomasz Michalak <tmichalak@antmicro.com> Signed-off-by: Karol Gugala <kgugala@antmicro.com>
diff --git a/tests/muxes/golden.pb_type.xml b/tests/muxes/golden.pb_type.xml index 919c737..aecccfb 100644 --- a/tests/muxes/golden.pb_type.xml +++ b/tests/muxes/golden.pb_type.xml
@@ -5,13 +5,13 @@ <input name="c" num_pins="1"/> <output name="o1" num_pins="1"/> <output name="o2" num_pins="1"/> - <pb_type blif_model=".subckt LOGICBOX" name="lboxa" num_pb="1"> + <pb_type name="lboxa" num_pb="1"> <xi:include href="../logicbox/logicbox.pb_type.xml" xpointer="xpointer(pb_type/child::node())"/> </pb_type> - <pb_type blif_model=".subckt LOGICBOX" name="lboxb" num_pb="1"> + <pb_type name="lboxb" num_pb="1"> <xi:include href="../logicbox/logicbox.pb_type.xml" xpointer="xpointer(pb_type/child::node())"/> </pb_type> - <pb_type blif_model=".subckt LOGICBOX" name="lboxc" num_pb="1"> + <pb_type name="lboxc" num_pb="1"> <xi:include href="../logicbox/logicbox.pb_type.xml" xpointer="xpointer(pb_type/child::node())"/> </pb_type> <interconnect>
diff --git a/tests/muxes/proper.golden.pb_type.xml b/tests/muxes/proper.golden.pb_type.xml deleted file mode 100644 index a01c26a..0000000 --- a/tests/muxes/proper.golden.pb_type.xml +++ /dev/null
@@ -1,28 +0,0 @@ -<?xml version='1.0' encoding='utf-8'?> -<pb_type xmlns:xi="http://www.w3.org/2001/XInclude" name="use_mux" 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"/> - <pb_type name="AMUX" num_pb="1"> - <xi:include href="routing/amux.pb_type.xml" xpointer="xpointer(pb_type/child::node())"/> - </pb_type> - <interconnect> - <direct> - <port name="a" type="input"/> - <port from="AMUX" name="A1" type="output"/> - </direct> - <direct> - <port name="b" type="input"/> - <port from="AMUX" name="B2" type="output"/> - </direct> - <direct> - <port name="cin" type="input"/> - <port from="AMUX" name="C3" type="output"/> - </direct> - <direct> - <port from="AMUX" name="O" type="input"/> - <port name="cout" type="output"/> - </direct> - </interconnect> -</pb_type>