Mark fixed blocks #1759

sfkhalid · 2021-06-02T19:14:47Z

Description

Before starting initial placement, the added code loops through the cluster blocks netlist to see whether any of the blocks have floorplan constraints that lock them to one grid location. For the blocks that are thus locked, the .is_fixed flag is set, and their locations are marked, meaning that the blocks will be skipped during initial placement, and they will not be moved during simulated annealing.

Related Issue

This pull request is related to adding floorplanning placement constraints to VPR, as described in this issue #932

…n the grid as fixed and changed definition of Region::empty() to show false for a region that contains one grid location

…possible dimensions, or it is uninitialized. This change was needed because previously, the default uninitialized values would be seen as impossible dimensions (and therefore empty) and now they are not because of the recent change to the empty routine

vpr/src/place/initial_placement.cpp

vpr/src/base/region.cpp

vpr/src/base/region.h

vpr/src/place/place_constraints.cpp

… extra checks

vpr/src/place/place.cpp

vpr/src/place/place_constraints.cpp

vpr/src/place/place_constraints.h

vpr/src/place/place_util.cpp

…ck covers one tile or more than one tile. This was needed to decide which blocks to mark as fixed

…ed after function to check number of tiles was written

…ting/vtr-verilog-to-routing into mark_fixed_blocks

sfkhalid · 2021-06-17T12:57:49Z

QoR results on this branch:
mark_fixed_qor_comparison.xlsx

vpr/src/place/place_constraints.cpp

vpr/src/place/place_constraints.h

sfkhalid · 2021-06-18T12:09:18Z

@vaughnbetz Does this look good to merge?
I moved the initialization of grid_blocks so that the load placement flow and load constraints file can both use the utility function I created, set_block_location. I also refactored the region tile area function to return an int instead of a bool.

sfkhalid · 2021-06-18T12:10:12Z

I'm currently waiting for the QoR results to finish running, once that happens I will post the QoR results for the updated code

…gions cover the same tile

sfkhalid · 2021-06-18T15:00:37Z

New QoR comparison:
mark_fixed_qor_comparison.xlsx

vaughnbetz

Some changes requested.

vpr/src/base/read_place.cpp

vpr/src/place/place_constraints.cpp

vpr/src/place/place_constraints.h

vpr/src/place/place_util.cpp

vpr/src/place/place_util.h

… blocks

…Initialize the structures using utility function init_placement_context, which is also used during the do place flow

sfkhalid · 2021-06-21T19:45:33Z

@vaughnbetz Does this look ok to merge once the CI goes green?
I made the changes requested on Friday, like simplifying the if statements in is_pr_size_one, adding the checks for subtile compatibility in region_tile_cover and performing the initialization of placement contexts with a helper routine during the load placement flow.

vaughnbetz · 2021-06-21T20:59:06Z

The changes look good; will merge when CI goes green.

One final feedback: using loop counters that indicate what you are looping over is a bit better than just using i. E.g. in the code looping over regions, you could use one of ireg/iregion/irect instead of i, and it would make the loop a bit easier to understand.

sfkhalid · 2021-06-22T13:48:53Z

@vaughnbetz The CI has passed, is this PR good to be merged now?

sfkhalid added 3 commits June 2, 2021 12:14

Added code for marking down blocks that constrained to one location o…

cd289a2

…n the grid as fixed and changed definition of Region::empty() to show false for a region that contains one grid location

Ran make format

77786c8

sfkhalid commented Jun 2, 2021

View reviewed changes

vpr/src/place/initial_placement.cpp Outdated Show resolved Hide resolved

sfkhalid mentioned this pull request Jun 2, 2021

Add constraints propagation to update the PartitionRegions of blocks … #1751

Merged

github-actions bot added the VPR VPR FPGA Placement & Routing Tool label Jun 2, 2021

sfkhalid commented Jun 3, 2021

View reviewed changes

vpr/src/base/region.cpp Outdated Show resolved Hide resolved

sfkhalid commented Jun 3, 2021

View reviewed changes

vpr/src/base/region.h Outdated Show resolved Hide resolved

sfkhalid commented Jun 3, 2021

View reviewed changes

vpr/src/place/place_constraints.cpp Outdated Show resolved Hide resolved

sfkhalid commented Jun 3, 2021

View reviewed changes

vpr/src/place/place_constraints.cpp Outdated Show resolved Hide resolved

sfkhalid commented Jun 3, 2021

View reviewed changes

vpr/src/place/place_constraints.cpp Outdated Show resolved Hide resolved

