Removed deprecated files from the directory Signed-off-by: Grzegorz Latosinski <glatosinski@antmicro.com>
diff --git a/CMakeLists.txt b/CMakeLists.txt deleted file mode 100644 index 09dae54..0000000 --- a/CMakeLists.txt +++ /dev/null
@@ -1 +0,0 @@ -add_subdirectory(convert_and_merge_composable_tests)
diff --git a/convert_and_merge_composable_fpga_architecture.sh b/convert_and_merge_composable_fpga_architecture.sh deleted file mode 100755 index 3393ee0..0000000 --- a/convert_and_merge_composable_fpga_architecture.sh +++ /dev/null
@@ -1,15 +0,0 @@ -#!/bin/bash - -set -euo pipefail - -TOP_DIR=$(git rev-parse --show-toplevel) -XSLTPROC_CMD="${XSLTPROC} --nomkdir --nonet --xinclude ${XSLTPROC_PARAMS}" -${XSLTPROC_CMD} ${TOP_DIR}/common/xml/identity.xsl "$@" | \ - ${XSLTPROC_CMD} ${TOP_DIR}/common/xml/convert-pb_type-attributes.xsl - | \ - ${XSLTPROC_CMD} ${TOP_DIR}/common/xml/convert-port-tag.xsl - | \ - ${XSLTPROC_CMD} ${TOP_DIR}/common/xml/convert-prefix-port.xsl - | \ - ${XSLTPROC_CMD} ${TOP_DIR}/common/xml/pack-patterns.xsl - | \ - ${XSLTPROC_CMD} ${TOP_DIR}/common/xml/remove-duplicate-models.xsl - | \ - ${XSLTPROC_CMD} ${TOP_DIR}/common/xml/attribute-fixes.xsl - | \ - ${XSLTPROC_CMD} ${TOP_DIR}/common/xml/sort-tags.xsl - | \ - cat
diff --git a/convert_and_merge_composable_tests/CMakeLists.txt b/convert_and_merge_composable_tests/CMakeLists.txt deleted file mode 100644 index ec3c04a..0000000 --- a/convert_and_merge_composable_tests/CMakeLists.txt +++ /dev/null
@@ -1,20 +0,0 @@ -include("xsl_tests.cmake") -# Test individual parts of the transform -xsl_golden_test(NAME "attribute-cleanup") -xsl_golden_test(NAME "composable-interconnect-existing-fasm-mux") -xsl_golden_test(NAME "composable-interconnect-fasm-mux") -xsl_golden_test(NAME "composable-interconnect-fasm-mux-levels") -xsl_golden_test(NAME "composable-interconnect-implicit-parent") -xsl_golden_test(NAME "composable-interconnect-pack_patterns") -xsl_golden_test(NAME "composable-loc-implicit-parent") -add_file_target(FILE "composable-pb_type-inner.xml" SCANNER_TYPE xml) -add_file_target(FILE "composable-pb_type-middle.xml" SCANNER_TYPE xml) -xsl_golden_test(NAME "composable-pb_type") -xsl_golden_test(NAME "explicit-port") -xsl_golden_test(NAME "pack_pattern-copy-direct-ports") -xsl_golden_test(NAME "pack_pattern-merge-type-into-name") -xsl_golden_test(NAME "pack_pattern-strip-from-pb_type-ports") -xsl_golden_test(NAME "preserve-interconnect") -# Test everything used together in one big file -add_file_target(FILE "full-test-inner.xml" SCANNER_TYPE xml) -xsl_golden_test(NAME "full-test")
diff --git a/convert_and_merge_composable_tests/attribute-cleanup.golden.xml b/convert_and_merge_composable_tests/attribute-cleanup.golden.xml deleted file mode 100644 index 4f0a14d..0000000 --- a/convert_and_merge_composable_tests/attribute-cleanup.golden.xml +++ /dev/null
@@ -1,8 +0,0 @@ -<?xml version="1.0"?> -<xml> - <tag b="1" c="123" x="abc"/> - <tag c="1" d="123" x="abc"/> - <tag> - <innertag a1="2" a2="2" b1="abc">Hello</innertag> - </tag> -</xml>
diff --git a/convert_and_merge_composable_tests/attribute-cleanup.xml b/convert_and_merge_composable_tests/attribute-cleanup.xml deleted file mode 100644 index 96a33a5..0000000 --- a/convert_and_merge_composable_tests/attribute-cleanup.xml +++ /dev/null
@@ -1,13 +0,0 @@ -<?xml version="1.0"?> -<!-- Clean up attributes - * Normalize space around attributes on a tag - * Sort the attributes by name - * Strip xml:base attribute - --> -<xml> - <tag b="1" c="123" x=' abc' /> - <tag c="1" d=" 123 " x="abc" /> - <tag> - <innertag a2=" 2 " b1="abc " a1="2">Hello</innertag> - </tag> -</xml>
diff --git a/convert_and_merge_composable_tests/composable-interconnect-existing-fasm-mux.golden.xml b/convert_and_merge_composable_tests/composable-interconnect-existing-fasm-mux.golden.xml deleted file mode 100644 index 0df25ac..0000000 --- a/convert_and_merge_composable_tests/composable-interconnect-existing-fasm-mux.golden.xml +++ /dev/null
@@ -1,42 +0,0 @@ -<?xml version="1.0"?> -<xml> - <pb_type name="parent"> - <input name="i0"/> - <input name="i1"/> - <output name="o"/> - <pb_type name="child"> - <input name="i"/> - <output name="o"/> - </pb_type> - <interconnect> - <direct input="COMMON_SLICE.CIN" name="CIN_TO_CARRY0" output="CARRY4_VPR.CIN"> - <pack_pattern in_port="COMMON_SLICE.CIN" name="CARRYCHAIN" out_port="CARRY4_VPR.CIN"/> - <metadata> - <meta name="fasm_mux"> - COMMON_SLICE.CIN = PRECYINIT.CIN - </meta> - </metadata> - </direct> - <mux input="COMMON_SLICE.AO5 COMMON_SLICE.AX" name="CARRY_DI0" output="CARRY4_VPR.DI0"> - <metadata> - <meta name="fasm_mux"> - COMMON_SLICE.AO5 = CARRY4.ACY0 - COMMON_SLICE.AX = NULL - </meta> - </metadata> - <delay_constant in_port="COMMON_SLICE.AX" max=".105e-9" out_port="CARRY4_VPR.DI0"/> - </mux> - <mux input="CARRY4_VPR.O3 CARRY4_VPR.CO_FABRIC3 COMMON_SLICE.DO6 COMMON_SLICE.DO5 COMMON_SLICE.DX" name="DFFMUX" output="SLICE_FF.D[3]"> - <metadata> - <meta name="fasm_mux"> - COMMON_SLICE.DX = DFFMUX.DX - COMMON_SLICE.DO5 = DFFMUX.O5 - COMMON_SLICE.DO6 = DFFMUX.O6 - CARRY4_VPR.CO_FABRIC3 = DFFMUX.CY - CARRY4_VPR.O3 = DFFMUX.XOR - </meta> - </metadata> - </mux> - </interconnect> - </pb_type> -</xml>
diff --git a/convert_and_merge_composable_tests/composable-interconnect-existing-fasm-mux.xml b/convert_and_merge_composable_tests/composable-interconnect-existing-fasm-mux.xml deleted file mode 100644 index 6590b67..0000000 --- a/convert_and_merge_composable_tests/composable-interconnect-existing-fasm-mux.xml +++ /dev/null
@@ -1,49 +0,0 @@ -<?xml version="1.0"?> -<!-- Test the special handling around the fasm_mux metadata doesn't destroy - existing values. - --> -<xml> - <pb_type name="parent"> - <input name="i0" /> - <input name="i1" /> - <output name="o" /> - - <pb_type name="child"> - <input name="i" /> - <output name="o" /> - </pb_type> - - <interconnect> - <direct name="CIN_TO_CARRY0" input="COMMON_SLICE.CIN" output="CARRY4_VPR.CIN" > - <pack_pattern name="CARRYCHAIN"/> - <metadata> - <meta name="fasm_mux"> - COMMON_SLICE.CIN = PRECYINIT.CIN - </meta> - </metadata> - </direct> - <mux name="DFFMUX" - input="CARRY4_VPR.O3 CARRY4_VPR.CO_FABRIC3 COMMON_SLICE.DO6 COMMON_SLICE.DO5 COMMON_SLICE.DX" - output="SLICE_FF.D[3]" > - <metadata> - <meta name="fasm_mux"> - COMMON_SLICE.DX = DFFMUX.DX - COMMON_SLICE.DO5 = DFFMUX.O5 - COMMON_SLICE.DO6 = DFFMUX.O6 - CARRY4_VPR.CO_FABRIC3 = DFFMUX.CY - CARRY4_VPR.O3 = DFFMUX.XOR - </meta> - </metadata> - </mux> - <mux name="CARRY_DI0" input="COMMON_SLICE.AO5 COMMON_SLICE.AX" output="CARRY4_VPR.DI0" > - <delay_constant max=".105e-9" in_port="COMMON_SLICE.AX" out_port="CARRY4_VPR.DI0" /> - <metadata> - <meta name="fasm_mux"> - COMMON_SLICE.AO5 = CARRY4.ACY0 - COMMON_SLICE.AX = NULL - </meta> - </metadata> - </mux> - </interconnect> - </pb_type> -</xml>
diff --git a/convert_and_merge_composable_tests/composable-interconnect-fasm-mux-levels.golden.xml b/convert_and_merge_composable_tests/composable-interconnect-fasm-mux-levels.golden.xml deleted file mode 100644 index 36509f5..0000000 --- a/convert_and_merge_composable_tests/composable-interconnect-fasm-mux-levels.golden.xml +++ /dev/null
@@ -1,38 +0,0 @@ -<?xml version="1.0"?> -<xml> - <pb_type name="parent"> - <input name="i0"/> - <input name="i1"/> - <output name="o"/> - <pb_type name="blocka"> - <input name="i"/> - <output name="a"/> - </pb_type> - <pb_type name="blockb"> - <input name="i"/> - <output name="b"/> - </pb_type> - <pb_type name="blockc" num_pb="2"> - <input name="i"/> - <output name="c"/> - </pb_type> - <pb_type name="blocko" num_pb="2"> - <input name="i"/> - <output name="o"/> - </pb_type> - <interconnect> - <mux input="blocka.a blockb.b blockc[0].c blockc[1].c" name="outmux" output="blocko.i"> - <metadata> - <meta name="fasm_mux"> -blocka.a : a1 -blockb.b : b1.l1 -blockc[0].c : c0.l1 -blockc[1].c : c1 -</meta> - <meta name="fasm_name">fasm_name</meta> - </metadata> - </mux> - <direct input="blocko.o" name="parent-o" output="parent.o"/> - </interconnect> - </pb_type> -</xml>
diff --git a/convert_and_merge_composable_tests/composable-interconnect-fasm-mux-levels.xml b/convert_and_merge_composable_tests/composable-interconnect-fasm-mux-levels.xml deleted file mode 100644 index 4c33420..0000000 --- a/convert_and_merge_composable_tests/composable-interconnect-fasm-mux-levels.xml +++ /dev/null
@@ -1,60 +0,0 @@ -<?xml version="1.0"?> -<!-- Test the special handling around the fasm_mux metadata when using - composable interconnects and existing metadata. --> -<xml> - <pb_type name="parent"> - <input name="i0" /> - <input name="i1" /> - <output name="o" /> - - <pb_type name="blocka"> - <input name="i" /> - <output name="a" /> - </pb_type> - <pb_type name="blockb"> - <input name="i" /> - <output name="b" /> - </pb_type> - <pb_type name="blockc" num_pb="2"> - <input name="i" /> - <output name="c" /> - </pb_type> - <pb_type name="blocko" num_pb="2"> - <input name="i" /> - <output name="o" /> - </pb_type> - - <interconnect> - <mux name="outmux"> - <port type="input" name="a" from="blocka"> - <metadata> - <meta name="fasm_mux">a1</meta> - </metadata> - </port> - <port type="input" name="b" from="blockb"> - <metadata> - <meta name="fasm_mux">b1.l1</meta> - </metadata> - </port> - <port type="input" name="c" from="blockc[0]"> - <metadata> - <meta name="fasm_mux">c0.l1</meta> - </metadata> - </port> - <port type="input" name="c" from="blockc[1]"> - <metadata> - <meta name="fasm_mux">c1</meta> - </metadata> - </port> - <port type="output" from="blocko" name="i" /> - <metadata> - <meta name="fasm_name">fasm_name</meta> - </metadata> - </mux> - <direct> - <port type="input" name="o" from="blocko" /> - <port type="output" name="o" /> - </direct> - </interconnect> - </pb_type> -</xml>
diff --git a/convert_and_merge_composable_tests/composable-interconnect-fasm-mux.golden.xml b/convert_and_merge_composable_tests/composable-interconnect-fasm-mux.golden.xml deleted file mode 100644 index 932b881..0000000 --- a/convert_and_merge_composable_tests/composable-interconnect-fasm-mux.golden.xml +++ /dev/null
@@ -1,24 +0,0 @@ -<?xml version="1.0"?> -<xml> - <pb_type name="parent"> - <input name="i0"/> - <input name="i1"/> - <output name="o"/> - <pb_type name="child"> - <input name="i"/> - <output name="o"/> - </pb_type> - <interconnect> - <mux input="parent.i0 parent.i1" name="mux1" output="child.i"> - <metadata> - <meta name="fasm_mux"> -parent.i0 : a1 -parent.i1 : b1 -</meta> - <meta name="fasm_name">fasm_name</meta> - </metadata> - </mux> - <direct input="child.o" name="parent-o" output="parent.o"/> - </interconnect> - </pb_type> -</xml>
diff --git a/convert_and_merge_composable_tests/composable-interconnect-fasm-mux.xml b/convert_and_merge_composable_tests/composable-interconnect-fasm-mux.xml deleted file mode 100644 index 741401c..0000000 --- a/convert_and_merge_composable_tests/composable-interconnect-fasm-mux.xml +++ /dev/null
@@ -1,38 +0,0 @@ -<?xml version="1.0"?> -<!-- Test the special handling around the fasm_mux metadata when using - composable interconnects. --> -<xml> - <pb_type name="parent"> - <input name="i0" /> - <input name="i1" /> - <output name="o" /> - - <pb_type name="child"> - <input name="i" /> - <output name="o" /> - </pb_type> - - <interconnect> - <direct> - <port type="output" name="o" /> - <port type="input" from="child" name="o" /> - </direct> - <mux name="mux1"> - <port type="input" name="i0"> - <metadata> - <meta name="fasm_mux">a1</meta> - </metadata> - </port> - <port type="input" name="i1"> - <metadata> - <meta name="fasm_mux">b1</meta> - </metadata> - </port> - <port type="output" from="child" name="i" /> - <metadata> - <meta name="fasm_name">fasm_name</meta> - </metadata> - </mux> - </interconnect> - </pb_type> -</xml>
diff --git a/convert_and_merge_composable_tests/composable-interconnect-implicit-parent.golden.xml b/convert_and_merge_composable_tests/composable-interconnect-implicit-parent.golden.xml deleted file mode 100644 index 1c662b7..0000000 --- a/convert_and_merge_composable_tests/composable-interconnect-implicit-parent.golden.xml +++ /dev/null
@@ -1,36 +0,0 @@ -<?xml version="1.0"?> -<xml> - <pb_type name="parent"> - <input name="ia1"/> - <input name="ia2"/> - <input name="ia3"/> - <output name="o0"/> - <output name="o1"/> - <pb_type name="childa"> - <input name="i1"/> - <input name="i2"/> - <output name="o"/> - </pb_type> - <pb_type name="childb"> - <input name="i"/> - <output name="o"/> - </pb_type> - <pb_type name="childc"> - <input name="i"/> - <output name="o"/> - </pb_type> - <interconnect> - <direct input="parent.ia1" name="childa-i1" output="childa.i1"> - <pack_pattern in_port="parent.ia1" name="A1" out_port="childa.i1"/> - </direct> - <mux input="parent.ia2 parent.ia3" name="childa-input-i2" output="childa.i2"> - <pack_pattern in_port="parent.ia2" name="A2" out_port="childa.i2"/> - <pack_pattern in_port="parent.ia3" name="A3" out_port="childa.i2"/> - </mux> - <direct input="childa.o" name="childb-i" output="childb.i"/> - <mux input="childa.o childb.o" name="childc-input" output="childc.i"/> - <direct input="childa.o" name="parent-o0" output="parent.o0"/> - <mux input="childa.o childb.o childc.o" name="output" output="parent.o1"/> - </interconnect> - </pb_type> -</xml>
diff --git a/convert_and_merge_composable_tests/composable-interconnect-implicit-parent.xml b/convert_and_merge_composable_tests/composable-interconnect-implicit-parent.xml deleted file mode 100644 index 089159f..0000000 --- a/convert_and_merge_composable_tests/composable-interconnect-implicit-parent.xml +++ /dev/null
@@ -1,107 +0,0 @@ -<?xml version="1.0"?> -<!-- - Convert "implicit" parent specification for interconnect tags. - - Convert - <interconnect><direct><port type='input' ...><port type='output' ...></direct><YYY../></interconnect> - to - <interconnect><direct input='...' name='xxx-xxx' output='...'><YYY../></direct></interconnect> - - Convert - <interconnect><mux><port type='input' ...><port type='input' ...><port type='output' ...></mux><YYY../></interconnect> - to - <interconnect><mux input='in1 in2' name='xxx-xxx' output='...'><YYY../></mux></interconnect> - -This example below is connected as follows; - ┌───────────────────────────────────────────────────────────────────┐ - │ │ - │ ┌────────────┐ │ - ia1│──────>│i1 │ │ - │ │ │ │ - │ │ childa o│─┬───────────────────────────────────────────>│o0 - ia2│──>│╲ │ │ │ │ - │ │├─>│i2 │ │ │ - ia3│──>│╱ └────────────┘ │ ┌──────────┐ │ - │ ├─>│i childb o│─┬──>│╲ │ - │ │ └──────────┘ │ ││ ┌──────────┐ │ - │ │ │ │├──>│i childc o│──>│╲ │ - │ ├──────────────────>││ └──────────┘ ││ │ - │ │ │ │╱ ││ │ - │ │ │ ╭────────>│├──>│o1 - │ │ ╰─────────────╯ ││ │ - │ │ ││ │ - │ ╰──────────────────────────────────────>│/ │ - │ │ - └───────────────────────────────────────────────────────────────────┘ - --> -<xml> - <pb_type name="parent"> - <input name="ia1"/> - <input name="ia2"/> - <input name="ia3"/> - <output name="o0"/> - <output name="o1"/> - <pb_type name="childa"> - <input name="i1"/> - <input name="i2"/> - <output name="o"/> - </pb_type> - <pb_type name="childb"> - <input name="i"/> - <output name="o"/> - </pb_type> - <pb_type name="childc"> - <input name="i"/> - <output name="o"/> - </pb_type> - <interconnect> - <!-- Direct parent -> child --> - <direct> - <port type="input" name="ia1" /> - <port type="output" from="childa" name="i1" /> - <pack_pattern name="A1"> - <port type="input" name="ia1" /> - <port type="output" from="childa" name="i1" /> - </pack_pattern> - </direct> - <!-- Mux parent -> child --> - <mux name="childa-input-i2"> - <port type="input" name="ia2" /> - <port type="input" name="ia3" /> - <port type="output" from="childa" name="i2" /> - <pack_pattern name="A2"> - <port type="input" name="ia2" /> - <port type="output" from="childa" name="i2" /> - </pack_pattern> - <pack_pattern name="A3"> - <port type="input" name="ia3" /> - <port type="output" from="childa" name="i2" /> - </pack_pattern> - </mux> - <!-- Direct parent -> child --> - <direct> - <port type="input" from="childa" name="o" /> - <port type="output" name="o0" /> - </direct> - <!-- Direct child -> child --> - <direct> - <port type="input" from="childa" name="o" /> - <port type="output" from="childb" name="i" /> - </direct> - <!-- Mux child -> child --> - <mux name="childc-input"> - <port type="input" from="childa" name="o" /> - <port type="input" from="childb" name="o" /> - <port type="output" from="childc" name="i" /> - </mux> - <!-- Mux child -> parent --> - <mux name="output"> - <port type="input" from="childa" name="o" /> - <port type="input" from="childb" name="o" /> - <port type="input" from="childc" name="o" /> - <port type="output" name="o1" /> - </mux> - </interconnect> - </pb_type> -</xml> -
diff --git a/convert_and_merge_composable_tests/composable-interconnect-pack_patterns.golden.xml b/convert_and_merge_composable_tests/composable-interconnect-pack_patterns.golden.xml deleted file mode 100644 index 5921ecf..0000000 --- a/convert_and_merge_composable_tests/composable-interconnect-pack_patterns.golden.xml +++ /dev/null
@@ -1,31 +0,0 @@ -<?xml version="1.0"?> -<xml> - <pb_type name="parent"> - <input name="ia1"/> - <input name="ia2"/> - <input name="ia3"/> - <output name="o0"/> - <output name="o1"/> - <pb_type name="childa"> - <input name="i1"/> - <input name="i2"/> - <output name="o"/> - </pb_type> - <pb_type name="childb"> - <input name="i"/> - <output name="o"/> - </pb_type> - <pb_type name="childc"> - <input name="i"/> - <output name="o"/> - </pb_type> - <interconnect> - <direct input="parent.ia1" name="childa-i1" output="childa.i1"/> - <mux input="parent.ia2 parent.ia3" name="childa-input-i2" output="childa.i2"/> - <direct input="childa.o" name="childb-i" output="childb.i"/> - <mux input="childa.o childb.o" name="childc-input" output="childc.i"/> - <direct input="childa.o" name="parent-o0" output="parent.o0"/> - <mux input="childa.o childb.o childc.o" name="output" output="parent.o1"/> - </interconnect> - </pb_type> -</xml>
diff --git a/convert_and_merge_composable_tests/composable-interconnect-pack_patterns.xml b/convert_and_merge_composable_tests/composable-interconnect-pack_patterns.xml deleted file mode 100644 index 5d8a28c..0000000 --- a/convert_and_merge_composable_tests/composable-interconnect-pack_patterns.xml +++ /dev/null
@@ -1,95 +0,0 @@ -<?xml version="1.0"?> -<!-- - Convert "implicit" parent specification for interconnect tags. - - Convert - <interconnect><direct><port type='input' ...><port type='output' ...></direct><YYY../></interconnect> - to - <interconnect><direct input='...' name='xxx-xxx' output='...'><YYY../></direct></interconnect> - - Convert - <interconnect><mux><port type='input' ...><port type='input' ...><port type='output' ...></mux><YYY../></interconnect> - to - <interconnect><mux input='in1 in2' name='xxx-xxx' output='...'><YYY../></mux></interconnect> - -This example below is connected as follows; - ┌───────────────────────────────────────────────────────────────────┐ - │ │ - │ ┌────────────┐ │ - ia1│──────>│i1 │ │ - │ │ │ │ - │ │ childa o│─┬───────────────────────────────────────────>│o0 - ia2│──>│╲ │ │ │ │ - │ │├─>│i2 │ │ │ - ia3│──>│╱ └────────────┘ │ ┌──────────┐ │ - │ ├─>│i childb o│─┬──>│╲ │ - │ │ └──────────┘ │ ││ ┌──────────┐ │ - │ │ │ │├──>│i childc o│──>│╲ │ - │ ├──────────────────>││ └──────────┘ ││ │ - │ │ │ │╱ ││ │ - │ │ │ ╭────────>│├──>│o1 - │ │ ╰─────────────╯ ││ │ - │ │ ││ │ - │ ╰──────────────────────────────────────>│/ │ - │ │ - └───────────────────────────────────────────────────────────────────┘ - --> -<xml> - <pb_type name="parent"> - <input name="ia1"/> - <input name="ia2"/> - <input name="ia3"/> - <output name="o0"/> - <output name="o1"/> - <pb_type name="childa"> - <input name="i1"/> - <input name="i2"/> - <output name="o"/> - </pb_type> - <pb_type name="childb"> - <input name="i"/> - <output name="o"/> - </pb_type> - <pb_type name="childc"> - <input name="i"/> - <output name="o"/> - </pb_type> - <interconnect> - <!-- Direct parent -> child --> - <direct> - <port type="input" name="ia1" /> - <port type="output" from="childa" name="i1" /> - </direct> - <!-- Mux parent -> child --> - <mux name="childa-input-i2"> - <port type="input" name="ia2" /> - <port type="input" name="ia3" /> - <port type="output" from="childa" name="i2" /> - </mux> - <!-- Direct parent -> child --> - <direct> - <port type="input" from="childa" name="o" /> - <port type="output" name="o0" /> - </direct> - <!-- Direct child -> child --> - <direct> - <port type="input" from="childa" name="o" /> - <port type="output" from="childb" name="i" /> - </direct> - <!-- Mux child -> child --> - <mux name="childc-input"> - <port type="input" from="childa" name="o" /> - <port type="input" from="childb" name="o" /> - <port type="output" from="childc" name="i" /> - </mux> - <!-- Mux child -> parent --> - <mux name="output"> - <port type="input" from="childa" name="o" /> - <port type="input" from="childb" name="o" /> - <port type="input" from="childc" name="o" /> - <port type="output" name="o1" /> - </mux> - </interconnect> - </pb_type> -</xml> -
diff --git a/convert_and_merge_composable_tests/composable-loc-implicit-parent.golden.xml b/convert_and_merge_composable_tests/composable-loc-implicit-parent.golden.xml deleted file mode 100644 index 0c90f56..0000000 --- a/convert_and_merge_composable_tests/composable-loc-implicit-parent.golden.xml +++ /dev/null
@@ -1,18 +0,0 @@ -<?xml version="1.0"?> -<xml> - <pb_type name="parent"> - <input name="i" width="2"/> - <pinlocations> - <loc> -parent.o -parent.i[0] -parent.i[1] -</loc> - </pinlocations> - <random> - <loc> - <port name="o"/> - </loc> - </random> - </pb_type> -</xml>
diff --git a/convert_and_merge_composable_tests/composable-loc-implicit-parent.xml b/convert_and_merge_composable_tests/composable-loc-implicit-parent.xml deleted file mode 100644 index e8bc8d2..0000000 --- a/convert_and_merge_composable_tests/composable-loc-implicit-parent.xml +++ /dev/null
@@ -1,24 +0,0 @@ -<?xml version="1.0"?> -<!-- - Convert - <loc ...><port ...><port ...></loc> - to - <loc ...>BLOCK.PORT BLOCK.PORT</loc> - --> -<xml> - <pb_type name="parent"> - <input name="i" width="2" /> - <pinlocations> - <loc> - <port name="o" /> - <port name="i" bit="0" /> - <port name="i" bit="1" /> - </loc> - </pinlocations> - <random> - <loc> - <port name="o" /> - </loc> - </random> - </pb_type> -</xml>
diff --git a/convert_and_merge_composable_tests/composable-pb_type-inner.xml b/convert_and_merge_composable_tests/composable-pb_type-inner.xml deleted file mode 100644 index 6d1d5b5..0000000 --- a/convert_and_merge_composable_tests/composable-pb_type-inner.xml +++ /dev/null
@@ -1,6 +0,0 @@ -<?xml version="1.0"?> -<pb_type name="INNER" other_attribute="r"> - <blif_model>.subckt random</blif_model> - <pb_class>lut</pb_class> - <other_tag/> -</pb_type>
diff --git a/convert_and_merge_composable_tests/composable-pb_type-middle.xml b/convert_and_merge_composable_tests/composable-pb_type-middle.xml deleted file mode 100644 index d4f1f66..0000000 --- a/convert_and_merge_composable_tests/composable-pb_type-middle.xml +++ /dev/null
@@ -1,6 +0,0 @@ -<?xml version="1.0"?> -<pb_type name="MIDDLE" xmlns:xi="http://www.w3.org/2001/XInclude"> - <pb_type name="middle_inner" num_pb="1"> - <xi:include href="composable-pb_type-inner.xml" xpointer="xpointer(pb_type/child::node())"/> - </pb_type> -</pb_type>
diff --git a/convert_and_merge_composable_tests/composable-pb_type.golden.xml b/convert_and_merge_composable_tests/composable-pb_type.golden.xml deleted file mode 100644 index ef10e9d..0000000 --- a/convert_and_merge_composable_tests/composable-pb_type.golden.xml +++ /dev/null
@@ -1,11 +0,0 @@ -<?xml version="1.0"?> -<pb_type xmlns:xi="http://www.w3.org/2001/XInclude" name="top" num_pb="1"> - <pb_type name="middle" num_pb="1"> - <pb_type blif_model=".subckt random" class="lut" name="middle_inner" num_pb="1"> - <other_tag/> - </pb_type> - </pb_type> - <pb_type blif_model=".subckt random" class="lut" name="top_inner" num_pb="1"> - <other_tag/> - </pb_type> -</pb_type>
diff --git a/convert_and_merge_composable_tests/composable-pb_type.xml b/convert_and_merge_composable_tests/composable-pb_type.xml deleted file mode 100644 index ede3b86..0000000 --- a/convert_and_merge_composable_tests/composable-pb_type.xml +++ /dev/null
@@ -1,9 +0,0 @@ -<?xml version="1.0" ?> -<pb_type name="top" num_pb="1" xmlns:xi="http://www.w3.org/2001/XInclude"> - <pb_type name="top_inner" num_pb="1" > - <xi:include href="composable-pb_type-inner.xml" xpointer="xpointer(pb_type/child::node())"/> - </pb_type> - <pb_type name="middle" num_pb="1"> - <xi:include href="composable-pb_type-middle.xml" xpointer="xpointer(pb_type/child::node())"/> - </pb_type> -</pb_type>
diff --git a/convert_and_merge_composable_tests/explicit-port.golden.xml b/convert_and_merge_composable_tests/explicit-port.golden.xml deleted file mode 100644 index 59cdf12..0000000 --- a/convert_and_merge_composable_tests/explicit-port.golden.xml +++ /dev/null
@@ -1,6 +0,0 @@ -<?xml version="1.0"?> -<xml> - <port-value-test o="port-name"/> - <port-value-test o="port-name[8]"/> - <port-value-test o="port-name[8:4]"/> -</xml>
diff --git a/convert_and_merge_composable_tests/explicit-port.xml b/convert_and_merge_composable_tests/explicit-port.xml deleted file mode 100644 index d078fea..0000000 --- a/convert_and_merge_composable_tests/explicit-port.xml +++ /dev/null
@@ -1,11 +0,0 @@ -<?xml version="1.0"?> -<!-- Convert - * <port name=XXX> to XXX - * <port name=XXX bit=Y> to XXX[Y] - * <port name=XXX bit-msb=M bit-lsb=L> to XXX[M:L] - --> -<xml> - <port-value-test><port name="port-name" /></port-value-test> - <port-value-test><port name="port-name" bit="8" /></port-value-test> - <port-value-test><port name="port-name" bit-msb="8" bit-lsb="4" /></port-value-test> -</xml>
diff --git a/convert_and_merge_composable_tests/full-test-inner.xml b/convert_and_merge_composable_tests/full-test-inner.xml deleted file mode 100644 index 575ddac..0000000 --- a/convert_and_merge_composable_tests/full-test-inner.xml +++ /dev/null
@@ -1,16 +0,0 @@ -<pb_type xmlns:xi="http://www.w3.org/2001/XInclude" name="ADDER" num_pb="1"> - <blif_model>.subckt adder</blif_model> - <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="a" out_port="cout"/> - <delay_constant max="300e-12" in_port="b" out_port="cout"/> - <delay_constant max="10e-12" in_port="cin" out_port="cout"/> - <delay_constant max="300e-12" in_port="a" out_port="sum"/> - <delay_constant max="300e-12" in_port="b" out_port="sum"/> - <delay_constant max="300e-12" in_port="cin" out_port="sum"/> - <T_setup clock="clk" port="a" value="10e-12"/> - <T_clock_to_Q clock="clk" max="10e-12" port="cout"/> -</pb_type>
diff --git a/convert_and_merge_composable_tests/full-test.golden.xml b/convert_and_merge_composable_tests/full-test.golden.xml deleted file mode 100644 index dd44989..0000000 --- a/convert_and_merge_composable_tests/full-test.golden.xml +++ /dev/null
@@ -1,83 +0,0 @@ -<?xml version="1.0"?> -<pb_type xmlns:xi="http://www.w3.org/2001/XInclude" name="MULTIPLE_INSTANCE" num_pb="1"> - <input name="a" num_pins="4"/> - <input name="b" num_pins="4"/> - <input name="c" num_pins="4"/> - <input name="cin" num_pins="1"/> - <input name="d" num_pins="4"/> - <output name="cout" num_pins="1"/> - <output name="sum" num_pins="8"/> - <pb_type blif_model=".subckt adder" name="comba" num_pb="4"> - <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 in_port="comba.a" max="300e-12" out_port="comba.cout"/> - <delay_constant in_port="comba.b" max="300e-12" out_port="comba.cout"/> - <delay_constant in_port="comba.cin" max="10e-12" out_port="comba.cout"/> - <delay_constant in_port="comba.a" max="300e-12" out_port="comba.sum"/> - <delay_constant in_port="comba.b" max="300e-12" out_port="comba.sum"/> - <delay_constant in_port="comba.cin" max="300e-12" out_port="comba.sum"/> - <T_setup clock="clk" port="comba.a" value="10e-12"/> - <T_clock_to_Q clock="clk" max="10e-12" port="comba.cout"/> - </pb_type> - <pb_type blif_model=".subckt adder" name="combb" num_pb="4"> - <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 in_port="combb.a" max="300e-12" out_port="combb.cout"/> - <delay_constant in_port="combb.b" max="300e-12" out_port="combb.cout"/> - <delay_constant in_port="combb.cin" max="10e-12" out_port="combb.cout"/> - <delay_constant in_port="combb.a" max="300e-12" out_port="combb.sum"/> - <delay_constant in_port="combb.b" max="300e-12" out_port="combb.sum"/> - <delay_constant in_port="combb.cin" max="300e-12" out_port="combb.sum"/> - <T_setup clock="clk" port="combb.a" value="10e-12"/> - <T_clock_to_Q clock="clk" max="10e-12" port="combb.cout"/> - </pb_type> - <interconnect> - <direct input="combb[3].cout" name="MULTIPLE_INSTANCE-cout" output="MULTIPLE_INSTANCE.cout"/> - <direct input="comba[0].sum" name="MULTIPLE_INSTANCE-sum[0]" output="MULTIPLE_INSTANCE.sum[0]"/> - <direct input="comba[1].sum" name="MULTIPLE_INSTANCE-sum[1]" output="MULTIPLE_INSTANCE.sum[1]"/> - <direct input="comba[2].sum" name="MULTIPLE_INSTANCE-sum[2]" output="MULTIPLE_INSTANCE.sum[2]"/> - <direct input="comba[3].sum" name="MULTIPLE_INSTANCE-sum[3]" output="MULTIPLE_INSTANCE.sum[3]"/> - <direct input="combb[0].sum" name="MULTIPLE_INSTANCE-sum[4]" output="MULTIPLE_INSTANCE.sum[4]"/> - <direct input="combb[1].sum" name="MULTIPLE_INSTANCE-sum[5]" output="MULTIPLE_INSTANCE.sum[5]"/> - <direct input="combb[2].sum" name="MULTIPLE_INSTANCE-sum[6]" output="MULTIPLE_INSTANCE.sum[6]"/> - <direct input="combb[3].sum" name="MULTIPLE_INSTANCE-sum[7]" output="MULTIPLE_INSTANCE.sum[7]"/> - <direct input="MULTIPLE_INSTANCE.a[0]" name="comba[0]-a" output="comba[0].a"/> - <direct input="MULTIPLE_INSTANCE.b[0]" name="comba[0]-b" output="comba[0].b"/> - <direct input="MULTIPLE_INSTANCE.cin" name="comba[0]-cin" output="comba[0].cin"/> - <direct input="MULTIPLE_INSTANCE.a[1]" name="comba[1]-a" output="comba[1].a"/> - <direct input="MULTIPLE_INSTANCE.b[1]" name="comba[1]-b" output="comba[1].b"/> - <direct input="MULTIPLE_INSTANCE.cin" name="comba[1]-cin" output="comba[1].cin"/> - <direct input="MULTIPLE_INSTANCE.a[2]" name="comba[2]-a" output="comba[2].a"/> - <direct input="MULTIPLE_INSTANCE.b[2]" name="comba[2]-b" output="comba[2].b"/> - <direct input="MULTIPLE_INSTANCE.cin" name="comba[2]-cin" output="comba[2].cin"/> - <direct input="MULTIPLE_INSTANCE.a[3]" name="comba[3]-a" output="comba[3].a"/> - <direct input="MULTIPLE_INSTANCE.b[3]" name="comba[3]-b" output="comba[3].b"/> - <direct input="MULTIPLE_INSTANCE.cin" name="comba[3]-cin" output="comba[3].cin"/> - <direct input="MULTIPLE_INSTANCE.c[0]" name="combb[0]-a" output="combb[0].a"/> - <direct input="MULTIPLE_INSTANCE.d[0]" name="combb[0]-b" output="combb[0].b"/> - <direct input="comba[0].cout" name="combb[0]-cin" output="combb[0].cin"> - <pack_pattern in_port="comba[0].cout" name="carry-ADDER" out_port="combb[0].cin"/> - </direct> - <direct input="MULTIPLE_INSTANCE.c[1]" name="combb[1]-a" output="combb[1].a"/> - <direct input="MULTIPLE_INSTANCE.d[1]" name="combb[1]-b" output="combb[1].b"/> - <direct input="comba[1].cout" name="combb[1]-cin" output="combb[1].cin"> - <pack_pattern in_port="comba[1].cout" name="carry-ADDER" out_port="combb[1].cin"/> - </direct> - <direct input="MULTIPLE_INSTANCE.c[2]" name="combb[2]-a" output="combb[2].a"/> - <direct input="MULTIPLE_INSTANCE.d[2]" name="combb[2]-b" output="combb[2].b"/> - <direct input="comba[2].cout" name="combb[2]-cin" output="combb[2].cin"> - <pack_pattern in_port="comba[2].cout" name="carry-ADDER" out_port="combb[2].cin"/> - </direct> - <direct input="MULTIPLE_INSTANCE.c[3]" name="combb[3]-a" output="combb[3].a"/> - <direct input="MULTIPLE_INSTANCE.d[3]" name="combb[3]-b" output="combb[3].b"/> - <direct input="comba[3].cout" name="combb[3]-cin" output="combb[3].cin"> - <pack_pattern in_port="comba[3].cout" name="carry-ADDER" out_port="combb[3].cin"/> - </direct> - </interconnect> -</pb_type>
diff --git a/convert_and_merge_composable_tests/full-test.xml b/convert_and_merge_composable_tests/full-test.xml deleted file mode 100644 index c5a31ef..0000000 --- a/convert_and_merge_composable_tests/full-test.xml +++ /dev/null
@@ -1,166 +0,0 @@ -<?xml version='1.0' encoding='utf-8'?> -<pb_type xmlns:xi="http://www.w3.org/2001/XInclude" name="MULTIPLE_INSTANCE" num_pb="1"> - <input name="a" num_pins="4"/> - <input name="b" num_pins="4"/> - <input name="c" num_pins="4"/> - <input name="cin" num_pins="1"/> - <input name="d" num_pins="4"/> - <output name="cout" num_pins="1"/> - <output name="sum" num_pins="8"/> - <pb_type name="comba" num_pb="4"> - <xi:include href="full-test-inner.xml" xpointer="xpointer(pb_type/child::node())"/> - </pb_type> - <pb_type name="combb" num_pb="4"> - <xi:include href="full-test-inner.xml" xpointer="xpointer(pb_type/child::node())"/> - </pb_type> - <interconnect> - <direct> - <port name="a[3]" type="input"/> - <port from="comba[3]" name="a" type="output"/> - </direct> - <direct> - <port name="b[3]" type="input"/> - <port from="comba[3]" name="b" type="output"/> - </direct> - <direct> - <port name="cin" type="input"/> - <port from="comba[0]" name="cin" type="output"/> - </direct> - <direct> - <port name="cin" type="input"/> - <port from="comba[1]" name="cin" type="output"/> - </direct> - <direct> - <port name="cin" type="input"/> - <port from="comba[2]" name="cin" type="output"/> - </direct> - <direct> - <port name="cin" type="input"/> - <port from="comba[3]" name="cin" type="output"/> - </direct> - <direct> - <port from="comba[3]" name="sum" type="input"/> - <port name="sum[3]" type="output"/> - </direct> - <direct> - <port name="a[0]" type="input"/> - <port from="comba[0]" name="a" type="output"/> - </direct> - <direct> - <port name="b[0]" type="input"/> - <port from="comba[0]" name="b" type="output"/> - </direct> - <direct> - <port from="comba[0]" name="sum" type="input"/> - <port name="sum[0]" type="output"/> - </direct> - <direct> - <port name="a[1]" type="input"/> - <port from="comba[1]" name="a" type="output"/> - </direct> - <direct> - <port name="b[1]" type="input"/> - <port from="comba[1]" name="b" type="output"/> - </direct> - <direct> - <port from="comba[1]" name="sum" type="input"/> - <port name="sum[1]" type="output"/> - </direct> - <direct> - <port name="a[2]" type="input"/> - <port from="comba[2]" name="a" type="output"/> - </direct> - <direct> - <port name="b[2]" type="input"/> - <port from="comba[2]" name="b" type="output"/> - </direct> - <direct> - <port from="comba[2]" name="sum" type="input"/> - <port name="sum[2]" type="output"/> - </direct> - <direct> - <port name="c[0]" type="input"/> - <port from="combb[0]" name="a" type="output"/> - </direct> - <direct> - <port name="d[0]" type="input"/> - <port from="combb[0]" name="b" type="output"/> - </direct> - <direct> - <port from="comba[0]" name="cout" type="input"/> - <port from="combb[0]" name="cin" type="output"/> - <pack_pattern name="ADDER" type="carry"> - <port from="comba[0]" name="cout" type="input"/> - <port from="combb[0]" name="cin" type="output"/> - </pack_pattern> - </direct> - <direct> - <port from="combb[0]" name="sum" type="input"/> - <port name="sum[4]" type="output"/> - </direct> - <direct> - <port name="c[1]" type="input"/> - <port from="combb[1]" name="a" type="output"/> - </direct> - <direct> - <port name="d[1]" type="input"/> - <port from="combb[1]" name="b" type="output"/> - </direct> - <direct> - <port from="comba[1]" name="cout" type="input"/> - <port from="combb[1]" name="cin" type="output"/> - <pack_pattern name="ADDER" type="carry"> - <port from="comba[1]" name="cout" type="input"/> - <port from="combb[1]" name="cin" type="output"/> - </pack_pattern> - </direct> - <direct> - <port from="combb[1]" name="sum" type="input"/> - <port name="sum[5]" type="output"/> - </direct> - <direct> - <port name="c[2]" type="input"/> - <port from="combb[2]" name="a" type="output"/> - </direct> - <direct> - <port name="d[2]" type="input"/> - <port from="combb[2]" name="b" type="output"/> - </direct> - <direct> - <port from="comba[2]" name="cout" type="input"/> - <port from="combb[2]" name="cin" type="output"/> - <pack_pattern name="ADDER" type="carry"> - <port from="comba[2]" name="cout" type="input"/> - <port from="combb[2]" name="cin" type="output"/> - </pack_pattern> - </direct> - <direct> - <port from="combb[2]" name="sum" type="input"/> - <port name="sum[6]" type="output"/> - </direct> - <direct> - <port name="c[3]" type="input"/> - <port from="combb[3]" name="a" type="output"/> - </direct> - <direct> - <port name="d[3]" type="input"/> - <port from="combb[3]" name="b" type="output"/> - </direct> - <direct> - <port from="comba[3]" name="cout" type="input"/> - <port from="combb[3]" name="cin" type="output"/> - <pack_pattern name="ADDER" type="carry"> - <port from="comba[3]" name="cout" type="input"/> - <port from="combb[3]" name="cin" type="output"/> - </pack_pattern> - </direct> - <direct> - <port from="combb[3]" name="cout" type="input"/> - <port name="cout" type="output"/> - </direct> - <direct> - <port from="combb[3]" name="sum" type="input"/> - <port name="sum[7]" type="output"/> - </direct> - </interconnect> -</pb_type>
diff --git a/convert_and_merge_composable_tests/pack_pattern-copy-direct-ports.golden.xml b/convert_and_merge_composable_tests/pack_pattern-copy-direct-ports.golden.xml deleted file mode 100644 index 7e983c0..0000000 --- a/convert_and_merge_composable_tests/pack_pattern-copy-direct-ports.golden.xml +++ /dev/null
@@ -1,11 +0,0 @@ -<?xml version="1.0"?> -<xml> - <interconnect> - <direct input="LUTFF.FCIN" name="SB_CARRY-CI" output="SB_CARRY.CI"> - <pack_pattern in_port="LUTFF.FCIN" name="CARRYCHAIN" out_port="SB_CARRY.CI"/> - </direct> - <direct input="SB_FF.D" name="VPR_FF-D" output="VPR_FF.D"> - <pack_pattern in_port="SB_FF.D" name="A" out_port="VPR_FF.D"/> - </direct> - </interconnect> -</xml>
diff --git a/convert_and_merge_composable_tests/pack_pattern-copy-direct-ports.xml b/convert_and_merge_composable_tests/pack_pattern-copy-direct-ports.xml deleted file mode 100644 index 0a23c15..0000000 --- a/convert_and_merge_composable_tests/pack_pattern-copy-direct-ports.xml +++ /dev/null
@@ -1,18 +0,0 @@ -<?xml version="1.0"?> -<!-- - Convert - <direct XXXX><pack_pattern name="xxx"/> - to - <direct XXXX><pack_pattern name="xxx" XXXX/> - --> -<xml> - <interconnect> - <direct input="SB_FF.D" name="VPR_FF-D" output="VPR_FF.D"> - <pack_pattern name="A"/> - </direct> - <direct> - <port type="input" from="LUTFF" name="FCIN"/><port type="output" from="SB_CARRY" name="CI"/> - <pack_pattern name="CARRYCHAIN"/> - </direct> - </interconnect> -</xml>
diff --git a/convert_and_merge_composable_tests/pack_pattern-merge-type-into-name.golden.xml b/convert_and_merge_composable_tests/pack_pattern-merge-type-into-name.golden.xml deleted file mode 100644 index f93626e..0000000 --- a/convert_and_merge_composable_tests/pack_pattern-merge-type-into-name.golden.xml +++ /dev/null
@@ -1,13 +0,0 @@ -<?xml version="1.0"?> -<xml> - <pb_type> - <direct> - <pack_pattern name="chain-B"/> - </direct> - <mux> - <pack_pattern name="molecule-A"> - <innertag/> - </pack_pattern> - </mux> - </pb_type> -</xml>
diff --git a/convert_and_merge_composable_tests/pack_pattern-merge-type-into-name.xml b/convert_and_merge_composable_tests/pack_pattern-merge-type-into-name.xml deleted file mode 100644 index 040ce3a..0000000 --- a/convert_and_merge_composable_tests/pack_pattern-merge-type-into-name.xml +++ /dev/null
@@ -1,23 +0,0 @@ -<?xml version="1.0"?> -<!-- - Convert - <pack_pattern name="xxx" type="yyy - to - <pack_pattern name="yyy-xxx" - - The idea is that eventually VPR will be explicit about chain and molecule - patterns. - - --> -<xml> - <pb_type> - <direct> - <pack_pattern name="B" type="chain" /> - </direct> - <mux> - <pack_pattern name="A" type="molecule" > - <innertag /> - </pack_pattern> - </mux> - </pb_type> -</xml>
diff --git a/convert_and_merge_composable_tests/pack_pattern-strip-from-pb_type-ports.golden.xml b/convert_and_merge_composable_tests/pack_pattern-strip-from-pb_type-ports.golden.xml deleted file mode 100644 index a6d6a3b..0000000 --- a/convert_and_merge_composable_tests/pack_pattern-strip-from-pb_type-ports.golden.xml +++ /dev/null
@@ -1,9 +0,0 @@ -<?xml version="1.0"?> -<xml> - <pb_type> - <input name="in1"/> - <input name="in2"/> - <output name="o1"/> - <output name="o2"/> - </pb_type> -</xml>
diff --git a/convert_and_merge_composable_tests/pack_pattern-strip-from-pb_type-ports.xml b/convert_and_merge_composable_tests/pack_pattern-strip-from-pb_type-ports.xml deleted file mode 100644 index da6866a..0000000 --- a/convert_and_merge_composable_tests/pack_pattern-strip-from-pb_type-ports.xml +++ /dev/null
@@ -1,23 +0,0 @@ -<?xml version="1.0"?> -<!-- - Strip pack_pattern's from input/output tags on pb_types. - - This allows us to add the pack_pattern annotation at the leaf values which - don't have an interconnect. It makes it explicit which ports are involved in - the chain (and hence won't end up on fabric). - - --> -<xml> - <pb_type> - <input name="in1"> - <pack_pattern /> - </input> - <input name="in2" /> - <output name="o1" /> - <output name="o2"> - <pack_pattern> - <innertag /> - </pack_pattern> - </output> - </pb_type> -</xml>
diff --git a/convert_and_merge_composable_tests/preserve-interconnect.golden.xml b/convert_and_merge_composable_tests/preserve-interconnect.golden.xml deleted file mode 100644 index 59dbb7c..0000000 --- a/convert_and_merge_composable_tests/preserve-interconnect.golden.xml +++ /dev/null
@@ -1,36 +0,0 @@ -<?xml version="1.0"?> -<xml> - <pb_type name="parent"> - <input name="ia1"/> - <input name="ia2"/> - <input name="ia3"/> - <output name="o0"/> - <output name="o1"/> - <pb_type name="childa"> - <input name="i1"/> - <input name="i2"/> - <output name="o"/> - </pb_type> - <pb_type name="childb"> - <input name="i"/> - <output name="o"/> - </pb_type> - <pb_type name="childc"> - <input name="i"/> - <output name="o"/> - </pb_type> - <interconnect> - <direct input="parent.ia1" name="childa-i1" output="childa.i1"/> - <mux input="parent.ia2 parent.ia3" name="childa-input-i2" output="childa.i2"> - <pack_pattern in_port="parent.ia2" name="MUX1" output="childa.i2"/> - <pack_pattern in_port="parent.ia3" name="MUX2" output="childa.i2"/> - </mux> - <direct input="childa.o" name="childb-i" output="childb.i"/> - <mux input="childa.o childb.o" name="childc-input" output="childc.i"/> - <direct input="childa.o" name="parent-o0" output="parent.o0"> - <pack_pattern in_port="childa.o" name="CARRY" out_port="parent.o0" output="parent.o0"/> - </direct> - <mux input="childa.o childb.o childc.o" name="output" output="parent.o1"/> - </interconnect> - </pb_type> -</xml>
diff --git a/convert_and_merge_composable_tests/preserve-interconnect.xml b/convert_and_merge_composable_tests/preserve-interconnect.xml deleted file mode 100644 index 1053784..0000000 --- a/convert_and_merge_composable_tests/preserve-interconnect.xml +++ /dev/null
@@ -1,37 +0,0 @@ -<?xml version="1.0"?> -<!-- Make sure existing interconnect values are preserved. --> -<xml> - <pb_type name="parent"> - <input name="ia1"/> - <input name="ia2"/> - <input name="ia3"/> - <output name="o0"/> - <output name="o1"/> - <pb_type name="childa"> - <input name="i1"/> - <input name="i2"/> - <output name="o"/> - </pb_type> - <pb_type name="childb"> - <input name="i"/> - <output name="o"/> - </pb_type> - <pb_type name="childc"> - <input name="i"/> - <output name="o"/> - </pb_type> - <interconnect> - <direct input="parent.ia1" name="childa-i1" output="childa.i1"/> - <mux name="childa-input-i2" input="parent.ia2 parent.ia3" output="childa.i2"> - <pack_pattern name="MUX1" in_port="parent.ia2" output="childa.i2" /> - <pack_pattern name="MUX2" in_port="parent.ia3" output="childa.i2" /> - </mux> - <direct input="childa.o" name="parent-o0" output="parent.o0"> - <pack_pattern name="CARRY" in_port="childa.o" output="parent.o0" /> - </direct> - <direct input="childa.o" name="childb-i" output="childb.i"/> - <mux name="childc-input" input="childa.o childb.o" output="childc.i"/> - <mux name="output" input="childa.o childb.o childc.o" output="parent.o1"/> - </interconnect> - </pb_type> -</xml>
diff --git a/convert_and_merge_composable_tests/xsl_tests.cmake b/convert_and_merge_composable_tests/xsl_tests.cmake deleted file mode 100644 index e50c50b..0000000 --- a/convert_and_merge_composable_tests/xsl_tests.cmake +++ /dev/null
@@ -1,49 +0,0 @@ -# Creating new target to call all the added tests -add_custom_target(all_xsl_tests ALL) - -function(XSL_GOLDEN_TEST) - # ~~~ - # XSL_GOLDEN_TEST( - # NAME name - # ) - # ~~~ - # - # This function is to test the xml_canonicalize_merge function which uses the - # convert_and_merge_composable_fpga_architecture.xsl script correctly - # transforms XML by comparing against a golden output file. - # - # NAME name of the test. - # - # Usage: xsl_golden_testl(NAME <test_name>) - - set(options "") - set(oneValueArgs NAME) - set(multiValueArgs "") - cmake_parse_arguments( - XSL_GOLDEN_TEST - "${options}" - "${oneValueArgs}" - "${multiValueArgs}" - ${ARGN} - ) - - set(NAME ${XSL_GOLDEN_TEST_NAME}) - - set(INPUT_XML ${NAME}.xml) - add_file_target(FILE ${INPUT_XML} SCANNER_TYPE xml) - - set(ACTUAL_XML ${NAME}.actual.xml) - xml_canonicalize_merge( - NAME merge_${ACTUAL_XML} - FILE ${INPUT_XML} - OUTPUT ${ACTUAL_XML} - EXTRA_ARGUMENTS "-param" "strip_comments" "1" - ) - - set(GOLDEN_XML ${NAME}.golden.xml) - add_file_target(FILE ${GOLDEN_XML} SCANNER_TYPE xml) - - diff(NAME diff_${NAME} GOLDEN ${GOLDEN_XML} ACTUAL ${ACTUAL_XML}) - - add_dependencies(all_xsl_tests diff_${NAME}) -endfunction(XSL_GOLDEN_TEST)