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/family.cmake | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'fpga_interchange/family.cmake') diff --git a/fpga_interchange/family.cmake b/fpga_interchange/family.cmake index e62ab458..112cb3dc 100644 --- a/fpga_interchange/family.cmake +++ b/fpga_interchange/family.cmake @@ -5,7 +5,14 @@ endif() find_package(ZLIB REQUIRED) +set(RAPIDWRIGHT_PATH $ENV{HOME}/RapidWright CACHE PATH "Path to RapidWright") +# FIXME: Make patch data available in the python package and remove this cached var +set(PYTHON_INTERCHANGE_PATH $ENV{HOME}/python-fpga-interchange CACHE PATH "Path to the FPGA interchange python library") +set(INTERCHANGE_SCHEMA_PATH $ENV{HOME}/fpga_interchange_schema CACHE PATH "Path to the FPGA interchange schema dir") + add_subdirectory(3rdparty/fpga-interchange-schema/cmake/cxx_static) +include(${family}/examples/chipdb.cmake) +include(${family}/examples/tests.cmake) foreach (target ${family_targets}) target_include_directories(${target} PRIVATE ${TCL_INCLUDE_PATH}) -- 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/family.cmake | 1 + 1 file changed, 1 insertion(+) (limited to 'fpga_interchange/family.cmake') diff --git a/fpga_interchange/family.cmake b/fpga_interchange/family.cmake index 112cb3dc..ec2d911e 100644 --- a/fpga_interchange/family.cmake +++ b/fpga_interchange/family.cmake @@ -6,6 +6,7 @@ endif() find_package(ZLIB REQUIRED) set(RAPIDWRIGHT_PATH $ENV{HOME}/RapidWright CACHE PATH "Path to RapidWright") +set(INVOKE_RAPIDWRIGHT ${RAPIDWRIGHT_PATH}/scripts/invoke_rapidwright.sh CACHE PATH "Path to RapidWright invocation script") # FIXME: Make patch data available in the python package and remove this cached var set(PYTHON_INTERCHANGE_PATH $ENV{HOME}/python-fpga-interchange CACHE PATH "Path to the FPGA interchange python library") set(INTERCHANGE_SCHEMA_PATH $ENV{HOME}/fpga_interchange_schema CACHE PATH "Path to the FPGA interchange schema dir") -- 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/family.cmake | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'fpga_interchange/family.cmake') diff --git a/fpga_interchange/family.cmake b/fpga_interchange/family.cmake index ec2d911e..cf92ef2e 100644 --- a/fpga_interchange/family.cmake +++ b/fpga_interchange/family.cmake @@ -12,9 +12,17 @@ set(PYTHON_INTERCHANGE_PATH $ENV{HOME}/python-fpga-interchange CACHE PATH "Path set(INTERCHANGE_SCHEMA_PATH $ENV{HOME}/fpga_interchange_schema CACHE PATH "Path to the FPGA interchange schema dir") add_subdirectory(3rdparty/fpga-interchange-schema/cmake/cxx_static) + include(${family}/examples/chipdb.cmake) include(${family}/examples/tests.cmake) +set(chipdb_dir ${CMAKE_CURRENT_BINARY_DIR}/${family}/chipdb) +file(MAKE_DIRECTORY ${chipdb_dir}) + +add_custom_target(all-${family}-tests) +add_subdirectory(${family}/examples/devices) +add_subdirectory(${family}/examples/tests) + foreach (target ${family_targets}) target_include_directories(${target} PRIVATE ${TCL_INCLUDE_PATH}) target_link_libraries(${target} PRIVATE ${TCL_LIBRARY}) -- 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/family.cmake | 2 ++ 1 file changed, 2 insertions(+) (limited to 'fpga_interchange/family.cmake') diff --git a/fpga_interchange/family.cmake b/fpga_interchange/family.cmake index cf92ef2e..ec5cdb59 100644 --- a/fpga_interchange/family.cmake +++ b/fpga_interchange/family.cmake @@ -19,6 +19,8 @@ include(${family}/examples/tests.cmake) set(chipdb_dir ${CMAKE_CURRENT_BINARY_DIR}/${family}/chipdb) file(MAKE_DIRECTORY ${chipdb_dir}) +set(root_dir ${CMAKE_CURRENT_SOURCE_DIR}) + add_custom_target(all-${family}-tests) add_subdirectory(${family}/examples/devices) add_subdirectory(${family}/examples/tests) -- 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/family.cmake | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'fpga_interchange/family.cmake') diff --git a/fpga_interchange/family.cmake b/fpga_interchange/family.cmake index ec5cdb59..bad439f8 100644 --- a/fpga_interchange/family.cmake +++ b/fpga_interchange/family.cmake @@ -19,9 +19,8 @@ include(${family}/examples/tests.cmake) set(chipdb_dir ${CMAKE_CURRENT_BINARY_DIR}/${family}/chipdb) file(MAKE_DIRECTORY ${chipdb_dir}) -set(root_dir ${CMAKE_CURRENT_SOURCE_DIR}) - add_custom_target(all-${family}-tests) +add_custom_target(all-${family}-archcheck-tests) add_subdirectory(${family}/examples/devices) add_subdirectory(${family}/examples/tests) -- cgit v1.2.3