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.cmake | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'fpga_interchange/examples/tests.cmake') diff --git a/fpga_interchange/examples/tests.cmake b/fpga_interchange/examples/tests.cmake index a550fb8f..cb2ec483 100644 --- a/fpga_interchange/examples/tests.cmake +++ b/fpga_interchange/examples/tests.cmake @@ -2,8 +2,8 @@ function(add_interchange_test) # ~~~ # add_interchange_test( # name - # part - # part + # device + # package # tcl # xdc # top @@ -12,7 +12,7 @@ function(add_interchange_test) # ~~~ set(options) - set(oneValueArgs name part package tcl xdc top) + set(oneValueArgs name device package tcl xdc top) set(multiValueArgs sources) cmake_parse_arguments( @@ -24,7 +24,7 @@ function(add_interchange_test) ) set(name ${add_interchange_test_name}) - set(part ${add_interchange_test_part}) + set(device ${add_interchange_test_device}) set(package ${add_interchange_test_package}) set(top ${add_interchange_test_top}) set(tcl ${CMAKE_CURRENT_SOURCE_DIR}/${add_interchange_test_tcl}) @@ -54,14 +54,14 @@ function(add_interchange_test) add_custom_target(test-${family}-${name}-json DEPENDS ${synth_json}) # Logical Netlist - set(device_target constraints-luts-${part}-device) - get_property(device_loc TARGET constraints-luts-${part}-device PROPERTY LOCATION) + set(device_target constraints-luts-${device}-device) + get_property(device_loc TARGET constraints-luts-${device}-device PROPERTY LOCATION) set(netlist ${CMAKE_CURRENT_BINARY_DIR}/${name}.netlist) add_custom_command( OUTPUT ${netlist} COMMAND - python3 -mfpga_interchange.yosys_json + ${PYTHON_EXECUTABLE} -mfpga_interchange.yosys_json --schema_dir ${INTERCHANGE_SCHEMA_PATH} --device ${device_loc} --top ${top} @@ -74,7 +74,7 @@ function(add_interchange_test) add_custom_target(test-${family}-${name}-netlist DEPENDS ${netlist}) - set(chipdb_target chipdb-${part}-bba) + set(chipdb_target chipdb-${device}-bba) # Physical Netlist set(phys ${CMAKE_CURRENT_BINARY_DIR}/${name}.phys) @@ -82,7 +82,7 @@ function(add_interchange_test) OUTPUT ${phys} COMMAND nextpnr-fpga_interchange - --chipdb ${chipdb_dir}/chipdb-${part}.bba + --chipdb ${chipdb_dir}/chipdb-${device}.bba --xdc ${xdc} --netlist ${netlist} --phys ${phys} -- cgit v1.2.3