mirrors/yosys
3
0
Fork 0
mirror of https://github.com/YosysHQ/yosys synced 2025-10-31 11:42:30 +00:00
Code Activity

Renamed $lut ports to follow A-Y naming scheme

Browse source
This commit is contained in:
Clifford Wolf 2014-08-15 14:18:40 +02:00
parent f092b50148
commit b64b38eea2
6 changed files with 38 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

4
backends/blif/blif.cc
View file

@ -188,13 +188,13 @@ struct BlifDumper
if (!config->icells_mode && cell->type == "$lut") { if (!config->icells_mode && cell->type == "$lut") {
fprintf(f, ".names"); fprintf(f, ".names");
auto &inputs = cell->getPort("\\I"); auto &inputs = cell->getPort("\\A");
auto width = cell->parameters.at("\\WIDTH").as_int(); auto width = cell->parameters.at("\\WIDTH").as_int();
log_assert(inputs.size() == width); log_assert(inputs.size() == width);
for (int i = 0; i < inputs.size(); i++) { for (int i = 0; i < inputs.size(); i++) {
fprintf(f, " %s", cstr(inputs.extract(i, 1))); fprintf(f, " %s", cstr(inputs.extract(i, 1)));
} }
auto &output = cell->getPort("\\O"); auto &output = cell->getPort("\\Y");
log_assert(output.size() == 1); log_assert(output.size() == 1);
fprintf(f, " %s", cstr(output)); fprintf(f, " %s", cstr(output));
fprintf(f, "\n"); fprintf(f, "\n");

3
kernel/celltypes.h
View file

@ -88,7 +88,7 @@ struct CellTypes
std::vector<RTLIL::IdString> unary_ops = { std::vector<RTLIL::IdString> unary_ops = {
"$not", "$pos", "$bu0", "$neg", "$not", "$pos", "$bu0", "$neg",
"$reduce_and", "$reduce_or", "$reduce_xor", "$reduce_xnor", "$reduce_bool", "$reduce_and", "$reduce_or", "$reduce_xor", "$reduce_xnor", "$reduce_bool",
"$logic_not", "$slice" "$logic_not", "$slice", "$lut"
}; };
std::vector<RTLIL::IdString> binary_ops = { std::vector<RTLIL::IdString> binary_ops = {
@ -108,7 +108,6 @@ struct CellTypes
for (auto type : std::vector<RTLIL::IdString>({"$mux", "$pmux"})) for (auto type : std::vector<RTLIL::IdString>({"$mux", "$pmux"}))
setup_type(type, {"\\A", "\\B", "\\S"}, {"\\Y"}, false); setup_type(type, {"\\A", "\\B", "\\S"}, {"\\Y"}, false);
setup_type("$lut", {"\\I"}, {"\\O"}, false);
setup_type("$assert", {"\\A", "\\EN"}, {}, false); setup_type("$assert", {"\\A", "\\EN"}, {}, false);
} }

8
kernel/rtlil.cc
View file

@ -615,8 +615,8 @@ namespace {
if (cell->type == "$lut") { if (cell->type == "$lut") {
param("\\LUT"); param("\\LUT");
port("\\I", param("\\WIDTH")); port("\\A", param("\\WIDTH"));
port("\\O", 1); port("\\Y", 1);
check_expected(); check_expected();
return; return;
} }
@ -1388,8 +1388,8 @@ RTLIL::Cell* RTLIL::Module::addLut(RTLIL::IdString name, RTLIL::SigSpec sig_i, R
RTLIL::Cell *cell = addCell(name, "$lut"); RTLIL::Cell *cell = addCell(name, "$lut");
cell->parameters["\\LUT"] = lut; cell->parameters["\\LUT"] = lut;
cell->parameters["\\WIDTH"] = sig_i.size(); cell->parameters["\\WIDTH"] = sig_i.size();
cell->setPort("\\I", sig_i); cell->setPort("\\A", sig_i);
cell->setPort("\\O", sig_o); cell->setPort("\\Y", sig_o);
return cell; return cell;
} }

4
passes/abc/blifparse.cc
View file

@ -195,8 +195,8 @@ RTLIL::Design *abc_parse_blif(FILE *f, std::string dff_name)
RTLIL::Cell *cell = module->addCell(NEW_ID, "$lut"); RTLIL::Cell *cell = module->addCell(NEW_ID, "$lut");
cell->parameters["\\WIDTH"] = RTLIL::Const(input_sig.size()); cell->parameters["\\WIDTH"] = RTLIL::Const(input_sig.size());
cell->parameters["\\LUT"] = RTLIL::Const(RTLIL::State::Sx, 1 << input_sig.size()); cell->parameters["\\LUT"] = RTLIL::Const(RTLIL::State::Sx, 1 << input_sig.size());
cell->setPort("\\I", input_sig); cell->setPort("\\A", input_sig);
cell->setPort("\\O", output_sig); cell->setPort("\\Y", output_sig);
lutptr = &cell->parameters.at("\\LUT"); lutptr = &cell->parameters.at("\\LUT");
lut_default_state = RTLIL::State::Sx; lut_default_state = RTLIL::State::Sx;
continue; continue;

22
techlibs/common/simlib.v
View file

@ -955,13 +955,13 @@ endmodule
// -------------------------------------------------------- // --------------------------------------------------------
`ifndef SIMLIB_NOLUT `ifndef SIMLIB_NOLUT
module \$lut (I, O); module \$lut (A, Y);
parameter WIDTH = 0; parameter WIDTH = 0;
parameter LUT = 0; parameter LUT = 0;
input [WIDTH-1:0] I; input [WIDTH-1:0] A;
output reg O; output reg Y;
wire lut0_out, lut1_out; wire lut0_out, lut1_out;
@ -969,18 +969,18 @@ generate
if (WIDTH <= 1) begin:simple if (WIDTH <= 1) begin:simple
assign {lut1_out, lut0_out} = LUT; assign {lut1_out, lut0_out} = LUT;
end else begin:complex end else begin:complex
\$lut #( .WIDTH(WIDTH-1), .LUT(LUT ) ) lut0 ( .I(I[WIDTH-2:0]), .O(lut0_out) ); \$lut #( .WIDTH(WIDTH-1), .LUT(LUT ) ) lut0 ( .A(A[WIDTH-2:0]), .Y(lut0_out) );
\$lut #( .WIDTH(WIDTH-1), .LUT(LUT >> (2**(WIDTH-1))) ) lut1 ( .I(I[WIDTH-2:0]), .O(lut1_out) ); \$lut #( .WIDTH(WIDTH-1), .LUT(LUT >> (2**(WIDTH-1))) ) lut1 ( .A(A[WIDTH-2:0]), .Y(lut1_out) );
end end
if (WIDTH > 0) begin:lutlogic if (WIDTH > 0) begin:lutlogic
always @* begin always @* begin
casez ({I[WIDTH-1], lut0_out, lut1_out}) casez ({A[WIDTH-1], lut0_out, lut1_out})
3'b?11: O = 1'b1; 3'b?11: Y = 1'b1;
3'b?00: O = 1'b0; 3'b?00: Y = 1'b0;
3'b0??: O = lut0_out; 3'b0??: Y = lut0_out;
3'b1??: O = lut1_out; 3'b1??: Y = lut1_out;
default: O = 1'bx; default: Y = 1'bx;
endcase endcase
end end
end end

36
techlibs/xilinx/cells.v
View file

@ -10,41 +10,41 @@ module \$_DFF_P_ (D, C, Q);
endmodule endmodule
module \$lut (I, O); module \$lut (A, Y);
parameter WIDTH = 0; parameter WIDTH = 0;
parameter LUT = 0; parameter LUT = 0;
input [WIDTH-1:0] I; input [WIDTH-1:0] A;
output O; output Y;
generate generate
if (WIDTH == 1) begin:lut1 if (WIDTH == 1) begin:lut1
LUT1 #(.INIT(LUT)) fpga_lut (.O(O), LUT1 #(.INIT(LUT)) fpga_lut (.O(Y),
.I0(I[0])); .I0(A[0]));
end else end else
if (WIDTH == 2) begin:lut2 if (WIDTH == 2) begin:lut2
LUT2 #(.INIT(LUT)) fpga_lut (.O(O), LUT2 #(.INIT(LUT)) fpga_lut (.O(Y),
.I0(I[0]), .I1(I[1])); .I0(A[0]), .I1(A[1]));
end else end else
if (WIDTH == 3) begin:lut3 if (WIDTH == 3) begin:lut3
LUT3 #(.INIT(LUT)) fpga_lut (.O(O), LUT3 #(.INIT(LUT)) fpga_lut (.O(Y),
.I0(I[0]), .I1(I[1]), .I2(I[2])); .I0(A[0]), .I1(A[1]), .I2(A[2]));
end else end else
if (WIDTH == 4) begin:lut4 if (WIDTH == 4) begin:lut4
LUT4 #(.INIT(LUT)) fpga_lut (.O(O), LUT4 #(.INIT(LUT)) fpga_lut (.O(Y),
.I0(I[0]), .I1(I[1]), .I2(I[2]), .I0(A[0]), .I1(A[1]), .I2(A[2]),
.I3(I[3])); .I3(A[3]));
end else end else
if (WIDTH == 5) begin:lut5 if (WIDTH == 5) begin:lut5
LUT5 #(.INIT(LUT)) fpga_lut (.O(O), LUT5 #(.INIT(LUT)) fpga_lut (.O(Y),
.I0(I[0]), .I1(I[1]), .I2(I[2]), .I0(A[0]), .I1(A[1]), .I2(A[2]),
.I3(I[3]), .I4(I[4])); .I3(A[3]), .I4(A[4]));
end else end else
if (WIDTH == 6) begin:lut6 if (WIDTH == 6) begin:lut6
LUT6 #(.INIT(LUT)) fpga_lut (.O(O), LUT6 #(.INIT(LUT)) fpga_lut (.O(Y),
.I0(I[0]), .I1(I[1]), .I2(I[2]), .I0(A[0]), .I1(A[1]), .I2(A[2]),
.I3(I[3]), .I4(I[4]), .I5(I[5])); .I3(A[3]), .I4(A[4]), .I5(A[5]));
end else begin:error end else begin:error
wire _TECHMAP_FAIL_ = 1; wire _TECHMAP_FAIL_ = 1;
end end