Remove remaining global and static varaibels in the placement stage #2770

soheilshahrouz · 2024-10-13T19:18:27Z

Removed static variable from place_macro.cpp
Encapsulated palcement macro initalization and lookup into a class: PlaceMacros
Added place_macros_ member variable to BlkLocRegistry
Use std::vector for Switches and Directs in t_arch
Added get_coordinate_of_pin() to BlkLocRegistry. Replaced inline pin location compuations with calls to this function.

…atic

…temp_place_macro_static

… place

…atic

…eGenerator

…ianMoveGenerator

…ghtedMedianMoveGenerator

soheilshahrouz · 2024-10-14T18:47:59Z

titan_quick_qor	pack-time	place time	place WL	place cpd	place_mem	n_swaps
titan-master	508.661663	1180.501624	2499010.582	16.92400524	5516.379438	18129958.28
titan-pr	505.8832901	1182.558045	2499010.582	16.92400524	5517.361088	18129958.28
ratio	0.9945378762	1.001741989	1	1	1.000177952	1

vaughnbetz

Looks good -- thanks! This is a huge readability/infrastructure improvement.

libs/libarchfpga/src/echo_arch.cpp

libs/libarchfpga/src/physical_types.h

vpr/src/analytical_place/full_legalizer.cpp

vpr/src/base/blk_loc_registry.h

vpr/src/place/place_macro.cpp

vpr/src/place/simpleRL_move_generator.h

vpr/src/place/weighted_centroid_move_generator.h

…str() when needed

vaughnbetz · 2024-10-28T22:57:57Z

Not sure why these little designs would get a different answer ... suggest running valgrind / the sanitizers to be sure there are no memory faults (S: strong).

soheilshahrouz · 2024-11-03T19:33:10Z

vpr/src/place/median_move_generator.cpp

-
-            xold = std::max(std::min(xold, (int)device_ctx.grid.width() - 2), 1);  //-2 for no perim channels
-            yold = std::max(std::min(yold, (int)device_ctx.grid.height() - 2), 1); //-2 for no perim channels
-            layer_old = std::max(std::min(layer_old, (int)device_ctx.grid.get_num_layers() - 1), 0);


Calls to std::max() and std::min() are removed from median move generators. There are a few other palces in this file and weighted_median_move_generator.cpp where pin location coordinates are clipped between 1 and H|W-2. QoR changes before and after the commit that removes this.

soheilshahrouz · 2024-11-05T20:48:28Z

I updated golden results for a few circuits in nightly tests. A failure in vtr_reg_nightly_test7 seems to be related to this issue, so I didn't update golden results for this one.

soheilshahrouz · 2024-11-05T23:03:20Z

Resolved merge confilicts caused my merging #2793.

vaughnbetz · 2024-11-05T23:28:06Z

Looks good. Since you only have a small change due to merging in changes, this is OK to merge without another QoR test. Just please take a look at the strong tests or run one design to confirm same/equivalent QoR. Then feel free to merge whenever you like.

soheilshahrouz · 2024-11-06T16:21:41Z

I compared 89d17a2 and baa73fa (the commit before resolving merge confilicts) by running vpr_reg_mcnm. The results are the same.

soheilshahrouz added 21 commits September 3, 2024 16:25

use vector of vectors instead of int**

5f30133

get_imacro_from_iblk return int instead filling an int* argument

e8c5a5c

t_direct_inf* Directs ---> std::vector<t_direct_inf> Directs

9da4bce

Merge branch 'master' into temp_place_macro_static

6c46e6b

created PlaceMacros class and moved some code

4d2ef04

added PortPinToBlockPinConverter class

64f426f

move placement macros from place_ctx to blk_loc_registry

97c97ff

add operator[] to PlaceMacros

47cf976

Merge remote-tracking branch 'origin/master' into temp_place_macro_st…

6e14e89

…atic

move get_coordinate_of_pin to BlkLocRegistry

a8cabfa

Merge remote-tracking branch 'origin/temp_chanx_place_cost_fac' into …

9e1690e

…temp_place_macro_static

call get_coordinate_of_pin() instead of computing the pin location in…

1fc28db

… place

move calculate_centroid_loc() to CentroidMoveGenerator

09421bd

added MoveAbortionLogger class

