From 5a494fada411d263f3f2f8f80ee04e4242afc602 Mon Sep 17 00:00:00 2001 From: Unai Martinez-Corral Date: Fri, 5 Aug 2022 09:53:01 +0200 Subject: [PATCH] mv vpr/ common/ Signed-off-by: Unai Martinez-Corral --- common/cmake/gen.cmake | 2 +- {vpr => common/vpr}/CMakeLists.txt | 0 {vpr => common/vpr}/buf/CMakeLists.txt | 0 {vpr => common/vpr}/buf/buf.model.xml | 0 {vpr => common/vpr}/buf/buf.pb_type.xml | 0 {vpr => common/vpr}/const/CMakeLists.txt | 0 {vpr => common/vpr}/const/const.pb_type.xml | 0 {vpr => common/vpr}/dual-pad/CMakeLists.txt | 0 {vpr => common/vpr}/dual-pad/dual-pad.pb_type.xml | 0 {vpr => common/vpr}/dual-pad/ibuf.pb_type.xml | 0 {vpr => common/vpr}/dual-pad/obuf.pb_type.xml | 0 {vpr => common/vpr}/ff/CMakeLists.txt | 0 {vpr => common/vpr}/ff/vpr_ff.sim.v | 0 {vpr => common/vpr}/ibuf/CMakeLists.txt | 0 {vpr => common/vpr}/ibuf/ibuf.pb_type.xml | 0 {vpr => common/vpr}/muxes/CMakeLists.txt | 0 {vpr => common/vpr}/muxes/logic/CMakeLists.txt | 0 {vpr => common/vpr}/muxes/logic/mux2/CMakeLists.txt | 0 {vpr => common/vpr}/muxes/logic/mux2/mux2.sim.v | 0 {vpr => common/vpr}/muxes/logic/mux2/simtest/test_mux2.py | 0 {vpr => common/vpr}/muxes/logic/mux4/mux4.sim.v | 0 {vpr => common/vpr}/muxes/logic/mux5/mux5.sim.v | 0 {vpr => common/vpr}/muxes/logic/mux6/mux6.sim.v | 0 {vpr => common/vpr}/muxes/logic/mux7/mux7.sim.v | 0 {vpr => common/vpr}/muxes/logic/mux8/CMakeLists.txt | 0 {vpr => common/vpr}/muxes/logic/mux8/mux8.sim.v | 0 {vpr => common/vpr}/obuf/CMakeLists.txt | 0 {vpr => common/vpr}/obuf/obuf.pb_type.xml | 0 {vpr => common/vpr}/pad/CMakeLists.txt | 0 {vpr => common/vpr}/pad/pad.pb_type.xml | 0 {vpr => common/vpr}/primitives.v | 0 {vpr => common/vpr}/wire/CMakeLists.txt | 0 {vpr => common/vpr}/wire/wire.pb_type.xml | 0 testarch/devices/clutff-bidir-s4/arch.xml | 4 ++-- testarch/devices/clutff-unidir-s4/arch.xml | 4 ++-- testarch/devices/ff-large/arch.xml | 4 ++-- testarch/devices/ff1/arch.xml | 2 +- testarch/devices/lutff-bidir-s4-g/arch.xml | 4 ++-- testarch/devices/lutff-bidir-s4/arch.xml | 4 ++-- testarch/devices/lutff-dpio-bidir-s4/arch.xml | 4 ++-- testarch/devices/lutff-multi-sw/arch.xml | 4 ++-- testarch/devices/lutff-unidir-s4/arch.xml | 4 ++-- testarch/devices/lutff3/arch.xml | 4 ++-- testarch/devices/test2/arch.xml | 2 +- testarch/devices/wire-bidir-min/arch.xml | 4 ++-- testarch/devices/wire-bidir-s4/arch.xml | 4 ++-- testarch/devices/wire-unidir-min/arch.xml | 4 ++-- testarch/devices/wire-unidir-s4/arch.xml | 4 ++-- testarch/tiles/wire/wire.pb_type.xml | 2 +- utils/update_tools/Makefile | 2 +- .../common_slice/routing/Nused/ntemplate.Nused.sim.v | 2 +- .../primitives/common_slice/routing/ceusedmux/ceusedmux.sim.v | 2 +- .../primitives/common_slice/routing/clkinv/clkinv.sim.v | 2 +- .../primitives/common_slice/routing/coutused/coutused.sim.v | 2 +- .../primitives/common_slice/routing/srusedmux/srusedmux.sim.v | 2 +- .../dsp48e1/carryinsel_logic/carryinsel_logic.sim.v | 2 +- xilinx/common/primitives/dsp48e1/nmux2/nmux2.sim.v | 2 +- 57 files changed, 38 insertions(+), 38 deletions(-) rename {vpr => common/vpr}/CMakeLists.txt (100%) rename {vpr => common/vpr}/buf/CMakeLists.txt (100%) rename {vpr => common/vpr}/buf/buf.model.xml (100%) rename {vpr => common/vpr}/buf/buf.pb_type.xml (100%) rename {vpr => common/vpr}/const/CMakeLists.txt (100%) rename {vpr => common/vpr}/const/const.pb_type.xml (100%) rename {vpr => common/vpr}/dual-pad/CMakeLists.txt (100%) rename {vpr => common/vpr}/dual-pad/dual-pad.pb_type.xml (100%) rename {vpr => common/vpr}/dual-pad/ibuf.pb_type.xml (100%) rename {vpr => common/vpr}/dual-pad/obuf.pb_type.xml (100%) rename {vpr => common/vpr}/ff/CMakeLists.txt (100%) rename {vpr => common/vpr}/ff/vpr_ff.sim.v (100%) rename {vpr => common/vpr}/ibuf/CMakeLists.txt (100%) rename {vpr => common/vpr}/ibuf/ibuf.pb_type.xml (100%) rename {vpr => common/vpr}/muxes/CMakeLists.txt (100%) rename {vpr => common/vpr}/muxes/logic/CMakeLists.txt (100%) rename {vpr => common/vpr}/muxes/logic/mux2/CMakeLists.txt (100%) rename {vpr => common/vpr}/muxes/logic/mux2/mux2.sim.v (100%) rename {vpr => common/vpr}/muxes/logic/mux2/simtest/test_mux2.py (100%) rename {vpr => common/vpr}/muxes/logic/mux4/mux4.sim.v (100%) rename {vpr => common/vpr}/muxes/logic/mux5/mux5.sim.v (100%) rename {vpr => common/vpr}/muxes/logic/mux6/mux6.sim.v (100%) rename {vpr => common/vpr}/muxes/logic/mux7/mux7.sim.v (100%) rename {vpr => common/vpr}/muxes/logic/mux8/CMakeLists.txt (100%) rename {vpr => common/vpr}/muxes/logic/mux8/mux8.sim.v (100%) rename {vpr => common/vpr}/obuf/CMakeLists.txt (100%) rename {vpr => common/vpr}/obuf/obuf.pb_type.xml (100%) rename {vpr => common/vpr}/pad/CMakeLists.txt (100%) rename {vpr => common/vpr}/pad/pad.pb_type.xml (100%) rename {vpr => common/vpr}/primitives.v (100%) rename {vpr => common/vpr}/wire/CMakeLists.txt (100%) rename {vpr => common/vpr}/wire/wire.pb_type.xml (100%) diff --git a/common/cmake/gen.cmake b/common/cmake/gen.cmake index 1b005a5864..e90f938b27 100644 --- a/common/cmake/gen.cmake +++ b/common/cmake/gen.cmake @@ -146,7 +146,7 @@ function(MUX_GEN) DEPENDS ${PYTHON3} ${f4pga-arch-defs_SOURCE_DIR}/utils/mux_gen.py - #${f4pga-arch-defs_SOURCE_DIR}/vpr/muxes/logic/mux${MUX_GEN_WIDTH}/mux${MUX_GEN_WIDTH}.sim.v + #${f4pga-arch-defs_SOURCE_DIR}/common/vpr/muxes/logic/mux${MUX_GEN_WIDTH}/mux${MUX_GEN_WIDTH}.sim.v COMMAND ${PYTHON3} ${f4pga-arch-defs_SOURCE_DIR}/utils/mux_gen.py ${MUX_GEN_ARGS} ) diff --git a/vpr/CMakeLists.txt b/common/vpr/CMakeLists.txt similarity index 100% rename from vpr/CMakeLists.txt rename to common/vpr/CMakeLists.txt diff --git a/vpr/buf/CMakeLists.txt b/common/vpr/buf/CMakeLists.txt similarity index 100% rename from vpr/buf/CMakeLists.txt rename to common/vpr/buf/CMakeLists.txt diff --git a/vpr/buf/buf.model.xml b/common/vpr/buf/buf.model.xml similarity index 100% rename from vpr/buf/buf.model.xml rename to common/vpr/buf/buf.model.xml diff --git a/vpr/buf/buf.pb_type.xml b/common/vpr/buf/buf.pb_type.xml similarity index 100% rename from vpr/buf/buf.pb_type.xml rename to common/vpr/buf/buf.pb_type.xml diff --git a/vpr/const/CMakeLists.txt b/common/vpr/const/CMakeLists.txt similarity index 100% rename from vpr/const/CMakeLists.txt rename to common/vpr/const/CMakeLists.txt diff --git a/vpr/const/const.pb_type.xml b/common/vpr/const/const.pb_type.xml similarity index 100% rename from vpr/const/const.pb_type.xml rename to common/vpr/const/const.pb_type.xml diff --git a/vpr/dual-pad/CMakeLists.txt b/common/vpr/dual-pad/CMakeLists.txt similarity index 100% rename from vpr/dual-pad/CMakeLists.txt rename to common/vpr/dual-pad/CMakeLists.txt diff --git a/vpr/dual-pad/dual-pad.pb_type.xml b/common/vpr/dual-pad/dual-pad.pb_type.xml similarity index 100% rename from vpr/dual-pad/dual-pad.pb_type.xml rename to common/vpr/dual-pad/dual-pad.pb_type.xml diff --git a/vpr/dual-pad/ibuf.pb_type.xml b/common/vpr/dual-pad/ibuf.pb_type.xml similarity index 100% rename from vpr/dual-pad/ibuf.pb_type.xml rename to common/vpr/dual-pad/ibuf.pb_type.xml diff --git a/vpr/dual-pad/obuf.pb_type.xml b/common/vpr/dual-pad/obuf.pb_type.xml similarity index 100% rename from vpr/dual-pad/obuf.pb_type.xml rename to common/vpr/dual-pad/obuf.pb_type.xml diff --git a/vpr/ff/CMakeLists.txt b/common/vpr/ff/CMakeLists.txt similarity index 100% rename from vpr/ff/CMakeLists.txt rename to common/vpr/ff/CMakeLists.txt diff --git a/vpr/ff/vpr_ff.sim.v b/common/vpr/ff/vpr_ff.sim.v similarity index 100% rename from vpr/ff/vpr_ff.sim.v rename to common/vpr/ff/vpr_ff.sim.v diff --git a/vpr/ibuf/CMakeLists.txt b/common/vpr/ibuf/CMakeLists.txt similarity index 100% rename from vpr/ibuf/CMakeLists.txt rename to common/vpr/ibuf/CMakeLists.txt diff --git a/vpr/ibuf/ibuf.pb_type.xml b/common/vpr/ibuf/ibuf.pb_type.xml similarity index 100% rename from vpr/ibuf/ibuf.pb_type.xml rename to common/vpr/ibuf/ibuf.pb_type.xml diff --git a/vpr/muxes/CMakeLists.txt b/common/vpr/muxes/CMakeLists.txt similarity index 100% rename from vpr/muxes/CMakeLists.txt rename to common/vpr/muxes/CMakeLists.txt diff --git a/vpr/muxes/logic/CMakeLists.txt b/common/vpr/muxes/logic/CMakeLists.txt similarity index 100% rename from vpr/muxes/logic/CMakeLists.txt rename to common/vpr/muxes/logic/CMakeLists.txt diff --git a/vpr/muxes/logic/mux2/CMakeLists.txt b/common/vpr/muxes/logic/mux2/CMakeLists.txt similarity index 100% rename from vpr/muxes/logic/mux2/CMakeLists.txt rename to common/vpr/muxes/logic/mux2/CMakeLists.txt diff --git a/vpr/muxes/logic/mux2/mux2.sim.v b/common/vpr/muxes/logic/mux2/mux2.sim.v similarity index 100% rename from vpr/muxes/logic/mux2/mux2.sim.v rename to common/vpr/muxes/logic/mux2/mux2.sim.v diff --git a/vpr/muxes/logic/mux2/simtest/test_mux2.py b/common/vpr/muxes/logic/mux2/simtest/test_mux2.py similarity index 100% rename from vpr/muxes/logic/mux2/simtest/test_mux2.py rename to common/vpr/muxes/logic/mux2/simtest/test_mux2.py diff --git a/vpr/muxes/logic/mux4/mux4.sim.v b/common/vpr/muxes/logic/mux4/mux4.sim.v similarity index 100% rename from vpr/muxes/logic/mux4/mux4.sim.v rename to common/vpr/muxes/logic/mux4/mux4.sim.v diff --git a/vpr/muxes/logic/mux5/mux5.sim.v b/common/vpr/muxes/logic/mux5/mux5.sim.v similarity index 100% rename from vpr/muxes/logic/mux5/mux5.sim.v rename to common/vpr/muxes/logic/mux5/mux5.sim.v diff --git a/vpr/muxes/logic/mux6/mux6.sim.v b/common/vpr/muxes/logic/mux6/mux6.sim.v similarity index 100% rename from vpr/muxes/logic/mux6/mux6.sim.v rename to common/vpr/muxes/logic/mux6/mux6.sim.v diff --git a/vpr/muxes/logic/mux7/mux7.sim.v b/common/vpr/muxes/logic/mux7/mux7.sim.v similarity index 100% rename from vpr/muxes/logic/mux7/mux7.sim.v rename to common/vpr/muxes/logic/mux7/mux7.sim.v diff --git a/vpr/muxes/logic/mux8/CMakeLists.txt b/common/vpr/muxes/logic/mux8/CMakeLists.txt similarity index 100% rename from vpr/muxes/logic/mux8/CMakeLists.txt rename to common/vpr/muxes/logic/mux8/CMakeLists.txt diff --git a/vpr/muxes/logic/mux8/mux8.sim.v b/common/vpr/muxes/logic/mux8/mux8.sim.v similarity index 100% rename from vpr/muxes/logic/mux8/mux8.sim.v rename to common/vpr/muxes/logic/mux8/mux8.sim.v diff --git a/vpr/obuf/CMakeLists.txt b/common/vpr/obuf/CMakeLists.txt similarity index 100% rename from vpr/obuf/CMakeLists.txt rename to common/vpr/obuf/CMakeLists.txt diff --git a/vpr/obuf/obuf.pb_type.xml b/common/vpr/obuf/obuf.pb_type.xml similarity index 100% rename from vpr/obuf/obuf.pb_type.xml rename to common/vpr/obuf/obuf.pb_type.xml diff --git a/vpr/pad/CMakeLists.txt b/common/vpr/pad/CMakeLists.txt similarity index 100% rename from vpr/pad/CMakeLists.txt rename to common/vpr/pad/CMakeLists.txt diff --git a/vpr/pad/pad.pb_type.xml b/common/vpr/pad/pad.pb_type.xml similarity index 100% rename from vpr/pad/pad.pb_type.xml rename to common/vpr/pad/pad.pb_type.xml diff --git a/vpr/primitives.v b/common/vpr/primitives.v similarity index 100% rename from vpr/primitives.v rename to common/vpr/primitives.v diff --git a/vpr/wire/CMakeLists.txt b/common/vpr/wire/CMakeLists.txt similarity index 100% rename from vpr/wire/CMakeLists.txt rename to common/vpr/wire/CMakeLists.txt diff --git a/vpr/wire/wire.pb_type.xml b/common/vpr/wire/wire.pb_type.xml similarity index 100% rename from vpr/wire/wire.pb_type.xml rename to common/vpr/wire/wire.pb_type.xml diff --git a/testarch/devices/clutff-bidir-s4/arch.xml b/testarch/devices/clutff-bidir-s4/arch.xml index e63d59965b..bc4c393921 100644 --- a/testarch/devices/clutff-bidir-s4/arch.xml +++ b/testarch/devices/clutff-bidir-s4/arch.xml @@ -7,8 +7,8 @@ - - + + diff --git a/testarch/devices/clutff-unidir-s4/arch.xml b/testarch/devices/clutff-unidir-s4/arch.xml index cbe8b74acb..fd3bdb2da7 100644 --- a/testarch/devices/clutff-unidir-s4/arch.xml +++ b/testarch/devices/clutff-unidir-s4/arch.xml @@ -9,8 +9,8 @@ - - + + diff --git a/testarch/devices/ff-large/arch.xml b/testarch/devices/ff-large/arch.xml index 1404d9c79b..ca0c2b1b5b 100644 --- a/testarch/devices/ff-large/arch.xml +++ b/testarch/devices/ff-large/arch.xml @@ -10,8 +10,8 @@ - - + + diff --git a/testarch/devices/ff1/arch.xml b/testarch/devices/ff1/arch.xml index 47ef66f487..721783455d 100644 --- a/testarch/devices/ff1/arch.xml +++ b/testarch/devices/ff1/arch.xml @@ -37,7 +37,7 @@ - + diff --git a/testarch/devices/lutff-bidir-s4-g/arch.xml b/testarch/devices/lutff-bidir-s4-g/arch.xml index e2c17d4056..e7e9b6dfc6 100644 --- a/testarch/devices/lutff-bidir-s4-g/arch.xml +++ b/testarch/devices/lutff-bidir-s4-g/arch.xml @@ -7,8 +7,8 @@ - - + + diff --git a/testarch/devices/lutff-bidir-s4/arch.xml b/testarch/devices/lutff-bidir-s4/arch.xml index d28bcd885e..1c6672a9c7 100644 --- a/testarch/devices/lutff-bidir-s4/arch.xml +++ b/testarch/devices/lutff-bidir-s4/arch.xml @@ -7,8 +7,8 @@ - - + + diff --git a/testarch/devices/lutff-dpio-bidir-s4/arch.xml b/testarch/devices/lutff-dpio-bidir-s4/arch.xml index 437be3e24e..643eeee026 100644 --- a/testarch/devices/lutff-dpio-bidir-s4/arch.xml +++ b/testarch/devices/lutff-dpio-bidir-s4/arch.xml @@ -7,8 +7,8 @@ - - + + diff --git a/testarch/devices/lutff-multi-sw/arch.xml b/testarch/devices/lutff-multi-sw/arch.xml index 95063a1df7..62bb5452b4 100644 --- a/testarch/devices/lutff-multi-sw/arch.xml +++ b/testarch/devices/lutff-multi-sw/arch.xml @@ -7,8 +7,8 @@ - - + + diff --git a/testarch/devices/lutff-unidir-s4/arch.xml b/testarch/devices/lutff-unidir-s4/arch.xml index 4d43d3bf31..8f9e748fcf 100644 --- a/testarch/devices/lutff-unidir-s4/arch.xml +++ b/testarch/devices/lutff-unidir-s4/arch.xml @@ -7,8 +7,8 @@ - - + + diff --git a/testarch/devices/lutff3/arch.xml b/testarch/devices/lutff3/arch.xml index 8aa7da61a2..8d590f46e3 100644 --- a/testarch/devices/lutff3/arch.xml +++ b/testarch/devices/lutff3/arch.xml @@ -7,8 +7,8 @@ - - + + diff --git a/testarch/devices/test2/arch.xml b/testarch/devices/test2/arch.xml index 4fad355197..001d1a2e80 100644 --- a/testarch/devices/test2/arch.xml +++ b/testarch/devices/test2/arch.xml @@ -50,7 +50,7 @@ - + diff --git a/testarch/devices/wire-bidir-min/arch.xml b/testarch/devices/wire-bidir-min/arch.xml index b24a026f87..89e1390629 100644 --- a/testarch/devices/wire-bidir-min/arch.xml +++ b/testarch/devices/wire-bidir-min/arch.xml @@ -7,8 +7,8 @@ - - + + diff --git a/testarch/devices/wire-bidir-s4/arch.xml b/testarch/devices/wire-bidir-s4/arch.xml index 094cff4665..1a78f7e4fe 100644 --- a/testarch/devices/wire-bidir-s4/arch.xml +++ b/testarch/devices/wire-bidir-s4/arch.xml @@ -7,8 +7,8 @@ - - + + diff --git a/testarch/devices/wire-unidir-min/arch.xml b/testarch/devices/wire-unidir-min/arch.xml index 67d4685d28..a269c3e1bd 100644 --- a/testarch/devices/wire-unidir-min/arch.xml +++ b/testarch/devices/wire-unidir-min/arch.xml @@ -7,8 +7,8 @@ - - + + diff --git a/testarch/devices/wire-unidir-s4/arch.xml b/testarch/devices/wire-unidir-s4/arch.xml index e386acc548..b13a1cf83d 100644 --- a/testarch/devices/wire-unidir-s4/arch.xml +++ b/testarch/devices/wire-unidir-s4/arch.xml @@ -7,8 +7,8 @@ - - + + diff --git a/testarch/tiles/wire/wire.pb_type.xml b/testarch/tiles/wire/wire.pb_type.xml index 44666e536a..b5138d92f8 100644 --- a/testarch/tiles/wire/wire.pb_type.xml +++ b/testarch/tiles/wire/wire.pb_type.xml @@ -4,7 +4,7 @@ - + diff --git a/utils/update_tools/Makefile b/utils/update_tools/Makefile index 04af8e3625..c7bd5c1ae6 100644 --- a/utils/update_tools/Makefile +++ b/utils/update_tools/Makefile @@ -15,7 +15,7 @@ update-vtr: # Testing that VTR is correctly integrated in SymbiFlow pushd ${VTR_LOCATION}; \ make -j`nproc`; \ - export VTR=`pwd`/build/vpr/vpr; \ + export VTR=`pwd`/build/common/vpr/vpr; \ export GENFASM=`pwd`/build/utils/fasm/genfasm; \ popd \ make all_xc7 -j${NPROC} && make all_ice40 -j${NPROC} && make all_v2x -j${NPROC} diff --git a/xilinx/common/primitives/common_slice/routing/Nused/ntemplate.Nused.sim.v b/xilinx/common/primitives/common_slice/routing/Nused/ntemplate.Nused.sim.v index a8e020e33b..c53f122d64 100644 --- a/xilinx/common/primitives/common_slice/routing/Nused/ntemplate.Nused.sim.v +++ b/xilinx/common/primitives/common_slice/routing/Nused/ntemplate.Nused.sim.v @@ -1,4 +1,4 @@ -`include "../../../../../../vpr/muxes/logic/mux2/mux2.sim.v" +`include "../../../../../../common/vpr/muxes/logic/mux2/mux2.sim.v" module {N}USED(I0, O); diff --git a/xilinx/common/primitives/common_slice/routing/ceusedmux/ceusedmux.sim.v b/xilinx/common/primitives/common_slice/routing/ceusedmux/ceusedmux.sim.v index 5bde36b6cb..ad010b5c25 100644 --- a/xilinx/common/primitives/common_slice/routing/ceusedmux/ceusedmux.sim.v +++ b/xilinx/common/primitives/common_slice/routing/ceusedmux/ceusedmux.sim.v @@ -1,4 +1,4 @@ -`include "../../../../../../vpr/muxes/logic/mux2/mux2.sim.v" +`include "../../../../../../common/vpr/muxes/logic/mux2/mux2.sim.v" module CEUSEDMUX(IN, OUT); input wire IN; diff --git a/xilinx/common/primitives/common_slice/routing/clkinv/clkinv.sim.v b/xilinx/common/primitives/common_slice/routing/clkinv/clkinv.sim.v index 2d84648261..32448146f7 100644 --- a/xilinx/common/primitives/common_slice/routing/clkinv/clkinv.sim.v +++ b/xilinx/common/primitives/common_slice/routing/clkinv/clkinv.sim.v @@ -1,4 +1,4 @@ -`include "../../../../../../vpr/muxes/logic/mux2/mux2.sim.v" +`include "../../../../../../common/vpr/muxes/logic/mux2/mux2.sim.v" module CLKINV(CLK, OUT); input wire CLK; diff --git a/xilinx/common/primitives/common_slice/routing/coutused/coutused.sim.v b/xilinx/common/primitives/common_slice/routing/coutused/coutused.sim.v index f0782bb7f0..023479f185 100644 --- a/xilinx/common/primitives/common_slice/routing/coutused/coutused.sim.v +++ b/xilinx/common/primitives/common_slice/routing/coutused/coutused.sim.v @@ -1,4 +1,4 @@ -`include "../../../../../../vpr/muxes/logic/mux2/mux2.sim.v" +`include "../../../../../../common/vpr/muxes/logic/mux2/mux2.sim.v" module COUTUSED(IN, OUT); input wire IN; diff --git a/xilinx/common/primitives/common_slice/routing/srusedmux/srusedmux.sim.v b/xilinx/common/primitives/common_slice/routing/srusedmux/srusedmux.sim.v index a97e4c0e29..f7be4e268a 100644 --- a/xilinx/common/primitives/common_slice/routing/srusedmux/srusedmux.sim.v +++ b/xilinx/common/primitives/common_slice/routing/srusedmux/srusedmux.sim.v @@ -1,4 +1,4 @@ -`include "../../../../../../vpr/muxes/logic/mux2/mux2.sim.v" +`include "../../../../../../common/vpr/muxes/logic/mux2/mux2.sim.v" module SRUSEDMUX(IN, OUT); input wire IN; diff --git a/xilinx/common/primitives/dsp48e1/carryinsel_logic/carryinsel_logic.sim.v b/xilinx/common/primitives/dsp48e1/carryinsel_logic/carryinsel_logic.sim.v index fed2a62214..3bad517214 100644 --- a/xilinx/common/primitives/dsp48e1/carryinsel_logic/carryinsel_logic.sim.v +++ b/xilinx/common/primitives/dsp48e1/carryinsel_logic/carryinsel_logic.sim.v @@ -1,4 +1,4 @@ -`include "../../../../../vpr/muxes/logic/mux8/mux8.sim.v" +`include "../../../../../common/vpr/muxes/logic/mux8/mux8.sim.v" `include "../nreg/reg.sim.v" `include "carryin_mux/carryin_mux.sim.v" diff --git a/xilinx/common/primitives/dsp48e1/nmux2/nmux2.sim.v b/xilinx/common/primitives/dsp48e1/nmux2/nmux2.sim.v index 6c7fb12389..edf0c5990d 100644 --- a/xilinx/common/primitives/dsp48e1/nmux2/nmux2.sim.v +++ b/xilinx/common/primitives/dsp48e1/nmux2/nmux2.sim.v @@ -1,4 +1,4 @@ -`include "../../../../../vpr/muxes/logic/mux2/mux2.sim.v" +`include "../../../../../common/vpr/muxes/logic/mux2/mux2.sim.v" module NMUX2 (