sfkhalid added 4 commits June 9, 2021 12:30

Changed default empty region values

25a5b7f

Added helper function for marking block locations and grid usage with…

6c6772d

… extra checks

Changed placement consistency error messages to improve clarity

bf766f0

Add function to count number of tiles covered by a floorplan region

c915129

sfkhalid commented Jun 10, 2021

View reviewed changes

vpr/src/place/place.cpp Show resolved Hide resolved

sfkhalid commented Jun 10, 2021

View reviewed changes

vpr/src/place/place_constraints.cpp Outdated Show resolved Hide resolved

sfkhalid commented Jun 10, 2021

View reviewed changes

vpr/src/place/place_constraints.h Outdated Show resolved Hide resolved

sfkhalid commented Jun 10, 2021

View reviewed changes

vpr/src/place/place_util.cpp Outdated Show resolved Hide resolved

sfkhalid and others added 9 commits June 14, 2021 11:08

Changed comment

2f0dbf6

Changed name of function mark_block_location->set_block_location

8165a5d

Added functions to check whether the PartitionRegion of a cluster blo…

8a90016

…ck covers one tile or more than one tile. This was needed to decide which blocks to mark as fixed

Ran make format

2cc056b

Removed locked member function from Region class - was no longer need…

904db47

…ed after function to check number of tiles was written

Merge branch 'master' into mark_fixed_blocks

4f94cbd

Got rid of unnecessary lines in mark_fixed_blocks

3a9096b

merge branch 'mark_fixed_blocks' of https://github.com/verilog-to-rou…

e359b20

…ting/vtr-verilog-to-routing into mark_fixed_blocks

Ran make format

3c9c93a

sfkhalid commented Jun 17, 2021

View reviewed changes

vpr/src/place/place_constraints.cpp Outdated Show resolved Hide resolved

sfkhalid commented Jun 17, 2021

View reviewed changes

vpr/src/place/place_constraints.cpp Outdated Show resolved Hide resolved

sfkhalid commented Jun 17, 2021

View reviewed changes

vpr/src/place/place_constraints.cpp Outdated Show resolved Hide resolved

sfkhalid commented Jun 17, 2021

View reviewed changes

vpr/src/place/place_constraints.cpp Outdated Show resolved Hide resolved

sfkhalid commented Jun 17, 2021

View reviewed changes

vpr/src/place/place_constraints.cpp Outdated Show resolved Hide resolved

sfkhalid commented Jun 17, 2021

View reviewed changes

vpr/src/place/place_constraints.h Outdated Show resolved Hide resolved

sfkhalid commented Jun 17, 2021

View reviewed changes

vpr/src/place/place_constraints.h Show resolved Hide resolved

sfkhalid added 6 commits June 17, 2021 12:53

Initialized grid blocks earlier in flow of reading in place file

e1fa745

Refactored read_place to make use of set_block_location utility function

f2305df

Improved error messaging during read place

7e0fe58

Refactored region size routine to return an int instead of a bool

0504d8c

Refactored region tile cover routine to return int instead of bool

8c3c163

Modified is_pr_size_one to get rid of compiler warning

c3ad3b6

Added check to partition region size check to see whether multiple re…

6ad75c3

…gions cover the same tile

vaughnbetz requested changes Jun 18, 2021

View reviewed changes

sfkhalid added 4 commits June 21, 2021 11:37

Added checks for whether subtile location is valid when marking fixed…

8887b6c

… blocks

Merge branch 'master' into mark_fixed_blocks

cbe935d

Check whether subtile is compatible when adding fixed blocks

58e2683

Moved initialization of placement structures during load place flow. …

57ae843

…Initialize the structures using utility function init_placement_context, which is also used during the do place flow

sfkhalid merged commit 99f2b7a into master Jun 22, 2021

sfkhalid deleted the mark_fixed_blocks branch June 22, 2021 16:25

Mark fixed blocks #1759

Mark fixed blocks #1759

Uh oh!

Conversation

sfkhalid commented Jun 2, 2021

Description

Related Issue

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

sfkhalid commented Jun 17, 2021

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

sfkhalid commented Jun 18, 2021

Uh oh!

sfkhalid commented Jun 18, 2021

Uh oh!

sfkhalid commented Jun 18, 2021

Uh oh!

vaughnbetz left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

sfkhalid commented Jun 21, 2021

Uh oh!

vaughnbetz commented Jun 21, 2021

Uh oh!

sfkhalid commented Jun 22, 2021

Uh oh!

Uh oh!