From 3cb5e81d50fb90c1fd1ffcd7af1a81c68e081646 Mon Sep 17 00:00:00 2001 From: gatecat Date: Wed, 24 Mar 2021 11:09:06 +0000 Subject: interchange: Add CMake support for Nexus/prjoxide Signed-off-by: gatecat --- fpga_interchange/examples/chipdb.cmake | 98 ++++++++++++++++++++++++++++++++++ 1 file changed, 98 insertions(+) (limited to 'fpga_interchange/examples/chipdb.cmake') diff --git a/fpga_interchange/examples/chipdb.cmake b/fpga_interchange/examples/chipdb.cmake index 4705c0bc..753bb257 100644 --- a/fpga_interchange/examples/chipdb.cmake +++ b/fpga_interchange/examples/chipdb.cmake @@ -67,6 +67,58 @@ function(create_rapidwright_device_db) endif() endfunction() +function(create_prjoxide_device_db) + # ~~~ + # create_rapidwright_device_db( + # device + # output_target + # ) + # ~~~ + # + # Generates a device database from Project Oxide + # + # If output_target is specified, the output_target_name variable + # is set to the generated output_device_file target. + # + # Arguments: + # - device: common device name of a set of parts. E.g. LIFCL-17 + # - output_target: variable name that will hold the output device target for the parent scope + # + # Targets generated: + # - prjoxide--device + set(options) + set(oneValueArgs device output_target) + set(multiValueArgs) + + cmake_parse_arguments( + create_prjoxide_device_db + "${options}" + "${oneValueArgs}" + "${multiValueArgs}" + ${ARGN} + ) + + set(device ${create_prjoxide_device_db_device}) + set(output_target ${create_prjoxide_device_db_output_target}) + set(prjoxide_device_db ${CMAKE_CURRENT_BINARY_DIR}/${device}.device) + add_custom_command( + OUTPUT ${prjoxide_device_db} + COMMAND + prjoxide + interchange-export + ${device} + ${prjoxide_device_db} + ) + + add_custom_target(prjoxide-${device}-device DEPENDS ${prjoxide_device_db}) + set_property(TARGET prjoxide-${device}-device PROPERTY LOCATION ${prjoxide_device_db}) + + if (DEFINED output_target) + set(${output_target} prjoxide-${device}-device PARENT_SCOPE) + endif() + +endfunction() + function(create_patched_device_db) # ~~~ # create_patched_device_db( @@ -225,6 +277,52 @@ function(generate_xc7_device_db) endif() endfunction() +function(generate_nexus_device_db) + # ~~~ + # generate_nexus_device_db( + # device + # part + # device_target + # ) + # ~~~ + # + # Generates a chipdb BBA file, starting from a Project Oxide device database. + # Patches applied: + # - constraints patch + # - luts patch + # + # Arguments: + # - device: common device name of a set of parts. E.g. LIFCL-17 + # - part: one among the parts available for a given device (currently ignored) + # - device_target: variable name that will hold the output device target for the parent scope + set(options) + set(oneValueArgs device part device_target) + set(multiValueArgs) + + cmake_parse_arguments( + generate_nexus_device_db + "${options}" + "${oneValueArgs}" + "${multiValueArgs}" + ${ARGN} + ) + + set(device ${generate_nexus_device_db_device}) + set(part ${generate_nexus_device_db_part}) + set(device_target ${generate_nexus_device_db_device_target}) + + create_prjoxide_device_db( + device ${device} + output_target prjoxide_device + ) + + # TODO: any patching that is needed + + if(DEFINED device_target) + set(${device_target} ${prjoxide_device} PARENT_SCOPE) + endif() +endfunction() + function(generate_chipdb) # ~~~ # generate_chipdb( -- cgit v1.2.3 From b6b89593971bcddc874b3839dc5d107f975f1404 Mon Sep 17 00:00:00 2001 From: gatecat Date: Wed, 24 Mar 2021 13:17:12 +0000 Subject: interchange: Add Nexus to CI Signed-off-by: gatecat --- fpga_interchange/examples/chipdb.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'fpga_interchange/examples/chipdb.cmake') diff --git a/fpga_interchange/examples/chipdb.cmake b/fpga_interchange/examples/chipdb.cmake index 753bb257..5ac0ce78 100644 --- a/fpga_interchange/examples/chipdb.cmake +++ b/fpga_interchange/examples/chipdb.cmake @@ -104,7 +104,7 @@ function(create_prjoxide_device_db) add_custom_command( OUTPUT ${prjoxide_device_db} COMMAND - prjoxide + ${PRJOXIDE_PREFIX}/bin/prjoxide interchange-export ${device} ${prjoxide_device_db} -- cgit v1.2.3 From ecfaae7f9ea9bfad4b9af08495ac72cb5f6972ec Mon Sep 17 00:00:00 2001 From: gatecat Date: Thu, 25 Mar 2021 12:51:19 +0000 Subject: interchange: Add Nexus LUT test Signed-off-by: gatecat --- fpga_interchange/examples/chipdb.cmake | 86 +++++++++++++++++++++++++++++++++- 1 file changed, 84 insertions(+), 2 deletions(-) (limited to 'fpga_interchange/examples/chipdb.cmake') diff --git a/fpga_interchange/examples/chipdb.cmake b/fpga_interchange/examples/chipdb.cmake index 5ac0ce78..201c9bac 100644 --- a/fpga_interchange/examples/chipdb.cmake +++ b/fpga_interchange/examples/chipdb.cmake @@ -108,6 +108,8 @@ function(create_prjoxide_device_db) interchange-export ${device} ${prjoxide_device_db} + DEPENDS + ${PRJOXIDE_PREFIX}/bin/prjoxide ) add_custom_target(prjoxide-${device}-device DEPENDS ${prjoxide_device_db}) @@ -208,6 +210,80 @@ function(create_patched_device_db) endif() endfunction() +function(patch_device_with_prim_lib) + # ~~~ + # patch_device_with_prim_lib( + # device + # yosys_script + # input_device + # output_target + # ) + # ~~~ + # + # Generates a patched device database starting from an input device + # + # If output_target is specified, the variable named as the output_target + # parameter value is set to the generated output_device_file target. + # + # Arguments: + # - device: common device name of a set of parts. E.g. xc7a35tcsg324-1 and xc7a35tcpg236-1 + # share the same xc7a35t device prefix. + # - yosys_script: yosys script to produce cell library + # - input_device: target for the device that needs to be patched + # - output_target: variable name that will hold the output device target for the parent scope + # + # Targets generated: + # - prims--device + + set(options) + set(oneValueArgs device yosys_script input_device output_target) + set(multiValueArgs) + + cmake_parse_arguments( + patch_device_with_prim_lib + "${options}" + "${oneValueArgs}" + "${multiValueArgs}" + ${ARGN} + ) + + set(device ${patch_device_with_prim_lib_device}) + set(yosys_script ${patch_device_with_prim_lib_yosys_script}) + set(input_device ${patch_device_with_prim_lib_input_device}) + set(output_target ${patch_device_with_prim_lib_output_target}) + + get_target_property(input_device_loc ${input_device} LOCATION) + set(output_device_file ${CMAKE_CURRENT_BINARY_DIR}/${device}_prim_lib.device) + set(output_json_file ${CMAKE_CURRENT_BINARY_DIR}/${device}_prim_lib.json) + + add_custom_command( + OUTPUT ${output_json_file} + COMMAND + yosys -p '${yosys_script}\; write_json ${output_json_file}' + ) + + add_custom_command( + OUTPUT ${output_device_file} + COMMAND + ${PYTHON_EXECUTABLE} -mfpga_interchange.add_prim_lib + --schema_dir ${INTERCHANGE_SCHEMA_PATH} + ${input_device_loc} + ${output_json_file} + ${output_device_file} + DEPENDS + ${input_device} + ${input_device_loc} + ${output_json_file} + ) + + add_custom_target(prims-${device}-device DEPENDS ${output_device_file}) + set_property(TARGET prims-${device}-device PROPERTY LOCATION ${output_device_file}) + + if (DEFINED output_target) + set(${output_target} prims-${device}-device PARENT_SCOPE) + endif() +endfunction() + function(generate_xc7_device_db) # ~~~ # generate_xc7_device_db( @@ -316,10 +392,16 @@ function(generate_nexus_device_db) output_target prjoxide_device ) - # TODO: any patching that is needed + # Add primitive library + patch_device_with_prim_lib( + device ${device} + yosys_script synth_nexus + input_device ${prjoxide_device} + output_target prjoxide_prims_device + ) if(DEFINED device_target) - set(${device_target} ${prjoxide_device} PARENT_SCOPE) + set(${device_target} ${prjoxide_prims_device} PARENT_SCOPE) endif() endfunction() -- cgit v1.2.3 From a003aae7c294cd3d32e26f1998deee550d7c1203 Mon Sep 17 00:00:00 2001 From: gatecat Date: Tue, 30 Mar 2021 11:05:43 +0100 Subject: interchange: Split xc7 and nexus chipdb cmake Signed-off-by: gatecat --- fpga_interchange/examples/chipdb.cmake | 245 +-------------------------------- 1 file changed, 2 insertions(+), 243 deletions(-) (limited to 'fpga_interchange/examples/chipdb.cmake') diff --git a/fpga_interchange/examples/chipdb.cmake b/fpga_interchange/examples/chipdb.cmake index 201c9bac..100a69f4 100644 --- a/fpga_interchange/examples/chipdb.cmake +++ b/fpga_interchange/examples/chipdb.cmake @@ -1,125 +1,5 @@ -function(create_rapidwright_device_db) - # ~~~ - # create_rapidwright_device_db( - # device - # part - # output_target - # ) - # ~~~ - # - # Generates a device database from RapidWright - # - # If output_target is specified, the output_target_name variable - # is set to the generated output_device_file target. - # - # Arguments: - # - device: common device name of a set of parts. E.g. xc7a35tcsg324-1 and xc7a35tcpg236-1 - # share the same xc7a35t device prefix - # - part: one among the parts available for a given device - # - output_target: variable name that will hold the output device target for the parent scope - # - # Targets generated: - # - rapidwright--device - - set(options) - set(oneValueArgs device part output_target) - set(multiValueArgs) - - cmake_parse_arguments( - create_rapidwright_device_db - "${options}" - "${oneValueArgs}" - "${multiValueArgs}" - ${ARGN} - ) - - set(device ${create_rapidwright_device_db_device}) - set(part ${create_rapidwright_device_db_part}) - set(output_target ${create_rapidwright_device_db_output_target}) - set(rapidwright_device_db ${CMAKE_CURRENT_BINARY_DIR}/${part}.device) - add_custom_command( - OUTPUT ${rapidwright_device_db} - COMMAND - RAPIDWRIGHT_PATH=${RAPIDWRIGHT_PATH} - ${INVOKE_RAPIDWRIGHT} ${JAVA_HEAP_SPACE} - com.xilinx.rapidwright.interchange.DeviceResourcesExample - ${part} - DEPENDS - ${INVOKE_RAPIDWRIGHT} - ) - - add_custom_target(rapidwright-${device}-device DEPENDS ${rapidwright_device_db}) - set_property(TARGET rapidwright-${device}-device PROPERTY LOCATION ${rapidwright_device_db}) - - add_custom_target(rapidwright-${device}-device-yaml - COMMAND - ${PYTHON_EXECUTABLE} -mfpga_interchange.convert - --schema_dir ${INTERCHANGE_SCHEMA_PATH} - --schema device - --input_format capnp - --output_format yaml - ${rapidwright_device_db} - ${rapidwright_device_db}.yaml - DEPENDS ${rapidwright_device_db}) - - if (DEFINED output_target) - set(${output_target} rapidwright-${device}-device PARENT_SCOPE) - endif() -endfunction() - -function(create_prjoxide_device_db) - # ~~~ - # create_rapidwright_device_db( - # device - # output_target - # ) - # ~~~ - # - # Generates a device database from Project Oxide - # - # If output_target is specified, the output_target_name variable - # is set to the generated output_device_file target. - # - # Arguments: - # - device: common device name of a set of parts. E.g. LIFCL-17 - # - output_target: variable name that will hold the output device target for the parent scope - # - # Targets generated: - # - prjoxide--device - set(options) - set(oneValueArgs device output_target) - set(multiValueArgs) - - cmake_parse_arguments( - create_prjoxide_device_db - "${options}" - "${oneValueArgs}" - "${multiValueArgs}" - ${ARGN} - ) - - set(device ${create_prjoxide_device_db_device}) - set(output_target ${create_prjoxide_device_db_output_target}) - set(prjoxide_device_db ${CMAKE_CURRENT_BINARY_DIR}/${device}.device) - add_custom_command( - OUTPUT ${prjoxide_device_db} - COMMAND - ${PRJOXIDE_PREFIX}/bin/prjoxide - interchange-export - ${device} - ${prjoxide_device_db} - DEPENDS - ${PRJOXIDE_PREFIX}/bin/prjoxide - ) - - add_custom_target(prjoxide-${device}-device DEPENDS ${prjoxide_device_db}) - set_property(TARGET prjoxide-${device}-device PROPERTY LOCATION ${prjoxide_device_db}) - - if (DEFINED output_target) - set(${output_target} prjoxide-${device}-device PARENT_SCOPE) - endif() - -endfunction() +include(${family}/examples/chipdb_xilinx.cmake) +include(${family}/examples/chipdb_nexus.cmake) function(create_patched_device_db) # ~~~ @@ -284,127 +164,6 @@ function(patch_device_with_prim_lib) endif() endfunction() -function(generate_xc7_device_db) - # ~~~ - # generate_xc7_device_db( - # device - # part - # device_target - # ) - # ~~~ - # - # Generates a chipdb BBA file, starting from a RapidWright device database which is then patched. - # Patches applied: - # - constraints patch - # - luts patch - # - # Arguments: - # - device: common device name of a set of parts. E.g. xc7a35tcsg324-1 and xc7a35tcpg236-1 - # share the same xc7a35t device prefix - # - part: one among the parts available for a given device - # - device_target: variable name that will hold the output device target for the parent scope - - set(options) - set(oneValueArgs device part device_target) - set(multiValueArgs) - - cmake_parse_arguments( - create_rapidwright_device_db - "${options}" - "${oneValueArgs}" - "${multiValueArgs}" - ${ARGN} - ) - - set(device ${create_rapidwright_device_db_device}) - set(part ${create_rapidwright_device_db_part}) - set(device_target ${create_rapidwright_device_db_device_target}) - - create_rapidwright_device_db( - device ${device} - part ${part} - output_target rapidwright_device - ) - - # Generate constraints patch - create_patched_device_db( - device ${device} - patch_name constraints - patch_path constraints - patch_format yaml - patch_data ${PYTHON_INTERCHANGE_PATH}/test_data/series7_constraints.yaml - input_device ${rapidwright_device} - output_target constraints_device - ) - - # Generate lut constraints patch - create_patched_device_db( - device ${device} - patch_name constraints-luts - patch_path lutDefinitions - patch_format yaml - patch_data ${PYTHON_INTERCHANGE_PATH}/test_data/series7_luts.yaml - input_device ${constraints_device} - output_target constraints_luts_device - ) - - if(DEFINED device_target) - set(${device_target} ${constraints_luts_device} PARENT_SCOPE) - endif() -endfunction() - -function(generate_nexus_device_db) - # ~~~ - # generate_nexus_device_db( - # device - # part - # device_target - # ) - # ~~~ - # - # Generates a chipdb BBA file, starting from a Project Oxide device database. - # Patches applied: - # - constraints patch - # - luts patch - # - # Arguments: - # - device: common device name of a set of parts. E.g. LIFCL-17 - # - part: one among the parts available for a given device (currently ignored) - # - device_target: variable name that will hold the output device target for the parent scope - set(options) - set(oneValueArgs device part device_target) - set(multiValueArgs) - - cmake_parse_arguments( - generate_nexus_device_db - "${options}" - "${oneValueArgs}" - "${multiValueArgs}" - ${ARGN} - ) - - set(device ${generate_nexus_device_db_device}) - set(part ${generate_nexus_device_db_part}) - set(device_target ${generate_nexus_device_db_device_target}) - - create_prjoxide_device_db( - device ${device} - output_target prjoxide_device - ) - - # Add primitive library - patch_device_with_prim_lib( - device ${device} - yosys_script synth_nexus - input_device ${prjoxide_device} - output_target prjoxide_prims_device - ) - - if(DEFINED device_target) - set(${device_target} ${prjoxide_prims_device} PARENT_SCOPE) - endif() -endfunction() - function(generate_chipdb) # ~~~ # generate_chipdb( -- cgit v1.2.3 From 3678eff5dc13b301f7841d2079ba265bbe3fac2b Mon Sep 17 00:00:00 2001 From: gatecat Date: Wed, 31 Mar 2021 10:11:09 +0100 Subject: interchange: Fix nexus cmake review comments Signed-off-by: gatecat --- fpga_interchange/examples/chipdb.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'fpga_interchange/examples/chipdb.cmake') diff --git a/fpga_interchange/examples/chipdb.cmake b/fpga_interchange/examples/chipdb.cmake index 100a69f4..a060576d 100644 --- a/fpga_interchange/examples/chipdb.cmake +++ b/fpga_interchange/examples/chipdb.cmake @@ -100,7 +100,7 @@ function(patch_device_with_prim_lib) # ) # ~~~ # - # Generates a patched device database starting from an input device + # Patches an input device with a primitive library from Yosys # # If output_target is specified, the variable named as the output_target # parameter value is set to the generated output_device_file target. -- cgit v1.2.3