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

Improvements in pmux2shiftx 

Signed-off-by: Clifford Wolf <clifford@clifford.at>
This commit is contained in:
Clifford Wolf 2019-04-19 23:37:11 +02:00
parent 4c831d72ef
commit 0070184ea9
3 changed files with 36 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
passes/opt/pmux2shiftx.cc
View File

@ -149,6 +149,7 @@ struct Pmux2ShiftxPass : public Pass {
dict<SigSpec, pool<int>> seldb; dict<SigSpec, pool<int>> seldb;
SigSpec B = cell->getPort("\\B");
SigSpec S = sigmap(cell->getPort("\\S")); SigSpec S = sigmap(cell->getPort("\\S"));
for (int i = 0; i < GetSize(S); i++) for (int i = 0; i < GetSize(S); i++)
{ {
@ -168,15 +169,6 @@ struct Pmux2ShiftxPass : public Pass {
SigSpec updated_S = cell->getPort("\\S"); SigSpec updated_S = cell->getPort("\\S");
SigSpec updated_B = cell->getPort("\\B"); SigSpec updated_B = cell->getPort("\\B");
#if 1
for (auto &it : seldb) {
string msg = stringf("seldb: %s ->", log_signal(it.first));
for (int i : it.second)
msg += stringf(" %d(%s)", i, log_signal(eqdb.at(S[i]).second));
log(" %s\n", msg.c_str());
}
#endif
while (!seldb.empty()) while (!seldb.empty())
{ {
// pick the largest entry in seldb // pick the largest entry in seldb
@ -319,7 +311,8 @@ struct Pmux2ShiftxPass : public Pass {
min_choice = std::min(min_choice, new_c.as_int()); min_choice = std::min(min_choice, new_c.as_int());
max_choice = std::max(max_choice, new_c.as_int()); max_choice = std::max(max_choice, new_c.as_int());
log(" %s -> %s -> %s\n", log_signal(old_c), log_signal(new_c_before_xor), log_signal(new_c)); log(" %3d: %s -> %s -> %s: %s\n", it.second, log_signal(old_c), log_signal(new_c_before_xor),
log_signal(new_c), log_signal(B.extract(it.second*width, width)));
} }
int range_density = 100*GetSize(choices) / (max_choice-min_choice+1); int range_density = 100*GetSize(choices) / (max_choice-min_choice+1);
@ -338,9 +331,9 @@ struct Pmux2ShiftxPass : public Pass {
Const offset(State::S0, GetSize(sig)); Const offset(State::S0, GetSize(sig));
if (absolute_density < non_offset_percentage && range_density >= offset_percentage) if (absolute_density < non_offset_percentage && range_density >= offset_percentage)
{ {
log(" using offset method.\n");
offset = Const(min_choice, GetSize(sig)); offset = Const(min_choice, GetSize(sig));
log(" offset: %s\n", log_signal(offset));
min_choice -= offset.as_int(); min_choice -= offset.as_int();
max_choice -= offset.as_int(); max_choice -= offset.as_int();
@ -377,7 +370,7 @@ struct Pmux2ShiftxPass : public Pass {
for (auto &it : perm_choices) { for (auto &it : perm_choices) {
int position = it.first.as_int()*extwidth; int position = it.first.as_int()*extwidth;
int data_index = it.second; int data_index = it.second;
data.replace(position, cell->getPort("\\B").extract(data_index*width, width)); data.replace(position, B.extract(data_index*width, width));
updated_S[data_index] = State::S0; updated_S[data_index] = State::S0;
updated_B.replace(data_index*width, SigSpec(State::Sx, width)); updated_B.replace(data_index*width, SigSpec(State::Sx, width));
} }

38
tests/various/pmux2shiftx.v
View File

@ -1,28 +1,34 @@
module pmux2shiftx_test ( module pmux2shiftx_test (
input [2:0] S1, input [2:0] S1,
input [5:0] S2, input [5:0] S2,
input [9:0] A, B, C, D, D, E, F, input [1:0] S3,
input [9:0] G, H, I, J, K, L, M, N, input [9:0] A, B, C, D, D, E, F, G, H,
input [9:0] I, J, K, L, M, N, O, P, Q,
output reg [9:0] X output reg [9:0] X
); );
always @* begin always @* begin
case (S1) case (S1)
3'd0: X = A; 3'd 0: X = A;
3'd1: X = B; 3'd 1: X = B;
3'd2: X = C; 3'd 2: X = C;
3'd3: X = D; 3'd 3: X = D;
3'd4: X = E; 3'd 4: X = E;
3'd5: X = F; 3'd 5: X = F;
3'd6: X = G; 3'd 6: X = G;
3'd7: X = H; 3'd 7: X = H;
endcase endcase
case (S2) case (S2)
6'd46: X = I; 6'd 45: X = I;
6'd47: X = J; 6'd 47: X = J;
6'd48: X = K; 6'd 49: X = K;
6'd52: X = L; 6'd 55: X = L;
6'd53: X = M; 6'd 57: X = M;
6'd54: X = N; 6'd 59: X = N;
endcase
case (S3)
2'd 1: X = O;
2'd 2: X = P;
2'd 3: X = Q;
endcase endcase
end end
endmodule endmodule

12
tests/various/pmux2shiftx.ys
View File

@ -2,13 +2,17 @@ read_verilog pmux2shiftx.v
prep prep
design -save gold design -save gold
pmux2shiftx pmux2shiftx -density 70 50
opt opt
stat
# show -width # show -width
select -assert-count 1 t:$mux
select -assert-count 1 t:$shift
select -assert-count 2 t:$shiftx
select -assert-count 1 t:$sub select -assert-count 1 t:$sub
select -assert-count 2 t:$mux
select -assert-count 2 t:$shift
select -assert-count 3 t:$shiftx
design -stash gate design -stash gate
design -import gold -as gold design -import gold -as gold