mirrors/yosys
3
0
Fork 0
mirror of https://github.com/YosysHQ/yosys synced 2025-06-06 06:03:23 +00:00
Code Activity

shiftx2mux: fix select out of bounds

Browse source
This commit is contained in:
Eddie Hung 2020-02-05 16:41:09 -08:00
parent 505557e93e
commit 4c1d3a126d
3 changed files with 14 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
techlibs/common/techmap.v
View file

@ -152,10 +152,11 @@ module _90_shift_shiftx (A, B, Y);
localparam len = 2**(B_WIDTH-1); localparam len = 2**(B_WIDTH-1);
localparam Y_WIDTH2 = 2**CLOG2_Y_WIDTH; localparam Y_WIDTH2 = 2**CLOG2_Y_WIDTH;
wire [len-1:0] T, F, AA; wire [len-1:0] T, F, AA;
wire [(A_WIDTH+Y_WIDTH2*2):0] Apad = {{Y_WIDTH2*2{extbit}}, A};
genvar i; genvar i;
for (i = 0; i < A_WIDTH; i=i+Y_WIDTH2*2) begin for (i = 0; i < A_WIDTH; i=i+Y_WIDTH2*2) begin
assign F[i/2 +: Y_WIDTH2] = A[i +: Y_WIDTH2]; assign F[i/2 +: Y_WIDTH2] = A[i +: Y_WIDTH2];
assign T[i/2 +: Y_WIDTH2] = (i + Y_WIDTH2 < A_WIDTH) ? A[i+Y_WIDTH2 +: Y_WIDTH2] : {Y_WIDTH2{extbit}}; assign T[i/2 +: Y_WIDTH2] = Apad[i+Y_WIDTH2 +: Y_WIDTH2];
assign AA[i/2 +: Y_WIDTH2] = B[CLOG2_Y_WIDTH] ? T[i/2 +: Y_WIDTH2] : F[i/2 +: Y_WIDTH2]; assign AA[i/2 +: Y_WIDTH2] = B[CLOG2_Y_WIDTH] ? T[i/2 +: Y_WIDTH2] : F[i/2 +: Y_WIDTH2];
end end
wire [B_WIDTH-2:0] BB = {B[B_WIDTH-1:CLOG2_Y_WIDTH+1], {CLOG2_Y_WIDTH{1'b0}}}; wire [B_WIDTH-2:0] BB = {B[B_WIDTH-1:CLOG2_Y_WIDTH+1], {CLOG2_Y_WIDTH{1'b0}}};

2
tests/techmap/run-test.sh
View file

@ -6,7 +6,7 @@ for x in *.ys; do
echo "all:: run-$x" echo "all:: run-$x"
echo "run-$x:" echo "run-$x:"
echo " @echo 'Running $x..'" echo " @echo 'Running $x..'"
echo " @../../yosys -ql ${x%.ys}.log $x" echo " @../../yosys -ql ${x%.ys}.log -e 'select out of bounds' $x"
done done
for s in *.sh; do for s in *.sh; do
if [ "$s" != "run-test.sh" ]; then if [ "$s" != "run-test.sh" ]; then

11
tests/techmap/shiftx2mux.ys
View file

@ -108,3 +108,14 @@ design -import gate -as gate
miter -equiv -flatten -make_assert -make_outputs gold gate miter miter -equiv -flatten -make_assert -make_outputs gold gate miter
sat -verify -prove-asserts -show-ports miter sat -verify -prove-asserts -show-ports miter
design -reset
read_verilog <<EOT
module top(input [6:0] A, input [1:0] B, output [1:0] Y);
wire [7:0] AA = {1'bx, A};
assign Y = AA[B*2 +: 2];
endmodule
EOT
opt
wreduce
equiv_opt techmap