From dfc9c3df8c016c26d8abe985d313b1bf81b4cc82 Mon Sep 17 00:00:00 2001 From: Alessandro Comodi Date: Wed, 7 Apr 2021 12:07:10 +0200 Subject: interchange: add FASM generation target and clean-up tests Signed-off-by: Alessandro Comodi --- .../examples/tests/const_wire/CMakeLists.txt | 18 +++--------------- .../examples/tests/const_wire/arty100t.xdc | 9 +++++++++ .../examples/tests/const_wire/arty35t.xdc | 9 +++++++++ fpga_interchange/examples/tests/const_wire/basys3.xdc | 9 +++++++++ .../examples/tests/const_wire/wire_arty.xdc | 9 --------- .../examples/tests/const_wire/wire_basys3.xdc | 9 --------- .../examples/tests/counter/CMakeLists.txt | 3 ++- fpga_interchange/examples/tests/counter/zybo.xdc | 14 ++++++++++++++ fpga_interchange/examples/tests/ff/CMakeLists.txt | 19 ++++--------------- fpga_interchange/examples/tests/ff/arty100t.xdc | 9 +++++++++ fpga_interchange/examples/tests/ff/arty35t.xdc | 9 +++++++++ fpga_interchange/examples/tests/ff/basys3.xdc | 9 +++++++++ fpga_interchange/examples/tests/ff/ff_arty.xdc | 9 --------- fpga_interchange/examples/tests/ff/ff_basys3.xdc | 9 --------- fpga_interchange/examples/tests/lut/CMakeLists.txt | 19 ++++--------------- fpga_interchange/examples/tests/lut/arty100t.xdc | 7 +++++++ fpga_interchange/examples/tests/lut/arty35t.xdc | 7 +++++++ fpga_interchange/examples/tests/lut/basys3.xdc | 7 +++++++ fpga_interchange/examples/tests/lut/lut_arty.xdc | 7 ------- fpga_interchange/examples/tests/lut/lut_basys3.xdc | 7 ------- fpga_interchange/examples/tests/ram/CMakeLists.txt | 8 +++----- fpga_interchange/examples/tests/wire/CMakeLists.txt | 1 + 22 files changed, 106 insertions(+), 101 deletions(-) create mode 100644 fpga_interchange/examples/tests/const_wire/arty100t.xdc create mode 100644 fpga_interchange/examples/tests/const_wire/arty35t.xdc create mode 100644 fpga_interchange/examples/tests/const_wire/basys3.xdc delete mode 100644 fpga_interchange/examples/tests/const_wire/wire_arty.xdc delete mode 100644 fpga_interchange/examples/tests/const_wire/wire_basys3.xdc create mode 100644 fpga_interchange/examples/tests/counter/zybo.xdc create mode 100644 fpga_interchange/examples/tests/ff/arty100t.xdc create mode 100644 fpga_interchange/examples/tests/ff/arty35t.xdc create mode 100644 fpga_interchange/examples/tests/ff/basys3.xdc delete mode 100644 fpga_interchange/examples/tests/ff/ff_arty.xdc delete mode 100644 fpga_interchange/examples/tests/ff/ff_basys3.xdc create mode 100644 fpga_interchange/examples/tests/lut/arty100t.xdc create mode 100644 fpga_interchange/examples/tests/lut/arty35t.xdc create mode 100644 fpga_interchange/examples/tests/lut/basys3.xdc delete mode 100644 fpga_interchange/examples/tests/lut/lut_arty.xdc delete mode 100644 fpga_interchange/examples/tests/lut/lut_basys3.xdc (limited to 'fpga_interchange/examples/tests') diff --git a/fpga_interchange/examples/tests/const_wire/CMakeLists.txt b/fpga_interchange/examples/tests/const_wire/CMakeLists.txt index ba013e47..3fff5fbb 100644 --- a/fpga_interchange/examples/tests/const_wire/CMakeLists.txt +++ b/fpga_interchange/examples/tests/const_wire/CMakeLists.txt @@ -1,19 +1,7 @@ -add_interchange_test( - name const_wire_basys3 +add_interchange_group_test( + name const_wire family ${family} - device xc7a35t - package cpg236 + board_list basys3 arty35t arty100t tcl run.tcl - xdc wire_basys3.xdc - sources wire.v -) - -add_interchange_test( - name const_wire_arty - family ${family} - device xc7a35t - package csg324 - tcl run.tcl - xdc wire_arty.xdc sources wire.v ) diff --git a/fpga_interchange/examples/tests/const_wire/arty100t.xdc b/fpga_interchange/examples/tests/const_wire/arty100t.xdc new file mode 100644 index 00000000..a6e69de5 --- /dev/null +++ b/fpga_interchange/examples/tests/const_wire/arty100t.xdc @@ -0,0 +1,9 @@ +set_property PACKAGE_PIN H5 [get_ports o] +set_property PACKAGE_PIN J5 [get_ports o2] +set_property PACKAGE_PIN T9 [get_ports o3] +set_property PACKAGE_PIN T10 [get_ports o4] + +set_property IOSTANDARD LVCMOS33 [get_ports o] +set_property IOSTANDARD LVCMOS33 [get_ports o2] +set_property IOSTANDARD LVCMOS33 [get_ports o3] +set_property IOSTANDARD LVCMOS33 [get_ports o4] diff --git a/fpga_interchange/examples/tests/const_wire/arty35t.xdc b/fpga_interchange/examples/tests/const_wire/arty35t.xdc new file mode 100644 index 00000000..a6e69de5 --- /dev/null +++ b/fpga_interchange/examples/tests/const_wire/arty35t.xdc @@ -0,0 +1,9 @@ +set_property PACKAGE_PIN H5 [get_ports o] +set_property PACKAGE_PIN J5 [get_ports o2] +set_property PACKAGE_PIN T9 [get_ports o3] +set_property PACKAGE_PIN T10 [get_ports o4] + +set_property IOSTANDARD LVCMOS33 [get_ports o] +set_property IOSTANDARD LVCMOS33 [get_ports o2] +set_property IOSTANDARD LVCMOS33 [get_ports o3] +set_property IOSTANDARD LVCMOS33 [get_ports o4] diff --git a/fpga_interchange/examples/tests/const_wire/basys3.xdc b/fpga_interchange/examples/tests/const_wire/basys3.xdc new file mode 100644 index 00000000..f8435580 --- /dev/null +++ b/fpga_interchange/examples/tests/const_wire/basys3.xdc @@ -0,0 +1,9 @@ +set_property PACKAGE_PIN U16 [get_ports o] +set_property PACKAGE_PIN E19 [get_ports o2] +set_property PACKAGE_PIN U19 [get_ports o3] +set_property PACKAGE_PIN V19 [get_ports o4] + +set_property IOSTANDARD LVCMOS33 [get_ports o] +set_property IOSTANDARD LVCMOS33 [get_ports o2] +set_property IOSTANDARD LVCMOS33 [get_ports o3] +set_property IOSTANDARD LVCMOS33 [get_ports o4] diff --git a/fpga_interchange/examples/tests/const_wire/wire_arty.xdc b/fpga_interchange/examples/tests/const_wire/wire_arty.xdc deleted file mode 100644 index 0d96fc45..00000000 --- a/fpga_interchange/examples/tests/const_wire/wire_arty.xdc +++ /dev/null @@ -1,9 +0,0 @@ -set_property PACKAGE_PIN N15 [get_ports o] -set_property PACKAGE_PIN N16 [get_ports o2] -set_property PACKAGE_PIN P17 [get_ports o3] -set_property PACKAGE_PIN R17 [get_ports o4] - -set_property IOSTANDARD LVCMOS33 [get_ports o] -set_property IOSTANDARD LVCMOS33 [get_ports o2] -set_property IOSTANDARD LVCMOS33 [get_ports o3] -set_property IOSTANDARD LVCMOS33 [get_ports o4] diff --git a/fpga_interchange/examples/tests/const_wire/wire_basys3.xdc b/fpga_interchange/examples/tests/const_wire/wire_basys3.xdc deleted file mode 100644 index f8435580..00000000 --- a/fpga_interchange/examples/tests/const_wire/wire_basys3.xdc +++ /dev/null @@ -1,9 +0,0 @@ -set_property PACKAGE_PIN U16 [get_ports o] -set_property PACKAGE_PIN E19 [get_ports o2] -set_property PACKAGE_PIN U19 [get_ports o3] -set_property PACKAGE_PIN V19 [get_ports o4] - -set_property IOSTANDARD LVCMOS33 [get_ports o] -set_property IOSTANDARD LVCMOS33 [get_ports o2] -set_property IOSTANDARD LVCMOS33 [get_ports o3] -set_property IOSTANDARD LVCMOS33 [get_ports o4] diff --git a/fpga_interchange/examples/tests/counter/CMakeLists.txt b/fpga_interchange/examples/tests/counter/CMakeLists.txt index 2f1509c2..38c104ff 100644 --- a/fpga_interchange/examples/tests/counter/CMakeLists.txt +++ b/fpga_interchange/examples/tests/counter/CMakeLists.txt @@ -1,8 +1,9 @@ add_interchange_group_test( name counter family ${family} - board_list basys3 arty35t arty100t + board_list basys3 arty35t arty100t zybo tcl run.tcl sources counter.v techmap ../../remap.v + output_fasm ) diff --git a/fpga_interchange/examples/tests/counter/zybo.xdc b/fpga_interchange/examples/tests/counter/zybo.xdc new file mode 100644 index 00000000..e7764d52 --- /dev/null +++ b/fpga_interchange/examples/tests/counter/zybo.xdc @@ -0,0 +1,14 @@ +# zybo board +set_property PACKAGE_PIN K17 [get_ports clk] +set_property PACKAGE_PIN K18 [get_ports rst] +set_property PACKAGE_PIN M14 [get_ports io_led[4]] +set_property PACKAGE_PIN M15 [get_ports io_led[5]] +set_property PACKAGE_PIN G14 [get_ports io_led[6]] +set_property PACKAGE_PIN D18 [get_ports io_led[7]] + +set_property IOSTANDARD LVCMOS33 [get_ports clk] +set_property IOSTANDARD LVCMOS33 [get_ports rst] +set_property IOSTANDARD LVCMOS33 [get_ports io_led[4]] +set_property IOSTANDARD LVCMOS33 [get_ports io_led[5]] +set_property IOSTANDARD LVCMOS33 [get_ports io_led[6]] +set_property IOSTANDARD LVCMOS33 [get_ports io_led[7]] diff --git a/fpga_interchange/examples/tests/ff/CMakeLists.txt b/fpga_interchange/examples/tests/ff/CMakeLists.txt index ccf16d44..e119b7c3 100644 --- a/fpga_interchange/examples/tests/ff/CMakeLists.txt +++ b/fpga_interchange/examples/tests/ff/CMakeLists.txt @@ -1,19 +1,8 @@ -add_interchange_test( - name ff_basys3 +add_interchange_group_test( + name ff family ${family} - device xc7a35t - package cpg236 + board_list basys3 arty35t arty100t tcl run.tcl - xdc ff_basys3.xdc - sources ff.v -) - -add_interchange_test( - name ff_arty - family ${family} - device xc7a35t - package csg324 - tcl run.tcl - xdc ff_arty.xdc sources ff.v + output_fasm ) diff --git a/fpga_interchange/examples/tests/ff/arty100t.xdc b/fpga_interchange/examples/tests/ff/arty100t.xdc new file mode 100644 index 00000000..29456f2a --- /dev/null +++ b/fpga_interchange/examples/tests/ff/arty100t.xdc @@ -0,0 +1,9 @@ +set_property PACKAGE_PIN E3 [get_ports clk] +set_property PACKAGE_PIN A8 [get_ports d] +set_property PACKAGE_PIN D9 [get_ports r] +set_property PACKAGE_PIN H5 [get_ports q] + +set_property IOSTANDARD LVCMOS33 [get_ports clk] +set_property IOSTANDARD LVCMOS33 [get_ports d] +set_property IOSTANDARD LVCMOS33 [get_ports r] +set_property IOSTANDARD LVCMOS33 [get_ports q] diff --git a/fpga_interchange/examples/tests/ff/arty35t.xdc b/fpga_interchange/examples/tests/ff/arty35t.xdc new file mode 100644 index 00000000..29456f2a --- /dev/null +++ b/fpga_interchange/examples/tests/ff/arty35t.xdc @@ -0,0 +1,9 @@ +set_property PACKAGE_PIN E3 [get_ports clk] +set_property PACKAGE_PIN A8 [get_ports d] +set_property PACKAGE_PIN D9 [get_ports r] +set_property PACKAGE_PIN H5 [get_ports q] + +set_property IOSTANDARD LVCMOS33 [get_ports clk] +set_property IOSTANDARD LVCMOS33 [get_ports d] +set_property IOSTANDARD LVCMOS33 [get_ports r] +set_property IOSTANDARD LVCMOS33 [get_ports q] diff --git a/fpga_interchange/examples/tests/ff/basys3.xdc b/fpga_interchange/examples/tests/ff/basys3.xdc new file mode 100644 index 00000000..ef65112a --- /dev/null +++ b/fpga_interchange/examples/tests/ff/basys3.xdc @@ -0,0 +1,9 @@ +set_property PACKAGE_PIN W5 [get_ports clk] +set_property PACKAGE_PIN U16 [get_ports d] +set_property PACKAGE_PIN E19 [get_ports r] +set_property PACKAGE_PIN U19 [get_ports q] + +set_property IOSTANDARD LVCMOS33 [get_ports clk] +set_property IOSTANDARD LVCMOS33 [get_ports d] +set_property IOSTANDARD LVCMOS33 [get_ports r] +set_property IOSTANDARD LVCMOS33 [get_ports q] diff --git a/fpga_interchange/examples/tests/ff/ff_arty.xdc b/fpga_interchange/examples/tests/ff/ff_arty.xdc deleted file mode 100644 index 3c132f1d..00000000 --- a/fpga_interchange/examples/tests/ff/ff_arty.xdc +++ /dev/null @@ -1,9 +0,0 @@ -set_property PACKAGE_PIN P17 [get_ports clk] -set_property PACKAGE_PIN N15 [get_ports d] -set_property PACKAGE_PIN N16 [get_ports r] -set_property PACKAGE_PIN M17 [get_ports q] - -set_property IOSTANDARD LVCMOS33 [get_ports clk] -set_property IOSTANDARD LVCMOS33 [get_ports d] -set_property IOSTANDARD LVCMOS33 [get_ports r] -set_property IOSTANDARD LVCMOS33 [get_ports q] diff --git a/fpga_interchange/examples/tests/ff/ff_basys3.xdc b/fpga_interchange/examples/tests/ff/ff_basys3.xdc deleted file mode 100644 index ef65112a..00000000 --- a/fpga_interchange/examples/tests/ff/ff_basys3.xdc +++ /dev/null @@ -1,9 +0,0 @@ -set_property PACKAGE_PIN W5 [get_ports clk] -set_property PACKAGE_PIN U16 [get_ports d] -set_property PACKAGE_PIN E19 [get_ports r] -set_property PACKAGE_PIN U19 [get_ports q] - -set_property IOSTANDARD LVCMOS33 [get_ports clk] -set_property IOSTANDARD LVCMOS33 [get_ports d] -set_property IOSTANDARD LVCMOS33 [get_ports r] -set_property IOSTANDARD LVCMOS33 [get_ports q] diff --git a/fpga_interchange/examples/tests/lut/CMakeLists.txt b/fpga_interchange/examples/tests/lut/CMakeLists.txt index f5503f71..77a4b4da 100644 --- a/fpga_interchange/examples/tests/lut/CMakeLists.txt +++ b/fpga_interchange/examples/tests/lut/CMakeLists.txt @@ -1,19 +1,8 @@ -add_interchange_test( - name lut_basys3 +add_interchange_group_test( + name lut family ${family} - device xc7a35t - package cpg236 + board_list basys3 arty35t arty100t tcl run.tcl - xdc lut_basys3.xdc - sources lut.v -) - -add_interchange_test( - name lut_arty - family ${family} - device xc7a35t - package csg324 - tcl run.tcl - xdc lut_arty.xdc sources lut.v + output_fasm ) diff --git a/fpga_interchange/examples/tests/lut/arty100t.xdc b/fpga_interchange/examples/tests/lut/arty100t.xdc new file mode 100644 index 00000000..1dba6574 --- /dev/null +++ b/fpga_interchange/examples/tests/lut/arty100t.xdc @@ -0,0 +1,7 @@ +set_property PACKAGE_PIN A8 [get_ports i0] +set_property PACKAGE_PIN C11 [get_ports i1] +set_property PACKAGE_PIN H5 [get_ports o] + +set_property IOSTANDARD LVCMOS33 [get_ports i0] +set_property IOSTANDARD LVCMOS33 [get_ports i1] +set_property IOSTANDARD LVCMOS33 [get_ports o] diff --git a/fpga_interchange/examples/tests/lut/arty35t.xdc b/fpga_interchange/examples/tests/lut/arty35t.xdc new file mode 100644 index 00000000..1dba6574 --- /dev/null +++ b/fpga_interchange/examples/tests/lut/arty35t.xdc @@ -0,0 +1,7 @@ +set_property PACKAGE_PIN A8 [get_ports i0] +set_property PACKAGE_PIN C11 [get_ports i1] +set_property PACKAGE_PIN H5 [get_ports o] + +set_property IOSTANDARD LVCMOS33 [get_ports i0] +set_property IOSTANDARD LVCMOS33 [get_ports i1] +set_property IOSTANDARD LVCMOS33 [get_ports o] diff --git a/fpga_interchange/examples/tests/lut/basys3.xdc b/fpga_interchange/examples/tests/lut/basys3.xdc new file mode 100644 index 00000000..aef287ee --- /dev/null +++ b/fpga_interchange/examples/tests/lut/basys3.xdc @@ -0,0 +1,7 @@ +set_property PACKAGE_PIN V17 [get_ports i0] +set_property PACKAGE_PIN V16 [get_ports i1] +set_property PACKAGE_PIN U16 [get_ports o] + +set_property IOSTANDARD LVCMOS33 [get_ports i0] +set_property IOSTANDARD LVCMOS33 [get_ports i1] +set_property IOSTANDARD LVCMOS33 [get_ports o] diff --git a/fpga_interchange/examples/tests/lut/lut_arty.xdc b/fpga_interchange/examples/tests/lut/lut_arty.xdc deleted file mode 100644 index 4f390f25..00000000 --- a/fpga_interchange/examples/tests/lut/lut_arty.xdc +++ /dev/null @@ -1,7 +0,0 @@ -set_property PACKAGE_PIN N16 [get_ports i0] -set_property PACKAGE_PIN N15 [get_ports i1] -set_property PACKAGE_PIN M17 [get_ports o] - -set_property IOSTANDARD LVCMOS33 [get_ports i0] -set_property IOSTANDARD LVCMOS33 [get_ports i1] -set_property IOSTANDARD LVCMOS33 [get_ports o] diff --git a/fpga_interchange/examples/tests/lut/lut_basys3.xdc b/fpga_interchange/examples/tests/lut/lut_basys3.xdc deleted file mode 100644 index aef287ee..00000000 --- a/fpga_interchange/examples/tests/lut/lut_basys3.xdc +++ /dev/null @@ -1,7 +0,0 @@ -set_property PACKAGE_PIN V17 [get_ports i0] -set_property PACKAGE_PIN V16 [get_ports i1] -set_property PACKAGE_PIN U16 [get_ports o] - -set_property IOSTANDARD LVCMOS33 [get_ports i0] -set_property IOSTANDARD LVCMOS33 [get_ports i1] -set_property IOSTANDARD LVCMOS33 [get_ports o] diff --git a/fpga_interchange/examples/tests/ram/CMakeLists.txt b/fpga_interchange/examples/tests/ram/CMakeLists.txt index 4625edb3..56db4870 100644 --- a/fpga_interchange/examples/tests/ram/CMakeLists.txt +++ b/fpga_interchange/examples/tests/ram/CMakeLists.txt @@ -1,10 +1,8 @@ -add_interchange_test( - name ram_basys3 +add_interchange_group_test( + name ram family ${family} - device xc7a35t - package cpg236 + board_list basys3 tcl run.tcl - xdc basys3.xdc sources ram.v ) diff --git a/fpga_interchange/examples/tests/wire/CMakeLists.txt b/fpga_interchange/examples/tests/wire/CMakeLists.txt index 7b6567ae..6308a6e9 100644 --- a/fpga_interchange/examples/tests/wire/CMakeLists.txt +++ b/fpga_interchange/examples/tests/wire/CMakeLists.txt @@ -4,4 +4,5 @@ add_interchange_group_test( board_list basys3 arty35t zybo arty100t nexys_video tcl run.tcl sources wire.v + output_fasm ) -- cgit v1.2.3