|
2 | 2 | #include <regex> |
3 | 3 | #include <algorithm> |
4 | 4 | #include <sstream> |
5 | | -#include <cstring> |
6 | 5 |
|
7 | 6 | #include "pack_types.h" |
8 | 7 | #include "prepack.h" |
|
26 | 25 | /* This module contains subroutines that are used in several unrelated parts * |
27 | 26 | * of VPR. They are VPR-specific utility routines. */ |
28 | 27 |
|
29 | | -/* This defines the maximum string length that could be parsed by functions * |
30 | | - * in vpr_utils. */ |
31 | | -static constexpr size_t MAX_STRING_LEN = 512; |
32 | | - |
33 | 28 | /******************** File-scope variables declarations **********************/ |
34 | 29 | //Regular expressions used to determine register and logic primitives |
35 | 30 | //TODO: Make this set-able from command-line? |
@@ -88,8 +83,7 @@ const t_model_ports* find_model_port(const t_model* model, const std::string& na |
88 | 83 | * print tabs given number of tabs to file |
89 | 84 | */ |
90 | 85 | void print_tabs(FILE* fpout, int num_tab) { |
91 | | - int i; |
92 | | - for (i = 0; i < num_tab; i++) { |
| 86 | + for (int i = 0; i < num_tab; i++) { |
93 | 87 | fprintf(fpout, "\t"); |
94 | 88 | } |
95 | 89 | } |
@@ -1638,7 +1632,7 @@ std::tuple<int, int, std::string, std::string> parse_direct_pin_name(std::string |
1638 | 1632 |
|
1639 | 1633 | // Replace '.' and '[' characters with ' ' |
1640 | 1634 | std::replace_if(source_string.begin(), source_string.end(), |
1641 | | - [](char c) { return c == '.' || c == '['; }, |
| 1635 | + [](char c) { return c == '.' || c == '[' || c == ':' || c == ']'; }, |
1642 | 1636 | ' '); |
1643 | 1637 |
|
1644 | 1638 | std::istringstream source_iss(source_string); |
@@ -2059,7 +2053,7 @@ std::vector<int> get_cluster_netlist_intra_tile_pins_at_loc(const int layer, |
2059 | 2053 | const auto& cluster_pin_chains = pin_chains_num[cluster_blk_id]; |
2060 | 2054 | const auto& cluster_chain_sinks = pin_chains[cluster_blk_id].chain_sink; |
2061 | 2055 | const auto& cluster_pin_chain_idx = pin_chains[cluster_blk_id].pin_chain_idx; |
2062 | | - // remove common elements betweeen cluster_pin_chains. |
| 2056 | + // remove common elements between cluster_pin_chains. |
2063 | 2057 | for (auto pin : cluster_internal_pins) { |
2064 | 2058 | auto it = cluster_pin_chains.find(pin); |
2065 | 2059 | if (it == cluster_pin_chains.end()) { |
|
0 commit comments