Skip to content

Commit

Permalink
mv vpr/ common/
Browse files Browse the repository at this point in the history 
Signed-off-by: Unai Martinez-Corral <[email protected]>
  • Loading branch information
@umarcor
umarcor committed Sep 1, 2022
1 parent d7d3212 commit b8dfc59
Show file tree
Hide file tree
Showing 57 changed files with 38 additions and 38 deletions.
2 changes: 1 addition & 1 deletion common/cmake/gen.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}
)

Expand Down
0 vpr/CMakeLists.txt → common/vpr/CMakeLists.txt
View file
File renamed without changes.
0 vpr/buf/CMakeLists.txt → common/vpr/buf/CMakeLists.txt
View file
File renamed without changes.
0 vpr/buf/buf.model.xml → common/vpr/buf/buf.model.xml
View file
File renamed without changes.
0 vpr/buf/buf.pb_type.xml → common/vpr/buf/buf.pb_type.xml
View file
File renamed without changes.
0 vpr/const/CMakeLists.txt → common/vpr/const/CMakeLists.txt
View file
File renamed without changes.
0 vpr/const/const.pb_type.xml → common/vpr/const/const.pb_type.xml
View file
File renamed without changes.
0 vpr/dual-pad/CMakeLists.txt → common/vpr/dual-pad/CMakeLists.txt
View file
File renamed without changes.
0 vpr/dual-pad/dual-pad.pb_type.xml → common/vpr/dual-pad/dual-pad.pb_type.xml
View file
File renamed without changes.
0 vpr/dual-pad/ibuf.pb_type.xml → common/vpr/dual-pad/ibuf.pb_type.xml
View file
File renamed without changes.
0 vpr/dual-pad/obuf.pb_type.xml → common/vpr/dual-pad/obuf.pb_type.xml
View file
File renamed without changes.
0 vpr/ff/CMakeLists.txt → common/vpr/ff/CMakeLists.txt
View file
File renamed without changes.
0 vpr/ff/vpr_ff.sim.v → common/vpr/ff/vpr_ff.sim.v
View file
File renamed without changes.
0 vpr/ibuf/CMakeLists.txt → common/vpr/ibuf/CMakeLists.txt
View file
File renamed without changes.
0 vpr/ibuf/ibuf.pb_type.xml → common/vpr/ibuf/ibuf.pb_type.xml
View file
File renamed without changes.
0 vpr/muxes/CMakeLists.txt → common/vpr/muxes/CMakeLists.txt
View file
File renamed without changes.
0 vpr/muxes/logic/CMakeLists.txt → common/vpr/muxes/logic/CMakeLists.txt
View file
File renamed without changes.
0 vpr/muxes/logic/mux2/CMakeLists.txt → common/vpr/muxes/logic/mux2/CMakeLists.txt
View file
File renamed without changes.
0 vpr/muxes/logic/mux2/mux2.sim.v → common/vpr/muxes/logic/mux2/mux2.sim.v
View file
File renamed without changes.
0 vpr/muxes/logic/mux2/simtest/test_mux2.py → ...vpr/muxes/logic/mux2/simtest/test_mux2.py
View file
File renamed without changes.
0 vpr/muxes/logic/mux4/mux4.sim.v → common/vpr/muxes/logic/mux4/mux4.sim.v
View file
File renamed without changes.
0 vpr/muxes/logic/mux5/mux5.sim.v → common/vpr/muxes/logic/mux5/mux5.sim.v
View file
File renamed without changes.
0 vpr/muxes/logic/mux6/mux6.sim.v → common/vpr/muxes/logic/mux6/mux6.sim.v
View file
File renamed without changes.
0 vpr/muxes/logic/mux7/mux7.sim.v → common/vpr/muxes/logic/mux7/mux7.sim.v
View file
File renamed without changes.
0 vpr/muxes/logic/mux8/CMakeLists.txt → common/vpr/muxes/logic/mux8/CMakeLists.txt
View file
File renamed without changes.
0 vpr/muxes/logic/mux8/mux8.sim.v → common/vpr/muxes/logic/mux8/mux8.sim.v
View file
File renamed without changes.
0 vpr/obuf/CMakeLists.txt → common/vpr/obuf/CMakeLists.txt
View file
File renamed without changes.
0 vpr/obuf/obuf.pb_type.xml → common/vpr/obuf/obuf.pb_type.xml
View file
File renamed without changes.
0 vpr/pad/CMakeLists.txt → common/vpr/pad/CMakeLists.txt
View file
File renamed without changes.
0 vpr/pad/pad.pb_type.xml → common/vpr/pad/pad.pb_type.xml
View file
File renamed without changes.
0 vpr/primitives.v → common/vpr/primitives.v
View file
File renamed without changes.
0 vpr/wire/CMakeLists.txt → common/vpr/wire/CMakeLists.txt
View file
File renamed without changes.
0 vpr/wire/wire.pb_type.xml → common/vpr/wire/wire.pb_type.xml
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions testarch/devices/clutff-bidir-s4/arch.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
<xi:include href="../layouts/all.xml" xpointer="xpointer(layout/child::node())" />
</layout>
<complexblocklist>
<xi:include href="../../../vpr/ibuf/ibuf.pb_type.xml"/>
<xi:include href="../../../vpr/obuf/obuf.pb_type.xml"/>
<xi:include href="../../../common/vpr/ibuf/ibuf.pb_type.xml"/>
<xi:include href="../../../common/vpr/obuf/obuf.pb_type.xml"/>
<xi:include href="../../tiles/clutff/clutff.pb_type.xml"/>
</complexblocklist>
<directlist>
Expand Down
4 changes: 2 additions & 2 deletions testarch/devices/clutff-unidir-s4/arch.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
<xi:include href="../layouts/all.xml" xpointer="xpointer(layout/child::node())" />
</layout>
<complexblocklist>
<xi:include href="../../../vpr/ibuf/ibuf.pb_type.xml"/>
<xi:include href="../../../vpr/obuf/obuf.pb_type.xml"/>
<xi:include href="../../../common/vpr/ibuf/ibuf.pb_type.xml"/>
<xi:include href="../../../common/vpr/obuf/obuf.pb_type.xml"/>
<xi:include href="../../tiles/clutff/clutff.pb_type.xml"/>
<xi:include href="../../tiles/const/gnd.pb_type.xml"/>
<xi:include href="../../tiles/const/vcc.pb_type.xml"/>
Expand Down
4 changes: 2 additions & 2 deletions testarch/devices/ff-large/arch.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
</layout>

