Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix WREDUCE on FF not fixing ARST_VALUE parameter. #824

Merged
merged 1 commit into from
Feb 24, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions passes/opt/wreduce.cc
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,19 @@ struct WreduceWorker
for (auto bit : sig_q)
work_queue_bits.insert(bit);

// Narrow ARST_VALUE parameter to new size.
//
// Note: This works because earlier loop only removes signals from
// the upper bits of the DFF.
if(cell->parameters.count("\\ARST_VALUE") > 0) {
RTLIL::Const old_arst_value = cell->parameters.at("\\ARST_VALUE");
std::vector<RTLIL::State> new_arst_value(GetSize(sig_q));
for(int i = 0; i < GetSize(sig_q); ++i) {
new_arst_value[i] = old_arst_value[i];
}
cell->parameters["\\ARST_VALUE"] = RTLIL::Const(new_arst_value);
}

cell->setPort("\\D", sig_d);
cell->setPort("\\Q", sig_q);
cell->fixup_parameters();
Expand Down
21 changes: 21 additions & 0 deletions tests/opt/opt_ff.v
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
module top(
input clk,
input rst,
input [2:0] a,
output [1:0] b
);
reg [2:0] b_reg;
initial begin
b_reg <= 3'b0;
end

assign b = b_reg[1:0];
always @(posedge clk or posedge rst) begin
if(rst) begin
b_reg <= 3'b0;
end else begin
b_reg <= a;
end
end
endmodule

3 changes: 3 additions & 0 deletions tests/opt/opt_ff.ys
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
read_verilog opt_ff.v
synth_ice40
ice40_unlut