Skip to content

Fix reserve/resize bug in full legalizer #3796

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AlexandreSinger merged 2 commits into from
Sep 1, 2026
+6 −6
Merged

Fix reserve/resize bug in full legalizer #3796

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9fea678
Fix out-of-bounds writes to mol_desired_physical_tile_loc by using re…
soheilshahrouz Sep 1, 2026
0b49e1f
Replace auto with explicit short type names in full legalizer
soheilshahrouz Sep 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions vpr/src/analytical_place/full_legalization/full_legalizer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ class APClusterPlacer {
const char* constraints_file)
: place_macros_(place_macros) {
// Initialize the block loc registry.
auto& blk_loc_registry = g_vpr_ctx.mutable_placement().mutable_blk_loc_registry();
BlkLocRegistry& blk_loc_registry = g_vpr_ctx.mutable_placement().mutable_blk_loc_registry();
blk_loc_registry.init();

// Place the fixed blocks and mark them as fixed.
Expand Down Expand Up @@ -188,7 +188,7 @@ class APClusterPlacer {
const FloorplanningContext& floorplanning_ctx = g_vpr_ctx.floorplanning();
const ClusteringContext& cluster_ctx = g_vpr_ctx.clustering();
const auto& block_locs = g_vpr_ctx.placement().block_locs();
auto& blk_loc_registry = g_vpr_ctx.mutable_placement().mutable_blk_loc_registry();
BlkLocRegistry& blk_loc_registry = g_vpr_ctx.mutable_placement().mutable_blk_loc_registry();
// If this block has already been placed, just return true.
// TODO: This should be investigated further. What I think is happening
// is that a macro is being placed which contains another cluster.
Expand Down Expand Up @@ -232,7 +232,7 @@ class APClusterPlacer {
// centroid, then random, then exhaustive.
bool exhaustively_place_cluster(ClusterBlockId clb_blk_id) {
const auto& block_locs = g_vpr_ctx.placement().block_locs();
auto& blk_loc_registry = g_vpr_ctx.mutable_placement().mutable_blk_loc_registry();
BlkLocRegistry& blk_loc_registry = g_vpr_ctx.mutable_placement().mutable_blk_loc_registry();
// If this block has already been placed, just return true.
// TODO: See similar comment above.
if (is_block_placed(clb_blk_id, block_locs))
Expand Down Expand Up @@ -343,7 +343,7 @@ FlatRecon::sort_and_group_blocks_by_tile(const PartialPlacement& p_placement) {
for (APBlockId blk_id : ap_netlist_.blocks()) {
t_physical_tile_loc tile_loc = p_placement.get_containing_tile_loc(blk_id);
for (PackMoleculeId mol_id : ap_netlist_.block_molecules(blk_id)) {
const auto& mol = prepacker_.get_molecule(mol_id);
const t_pack_molecule& mol = prepacker_.get_molecule(mol_id);

int num_ext_inputs = prepacker_.calc_molecule_stats(mol_id, atom_netlist_, arch_.models).num_used_ext_inputs;
bool long_chain = mol.is_chain() && prepacker_.get_molecule_chain_info(mol.chain_id).is_long_chain;
Expand Down Expand Up @@ -374,7 +374,7 @@ FlatRecon::sort_and_group_blocks_by_tile(const PartialPlacement& p_placement) {
// Group the molecules by root tile. Any non-zero offset gets
// pulled back to its root.
std::unordered_map<t_physical_tile_loc, std::vector<PackMoleculeId>> tile_blocks;
mol_desired_physical_tile_loc.reserve(prepacker_.molecules().size());
mol_desired_physical_tile_loc.resize(prepacker_.molecules().size());
for (const auto& [mol_id, ext_pins, is_long_chain, tile_loc] : sorted_blocks) {
int width_offset = device_grid_.get_width_offset(tile_loc);
int height_offset = device_grid_.get_height_offset(tile_loc);
Expand Down Expand Up @@ -1367,7 +1367,7 @@ void FullLegalizer::update_drawing_data_structures() {
}

void FullLegalizer::recreate_device_if_needed() {
const auto& device_ctx = g_vpr_ctx.device();
const DeviceContext& device_ctx = g_vpr_ctx.device();
// Capture before grid recreation: vpr_create_device_grid only writes
// device_ctx.grid and does not touch the RR graph, so this flag remains
// valid after the call.
Expand Down
Loading