<complexblocklist>
<xi:include href="../../../vpr/ibuf/ibuf.pb_type.xml"/>
<xi:include href="../../../vpr/obuf/obuf.pb_type.xml"/>
<xi:include href="../../../common/vpr/ibuf/ibuf.pb_type.xml"/>
<xi:include href="../../../common/vpr/obuf/obuf.pb_type.xml"/>
<xi:include href="../../tiles/ff-large/ff-large.pb_type.xml"/>
</complexblocklist>

Expand Down
2 changes: 1 addition & 1 deletion testarch/devices/ff1/arch.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
</device>

<complexblocklist>
<xi:include href="../../../vpr/pad/pad.pb_type.xml"/>
<xi:include href="../../../common/vpr/pad/pad.pb_type.xml"/>
<xi:include href="../../tiles/ff1/ff1.pb_type.xml"/>
</complexblocklist>

Expand Down
4 changes: 2 additions & 2 deletions testarch/devices/lutff-bidir-s4-g/arch.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
<xi:include href="../layouts/all.xml" xpointer="xpointer(layout/child::node())" />
</layout>
<complexblocklist>
<xi:include href="../../../vpr/ibuf/ibuf.pb_type.xml"/>
<xi:include href="../../../vpr/obuf/obuf.pb_type.xml"/>
<xi:include href="../../../common/vpr/ibuf/ibuf.pb_type.xml"/>
<xi:include href="../../../common/vpr/obuf/obuf.pb_type.xml"/>
<xi:include href="../../tiles/lutff/lutff.pb_type.xml"/>
</complexblocklist>

