mirror of
https://github.com/YosysHQ/yosys
synced 2025-04-29 03:45:52 +00:00
minor cleanup and fixes
This commit is contained in:
Artur Swiderski
parent
41f83c19fd
commit
309689da5b
11 changed files with 76 additions and 355 deletions
|
|
@ -30,21 +30,21 @@ wire [Y_WIDTH-1:0] AA = A_buf;
|
|||
wire [Y_WIDTH-1:0] BB = BI ? ~B_buf : B_buf;
|
||||
(* force_downto *)
|
||||
wire [Y_WIDTH-1:0] BX = B_buf;
|
||||
wire [Y_WIDTH-1:0] BSUM;
|
||||
wire [Y_WIDTH-1:0] BTOADDER;
|
||||
wire [Y_WIDTH:0] LE_CARRY;
|
||||
|
||||
// Start of carry chain
|
||||
generate
|
||||
if (_TECHMAP_CONSTMSK_CI_ == 1) begin
|
||||
assign ALM_CARRY[0] = _TECHMAP_CONSTVAL_CI_;
|
||||
assign LE_CARRY[0] = _TECHMAP_CONSTVAL_CI_;
|
||||
end else begin
|
||||
MISTRAL_ALUT_ARITH #(
|
||||
.LUT0(16'b1010_1010_1010_1010), // Q = A
|
||||
.LUT1(16'b0000_0000_0000_0000), // Q = 0 (LUT1's input to the adder is inverted)
|
||||
.LUT(16'b1010_1010_1010_1010), // Q = A
|
||||
) alm_start (
|
||||
.A(CI), .B(1'b1), .C(1'b1), .D0(1'b1), .D1(1'b1),
|
||||
.CI(1'b0),
|
||||
.CO(ALM_CARRY[0])
|
||||
.SO(),
|
||||
.CO(LE_CARRY[0])
|
||||
);
|
||||
end
|
||||
endgenerate
|
||||
|
|
@ -54,25 +54,24 @@ genvar i;
|
|||
generate for (i = 0; i < Y_WIDTH; i = i + 1) begin:slice
|
||||
// TODO: mwk suggests that a pass could merge pre-adder logic into this.
|
||||
MISTRAL_ALUT_ARITH #(
|
||||
.LUT0(16'b0110_0110_0110_0110) // Q = A ? ~B : B
|
||||
.LUT(16'b0110_0110_0110_0110) // Q = A ? ~B : B
|
||||
) alm_i (
|
||||
.A(BI), .B(BX[i]), .C(1'b0), .D(1'b0),
|
||||
.CI(1'b0),
|
||||
.SO(BSUM[i]),
|
||||
.SO(BTOADDER[i]),
|
||||
.CO()
|
||||
);
|
||||
MISTRAL_ALUT_ARITH #(
|
||||
.LUT0(16'b1010_1010_1010_1010), // SUM = A xor B xor CI
|
||||
.LUT(16'b1010_1010_1010_1010), // SUM = A xor B xor CI
|
||||
// CARRYi+1 = A and B or A and CI or B and CI
|
||||
.sum_lutc_input("cin")
|
||||
) alm_start (
|
||||
.A(AA[i]), .B(BX[i]), .C(1'b1), .D(1'b1),
|
||||
.CI(LE_CARRY),
|
||||
.A(AA[i]), .B(BTOADDER[i]), .C(1'b1), .D(1'b1),
|
||||
.CI(LE_CARRY[i]),
|
||||
.SO(Y[i]),
|
||||
.CO(ALM_CARRY[i+1])
|
||||
.CO(LE_CARRY[i+1])
|
||||
);
|
||||
// ALM carry chain is not directly accessible, so calculate the carry through soft logic if really needed.
|
||||
assign CO[i] = (AA[i] && BB[i]) || ((Y[i] ^ AA[i] ^ BB[i]) && (AA[i] || BB[i]));
|
||||
|
||||
end endgenerate
|
||||
|
||||
assign X = AA ^ BB;
|
||||
|
|
|
|||
|
|
@ -1,33 +0,0 @@
|
|||
bram __MISTRAL_M20K_SDP
|
||||
init 1 # TODO: Re-enable when I figure out how BRAM init works
|
||||
abits 14 @D16384x1
|
||||
dbits 1 @D16384x1
|
||||
abits 13 @D8192x2
|
||||
dbits 2 @D8192x2
|
||||
abits 12 @D4096x4 @D4096x5
|
||||
dbits 4 @D4096x4
|
||||
dbits 5 @D4096x5
|
||||
abits 11 @D2048x8 @D2048x10
|
||||
dbits 8 @D2048x8
|
||||
dbits 10 @D2048x10
|
||||
abits 10 @D1024x16 @D1024x20
|
||||
dbits 16 @D1024x16
|
||||
dbits 20 @D1024x20
|
||||
abits 9 @D512x32 @D512x40
|
||||
dbits 32 @D512x32
|
||||
dbits 40 @D512x40
|
||||
groups 2
|
||||
ports 1 1
|
||||
wrmode 1 0
|
||||
# read enable; write enable + byte enables (only for multiples of 8)
|
||||
enable 1 1
|
||||
transp 0 0
|
||||
clocks 1 1
|
||||
clkpol 1 1
|
||||
endbram
|
||||
|
||||
|
||||
match __MISTRAL_M20K_SDP
|
||||
min efficiency 5
|
||||
make_transp
|
||||
endmatch
|
||||
|
|
@ -1,31 +0,0 @@
|
|||
module __MISTRAL_M20K_SDP(CLK1, A1ADDR, A1DATA, A1EN, B1ADDR, B1DATA, B1EN);
|
||||
|
||||
parameter CFG_ABITS = 10;
|
||||
parameter CFG_DBITS = 20;
|
||||
parameter CFG_ENABLE_A = 1;
|
||||
parameter CFG_ENABLE_B = 1;
|
||||
|
||||
input CLK1;
|
||||
input [CFG_ABITS-1:0] A1ADDR, B1ADDR;
|
||||
input [CFG_DBITS-1:0] A1DATA;
|
||||
output [CFG_DBITS-1:0] B1DATA;
|
||||
input [CFG_ENABLE_A-1:0] A1EN, B1EN;
|
||||
|
||||
altsyncram #(
|
||||
.operation_mode("dual_port"),
|
||||
.ram_block_type("m20k"),
|
||||
.widthad_a(CFG_ABITS),
|
||||
.width_a(CFG_DBITS),
|
||||
.widthad_b(CFG_ABITS),
|
||||
.width_b(CFG_DBITS),
|
||||
) _TECHMAP_REPLACE_ (
|
||||
.address_a(A1ADDR),
|
||||
.data_a(A1DATA),
|
||||
.wren_a(A1EN),
|
||||
.address_b(B1ADDR),
|
||||
.q_b(B1DATA),
|
||||
.clock0(CLK1),
|
||||
.clock1(CLK1)
|
||||
);
|
||||
|
||||
endmodule
|
||||
|
|
@ -1,21 +1,20 @@
|
|||
bram MISTRAL_M10K
|
||||
bram MISTRAL_M9K
|
||||
init 0 # TODO: Re-enable when I figure out how BRAM init works
|
||||
abits 13 @D8192x1
|
||||
dbits 1 @D8192x1
|
||||
abits 12 @D4096x2
|
||||
dbits 2 @D4096x2
|
||||
abits 11 @D2048x4 @D2048x5
|
||||
abits 11 @D2048x4
|
||||
dbits 4 @D2048x4
|
||||
dbits 5 @D2048x5
|
||||
abits 10 @D1024x8 @D1024x10
|
||||
abits 10 @D1024x8 @D1024x9
|
||||
dbits 8 @D1024x8
|
||||
dbits 10 @D1024x10
|
||||
abits 9 @D512x16 @D512x20
|
||||
dbits 9 @D1024x9
|
||||
abits 9 @D512x16 @D512x18
|
||||
dbits 16 @D512x16
|
||||
dbits 20 @D512x20
|
||||
abits 8 @D256x32 @D256x40
|
||||
dbits 18 @D512x18
|
||||
abits 8 @D256x32 @D256x36
|
||||
dbits 32 @D256x32
|
||||
dbits 40 @D256x40
|
||||
dbits 36 @D256x36
|
||||
groups 2
|
||||
ports 1 1
|
||||
wrmode 1 0
|
||||
|
|
|
|||
|
|
@ -1,51 +0,0 @@
|
|||
`default_nettype none
|
||||
|
||||
module __MUL27X27(A, B, Y);
|
||||
|
||||
parameter A_SIGNED = 1;
|
||||
parameter B_SIGNED = 1;
|
||||
parameter A_WIDTH = 27;
|
||||
parameter B_WIDTH = 27;
|
||||
parameter Y_WIDTH = 54;
|
||||
|
||||
input [A_WIDTH-1:0] A;
|
||||
input [B_WIDTH-1:0] B;
|
||||
output [Y_WIDTH-1:0] Y;
|
||||
|
||||
MISTRAL_MUL27X27 _TECHMAP_REPLACE_ (.A(A), .B(B), .Y(Y));
|
||||
|
||||
endmodule
|
||||
|
||||
|
||||
module __MUL18X18(A, B, Y);
|
||||
|
||||
parameter A_SIGNED = 1;
|
||||
parameter B_SIGNED = 1;
|
||||
parameter A_WIDTH = 18;
|
||||
parameter B_WIDTH = 18;
|
||||
parameter Y_WIDTH = 36;
|
||||
|
||||
input [A_WIDTH-1:0] A;
|
||||
input [B_WIDTH-1:0] B;
|
||||
output [Y_WIDTH-1:0] Y;
|
||||
|
||||
MISTRAL_MUL18X18 _TECHMAP_REPLACE_ (.A(A), .B(B), .Y(Y));
|
||||
|
||||
endmodule
|
||||
|
||||
|
||||
module __MUL9X9(A, B, Y);
|
||||
|
||||
parameter A_SIGNED = 1;
|
||||
parameter B_SIGNED = 1;
|
||||
parameter A_WIDTH = 9;
|
||||
parameter B_WIDTH = 9;
|
||||
parameter Y_WIDTH = 18;
|
||||
|
||||
input [A_WIDTH-1:0] A;
|
||||
input [B_WIDTH-1:0] B;
|
||||
output [Y_WIDTH-1:0] Y;
|
||||
|
||||
MISTRAL_MUL9X9 _TECHMAP_REPLACE_ (.A(A), .B(B), .Y(Y));
|
||||
|
||||
endmodule
|
||||
|
|
@ -1,83 +0,0 @@
|
|||
(* abc9_box *)
|
||||
module MISTRAL_MUL27X27(input [26:0] A, input [26:0] B, output [53:0] Y);
|
||||
|
||||
parameter A_SIGNED = 1;
|
||||
parameter B_SIGNED = 1;
|
||||
|
||||
// TODO: Cyclone 10 GX timings; the below are for Cyclone V
|
||||
specify
|
||||
(A *> Y) = 3732;
|
||||
(B *> Y) = 3928;
|
||||
endspecify
|
||||
|
||||
wire [53:0] A_, B_;
|
||||
|
||||
if (A_SIGNED)
|
||||
assign A_ = $signed(A);
|
||||
else
|
||||
assign A_ = $unsigned(A);
|
||||
|
||||
if (B_SIGNED)
|
||||
assign B_ = $signed(B);
|
||||
else
|
||||
assign B_ = $unsigned(B);
|
||||
|
||||
assign Y = A_ * B_;
|
||||
|
||||
endmodule
|
||||
|
||||
(* abc9_box *)
|
||||
module MISTRAL_MUL18X18(input [17:0] A, input [17:0] B, output [35:0] Y);
|
||||
|
||||
parameter A_SIGNED = 1;
|
||||
parameter B_SIGNED = 1;
|
||||
|
||||
// TODO: Cyclone 10 GX timings; the below are for Cyclone V
|
||||
specify
|
||||
(A *> Y) = 3180;
|
||||
(B *> Y) = 3982;
|
||||
endspecify
|
||||
|
||||
wire [35:0] A_, B_;
|
||||
|
||||
if (A_SIGNED)
|
||||
assign A_ = $signed(A);
|
||||
else
|
||||
assign A_ = $unsigned(A);
|
||||
|
||||
if (B_SIGNED)
|
||||
assign B_ = $signed(B);
|
||||
else
|
||||
assign B_ = $unsigned(B);
|
||||
|
||||
assign Y = A_ * B_;
|
||||
|
||||
endmodule
|
||||
|
||||
(* abc9_box *)
|
||||
module MISTRAL_MUL9X9(input [8:0] A, input [8:0] B, output [17:0] Y);
|
||||
|
||||
parameter A_SIGNED = 1;
|
||||
parameter B_SIGNED = 1;
|
||||
|
||||
// TODO: Cyclone 10 GX timings; the below are for Cyclone V
|
||||
specify
|
||||
(A *> Y) = 2818;
|
||||
(B *> Y) = 3051;
|
||||
endspecify
|
||||
|
||||
wire [17:0] A_, B_;
|
||||
|
||||
if (A_SIGNED)
|
||||
assign A_ = $signed(A);
|
||||
else
|
||||
assign A_ = $unsigned(A);
|
||||
|
||||
if (B_SIGNED)
|
||||
assign B_ = $signed(B);
|
||||
else
|
||||
assign B_ = $unsigned(B);
|
||||
|
||||
assign Y = A_ * B_;
|
||||
|
||||
endmodule
|
||||
|
|
@ -231,32 +231,30 @@ assign Q = ~A;
|
|||
endmodule
|
||||
|
||||
(* abc9_box, lib_whitebox *)
|
||||
module MISTRAL_ALUT_ARITH(input A, B, C, D, (* abc9_carry *) input CI, output , (* abc9_carry *) output CO);
|
||||
module MISTRAL_ALUT_ARITH(input A, B, C, D, (* abc9_carry *) input CI, output SO, (* abc9_carry *) output CO);
|
||||
|
||||
parameter LUT = 16'h0000;
|
||||
parameter sum_lutc_input = "cin";
|
||||
`ifdef cycloneiv
|
||||
`ifdef cycloneiv
|
||||
specify
|
||||
(A => SO) = 1342;
|
||||
(B => SO) = 1323;
|
||||
(C => SO) = 927;
|
||||
(D0 => SO) = 887;
|
||||
(D1 => SO) = 785;
|
||||
(D => SO) = 887;
|
||||
(CI => SO) = 368;
|
||||
|
||||
(A => CO) = 1082;
|
||||
(B => CO) = 1062;
|
||||
(C => CO) = 813;
|
||||
(D0 => CO) = 866;
|
||||
(D1 => CO) = 1198;
|
||||
(D => CO) = 866;
|
||||
(CI => CO) = 36; // Divided by 2 to account for there being two ALUT_ARITHs in an ALM)
|
||||
endspecify
|
||||
`endif
|
||||
|
||||
wire q0, q1;
|
||||
|
||||
assign q0 = LUT0 >> sum_lutc_input == "cin" : {D, CI, B, A},{D, C, B, A};
|
||||
assign q1 = LUT0 >> sum_lutc_input == "cin" : {'b0, CI, B, A},{'b0, C, B, A};
|
||||
assign q0 = LUT >> sum_lutc_input == "cin" ? {D, CI, B, A}:{D, C, B, A};
|
||||
assign q1 = LUT >> sum_lutc_input == "cin" ? {'b1, CI, B, A}:{'b1, C, B, A};
|
||||
|
||||
assign SO = D ? q1 : q0;
|
||||
|
||||
|
|
|
|||
|
|
@ -74,7 +74,7 @@ assign B1DATA = mem[B1ADDR];
|
|||
|
||||
endmodule
|
||||
|
||||
// The M10K
|
||||
// The M9K
|
||||
// --------
|
||||
// TODO
|
||||
|
||||
|
|
|
|||
|
|
@ -3,11 +3,6 @@
|
|||
`define MAC cycloneiv_mac
|
||||
`define MLAB cycloneiv_mlab_cell
|
||||
`endif
|
||||
`ifdef cyclone10gx
|
||||
`define LCELL cyclone10gx_lcell_comb
|
||||
`define MAC cyclone10gx_mac
|
||||
`define MLAB cyclone10gx_mlab_cell
|
||||
`endif
|
||||
|
||||
module __MISTRAL_VCC(output Q);
|
||||
|
||||
|
|
@ -30,20 +25,6 @@ dffeas #(.power_up("low"), .is_wysiwyg("true")) _TECHMAP_REPLACE_ (.d(DATAIN), .
|
|||
endmodule
|
||||
|
||||
|
||||
module MISTRAL_ALUT6(input A, B, C, D, E, F, output Q);
|
||||
parameter [63:0] LUT = 64'h0000_0000_0000_0000;
|
||||
|
||||
`LCELL #(.lut_mask(LUT)) _TECHMAP_REPLACE_ (.dataa(A), .datab(B), .datac(C), .datad(D), .datae(E), .dataf(F), .combout(Q));
|
||||
|
||||
endmodule
|
||||
|
||||
|
||||
module MISTRAL_ALUT5(input A, B, C, D, E, output Q);
|
||||
parameter [31:0] LUT = 32'h0000_0000;
|
||||
|
||||
`LCELL #(.lut_mask({2{LUT}})) _TECHMAP_REPLACE_ (.dataa(A), .datab(B), .datac(C), .datad(D), .datae(E), .combout(Q));
|
||||
|
||||
endmodule
|
||||
|
||||
|
||||
module MISTRAL_ALUT4(input A, B, C, D, output Q);
|
||||
|
|
@ -77,11 +58,10 @@ NOT _TECHMAP_REPLACE_ (.IN(A), .OUT(Q));
|
|||
endmodule
|
||||
|
||||
|
||||
module MISTRAL_ALUT_ARITH(input A, B, C, D0, D1, CI, output SO, CO);
|
||||
parameter LUT0 = 16'h0000;
|
||||
parameter LUT1 = 16'h0000;
|
||||
module MISTRAL_ALUT_ARITH(input A, B, C, D, CI, output SO, CO);
|
||||
parameter LUT = 16'h0000;
|
||||
|
||||
`LCELL #(.lut_mask({16'h0, LUT1, 16'h0, LUT0})) _TECHMAP_REPLACE_ (.dataa(A), .datab(B), .datac(C), .datad(D0), .dataf(D1), .cin(CI), .sumout(SO), .cout(CO));
|
||||
`LCELL #(.lut_mask({16'h0, LUT})) _TECHMAP_REPLACE_ (.dataa(A), .datab(B), .datac(C), .datad(D), .cin(CI), .sumout(SO), .cout(CO));
|
||||
|
||||
endmodule
|
||||
|
||||
|
|
@ -125,7 +105,7 @@ parameter _TECHMAP_CELLNAME_ = "";
|
|||
endmodule
|
||||
|
||||
|
||||
module MISTRAL_M10K(A1ADDR, A1DATA, A1EN, CLK1, B1ADDR, B1DATA, B1EN);
|
||||
module MISTRAL_M9K(A1ADDR, A1DATA, A1EN, CLK1, B1ADDR, B1DATA, B1EN);
|
||||
|
||||
parameter CFG_ABITS = 10;
|
||||
parameter CFG_DBITS = 10;
|
||||
|
|
@ -137,7 +117,7 @@ input [CFG_DBITS-1:0] A1DATA;
|
|||
input CLK1, A1EN, B1EN;
|
||||
output [CFG_DBITS-1:0] B1DATA;
|
||||
|
||||
// Much like the MLAB, the M10K has mem_init[01234] parameters which would let
|
||||
// Much like the MLAB, the M9K has mem_init[01234] parameters which would let
|
||||
// you initialise the RAM cell via hex literals. If they were implemented.
|
||||
|
||||
cycloneiv_ram_block #(
|
||||
|
|
@ -172,64 +152,3 @@ cycloneiv_ram_block #(
|
|||
endmodule
|
||||
|
||||
|
||||
module MISTRAL_MUL27X27(input [26:0] A, B, output [53:0] Y);
|
||||
|
||||
parameter A_SIGNED = 1;
|
||||
parameter B_SIGNED = 1;
|
||||
|
||||
`MAC #(
|
||||
.ax_width(27),
|
||||
.signed_max(A_SIGNED ? "true" : "false"),
|
||||
.ay_scan_in_width(27),
|
||||
.signed_may(B_SIGNED ? "true" : "false"),
|
||||
.result_a_width(54),
|
||||
.operation_mode("M27x27")
|
||||
) _TECHMAP_REPLACE_ (
|
||||
.ax(A),
|
||||
.ay(B),
|
||||
.resulta(Y)
|
||||
);
|
||||
|
||||
endmodule
|
||||
|
||||
|
||||
module MISTRAL_MUL18X18(input [17:0] A, B, output [35:0] Y);
|
||||
|
||||
parameter A_SIGNED = 1;
|
||||
parameter B_SIGNED = 1;
|
||||
|
||||
`MAC #(
|
||||
.ax_width(18),
|
||||
.signed_max(A_SIGNED ? "true" : "false"),
|
||||
.ay_scan_in_width(18),
|
||||
.signed_may(B_SIGNED ? "true" : "false"),
|
||||
.result_a_width(36),
|
||||
.operation_mode("M18x18_FULL")
|
||||
) _TECHMAP_REPLACE_ (
|
||||
.ax(A),
|
||||
.ay(B),
|
||||
.resulta(Y)
|
||||
);
|
||||
|
||||
endmodule
|
||||
|
||||
|
||||
module MISTRAL_MUL9X9(input [8:0] A, B, output [17:0] Y);
|
||||
|
||||
parameter A_SIGNED = 1;
|
||||
parameter B_SIGNED = 1;
|
||||
|
||||
`MAC #(
|
||||
.ax_width(9),
|
||||
.signed_max(A_SIGNED ? "true" : "false"),
|
||||
.ay_scan_in_width(9),
|
||||
.signed_may(B_SIGNED ? "true" : "false"),
|
||||
.result_a_width(18),
|
||||
.operation_mode("M9x9")
|
||||
) _TECHMAP_REPLACE_ (
|
||||
.ax(A),
|
||||
.ay(B),
|
||||
.resulta(Y)
|
||||
);
|
||||
|
||||
endmodule
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue