From 6e83154703dc8960cfe2a9ca94725d012c39840a Mon Sep 17 00:00:00 2001 From: tangxifan Date: Wed, 4 Mar 2020 14:14:28 -0700 Subject: [PATCH] move rr_gsb and rr_chan to tileable rr_graph builder --- vpr/CMakeLists.txt | 15 ++++++++------- .../src/tileable_rr_graph}/rr_chan.cpp | 0 .../src/tileable_rr_graph}/rr_chan.h | 0 .../src/tileable_rr_graph}/rr_gsb.cpp | 0 .../src/tileable_rr_graph}/rr_gsb.h | 0 5 files changed, 8 insertions(+), 7 deletions(-) rename {openfpga/src/annotation => vpr/src/tileable_rr_graph}/rr_chan.cpp (100%) rename {openfpga/src/annotation => vpr/src/tileable_rr_graph}/rr_chan.h (100%) rename {openfpga/src/annotation => vpr/src/tileable_rr_graph}/rr_gsb.cpp (100%) rename {openfpga/src/annotation => vpr/src/tileable_rr_graph}/rr_gsb.h (100%) diff --git a/vpr/CMakeLists.txt b/vpr/CMakeLists.txt index 4d06b1e1a..592fa2edb 100644 --- a/vpr/CMakeLists.txt +++ b/vpr/CMakeLists.txt @@ -56,13 +56,14 @@ set_target_properties(libvpr8 PROPERTIES PREFIX "") #Avoid extra 'lib' prefix #Specify link-time dependancies target_link_libraries(libvpr8 - libvtrutil - libarchfpga - libsdcparse - libblifparse - libtatum - libargparse - libpugixml) + libvtrutil + libopenfpgautil + libarchfpga + libsdcparse + libblifparse + libtatum + libargparse + libpugixml) #link graphics library only when graphics set to on if (VPR_USE_EZGL STREQUAL "on") diff --git a/openfpga/src/annotation/rr_chan.cpp b/vpr/src/tileable_rr_graph/rr_chan.cpp similarity index 100% rename from openfpga/src/annotation/rr_chan.cpp rename to vpr/src/tileable_rr_graph/rr_chan.cpp diff --git a/openfpga/src/annotation/rr_chan.h b/vpr/src/tileable_rr_graph/rr_chan.h similarity index 100% rename from openfpga/src/annotation/rr_chan.h rename to vpr/src/tileable_rr_graph/rr_chan.h diff --git a/openfpga/src/annotation/rr_gsb.cpp b/vpr/src/tileable_rr_graph/rr_gsb.cpp similarity index 100% rename from openfpga/src/annotation/rr_gsb.cpp rename to vpr/src/tileable_rr_graph/rr_gsb.cpp diff --git a/openfpga/src/annotation/rr_gsb.h b/vpr/src/tileable_rr_graph/rr_gsb.h similarity index 100% rename from openfpga/src/annotation/rr_gsb.h rename to vpr/src/tileable_rr_graph/rr_gsb.h