Skip to content

Change place flow in init place #1841

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.

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
merged 69 commits into from
Oct 12, 2021
Merged
Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
69 commits
Select commit Hold shift + click to select a range
96c4d1f
Fixed bug - when placing macros during initial placement, did not use…
sfkhalid Aug 24, 2021
7c34754
Refactored initial placement to place all blocks in the order they we…
sfkhalid Aug 25, 2021
44a418a
Tried different way of updating legal_pos for each macro member
sfkhalid Aug 26, 2021
0186c6a
Update legal_pos and free_locations all at once after placing macros
sfkhalid Aug 26, 2021
341cfb1
Merging master into branch
sfkhalid Sep 1, 2021
85c10d2
Refactored placing of non-macro blocks to not use legal_pos or free_l…
sfkhalid Sep 1, 2021
bba5ffd
Changed exhaustive placement method to use regular grid instead of co…
sfkhalid Sep 2, 2021
9cc9957
Added messages for debugging
sfkhalid Sep 2, 2021
5171ddc
Fixed bug where blocks were being placed at grid locations that were …
sfkhalid Sep 6, 2021
fe36cf6
Fixed for loops to get rid of warnings, deleted unused code in initia…
sfkhalid Sep 8, 2021
0d0f9b7
Made exhaustive placement routines in initial placement use compresse…
sfkhalid Sep 8, 2021
e75fecd
Removed unnecessary code in exhaustive placement routine (regular gri…
sfkhalid Sep 9, 2021
e42e66c
Cleaned up initial placement by removing unused code and ran make format
sfkhalid Sep 9, 2021
583e022
Removed unused lines of code in initial placement
sfkhalid Sep 9, 2021
0a926d2
Uncommented compressed grid echo file name
sfkhalid Sep 9, 2021
aa6087b
Added debug messages to a function that is giving an assertion failur…
sfkhalid Sep 14, 2021
1d1de1b
Ran make format
sfkhalid Sep 14, 2021
8be3af7
Removed debug lines
sfkhalid Sep 14, 2021
82363ff
Removed two assertions in get_legal_place_loc in initial placement
sfkhalid Sep 14, 2021
fd51ba0
Added new assertions to check that y dim of compressed grid is >= 0 w…
sfkhalid Sep 14, 2021
68c8c50
Added debug messages to see what happens in CI
sfkhalid Sep 15, 2021
6048169
Merge branch 'master' into change_place_flow_in_init_place
sfkhalid Sep 15, 2021
7cdb079
Added another debug message
sfkhalid Sep 15, 2021
dafeffd
Merge branch 'change_place_flow_in_init_place' of https://github.com/…
sfkhalid Sep 15, 2021
de0e71f
Ran make format
sfkhalid Sep 15, 2021
9a78fdd
Modified debug statements
sfkhalid Sep 15, 2021
7bec2fa
Added more debug statements
sfkhalid Sep 15, 2021
17011f7
Added more debug messages
sfkhalid Sep 15, 2021
cd02a4b
Added more debug messages - in try_place_macro
sfkhalid Sep 15, 2021
391caf1
Added debug messages to check_macro_can_be_placed
sfkhalid Sep 15, 2021
ddc68a2
Added bug fix - in check_macro_can_be_placed, there was no check to s…
sfkhalid Sep 15, 2021
4c4f141
Removed all of the extra debugging statements
sfkhalid Sep 16, 2021
ff5f986
Cleaned up code by renaming some functions
sfkhalid Sep 20, 2021
4407dca
Commented out some warnings to make log file shorter. Also changed co…
sfkhalid Sep 22, 2021
b2a1300
Adding some log lines to check how much bb_cost is changing
sfkhalid Sep 22, 2021
9151a58
Made changes to attempt to accomodate for logical pins potentially ha…
sfkhalid Sep 27, 2021
06b42f3
Added more debugging lines in place moves flow
sfkhalid Sep 27, 2021
c0a9776
Added debug messages to check whether physical pins updated for block…
sfkhalid Sep 27, 2021
2c37b32
Fixed bug that was happening because physical pins needed to be resyn…
sfkhalid Sep 28, 2021
6631e59
Uncommented warning log messages
sfkhalid Sep 28, 2021
3591d1e
Took out debug lines and added comment for bug fix
sfkhalid Sep 28, 2021
844f92e
Ran make format
sfkhalid Sep 28, 2021
ddf4bc4
Resync physical pins only when needed for each block, rather than eve…
sfkhalid Sep 28, 2021
0b3c73a
Added comments to new routines in initial placement
sfkhalid Sep 29, 2021
429cbe6
Changed seeds in some runs that were having a circuit run into a circ…
sfkhalid Sep 29, 2021
9385390
Merged macro and non-macro cases for initial placement and added more…
sfkhalid Oct 4, 2021
a9062d7
Updated fix for bug where physical pins mapping was not getting updat…
sfkhalid Oct 5, 2021
9513528
Updated a comment
sfkhalid Oct 5, 2021
00c7dec
Updated bug fix for syncing physical pins issue. There was one more p…
sfkhalid Oct 5, 2021
a24fa2a
Updated golden results to let test pass
sfkhalid Oct 6, 2021
3627262
Updated golden result for basic timing test
sfkhalid Oct 6, 2021
fef0216
updated some vtr_reg_strong qor results
sfkhalid Oct 6, 2021
c9eea73
Updated some more vtr_reg_strong qor tests
sfkhalid Oct 6, 2021
cf867ca
Updated more vtr_reg_strong qor results
sfkhalid Oct 6, 2021
f02de88
Updated more vtr_reg_strong qor results
sfkhalid Oct 6, 2021
157d8f7
Changed function return types to bool where necessary
sfkhalid Oct 6, 2021
05fc8f1
Updated odin basic test golden results
sfkhalid Oct 6, 2021
060441e
Updated qor golden results for titan quick qor in nightly2 reg test
sfkhalid Oct 6, 2021
65ece61
Update golden results for vtr_reg_qor_chain_predictor_off
sfkhalid Oct 7, 2021
f99bd4e
Updated golden results of some tests in vtr_reg_nightly_test1
sfkhalid Oct 7, 2021
c9f3aa1
Updated golden results of power_extended_arch_list test in nightly1
sfkhalid Oct 7, 2021
769680e
Commented out one circuit from a reg test that needs its golden resul…
sfkhalid Oct 7, 2021
90b2667
Removed unneeded comment
sfkhalid Oct 7, 2021
d63fce7
Updated golden results for power_extended_circuit_list test in nightly1
sfkhalid Oct 7, 2021
21b2da5
Updated golden results for odin II basic reg test
sfkhalid Oct 7, 2021
16035c5
Updated another set of golden results for odin II basic tests
sfkhalid Oct 7, 2021
6162239
Increased range of acceptable qor golden result for min chan width ro…
sfkhalid Oct 8, 2021
361db0b
Increased range of acceptable qor golden result for crit path routing…
sfkhalid Oct 8, 2021
4f07114
Increased range of qor pass requirements for min_chan_width_route_time
sfkhalid Oct 8, 2021
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
1 change: 1 addition & 0 deletions vpr/src/base/echo_files.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@ void alloc_and_load_echo_file_info() {
setEchoFileName(E_ECHO_ENDPOINT_TIMING, "endpoint_timing.echo.json");
setEchoFileName(E_ECHO_LOOKAHEAD_MAP, "lookahead_map.echo");
setEchoFileName(E_ECHO_RR_GRAPH_INDEXED_DATA, "rr_indexed_data.echo");
setEchoFileName(E_ECHO_COMPRESSED_GRIDS, "compressed_grids.echo");
}

void free_echo_file_info() {
Expand Down
1 change: 1 addition & 0 deletions vpr/src/base/echo_files.h
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ enum e_echo_files {
E_ECHO_ENDPOINT_TIMING,
E_ECHO_LOOKAHEAD_MAP,
E_ECHO_RR_GRAPH_INDEXED_DATA,
E_ECHO_COMPRESSED_GRIDS,

//Timing Graphs
E_ECHO_PRE_PACKING_TIMING_GRAPH,
Expand Down
37 changes: 37 additions & 0 deletions vpr/src/place/compressed_grid.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -142,3 +142,40 @@ int grid_to_compressed_approx(const std::vector<int>& coords, int point) {
return std::distance(coords.begin(), itr - 1);
return std::distance(coords.begin(), itr);
}

/*Print the contents of each cluster to an echo file*/
void echo_compressed_grids(char* filename, const std::vector<t_compressed_block_grid>& comp_grids) {
FILE* fp;
fp = vtr::fopen(filename, "w");

auto& device_ctx = g_vpr_ctx.device();

fprintf(fp, "--------------------------------------------------------------\n");
fprintf(fp, "Compressed Grids: \n");
fprintf(fp, "--------------------------------------------------------------\n");
fprintf(fp, "\n");

for (int i = 0; i < (int)comp_grids.size(); i++) {
fprintf(fp, "\n\nGrid type: %s \n", device_ctx.logical_block_types[i].name);

fprintf(fp, "X coordinates: \n");
for (int j = 0; j < (int)comp_grids[i].compressed_to_grid_x.size(); j++) {
fprintf(fp, "%d ", comp_grids[i].compressed_to_grid_x[j]);
}
fprintf(fp, "\n");

fprintf(fp, "Y coordinates: \n");
for (int k = 0; k < (int)comp_grids[i].compressed_to_grid_y.size(); k++) {
fprintf(fp, "%d ", comp_grids[i].compressed_to_grid_y[k]);
}
fprintf(fp, "\n");

fprintf(fp, "Subtiles: \n");
for (int s = 0; s < (int)comp_grids[i].compatible_sub_tiles_for_tile.size(); s++) {
fprintf(fp, "%d ", comp_grids[i].compressed_to_grid_y[s]);
}
fprintf(fp, "\n");
}

fclose(fp);
}
2 changes: 2 additions & 0 deletions vpr/src/place/compressed_grid.h
Original file line number Diff line number Diff line change
Expand Up @@ -64,4 +64,6 @@ int grid_to_compressed(const std::vector<int>& coords, int point);
*/
int grid_to_compressed_approx(const std::vector<int>& coords, int point);

void echo_compressed_grids(char* filename, const std::vector<t_compressed_block_grid>& comp_grids);

#endif
Loading