diff options
author | gatecat <gatecat@ds0.me> | 2021-04-14 12:19:10 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-04-14 12:19:10 +0100 |
commit | b26088f940d512174154cef3954f3a9b6c9642e7 (patch) | |
tree | 26ecc8b150afaa9381910ebe3d22622e967f91e3 /fpga_interchange/site_router.cc | |
parent | 2912860c9788033a7501726e77bb4962b394280d (diff) | |
parent | b0f57d234f877fe8b2a421e3e868c8a3e9cd89eb (diff) | |
download | nextpnr-b26088f940d512174154cef3954f3a9b6c9642e7.tar.gz nextpnr-b26088f940d512174154cef3954f3a9b6c9642e7.tar.bz2 nextpnr-b26088f940d512174154cef3954f3a9b6c9642e7.zip |
Merge pull request #679 from YosysHQ/gatecat/disable-absl
Hash table changes
Diffstat (limited to 'fpga_interchange/site_router.cc')
-rw-r--r-- | fpga_interchange/site_router.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fpga_interchange/site_router.cc b/fpga_interchange/site_router.cc index 51b8bef3..f8cc2208 100644 --- a/fpga_interchange/site_router.cc +++ b/fpga_interchange/site_router.cc @@ -988,7 +988,7 @@ static void apply_routing(Context *ctx, const SiteArch &site_arch) } static bool map_luts_in_site(const SiteInformation &site_info, - HashTables::HashSet<std::pair<IdString, IdString>> *blocked_wires) + HashTables::HashSet<std::pair<IdString, IdString>, PairHash> *blocked_wires) { const Context *ctx = site_info.ctx; const std::vector<LutElement> &lut_elements = ctx->lut_elements.at(site_info.tile_type); @@ -1031,7 +1031,7 @@ static bool map_luts_in_site(const SiteInformation &site_info, // Block outputs of unavailable LUTs to prevent site router from using them. static void block_lut_outputs(SiteArch *site_arch, - const HashTables::HashSet<std::pair<IdString, IdString>> &blocked_wires) + const HashTables::HashSet<std::pair<IdString, IdString>, PairHash> &blocked_wires) { const Context *ctx = site_arch->site_info->ctx; auto &tile_info = ctx->chip_info->tile_types[site_arch->site_info->tile_type]; @@ -1112,7 +1112,7 @@ bool SiteRouter::checkSiteRouting(const Context *ctx, const TileStatus &tile_sta } SiteInformation site_info(ctx, tile, site, cells_in_site); - HashTables::HashSet<std::pair<IdString, IdString>> blocked_wires; + HashTables::HashSet<std::pair<IdString, IdString>, PairHash> blocked_wires; if (!map_luts_in_site(site_info, &blocked_wires)) { site_ok = false; return site_ok; @@ -1190,7 +1190,7 @@ void SiteRouter::bindSiteRouting(Context *ctx) } SiteInformation site_info(ctx, tile, site, cells_in_site); - HashTables::HashSet<std::pair<IdString, IdString>> blocked_wires; + HashTables::HashSet<std::pair<IdString, IdString>, PairHash> blocked_wires; NPNR_ASSERT(map_luts_in_site(site_info, &blocked_wires)); SiteArch site_arch(&site_info); |