mirrors/yosys
3
0
Fork 0
mirror of https://github.com/YosysHQ/yosys synced 2025-11-04 05:19:11 +00:00
Code Activity

Revert "Fix xilinx tests, when iopads are default"

Browse source 
This reverts commit 477e43d921.
This commit is contained in:
Miodrag Milanovic 2019-12-28 16:12:45 +01:00
parent 436fea9e69
commit 509da7ed1a
16 changed files with 40 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tests/arch/xilinx/add_sub.ys
View file

@ -7,5 +7,5 @@ cd top # Constrain all select calls below inside the top module
select -assert-count 14 t:LUT2
select -assert-count 6 t:MUXCY
select -assert-count 8 t:XORCY
select -assert-none t:LUT2 t:MUXCY t:XORCY t:IBUF t:OBUF %% t:* %D
select -assert-none t:LUT2 t:MUXCY t:XORCY %% t:* %D

8
tests/arch/xilinx/adffs.ys
View file

@ -9,7 +9,7 @@ cd adff # Constrain all select calls below inside the top module
select -assert-count 1 t:BUFG
select -assert-count 1 t:FDCE
select -assert-none t:BUFG t:FDCE t:IBUF t:OBUF %% t:* %D
select -assert-none t:BUFG t:FDCE %% t:* %D
design -load read
@ -22,7 +22,7 @@ select -assert-count 1 t:BUFG
select -assert-count 1 t:FDCE
select -assert-count 1 t:INV
select -assert-none t:BUFG t:FDCE t:INV t:IBUF t:OBUF %% t:* %D
select -assert-none t:BUFG t:FDCE t:INV %% t:* %D
design -load read
@ -34,7 +34,7 @@ cd dffs # Constrain all select calls below inside the top module
select -assert-count 1 t:BUFG
select -assert-count 1 t:FDSE
select -assert-none t:BUFG t:FDSE t:IBUF t:OBUF %% t:* %D
select -assert-none t:BUFG t:FDSE %% t:* %D
design -load read
@ -47,4 +47,4 @@ select -assert-count 1 t:BUFG
select -assert-count 1 t:FDRE_1
select -assert-count 1 t:INV
select -assert-none t:BUFG t:FDRE_1 t:INV t:IBUF t:OBUF %% t:* %D
select -assert-none t:BUFG t:FDRE_1 t:INV %% t:* %D

2
tests/arch/xilinx/bug1460.ys
View file

@ -31,4 +31,4 @@ EOT
synth_xilinx
cd register_file
select -assert-count 32 t:RAM32M
select -assert-none t:* t:BUFG %d t:IBUF %d t:OBUF %d t:RAM32M %d
select -assert-none t:* t:BUFG %d t:RAM32M %d

2
tests/arch/xilinx/counter.ys
View file

@ -11,4 +11,4 @@ select -assert-count 8 t:FDCE
select -assert-count 1 t:INV
select -assert-count 7 t:MUXCY
select -assert-count 8 t:XORCY
select -assert-none t:BUFG t:FDCE t:INV t:MUXCY t:XORCY t:IBUF t:OBUF %% t:* %D
select -assert-none t:BUFG t:FDCE t:INV t:MUXCY t:XORCY %% t:* %D

4
tests/arch/xilinx/dffs.ys
View file

@ -9,7 +9,7 @@ cd dff # Constrain all select calls below inside the top module
select -assert-count 1 t:BUFG
select -assert-count 1 t:FDRE
select -assert-none t:BUFG t:FDRE t:IBUF t:OBUF %% t:* %D
select -assert-none t:BUFG t:FDRE %% t:* %D
design -load read
@ -21,5 +21,5 @@ cd dffe # Constrain all select calls below inside the top module
select -assert-count 1 t:BUFG
select -assert-count 1 t:FDRE
select -assert-none t:BUFG t:FDRE t:IBUF t:OBUF %% t:* %D
select -assert-none t:BUFG t:FDRE %% t:* %D

2
tests/arch/xilinx/dsp_fastfir.ys
View file

