vpr: Add fix_clusters option to allow users to lock down any block to… #1433
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -139,8 +139,8 @@ void read_place(const char* net_file, | |
| place_ctx.placement_id = vtr::secure_digest_file(place_file); | ||
| } | ||
|
|
||
| void read_user_block_loc(const char* constraints_file) { | ||
|
There was a problem hiding this comment. This takes a comment out of doxygen. See https://www.doxygen.nl/manual/docblocks.html for how doxygen works. Should put the comment before the function, using ///@brief so doxygen finds it. There was a problem hiding this comment. Should expand this comment. Comment should include: |
||
| /* Reads in the locations of the blocks from a file. */ | ||
| t_hash **hash_table, *h_ptr; | ||
| int xtmp, ytmp; | ||
| FILE* fp; | ||
|
|
@@ -152,11 +152,11 @@ void read_user_pad_loc(const char* pad_loc_file) { | |
| auto& place_ctx = g_vpr_ctx.mutable_placement(); | ||
|
|
||
| VTR_LOG("\n"); | ||
| VTR_LOG("Reading locations of blocks from '%s'.\n", constraints_file); | ||
| fp = fopen(constraints_file, "r"); | ||
| if (!fp) VPR_FATAL_ERROR(VPR_ERROR_PLACE_F, | ||
| "'%s' - Cannot find block locations file.\n", | ||
| constraints_file); | ||
|
|
||
| hash_table = alloc_hash_table(); | ||
| for (auto blk_id : cluster_ctx.clb_nlist.blocks()) { | ||
|
|
@@ -189,41 +189,41 @@ void read_user_pad_loc(const char* pad_loc_file) { | |
| if (strlen(ptr) + 1 < vtr::bufsize) { | ||
| strcpy(bname, ptr); | ||
| } else { | ||
| vpr_throw(VPR_ERROR_PLACE_F, constraints_file, vtr::get_file_line_number_of_last_opened_file(), | ||
| "Block name exceeded buffer size of %zu characters", vtr::bufsize); | ||
| } | ||
|
|
||
| ptr = vtr::strtok(nullptr, TOKENS, fp, buf); | ||
| if (ptr == nullptr) { | ||
| vpr_throw(VPR_ERROR_PLACE_F, constraints_file, vtr::get_file_line_number_of_last_opened_file(), | ||
| "Incomplete.\n"); | ||
| } | ||
| sscanf(ptr, "%d", &xtmp); | ||
|
|
||
| ptr = vtr::strtok(nullptr, TOKENS, fp, buf); | ||
| if (ptr == nullptr) { | ||
| vpr_throw(VPR_ERROR_PLACE_F, constraints_file, vtr::get_file_line_number_of_last_opened_file(), | ||
| "Incomplete.\n"); | ||
| } | ||
| sscanf(ptr, "%d", &ytmp); | ||
|
|
||
| ptr = vtr::strtok(nullptr, TOKENS, fp, buf); | ||
| if (ptr == nullptr) { | ||
| vpr_throw(VPR_ERROR_PLACE_F, constraints_file, vtr::get_file_line_number_of_last_opened_file(), | ||
| "Incomplete.\n"); | ||
| } | ||
| int k; | ||
| sscanf(ptr, "%d", &k); | ||
|
|
||
| ptr = vtr::strtok(nullptr, TOKENS, fp, buf); | ||
| if (ptr != nullptr) { | ||
| vpr_throw(VPR_ERROR_PLACE_F, constraints_file, vtr::get_file_line_number_of_last_opened_file(), | ||
| "Extra characters at end of line.\n"); | ||
| } | ||
|
|
||
| h_ptr = get_hash_entry(hash_table, bname); | ||
| if (h_ptr == nullptr) { | ||
| VTR_LOG_WARN("[Line %d] Block %s invalid, no such block.\n", | ||
| vtr::get_file_line_number_of_last_opened_file(), bname); | ||
| ptr = vtr::fgets(buf, vtr::bufsize, fp); | ||
| continue; | ||
|
|
@@ -233,12 +233,12 @@ void read_user_pad_loc(const char* pad_loc_file) { | |
| int j = ytmp; | ||
|
|
||
| if (place_ctx.block_locs[bnum].loc.x != OPEN) { | ||
| VPR_THROW(VPR_ERROR_PLACE_F, constraints_file, vtr::get_file_line_number_of_last_opened_file(), | ||
| "Block %s is listed twice in constraints file.\n", bname); | ||
| } | ||
|
|
||
| if (i < 0 || i > int(device_ctx.grid.width() - 1) || j < 0 || j > int(device_ctx.grid.height() - 1)) { | ||
| VPR_THROW(VPR_ERROR_PLACE_F, constraints_file, 0, | ||
| "Block #%zu (%s) location, (%d,%d) is out of range.\n", size_t(bnum), bname, i, j); | ||
| } | ||
|
|
||
|
|
@@ -250,13 +250,13 @@ void read_user_pad_loc(const char* pad_loc_file) { | |
| auto physical_tile = device_ctx.grid[i][j].type; | ||
| auto logical_block = cluster_ctx.clb_nlist.block_type(bnum); | ||
| if (!is_sub_tile_compatible(physical_tile, logical_block, place_ctx.block_locs[bnum].loc.sub_tile)) { | ||
| VPR_THROW(VPR_ERROR_PLACE_F, constraints_file, 0, | ||
| "Attempt to place block %s at illegal location (%d, %d).\n", bname, i, j); | ||
| } | ||
|
|
||
| if (k >= physical_tile->capacity || k < 0) { | ||
| VPR_THROW(VPR_ERROR_PLACE_F, constraints_file, vtr::get_file_line_number_of_last_opened_file(), | ||
| "Block %s subtile number (%d) is out of range.\n", bname, k); | ||
| } | ||
| place_ctx.grid_blocks[i][j].blocks[k] = bnum; | ||
| place_ctx.grid_blocks[i][j].usage++; | ||
|
|
@@ -273,14 +273,14 @@ void read_user_pad_loc(const char* pad_loc_file) { | |
| } | ||
|
|
||
| if (place_ctx.block_locs[blk_id].loc.x == OPEN) { | ||
| VPR_THROW(VPR_ERROR_PLACE_F, constraints_file, 0, | ||
| "Block %s location was not specified in the constraints file.\n", cluster_ctx.clb_nlist.block_name(blk_id).c_str()); | ||
| } | ||
| } | ||
|
|
||
| fclose(fp); | ||
| free_hash_table(hash_table); | ||
| VTR_LOG("Successfully read %s.\n", constraints_file); | ||
| VTR_LOG("\n"); | ||
| } | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| ################################################### | ||
| # Architecture Files | ||
| ################################################### | ||
|
|
||
| This directory contains architecture files that are used in regression testing. | ||
|
|
||
|
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Need to remove random option.