d37da14

remove ditected_moves_util.h/cpp

6883744

Merge remote-tracking branch 'origin/master' into temp_place_macro_st…

4ecb049

…atic

don't clip bounding box coordinates between 1 and H/W -2 in MedianMov…

13ed5c2

…eGenerator

call get_coordinate_of_pin() instead of computing pin location in Med…

359b2e1

…ianMoveGenerator

call get_coordinate_of_pin() instead of computing pin location in Wei…

f822a9f

…ghtedMedianMoveGenerator

Merge branch 'master' into temp_place_macro_static

16fe0db

avoid a copy in initial placement

419d8b6

github-actions bot added VPR VPR FPGA Placement & Routing Tool libarchfpga Library for handling FPGA Architecture descriptions lang-cpp C/C++ code libvtrutil labels Oct 13, 2024

soheilshahrouz added 2 commits October 13, 2024 17:52

use std::vector for arch.Switches

1cb8d5d

typos and comments

1bfe098

non-static member variable in CentroidMoveGenerator

ea74465

vaughnbetz reviewed Oct 21, 2024

View reviewed changes

soheilshahrouz added 4 commits October 22, 2024 15:39

reformat comments of t_arch_switch_inf

0177ba1

return by value in parse_direct_pin_name()

6d722f3

add more comments

4ccc910

move PortPinToBlockPinConverter to vpr_utils

f0a0a42

github-actions bot added the docs Documentation label Oct 22, 2024

soheilshahrouz added 11 commits October 23, 2024 11:33

fix bug in parsing pb_type_name.port_name[end_pin_index:start_pin_index]

63ccaf7

Merge branch 'master' into temp_place_macro_static

121655c

doxygen comments for static function in place_macro.h

c8be807

replace char* with std::string and use local loop vars

41a2802

fix compilation warning in compressed_grid.cpp

b021789

fix compilation errors in arch_check.cpp

3048d8b

call c_str() in physical_type_util.cpp

8ef3b02

call c_str() on name member variable when necessary

f0e8378

avoid calling vtr::strdup() for t_logical_block_type.name and call c_…

de7ac0d

…str() when needed

remove redundant parentheses + typo

2b31ba0

fix memory leak by removing call to strdup

a5fc08a

soheilshahrouz added 3 commits October 28, 2024 19:20

set --route_chan_width to 40 for post_routing_sync

7a411f6

update strong qor results

558cb2f

update qor results in vtr_reg_multiclock_odin/func_multiclock

f332633

soheilshahrouz commented Nov 3, 2024

View reviewed changes

soheilshahrouz added 2 commits November 4, 2024 10:36

update qor for vtr_nightly1

05eba63

update golden results of vtr_nightly6

baa73fa

Merge branch 'master' into temp_place_macro_static

89d17a2

soheilshahrouz merged commit eb8c186 into master Nov 6, 2024
37 checks passed

soheilshahrouz deleted the temp_place_macro_static branch November 6, 2024 16:22

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Remove remaining global and static varaibels in the placement stage #2770

Remove remaining global and static varaibels in the placement stage #2770

soheilshahrouz commented Oct 13, 2024 •

edited

Loading

soheilshahrouz commented Oct 14, 2024

vaughnbetz left a comment

vaughnbetz commented Oct 28, 2024

soheilshahrouz Nov 3, 2024

soheilshahrouz commented Nov 5, 2024

soheilshahrouz commented Nov 5, 2024

vaughnbetz commented Nov 5, 2024

soheilshahrouz commented Nov 6, 2024

Remove remaining global and static varaibels in the placement stage #2770

Remove remaining global and static varaibels in the placement stage #2770

Conversation

soheilshahrouz commented Oct 13, 2024 • edited Loading

soheilshahrouz commented Oct 14, 2024

vaughnbetz left a comment

Choose a reason for hiding this comment

vaughnbetz commented Oct 28, 2024

soheilshahrouz Nov 3, 2024

Choose a reason for hiding this comment

soheilshahrouz commented Nov 5, 2024

soheilshahrouz commented Nov 5, 2024

vaughnbetz commented Nov 5, 2024

soheilshahrouz commented Nov 6, 2024

soheilshahrouz commented Oct 13, 2024 •

edited

Loading