@ -66,4 +66,4 @@ EOT
synth_xilinx
cd fastfir_dynamictaps
select -assert-count 2 t:DSP48E1
select -assert-none t:* t:DSP48E1 %d t:BUFG %d t:IBUF %d t:OBUF %d
select -assert-none t:* t:DSP48E1 %d t:BUFG %d

2
tests/arch/xilinx/fsm.ys
View file

@ -16,4 +16,4 @@ select -assert-count 1 t:FDSE
select -assert-count 1 t:LUT2
select -assert-count 3 t:LUT5
select -assert-count 1 t:LUT6
select -assert-none t:BUFG t:IBUF t:OBUF t:FDRE t:FDSE t:LUT2 t:LUT5 t:LUT6 %% t:* %D
select -assert-none t:BUFG t:FDRE t:FDSE t:LUT2 t:LUT5 t:LUT6 %% t:* %D

6
tests/arch/xilinx/latches.ys
View file

@ -8,7 +8,7 @@ design -load postopt # load the post-opt design (otherwise equiv_opt loads the p
cd latchp # Constrain all select calls below inside the top module
select -assert-count 1 t:LDCE
select -assert-none t:LDCE t:IBUF t:OBUF %% t:* %D
select -assert-none t:LDCE %% t:* %D
design -load read
@ -20,7 +20,7 @@ cd latchn # Constrain all select calls below inside the top module
select -assert-count 1 t:LDCE
select -assert-count 1 t:INV
select -assert-none t:LDCE t:INV t:IBUF t:OBUF %% t:* %D
select -assert-none t:LDCE t:INV %% t:* %D
design -load read
@ -32,4 +32,4 @@ cd latchsr # Constrain all select calls below inside the top module
select -assert-count 1 t:LDCE
select -assert-count 2 t:LUT3
select -assert-none t:LDCE t:LUT3 t:IBUF t:OBUF %% t:* %D
select -assert-none t:LDCE t:LUT3 %% t:* %D

2
tests/arch/xilinx/logic.ys
View file

@ -8,4 +8,4 @@ cd top # Constrain all select calls below inside the top module
select -assert-count 1 t:INV
select -assert-count 6 t:LUT2
select -assert-count 2 t:LUT4
select -assert-none t:INV t:LUT2 t:LUT4 t:IBUF t:OBUF %% t:* %D
select -assert-none t:INV t:LUT2 t:LUT4 %% t:* %D

14
tests/arch/xilinx/lutram.ys
View file

@ -14,7 +14,7 @@
#select -assert-count 1 t:BUFG
#select -assert-count 8 t:FDRE
#select -assert-count 8 t:RAM16X1D
#select -assert-none t:BUFG t:FDRE t:RAM16X1D t:IBUF t:OBUF %% t:* %D
#select -assert-none t:BUFG t:FDRE t:RAM16X1D %% t:* %D
design -reset
@ -34,7 +34,7 @@ cd lutram_1w1r
select -assert-count 1 t:BUFG
select -assert-count 8 t:FDRE
select -assert-count 8 t:RAM32X1D
select -assert-none t:BUFG t:FDRE t:RAM32X1D t:IBUF t:OBUF %% t:* %D
select -assert-none t:BUFG t:FDRE t:RAM32X1D %% t:* %D
design -reset
@ -54,7 +54,7 @@ cd lutram_1w1r
select -assert-count 1 t:BUFG
select -assert-count 8 t:FDRE
select -assert-count 8 t:RAM64X1D
select -assert-none t:BUFG t:FDRE t:RAM64X1D t:IBUF t:OBUF %% t:* %D
select -assert-none t:BUFG t:FDRE t:RAM64X1D %% t:* %D
design -reset
@ -74,7 +74,7 @@ cd lutram_1w3r
select -assert-count 1 t:BUFG
select -assert-count 24 t:FDRE
select -assert-count 4 t:RAM32M
select -assert-none t:BUFG t:FDRE t:RAM32M t:IBUF t:OBUF %% t:* %D
select -assert-none t:BUFG t:FDRE t:RAM32M %% t:* %D
design -reset
@ -94,7 +94,7 @@ cd lutram_1w3r
select -assert-count 1 t:BUFG
select -assert-count 24 t:FDRE
select -assert-count 8 t:RAM64M
select -assert-none t:BUFG t:FDRE t:RAM64M t:IBUF t:OBUF %% t:* %D
select -assert-none t:BUFG t:FDRE t:RAM64M %% t:* %D
design -reset
@ -114,7 +114,7 @@ cd lutram_1w1r
select -assert-count 1 t:BUFG
select -assert-count 6 t:FDRE
select -assert-count 1 t:RAM32M
select -assert-none t:BUFG t:FDRE t:RAM32M t:IBUF t:OBUF %% t:* %D
select -assert-none t:BUFG t:FDRE t:RAM32M %% t:* %D
design -reset
@ -134,4 +134,4 @@ cd lutram_1w1r
select -assert-count 1 t:BUFG
select -assert-count 6 t:FDRE
select -assert-count 2 t:RAM64M
select -assert-none t:BUFG t:FDRE t:RAM64M t:IBUF t:OBUF %% t:* %D
select -assert-none t:BUFG t:FDRE t:RAM64M %% t:* %D