Expand Down
4 changes: 2 additions & 2 deletions testarch/devices/lutff-bidir-s4/arch.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
<xi:include href="../layouts/all.xml" xpointer="xpointer(layout/child::node())" />
</layout>
<complexblocklist>
<xi:include href="../../../vpr/ibuf/ibuf.pb_type.xml"/>
<xi:include href="../../../vpr/obuf/obuf.pb_type.xml"/>
<xi:include href="../../../common/vpr/ibuf/ibuf.pb_type.xml"/>
<xi:include href="../../../common/vpr/obuf/obuf.pb_type.xml"/>
<xi:include href="../../tiles/lutff/lutff.pb_type.xml"/>
</complexblocklist>

Expand Down
4 changes: 2 additions & 2 deletions testarch/devices/lutff-dpio-bidir-s4/arch.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
<xi:include href="../layouts/all.xml" xpointer="xpointer(layout/child::node())" />
</layout>
<complexblocklist>
<xi:include href="../../../vpr/dual-pad/ibuf.pb_type.xml"/>
<xi:include href="../../../vpr/dual-pad/obuf.pb_type.xml"/>
<xi:include href="../../../common/vpr/dual-pad/ibuf.pb_type.xml"/>
<xi:include href="../../../common/vpr/dual-pad/obuf.pb_type.xml"/>
<xi:include href="../../tiles/lutff/lutff.pb_type.xml"/>
</complexblocklist>

Expand Down
4 changes: 2 additions & 2 deletions testarch/devices/lutff-multi-sw/arch.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
<xi:include href="../layouts/all.xml" xpointer="xpointer(layout/child::node())" />
</layout>
<complexblocklist>
<xi:include href="../../../vpr/ibuf/ibuf.pb_type.xml"/>
<xi:include href="../../../vpr/obuf/obuf.pb_type.xml"/>
<xi:include href="../../../common/vpr/ibuf/ibuf.pb_type.xml"/>
<xi:include href="../../../common/vpr/obuf/obuf.pb_type.xml"/>
<xi:include href="../../tiles/lutff/lutff.pb_type.xml"/>
</complexblocklist>

Expand Down
4 changes: 2 additions & 2 deletions testarch/devices/lutff-unidir-s4/arch.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
<xi:include href="../layouts/all.xml" xpointer="xpointer(layout/child::node())" />
</layout>
<complexblocklist>
<xi:include href="../../../vpr/ibuf/ibuf.pb_type.xml"/>
<xi:include href="../../../vpr/obuf/obuf.pb_type.xml"/>
<xi:include href="../../../common/vpr/ibuf/ibuf.pb_type.xml"/>
<xi:include href="../../../common/vpr/obuf/obuf.pb_type.xml"/>
<xi:include href="../../tiles/lutff/lutff.pb_type.xml"/>
</complexblocklist>

Expand Down
4 changes: 2 additions & 2 deletions testarch/devices/lutff3/arch.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
<xi:include href="../layouts/all.xml" xpointer="xpointer(layout/child::node())" />
</layout>
<complexblocklist>
<xi:include href="../../../vpr/ibuf/ibuf.pb_type.xml"/>
<xi:include href="../../../vpr/obuf/obuf.pb_type.xml"/>
<xi:include href="../../../common/vpr/ibuf/ibuf.pb_type.xml"/>
<xi:include href="../../../common/vpr/obuf/obuf.pb_type.xml"/>
<xi:include href="../../tiles/lutff3/lutff3.pb_type.xml"/>
</complexblocklist>

Expand Down
2 changes: 1 addition & 1 deletion testarch/devices/test2/arch.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
</segment>
</segmentlist>
<complexblocklist>
<xi:include href="../../../vpr/pad/pad.pb_type.xml"/>
<xi:include href="../../../common/vpr/pad/pad.pb_type.xml"/>
<xi:include href="../../tiles/lutff3/lutff3.pb_type.xml"/>
</complexblocklist>

Expand Down
4 changes: 2 additions & 2 deletions testarch/devices/wire-bidir-min/arch.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
<xi:include href="../layouts/all.xml" xpointer="xpointer(layout/child::node())" />
</layout>
<complexblocklist>
<xi:include href="../../../vpr/ibuf/ibuf.pb_type.xml"/>
<xi:include href="../../../vpr/obuf/obuf.pb_type.xml"/>
<xi:include href="../../../common/vpr/ibuf/ibuf.pb_type.xml"/>
<xi:include href="../../../common/vpr/obuf/obuf.pb_type.xml"/>
<xi:include href="../../tiles/wire/wire.pb_type.xml" />
</complexblocklist>

