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

Revert "Fix techmapping muxes some more"

Browse source 
This reverts commit 0aae3b4f43.
This commit is contained in:
Eddie Hung 2019-06-24 14:15:31 -07:00
parent 7fbfcf20d1
commit 2e7992efff
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
techlibs/xilinx/cells_map.v
View file

@ -225,7 +225,7 @@ module \$__XILINX_SHIFTX (A, B, Y);
else if (A_WIDTH <= 2 ** 4) begin else if (A_WIDTH <= 2 ** 4) begin
localparam a_width0 = 2 ** 2; localparam a_width0 = 2 ** 2;
localparam num_mux8 = A_WIDTH / a_width0; localparam num_mux8 = A_WIDTH / a_width0;
localparam a_widthN = A_WIDTH % a_width0; localparam a_widthN = A_WIDTH - num_mux8*a_width0;
wire [a_width0-1:0] T; wire [a_width0-1:0] T;
for (i = 0; i < a_width0; i++) for (i = 0; i < a_width0; i++)
if (i < num_mux8) if (i < num_mux8)
@ -243,9 +243,9 @@ module \$__XILINX_SHIFTX (A, B, Y);
else begin else begin
localparam a_width0 = 2 ** 4; localparam a_width0 = 2 ** 4;
localparam num_mux16 = A_WIDTH / a_width0; localparam num_mux16 = A_WIDTH / a_width0;
localparam a_widthN = A_WIDTH % a_width0; localparam a_widthN = A_WIDTH - num_mux16*a_width0;
wire [(2**(B_WIDTH-4))-1:0] T; wire [a_width0-1:0] T;
for (i = 0; i < 2 ** (B_WIDTH-4); i++) for (i = 0; i < a_width0; i++)
if (i < num_mux16) if (i < num_mux16)
\$__XILINX_SHIFTX #(.A_SIGNED(A_SIGNED), .B_SIGNED(B_SIGNED), .A_WIDTH(a_width0), .B_WIDTH(4), .Y_WIDTH(Y_WIDTH)) fpga_soft_mux (.A(A[i*a_width0+:a_width0]), .B(B[4-1:0]), .Y(T[i])); \$__XILINX_SHIFTX #(.A_SIGNED(A_SIGNED), .B_SIGNED(B_SIGNED), .A_WIDTH(a_width0), .B_WIDTH(4), .Y_WIDTH(Y_WIDTH)) fpga_soft_mux (.A(A[i*a_width0+:a_width0]), .B(B[4-1:0]), .Y(T[i]));
else if (i == num_mux16 && a_widthN > 0) begin else if (i == num_mux16 && a_widthN > 0) begin