diff options
| author | Ross Schlaikjer <ross@schlaikjer.net> | 2020-04-07 14:11:02 -0400 |
|---|---|---|
| committer | Ross Schlaikjer <ross@schlaikjer.net> | 2020-04-07 14:11:49 -0400 |
| commit | 3257bdc8a15077e8e8ad9285f98e8d9e1e5cae07 (patch) | |
| tree | 29d4f6023fbbfa14b41ff0fb0450ab261fbda246 /ecp5/pack.cc | |
| parent | 0bdf1e05f126e01adcea3f11d1d76f3235ab44e8 (diff) | |
| download | nextpnr-3257bdc8a15077e8e8ad9285f98e8d9e1e5cae07.tar.gz nextpnr-3257bdc8a15077e8e8ad9285f98e8d9e1e5cae07.tar.bz2 nextpnr-3257bdc8a15077e8e8ad9285f98e8d9e1e5cae07.zip | |
Actually just move all the logic to ArchInfo
Diffstat (limited to 'ecp5/pack.cc')
| -rw-r--r-- | ecp5/pack.cc | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/ecp5/pack.cc b/ecp5/pack.cc index 16728af4..11aef630 100644 --- a/ecp5/pack.cc +++ b/ecp5/pack.cc @@ -3012,8 +3012,19 @@ void Arch::assignArchInfo() std::string regmode_b = str_or_default(ci->params, id("REGMODE_B"), "NOREG"); if (!(regmode_b == "NOREG" || regmode_b == "OUTREG")) NPNR_ASSERT_FALSE_STR("bad DP16KD REGMODE_B configuration '" + regmode_b + "'"); - ci->ramInfo.output_a_registered = regmode_a == "OUTREG"; - ci->ramInfo.output_b_registered = regmode_b == "OUTREG"; + ci->ramInfo.is_output_a_registered = regmode_a == "OUTREG"; + ci->ramInfo.is_output_b_registered = regmode_b == "OUTREG"; + + // Based on the REGMODE, we have different timing lookup tables. + if (!ci->ramInfo.is_output_a_registered && !ci->ramInfo.is_output_b_registered) { + ci->ramInfo.regmode_timing_id = id_DP16KD_REGMODE_A_NOREG_REGMODE_B_NOREG; + } else if (!ci->ramInfo.is_output_a_registered && ci->ramInfo.is_output_b_registered) { + ci->ramInfo.regmode_timing_id = id_DP16KD_REGMODE_A_NOREG_REGMODE_B_OUTREG; + } else if (ci->ramInfo.is_output_a_registered && !ci->ramInfo.is_output_b_registered) { + ci->ramInfo.regmode_timing_id = id_DP16KD_REGMODE_A_OUTREG_REGMODE_B_NOREG; + } else if (ci->ramInfo.is_output_a_registered && ci->ramInfo.is_output_b_registered) { + ci->ramInfo.regmode_timing_id = id_DP16KD_REGMODE_A_OUTREG_REGMODE_B_OUTREG; + } } } for (auto net : sorted(nets)) { |