Expand Down
4 changes: 2 additions & 2 deletions testarch/devices/wire-bidir-s4/arch.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
<xi:include href="../layouts/all.xml" xpointer="xpointer(layout/child::node())" />
</layout>
<complexblocklist>
<xi:include href="../../../vpr/ibuf/ibuf.pb_type.xml"/>
<xi:include href="../../../vpr/obuf/obuf.pb_type.xml"/>
<xi:include href="../../../common/vpr/ibuf/ibuf.pb_type.xml"/>
<xi:include href="../../../common/vpr/obuf/obuf.pb_type.xml"/>
<xi:include href="../../tiles/wire/wire.pb_type.xml" />
</complexblocklist>

Expand Down
4 changes: 2 additions & 2 deletions testarch/devices/wire-unidir-min/arch.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
<xi:include href="../layouts/all.xml" xpointer="xpointer(layout/child::node())" />
</layout>
<complexblocklist>
<xi:include href="../../../vpr/ibuf/ibuf.pb_type.xml"/>
<xi:include href="../../../vpr/obuf/obuf.pb_type.xml"/>
<xi:include href="../../../common/vpr/ibuf/ibuf.pb_type.xml"/>
<xi:include href="../../../common/vpr/obuf/obuf.pb_type.xml"/>
<xi:include href="../../tiles/wire/wire.pb_type.xml" />
</complexblocklist>

Expand Down
4 changes: 2 additions & 2 deletions testarch/devices/wire-unidir-s4/arch.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
<xi:include href="../layouts/all.xml" xpointer="xpointer(layout/child::node())" />
</layout>
<complexblocklist>
<xi:include href="../../../vpr/ibuf/ibuf.pb_type.xml"/>
<xi:include href="../../../vpr/obuf/obuf.pb_type.xml"/>
<xi:include href="../../../common/vpr/ibuf/ibuf.pb_type.xml"/>
<xi:include href="../../../common/vpr/obuf/obuf.pb_type.xml"/>
<xi:include href="../../tiles/wire/wire.pb_type.xml" />
</complexblocklist>

Expand Down
2 changes: 1 addition & 1 deletion testarch/tiles/wire/wire.pb_type.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<!-- Tile Outputs -->
<output name="OUT" num_pins="1" />

<xi:include href="../../../vpr/wire/wire.pb_type.xml"/>
<xi:include href="../../../common/vpr/wire/wire.pb_type.xml"/>

<interconnect>
<direct name="TILE.IN" input="TILE.IN" output="WIRE.in" />
Expand Down
2 changes: 1 addition & 1 deletion utils/update_tools/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
2 changes: 1 addition & 1 deletion xilinx/common/primitives/common_slice/routing/Nused/ntemplate.Nused.sim.v
View file
Original file line number Diff line number Diff line change
@@ -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);

Expand Down
2 changes: 1 addition & 1 deletion xilinx/common/primitives/common_slice/routing/ceusedmux/ceusedmux.sim.v
View file
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion xilinx/common/primitives/common_slice/routing/clkinv/clkinv.sim.v
View file
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion xilinx/common/primitives/common_slice/routing/coutused/coutused.sim.v
View file
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion xilinx/common/primitives/common_slice/routing/srusedmux/srusedmux.sim.v
View file
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion xilinx/common/primitives/dsp48e1/carryinsel_logic/carryinsel_logic.sim.v
View file
Original file line number Diff line number Diff line change
@@ -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"

Expand Down
2 changes: 1 addition & 1 deletion xilinx/common/primitives/dsp48e1/nmux2/nmux2.sim.v
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
`include "../../../../../vpr/muxes/logic/mux2/mux2.sim.v"
`include "../../../../../common/vpr/muxes/logic/mux2/mux2.sim.v"

module NMUX2
(
Expand Down

0 comments on commit b8dfc59

Please sign in to comment.