riscv
/
yosys
mirror of https://github.com/YosysHQ/yosys.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix $lcu -> MUXCY mapping, credit @mwkmwkmwk

This commit is contained in:
Eddie Hung 2020-02-06 11:25:07 -08:00
parent 5ecbc6c7b2
commit d625e399cb
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
techlibs/xilinx/arith_map.v
View File

@ -36,12 +36,13 @@ module _80_xilinx_lcu (P, G, CI, CO);
`ifdef _EXPLICIT_CARRY `ifdef _EXPLICIT_CARRY
wire [WIDTH-1:0] C = {CO, CI}; wire [WIDTH-1:0] C = {CO, CI};
wire [WIDTH-1:0] S = P & ~G;
generate for (i = 0; i < WIDTH; i = i + 1) begin:slice generate for (i = 0; i < WIDTH; i = i + 1) begin:slice
MUXCY muxcy ( MUXCY muxcy (
.CI(C[i]), .CI(C[i]),
.DI(G[i]), .DI(G[i]),
.S(P[i]), .S(S[i]),
.O(CO[i]) .O(CO[i])
); );
end endgenerate end endgenerate
@ -52,8 +53,8 @@ module _80_xilinx_lcu (P, G, CI, CO);
localparam MAX_WIDTH = CARRY4_COUNT * 4; localparam MAX_WIDTH = CARRY4_COUNT * 4;
localparam PAD_WIDTH = MAX_WIDTH - WIDTH; localparam PAD_WIDTH = MAX_WIDTH - WIDTH;
wire [MAX_WIDTH-1:0] S = {{PAD_WIDTH{1'b0}}, P & ~G};
wire [MAX_WIDTH-1:0] GG = {{PAD_WIDTH{1'b0}}, G}; wire [MAX_WIDTH-1:0] GG = {{PAD_WIDTH{1'b0}}, G};
wire [MAX_WIDTH-1:0] PP = {{PAD_WIDTH{1'b0}}, P};
wire [MAX_WIDTH-1:0] C; wire [MAX_WIDTH-1:0] C;
assign CO = C; assign CO = C;
@ -64,7 +65,7 @@ module _80_xilinx_lcu (P, G, CI, CO);
.CYINIT(CI), .CYINIT(CI),
.CI (1'd0), .CI (1'd0),
.DI (GG[i*4 +: 4]), .DI (GG[i*4 +: 4]),
.S (PP[i*4 +: 4]), .S (S [i*4 +: 4]),
.CO (C [i*4 +: 4]), .CO (C [i*4 +: 4]),
); );
end else begin end else begin
@ -73,7 +74,7 @@ module _80_xilinx_lcu (P, G, CI, CO);
.CYINIT(1'd0), .CYINIT(1'd0),
.CI (C [i*4 - 1]), .CI (C [i*4 - 1]),
.DI (GG[i*4 +: 4]), .DI (GG[i*4 +: 4]),
.S (PP[i*4 +: 4]), .S (S [i*4 +: 4]),
.CO (C [i*4 +: 4]), .CO (C [i*4 +: 4]),
); );
end end