4
tests/arch/xilinx/macc.ys
View file

@ -12,7 +12,7 @@ cd macc # Constrain all select calls below inside the top module
select -assert-count 1 t:BUFG
select -assert-count 1 t:FDRE
select -assert-count 1 t:DSP48E1
select -assert-none t:BUFG t:FDRE t:DSP48E1 t:IBUF t:OBUF %% t:* %D
select -assert-none t:BUFG t:FDRE t:DSP48E1 %% t:* %D
design -load read
hierarchy -top macc2
@ -29,4 +29,4 @@ select -assert-count 1 t:DSP48E1
select -assert-count 1 t:FDRE
select -assert-count 1 t:LUT2
select -assert-count 40 t:LUT3
select -assert-none t:BUFG t:DSP48E1 t:FDRE t:LUT2 t:LUT3 t:IBUF t:OBUF %% t:* %D
select -assert-none t:BUFG t:DSP48E1 t:FDRE t:LUT2 t:LUT3 %% t:* %D

2
tests/arch/xilinx/mul.ys
View file

@ -6,4 +6,4 @@ design -load postopt # load the post-opt design (otherwise equiv_opt loads the p
cd top # Constrain all select calls below inside the top module
select -assert-count 1 t:DSP48E1
select -assert-none t:DSP48E1 t:IBUF t:OBUF %% t:* %D
select -assert-none t:DSP48E1 %% t:* %D

2
tests/arch/xilinx/mul_unsigned.ys
View file

@ -8,4 +8,4 @@ cd mul_unsigned # Constrain all select calls below inside the top module
select -assert-count 1 t:BUFG
select -assert-count 1 t:DSP48E1
select -assert-count 30 t:FDRE
select -assert-none t:DSP48E1 t:FDRE t:BUFG t:IBUF t:OBUF %% t:* %D
select -assert-none t:DSP48E1 t:FDRE t:BUFG %% t:* %D

8
tests/arch/xilinx/mux.ys
View file

@ -8,7 +8,7 @@ design -load postopt # load the post-opt design (otherwise equiv_opt loads the p
cd mux2 # Constrain all select calls below inside the top module
select -assert-count 1 t:LUT3
select -assert-none t:LUT3 t:IBUF t:OBUF %% t:* %D
select -assert-none t:LUT3 %% t:* %D
design -load read
@ -19,7 +19,7 @@ design -load postopt # load the post-opt design (otherwise equiv_opt loads the p
cd mux4 # Constrain all select calls below inside the top module
select -assert-count 1 t:LUT6
select -assert-none t:LUT6 t:IBUF t:OBUF %% t:* %D
select -assert-none t:LUT6 %% t:* %D
design -load read
@ -31,7 +31,7 @@ cd mux8 # Constrain all select calls below inside the top module
select -assert-count 1 t:LUT3
select -assert-count 2 t:LUT6
select -assert-none t:LUT3 t:LUT6 t:IBUF t:OBUF %% t:* %D
select -assert-none t:LUT3 t:LUT6 %% t:* %D
design -load read
@ -44,4 +44,4 @@ select -assert-min 5 t:LUT6
select -assert-max 7 t:LUT6
select -assert-max 2 t:MUXF7
select -assert-none t:LUT6 t:MUXF7 t:IBUF t:OBUF %% t:* %D
select -assert-none t:LUT6 t:MUXF7 %% t:* %D

