From 77ffdd7fd4e90e0da43e81b1f5e021b08ee64a9f Mon Sep 17 00:00:00 2001 From: Alessandro Comodi Date: Fri, 12 Mar 2021 13:53:09 +0100 Subject: fpga_interchange: tests: add cmake functions Also move all tests in a tests directory Signed-off-by: Alessandro Comodi --- fpga_interchange/examples/tests/ff/CMakeLists.txt | 17 +++++++++++++++++ fpga_interchange/examples/tests/ff/ff.v | 11 +++++++++++ fpga_interchange/examples/tests/ff/ff.xdc | 9 +++++++++ fpga_interchange/examples/tests/ff/run.tcl | 14 ++++++++++++++ 4 files changed, 51 insertions(+) create mode 100644 fpga_interchange/examples/tests/ff/CMakeLists.txt create mode 100644 fpga_interchange/examples/tests/ff/ff.v create mode 100644 fpga_interchange/examples/tests/ff/ff.xdc create mode 100644 fpga_interchange/examples/tests/ff/run.tcl (limited to 'fpga_interchange/examples/tests/ff') diff --git a/fpga_interchange/examples/tests/ff/CMakeLists.txt b/fpga_interchange/examples/tests/ff/CMakeLists.txt new file mode 100644 index 00000000..66074c64 --- /dev/null +++ b/fpga_interchange/examples/tests/ff/CMakeLists.txt @@ -0,0 +1,17 @@ +add_interchange_test( + name ff_basys3 + part xc7a35tcpg236-1 + package cpg236 + tcl run.tcl + xdc ff.xdc + sources ff.v +) + +add_interchange_test( + name ff_arty + part xc7a35tcsg324-1 + package csg324 + tcl run.tcl + xdc ff.xdc + sources ff.v +) diff --git a/fpga_interchange/examples/tests/ff/ff.v b/fpga_interchange/examples/tests/ff/ff.v new file mode 100644 index 00000000..1c271042 --- /dev/null +++ b/fpga_interchange/examples/tests/ff/ff.v @@ -0,0 +1,11 @@ +module top(input clk, input d, input r, output reg q); + +always @(posedge clk) +begin + if(r) + q <= 1'b0; + else + q <= d; +end + +endmodule diff --git a/fpga_interchange/examples/tests/ff/ff.xdc b/fpga_interchange/examples/tests/ff/ff.xdc new file mode 100644 index 00000000..3c132f1d --- /dev/null +++ b/fpga_interchange/examples/tests/ff/ff.xdc @@ -0,0 +1,9 @@ +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/run.tcl b/fpga_interchange/examples/tests/ff/run.tcl new file mode 100644 index 00000000..b8d0df72 --- /dev/null +++ b/fpga_interchange/examples/tests/ff/run.tcl @@ -0,0 +1,14 @@ +yosys -import + +read_verilog $::env(SOURCES) + +synth_xilinx -nolutram -nowidelut -nosrl -nocarry -nodsp + +# opt_expr -undriven makes sure all nets are driven, if only by the $undef +# net. +opt_expr -undriven +opt_clean + +setundef -zero -params + +write_json $::env(OUT_JSON) -- cgit v1.2.3 From 490fdb0a1c3bb78856d26be2186e4dca5d3d021f Mon Sep 17 00:00:00 2001 From: Alessandro Comodi Date: Fri, 12 Mar 2021 16:37:00 +0100 Subject: fpga_interchange: cmake: generate only one device family Signed-off-by: Alessandro Comodi --- fpga_interchange/examples/tests/ff/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'fpga_interchange/examples/tests/ff') diff --git a/fpga_interchange/examples/tests/ff/CMakeLists.txt b/fpga_interchange/examples/tests/ff/CMakeLists.txt index 66074c64..30ae0417 100644 --- a/fpga_interchange/examples/tests/ff/CMakeLists.txt +++ b/fpga_interchange/examples/tests/ff/CMakeLists.txt @@ -1,6 +1,6 @@ add_interchange_test( name ff_basys3 - part xc7a35tcpg236-1 + device xc7a50t package cpg236 tcl run.tcl xdc ff.xdc @@ -9,7 +9,7 @@ add_interchange_test( add_interchange_test( name ff_arty - part xc7a35tcsg324-1 + device xc7a50t package csg324 tcl run.tcl xdc ff.xdc -- cgit v1.2.3 From bd2da27e4e35e92ad91145921cf9c7d2c490a9df Mon Sep 17 00:00:00 2001 From: Alessandro Comodi Date: Fri, 12 Mar 2021 19:03:02 +0100 Subject: fpga_interchange: tests: added comment and fixed XDC Signed-off-by: Alessandro Comodi --- fpga_interchange/examples/tests/ff/CMakeLists.txt | 8 ++++---- fpga_interchange/examples/tests/ff/ff.xdc | 9 --------- fpga_interchange/examples/tests/ff/ff_arty.xdc | 9 +++++++++ fpga_interchange/examples/tests/ff/ff_basys3.xdc | 9 +++++++++ 4 files changed, 22 insertions(+), 13 deletions(-) delete mode 100644 fpga_interchange/examples/tests/ff/ff.xdc create mode 100644 fpga_interchange/examples/tests/ff/ff_arty.xdc create mode 100644 fpga_interchange/examples/tests/ff/ff_basys3.xdc (limited to 'fpga_interchange/examples/tests/ff') diff --git a/fpga_interchange/examples/tests/ff/CMakeLists.txt b/fpga_interchange/examples/tests/ff/CMakeLists.txt index 30ae0417..953e6038 100644 --- a/fpga_interchange/examples/tests/ff/CMakeLists.txt +++ b/fpga_interchange/examples/tests/ff/CMakeLists.txt @@ -1,17 +1,17 @@ add_interchange_test( name ff_basys3 - device xc7a50t + device xc7a35t package cpg236 tcl run.tcl - xdc ff.xdc + xdc ff_basys3.xdc sources ff.v ) add_interchange_test( name ff_arty - device xc7a50t + device xc7a35t package csg324 tcl run.tcl - xdc ff.xdc + xdc ff_arty.xdc sources ff.v ) diff --git a/fpga_interchange/examples/tests/ff/ff.xdc b/fpga_interchange/examples/tests/ff/ff.xdc deleted file mode 100644 index 3c132f1d..00000000 --- a/fpga_interchange/examples/tests/ff/ff.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_arty.xdc b/fpga_interchange/examples/tests/ff/ff_arty.xdc new file mode 100644 index 00000000..3c132f1d --- /dev/null +++ b/fpga_interchange/examples/tests/ff/ff_arty.xdc @@ -0,0 +1,9 @@ +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 new file mode 100644 index 00000000..ef65112a --- /dev/null +++ b/fpga_interchange/examples/tests/ff/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] -- cgit v1.2.3 From c1e668f8238141a7d19525e9eb7a23c17cd1b120 Mon Sep 17 00:00:00 2001 From: Alessandro Comodi Date: Tue, 16 Mar 2021 21:49:06 +0100 Subject: fpga_interchange: address review comments Signed-off-by: Alessandro Comodi --- fpga_interchange/examples/tests/ff/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) (limited to 'fpga_interchange/examples/tests/ff') diff --git a/fpga_interchange/examples/tests/ff/CMakeLists.txt b/fpga_interchange/examples/tests/ff/CMakeLists.txt index 953e6038..ccf16d44 100644 --- a/fpga_interchange/examples/tests/ff/CMakeLists.txt +++ b/fpga_interchange/examples/tests/ff/CMakeLists.txt @@ -1,5 +1,6 @@ add_interchange_test( name ff_basys3 + family ${family} device xc7a35t package cpg236 tcl run.tcl @@ -9,6 +10,7 @@ add_interchange_test( add_interchange_test( name ff_arty + family ${family} device xc7a35t package csg324 tcl run.tcl -- cgit v1.2.3