From d77d0ff34a3e183ad4f9f1d8af7eddad55e0929e Mon Sep 17 00:00:00 2001 From: Alessandro Comodi Date: Fri, 12 Mar 2021 12:25:41 +0100 Subject: fpga_intrchange: add cmake infrastructure to generate chipdbs Signed-off-by: Alessandro Comodi --- fpga_interchange/examples/devices/CMakeLists.txt | 1 + fpga_interchange/examples/devices/xc7a35t/CMakeLists.txt | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 fpga_interchange/examples/devices/CMakeLists.txt create mode 100644 fpga_interchange/examples/devices/xc7a35t/CMakeLists.txt (limited to 'fpga_interchange/examples/devices') diff --git a/fpga_interchange/examples/devices/CMakeLists.txt b/fpga_interchange/examples/devices/CMakeLists.txt new file mode 100644 index 00000000..5b96ac80 --- /dev/null +++ b/fpga_interchange/examples/devices/CMakeLists.txt @@ -0,0 +1 @@ +add_subdirectory(xc7a35t) diff --git a/fpga_interchange/examples/devices/xc7a35t/CMakeLists.txt b/fpga_interchange/examples/devices/xc7a35t/CMakeLists.txt new file mode 100644 index 00000000..2b0dce53 --- /dev/null +++ b/fpga_interchange/examples/devices/xc7a35t/CMakeLists.txt @@ -0,0 +1,2 @@ +generate_chipdb(part xc7a35tcsg324-1) +generate_chipdb(part xc7a35tcpg236-1) -- 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/devices/CMakeLists.txt | 5 ++++- fpga_interchange/examples/devices/xc7a35t/CMakeLists.txt | 2 -- 2 files changed, 4 insertions(+), 3 deletions(-) delete mode 100644 fpga_interchange/examples/devices/xc7a35t/CMakeLists.txt (limited to 'fpga_interchange/examples/devices') diff --git a/fpga_interchange/examples/devices/CMakeLists.txt b/fpga_interchange/examples/devices/CMakeLists.txt index 5b96ac80..8497484b 100644 --- a/fpga_interchange/examples/devices/CMakeLists.txt +++ b/fpga_interchange/examples/devices/CMakeLists.txt @@ -1 +1,4 @@ -add_subdirectory(xc7a35t) +generate_chipdb( + device xc7a50t + part xc7a50tfgg484-1 +) diff --git a/fpga_interchange/examples/devices/xc7a35t/CMakeLists.txt b/fpga_interchange/examples/devices/xc7a35t/CMakeLists.txt deleted file mode 100644 index 2b0dce53..00000000 --- a/fpga_interchange/examples/devices/xc7a35t/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -generate_chipdb(part xc7a35tcsg324-1) -generate_chipdb(part xc7a35tcpg236-1) -- cgit v1.2.3 From e5cc03965ef3959ed11cf811816422fd6a5a5cc1 Mon Sep 17 00:00:00 2001 From: Alessandro Comodi Date: Fri, 12 Mar 2021 19:02:00 +0100 Subject: fpga_interchange: chipdb: use generic patching function Also moved the RapidWright invocation script path under a CMake variable Signed-off-by: Alessandro Comodi --- fpga_interchange/examples/devices/CMakeLists.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'fpga_interchange/examples/devices') diff --git a/fpga_interchange/examples/devices/CMakeLists.txt b/fpga_interchange/examples/devices/CMakeLists.txt index 8497484b..4bbd5802 100644 --- a/fpga_interchange/examples/devices/CMakeLists.txt +++ b/fpga_interchange/examples/devices/CMakeLists.txt @@ -1,4 +1,5 @@ generate_chipdb( - device xc7a50t - part xc7a50tfgg484-1 + device xc7a35t + part xc7a35tcsg324-1 + bel_bucket_seeds ${PYTHON_INTERCHANGE_PATH}/test_data/series7_bel_buckets.yaml ) -- cgit v1.2.3 From 0b62e540a388287bed9c50b7a113b6a7eb87e541 Mon Sep 17 00:00:00 2001 From: Alessandro Comodi Date: Fri, 12 Mar 2021 20:04:51 +0100 Subject: fpga_interchange: address review comments Signed-off-by: Alessandro Comodi --- fpga_interchange/examples/devices/CMakeLists.txt | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'fpga_interchange/examples/devices') diff --git a/fpga_interchange/examples/devices/CMakeLists.txt b/fpga_interchange/examples/devices/CMakeLists.txt index 4bbd5802..6a60d4f8 100644 --- a/fpga_interchange/examples/devices/CMakeLists.txt +++ b/fpga_interchange/examples/devices/CMakeLists.txt @@ -1,5 +1,11 @@ +generate_xc7_device_db( + device xc7a35t + part xc7a35tcsg324-1 +) + generate_chipdb( device xc7a35t part xc7a35tcsg324-1 + device_target ${device_target} bel_bucket_seeds ${PYTHON_INTERCHANGE_PATH}/test_data/series7_bel_buckets.yaml ) -- cgit v1.2.3 From 3f3cabea2d16cd93c8d9114939b8a4fc883f09f1 Mon Sep 17 00:00:00 2001 From: Alessandro Comodi Date: Mon, 15 Mar 2021 10:51:37 +0100 Subject: fpga_interchange: add bbasm step and archcheck Signed-off-by: Alessandro Comodi --- fpga_interchange/examples/devices/CMakeLists.txt | 12 +------- .../examples/devices/xc7a35t/CMakeLists.txt | 12 ++++++++ .../examples/devices/xc7a35t/test_data.yaml | 36 ++++++++++++++++++++++ 3 files changed, 49 insertions(+), 11 deletions(-) create mode 100644 fpga_interchange/examples/devices/xc7a35t/CMakeLists.txt create mode 100644 fpga_interchange/examples/devices/xc7a35t/test_data.yaml (limited to 'fpga_interchange/examples/devices') diff --git a/fpga_interchange/examples/devices/CMakeLists.txt b/fpga_interchange/examples/devices/CMakeLists.txt index 6a60d4f8..5b96ac80 100644 --- a/fpga_interchange/examples/devices/CMakeLists.txt +++ b/fpga_interchange/examples/devices/CMakeLists.txt @@ -1,11 +1 @@ -generate_xc7_device_db( - device xc7a35t - part xc7a35tcsg324-1 -) - -generate_chipdb( - device xc7a35t - part xc7a35tcsg324-1 - device_target ${device_target} - bel_bucket_seeds ${PYTHON_INTERCHANGE_PATH}/test_data/series7_bel_buckets.yaml -) +add_subdirectory(xc7a35t) diff --git a/fpga_interchange/examples/devices/xc7a35t/CMakeLists.txt b/fpga_interchange/examples/devices/xc7a35t/CMakeLists.txt new file mode 100644 index 00000000..a7a49751 --- /dev/null +++ b/fpga_interchange/examples/devices/xc7a35t/CMakeLists.txt @@ -0,0 +1,12 @@ +generate_xc7_device_db( + device xc7a35t + part xc7a35tcsg324-1 +) + +generate_chipdb( + device xc7a35t + part xc7a35tcsg324-1 + device_target ${device_target} + bel_bucket_seeds ${PYTHON_INTERCHANGE_PATH}/test_data/series7_bel_buckets.yaml + package csg324 +) diff --git a/fpga_interchange/examples/devices/xc7a35t/test_data.yaml b/fpga_interchange/examples/devices/xc7a35t/test_data.yaml new file mode 100644 index 00000000..268d180a --- /dev/null +++ b/fpga_interchange/examples/devices/xc7a35t/test_data.yaml @@ -0,0 +1,36 @@ +pip_test: + - src_wire: CLBLM_R_X11Y93/CLBLM_L_D3 + dst_wire: SLICE_X15Y93.SLICEL/D3 +pip_chain_test: + - wires: + - $CONSTANTS_X0Y0.$CONSTANTS/$GND_SOURCE + - $CONSTANTS_X0Y0/$GND_NODE + - TIEOFF_X3Y145.TIEOFF/$GND_SITE_WIRE + - TIEOFF_X3Y145.TIEOFF/HARD0GND_HARD0 + - INT_R_X3Y145/GND_WIRE + - wires: + - $CONSTANTS_X0Y0.$CONSTANTS/$VCC_SOURCE + - $CONSTANTS_X0Y0/$VCC_NODE + - TIEOFF_X3Y145.TIEOFF/$VCC_SITE_WIRE + - TIEOFF_X3Y145.TIEOFF/HARD1VCC_HARD1 + - INT_R_X3Y145/VCC_WIRE + - wires: + - $CONSTANTS_X0Y0.$CONSTANTS/$VCC_SOURCE + - $CONSTANTS_X0Y0/$VCC_NODE + - SLICE_X3Y145.SLICEL/$VCC_SITE_WIRE + - SLICE_X3Y145.SLICEL/CEUSEDVCC_HARD1 + - wires: + - $CONSTANTS_X0Y0.$CONSTANTS/$GND_SOURCE + - $CONSTANTS_X0Y0/$GND_NODE + - SLICE_X3Y145.SLICEL/$GND_SITE_WIRE + - SLICE_X3Y145.SLICEL/SRUSEDGND_HARD0 +bel_pin_test: + - bel: SLICE_X15Y93.SLICEL/D6LUT + pin: A3 + wire: SLICE_X15Y93.SLICEL/D3 + - bel: $CONSTANTS_X0Y0.$CONSTANTS/GND + pin: G + wire: $CONSTANTS_X0Y0.$CONSTANTS/$GND_SOURCE + - bel: $CONSTANTS_X0Y0.$CONSTANTS/VCC + pin: P + wire: $CONSTANTS_X0Y0.$CONSTANTS/$VCC_SOURCE -- 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/devices/xc7a35t/CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'fpga_interchange/examples/devices') diff --git a/fpga_interchange/examples/devices/xc7a35t/CMakeLists.txt b/fpga_interchange/examples/devices/xc7a35t/CMakeLists.txt index a7a49751..465ff66d 100644 --- a/fpga_interchange/examples/devices/xc7a35t/CMakeLists.txt +++ b/fpga_interchange/examples/devices/xc7a35t/CMakeLists.txt @@ -1,12 +1,14 @@ generate_xc7_device_db( device xc7a35t part xc7a35tcsg324-1 + device_target target ) generate_chipdb( + family ${family} device xc7a35t part xc7a35tcsg324-1 - device_target ${device_target} + device_target ${target} bel_bucket_seeds ${PYTHON_INTERCHANGE_PATH}/test_data/series7_bel_buckets.yaml package csg324 ) -- cgit v1.2.3 From f6583f7ecc807c3c2a08d0121ef20fab3616c1e7 Mon Sep 17 00:00:00 2001 From: Alessandro Comodi Date: Tue, 16 Mar 2021 22:40:15 +0100 Subject: fpga_interchange: minor fixes and comments addition Signed-off-by: Alessandro Comodi --- fpga_interchange/examples/devices/xc7a35t/CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'fpga_interchange/examples/devices') diff --git a/fpga_interchange/examples/devices/xc7a35t/CMakeLists.txt b/fpga_interchange/examples/devices/xc7a35t/CMakeLists.txt index 465ff66d..ce5d5d2d 100644 --- a/fpga_interchange/examples/devices/xc7a35t/CMakeLists.txt +++ b/fpga_interchange/examples/devices/xc7a35t/CMakeLists.txt @@ -1,14 +1,14 @@ generate_xc7_device_db( device xc7a35t part xc7a35tcsg324-1 - device_target target + device_target xc7a35t_target ) generate_chipdb( family ${family} device xc7a35t part xc7a35tcsg324-1 - device_target ${target} + device_target ${xc7a35t_target} bel_bucket_seeds ${PYTHON_INTERCHANGE_PATH}/test_data/series7_bel_buckets.yaml - package csg324 + test_package csg324 ) -- cgit v1.2.3