diff options
| author | gatecat <gatecat@ds0.me> | 2021-05-13 20:25:55 +0100 |
|---|---|---|
| committer | gatecat <gatecat@ds0.me> | 2021-05-15 14:54:33 +0100 |
| commit | 09a867310b8c3c51e62f394a9acfda217e7addc5 (patch) | |
| tree | 43f7d1579afa93a2a8ac307d586cc63bfac4585c /mistral | |
| parent | 3d1bb4f1b217b020e750277dd1ee2e4d3516b58f (diff) | |
| download | nextpnr-09a867310b8c3c51e62f394a9acfda217e7addc5.tar.gz nextpnr-09a867310b8c3c51e62f394a9acfda217e7addc5.tar.bz2 nextpnr-09a867310b8c3c51e62f394a9acfda217e7addc5.zip | |
mistral: Carry fixes
Signed-off-by: gatecat <gatecat@ds0.me>
Diffstat (limited to 'mistral')
| -rw-r--r-- | mistral/bitstream.cc | 3 | ||||
| -rw-r--r-- | mistral/lab.cc | 16 |
2 files changed, 16 insertions, 3 deletions
diff --git a/mistral/bitstream.cc b/mistral/bitstream.cc index a9eaeff2..58154d7c 100644 --- a/mistral/bitstream.cc +++ b/mistral/bitstream.cc @@ -226,7 +226,8 @@ struct MistralBitgen bool is_carry = (luts[0] && luts[0]->combInfo.is_carry) || (luts[1] && luts[1]->combInfo.is_carry); if (is_carry) cv->bmux_m_set(CycloneV::LAB, pos, CycloneV::ARITH_SEL, alm, CycloneV::ADDER); - if (is_carry && alm == 0 && luts[0]->combInfo.carry_start) + // The carry in/out enable bits + if (is_carry && alm == 0 && !luts[0]->combInfo.carry_start) cv->bmux_b_set(CycloneV::LAB, pos, CycloneV::TTO_DIS, alm, true); } diff --git a/mistral/lab.cc b/mistral/lab.cc index a0179a88..11b347ca 100644 --- a/mistral/lab.cc +++ b/mistral/lab.cc @@ -735,11 +735,23 @@ uint64_t Arch::compute_lut_mask(uint32_t lab, uint8_t alm) int index = 0; for (int k = 0; k < lut->combInfo.lut_input_count; k++) { IdString log_pin = get_lut_pin(lut, k); + int init_idx = k; + if (arith) { + // D0 only affects lower half; D1 upper half + if (k == 3 && j >= 16) + continue; + if (k == 4) { + if (j < 16) + continue; + else + init_idx = 3; + } + } CellPinState state = lut->get_pin_state(log_pin); if (state == PIN_0) continue; else if (state == PIN_1) - index |= (1 << k); + index |= (1 << init_idx); // Ignore if no associated physical pin if (get_net_or_empty(lut, log_pin) == nullptr || lut->pin_data.at(log_pin).bel_pins.empty()) continue; @@ -749,7 +761,7 @@ uint64_t Arch::compute_lut_mask(uint32_t lab, uint8_t alm) // Depermute physical pin IdString phys_pin = lut->pin_data.at(log_pin).bel_pins.at(0); if (get_phys_pin_val(alm_data.l6_mode, arith, j, phys_pin) != inverted) - index |= (1 << k); + index |= (1 << init_idx); } if ((init >> index) & 0x1) { mask |= (1ULL << uint64_t(j + offset)); |