2
tests/arch/xilinx/shifter.ys
View file

@ -8,4 +8,4 @@ cd top # Constrain all select calls below inside the top module
select -assert-count 1 t:BUFG
select -assert-count 8 t:FDRE
select -assert-none t:BUFG t:FDRE t:IBUF t:OBUF %% t:* %D
select -assert-none t:BUFG t:FDRE %% t:* %D

18
tests/arch/xilinx/xilinx_dffopt.ys
View file

@ -28,7 +28,7 @@ clean
select -assert-count 1 t:FDRE
select -assert-count 1 t:LUT6
select -assert-count 3 t:LUT2
select -assert-none t:FDRE t:LUT6 t:LUT2 t:IBUF t:OBUF %% t:* %D
select -assert-none t:FDRE t:LUT6 t:LUT2 %% t:* %D
design -load t0
@ -39,7 +39,7 @@ clean
select -assert-count 1 t:FDRE
select -assert-count 1 t:LUT4
select -assert-count 3 t:LUT2
select -assert-none t:FDRE t:LUT4 t:LUT2 t:IBUF t:OBUF %% t:* %D
select -assert-none t:FDRE t:LUT4 t:LUT2 %% t:* %D
design -reset
@ -74,7 +74,7 @@ clean
select -assert-count 1 t:FDSE
select -assert-count 1 t:LUT6
select -assert-count 3 t:LUT2
select -assert-none t:FDSE t:LUT6 t:LUT2 t:IBUF t:OBUF %% t:* %D
select -assert-none t:FDSE t:LUT6 t:LUT2 %% t:* %D
design -load t0
@ -85,7 +85,7 @@ clean
select -assert-count 1 t:FDSE
select -assert-count 1 t:LUT4
select -assert-count 3 t:LUT2
select -assert-none t:FDSE t:LUT4 t:LUT2 t:IBUF t:OBUF %% t:* %D
select -assert-none t:FDSE t:LUT4 t:LUT2 %% t:* %D
design -reset
@ -120,7 +120,7 @@ clean
select -assert-count 1 t:FDCE
select -assert-count 1 t:LUT4
select -assert-count 3 t:LUT2
select -assert-none t:FDCE t:LUT4 t:LUT2 t:IBUF t:OBUF %% t:* %D
select -assert-none t:FDCE t:LUT4 t:LUT2 %% t:* %D
design -reset
@ -154,7 +154,7 @@ clean
select -assert-count 1 t:FDSE
select -assert-count 1 t:LUT5
select -assert-count 2 t:LUT2
select -assert-none t:FDSE t:LUT5 t:LUT2 t:IBUF t:OBUF %% t:* %D
select -assert-none t:FDSE t:LUT5 t:LUT2 %% t:* %D
design -load t0
@ -164,7 +164,7 @@ clean
select -assert-count 1 t:FDSE
select -assert-count 2 t:LUT2
select -assert-none t:FDSE t:LUT2 t:IBUF t:OBUF %% t:* %D
select -assert-none t:FDSE t:LUT2 %% t:* %D
design -reset
@ -200,7 +200,7 @@ clean
select -assert-count 1 t:FDRSE
select -assert-count 1 t:LUT6
select -assert-count 4 t:LUT2
select -assert-none t:FDRSE t:LUT6 t:LUT2 t:IBUF t:OBUF %% t:* %D
select -assert-none t:FDRSE t:LUT6 t:LUT2 %% t:* %D
design -load t0
@ -211,6 +211,6 @@ clean
select -assert-count 1 t:FDRSE
select -assert-count 1 t:LUT4
select -assert-count 4 t:LUT2
select -assert-none t:FDRSE t:LUT4 t:LUT2 t:IBUF t:OBUF %% t:* %D
select -assert-none t:FDRSE t:LUT4 t:LUT2 %% t:* %D
design -reset