mirrors/yosys
3
0
Fork 0
mirror of https://github.com/YosysHQ/yosys synced 2026-07-20 22:25:49 +00:00
Code Activity

Merge pull request #183 from Silimate/opt_argmax_fix1

Browse source 
opt_argmax fixes
This commit is contained in:
Akash Levy 2026-06-09 02:54:05 -07:00 • committed by GitHub
commit b60d2daa41
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 123 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

56
passes/opt/opt_argmax.cc
View file

@ -75,6 +75,7 @@ struct OptArgmaxWorker
SigSpec values_sig;
std::string index_name;
std::string values_name;
bool identity_index = false;
int width = 0;
int index_width = 0;
int value_width = 0;
@ -240,9 +241,10 @@ struct OptArgmaxWorker
for (auto bit : sigmap(cand.valid_sig))
if (bit.wire)
allowed.insert(bit);
for (auto bit : sigmap(cand.index_sig))
if (bit.wire)
allowed.insert(bit);
if (!cand.identity_index)
for (auto bit : sigmap(cand.index_sig))
if (bit.wire)
allowed.insert(bit);
for (auto bit : sigmap(cand.values_sig))
if (bit.wire)
allowed.insert(bit);
@ -344,16 +346,16 @@ struct OptArgmaxWorker
return vectors;
}
int expected_argmax(const TestVector &tv, int width, int value_width)
int expected_argmax(const TestVector &tv, int width, int value_width, bool identity_index)
{
uint64_t mask = value_mask(value_width);
int best_idx = 0;
bool best_valid = tv.valid[0] != 0;
uint64_t best_value = tv.values[tv.index[0]] & mask;
uint64_t best_value = tv.values[identity_index ? 0 : tv.index[0]] & mask;
for (int k = 1; k < width; k++) {
bool cand_valid = tv.valid[k] != 0;
uint64_t cand_value = tv.values[tv.index[k]] & mask;
uint64_t cand_value = tv.values[identity_index ? k : tv.index[k]] & mask;
if (!best_valid && cand_valid) {
best_idx = k;
best_valid = true;
@ -372,14 +374,15 @@ struct OptArgmaxWorker
ConstEval ce(module);
SigSpec out_sig = sigmap(SigSpec(cand.out_wire));
SigSpec valid_sig = sigmap(cand.valid_sig);
SigSpec index_sig = sigmap(cand.index_sig);
SigSpec index_sig = cand.identity_index ? SigSpec() : sigmap(cand.index_sig);
SigSpec values_sig = sigmap(cand.values_sig);
vector<TestVector> vectors = make_test_vectors(cand.width, cand.value_width);
for (auto &tv : vectors) {
ce.push();
ce.set(valid_sig, packed_valid_const(tv.valid));
ce.set(index_sig, packed_table_const(tv.index, cand.index_width));
if (!cand.identity_index)
ce.set(index_sig, packed_table_const(tv.index, cand.index_width));
ce.set(values_sig, packed_table_const(tv.values, cand.value_width));
SigSpec out = out_sig;
@ -390,7 +393,7 @@ struct OptArgmaxWorker
return false;
int actual = out.as_const().as_int();
int expected = expected_argmax(tv, cand.width, cand.value_width);
int expected = expected_argmax(tv, cand.width, cand.value_width, cand.identity_index);
if (actual != expected)
return false;
}
@ -481,12 +484,17 @@ struct OptArgmaxWorker
{
vector<Record> leaves;
SigSpec valid = sigmap(cand.valid_sig);
SigSpec index_map = sigmap(cand.index_sig);
SigSpec index_map = cand.identity_index ? SigSpec() : sigmap(cand.index_sig);
SigSpec values = sigmap(cand.values_sig);
for (int k = 0; k < cand.width; k++) {
SigSpec index = index_map.extract(k * cand.index_width, cand.index_width);
SigSpec value = emit_bmux(cand.anchor, values, index);
SigSpec value;
if (cand.identity_index)
value = values.extract(k * cand.value_width, cand.value_width);
else {
SigSpec index = index_map.extract(k * cand.index_width, cand.index_width);
value = emit_bmux(cand.anchor, values, index);
}
leaves.push_back({valid[k], value, SigSpec(Const(k, cand.index_width))});
}
@ -666,6 +674,29 @@ struct OptArgmaxWorker
values_buses.push_back(bus);
}
for (auto &values : values_buses) {
Candidate cand;
cand.out_wire = out;
cand.valid_wire = valid;
cand.valid_sig = SigSpec(valid);
cand.values_sig = values.sig;
cand.index_name = "<identity>";
cand.values_name = values.name;
cand.identity_index = true;
cand.width = width;
cand.index_width = out_width;
cand.value_width = values.elem_width;
if (!check_candidate(cand, cone))
continue;
rewrites.push_back(cand);
claimed_outputs.insert(out);
log(" %s: %s <- argmax(valid=%s, index=<identity>, values=%s) [N=%d, IW=%d, VW=%d]\n",
log_id(module), log_id(out), log_id(valid), values.name.c_str(),
cand.width, cand.index_width, cand.value_width);
goto next_output;
}
for (auto &index : index_buses) {
for (auto &values : values_buses) {
if (index.sig == values.sig)
@ -678,6 +709,7 @@ struct OptArgmaxWorker
cand.values_sig = values.sig;
cand.index_name = index.name;
cand.values_name = values.name;
cand.identity_index = false;
cand.width = width;
cand.index_width = out_width;
cand.value_width = values.elem_width;