diff --git a/vpr/src/pack/appack_max_dist_th_manager.cpp b/vpr/src/pack/appack_max_dist_th_manager.cpp index 4736407096..9d0fa3e931 100644 --- a/vpr/src/pack/appack_max_dist_th_manager.cpp +++ b/vpr/src/pack/appack_max_dist_th_manager.cpp @@ -36,7 +36,7 @@ void APPackMaxDistThManager::init(const std::vector& max_dist_ths, set_max_distance_thresholds_from_strings(max_dist_ths, logical_block_types); } - // Set the initilized flag to true. + // Set the initialized flag to true. is_initialized_ = true; // Log the max distance thresholds for each logical block type. This is diff --git a/vpr/src/pack/appack_max_dist_th_manager.h b/vpr/src/pack/appack_max_dist_th_manager.h index 9794e78c4b..35aa294515 100644 --- a/vpr/src/pack/appack_max_dist_th_manager.h +++ b/vpr/src/pack/appack_max_dist_th_manager.h @@ -136,7 +136,7 @@ class APPackMaxDistThManager { void set_max_distance_thresholds_from_strings(const std::vector& max_dist_ths, const std::vector& logical_block_types); - /// @brief A flag which shows if the thesholds have been computed or not. + /// @brief A flag which shows if the thresholds have been computed or not. bool is_initialized_ = false; /// @brief The max distance thresholds of all logical blocks in the architecture. diff --git a/vpr/src/pack/atom_pb_bimap.h b/vpr/src/pack/atom_pb_bimap.h index 88f58cbab3..3aafdeb40a 100644 --- a/vpr/src/pack/atom_pb_bimap.h +++ b/vpr/src/pack/atom_pb_bimap.h @@ -35,7 +35,7 @@ class AtomPBBimap { ///@brief Returns the atom block id associated with pb AtomBlockId pb_atom(const t_pb* pb) const; - ///@brief Conveneince wrapper around atom_pb to access the associated graph node + ///@brief Convenience wrapper around atom_pb to access the associated graph node const t_pb_graph_node* atom_pb_graph_node(const AtomBlockId blk_id) const; /** diff --git a/vpr/src/pack/cluster_feasibility_filter.cpp b/vpr/src/pack/cluster_feasibility_filter.cpp index 1e4a5fef08..9630aa8dd0 100644 --- a/vpr/src/pack/cluster_feasibility_filter.cpp +++ b/vpr/src/pack/cluster_feasibility_filter.cpp @@ -77,7 +77,7 @@ void load_pin_classes_in_pb_graph_head(t_pb_graph_node* pb_graph_node) { for (i = 0; i < depth; i++) { input_count = output_count = 0; // The following function marks pins based on the pin count. This is - // used when traversing the pb heirarchy. + // used when traversing the pb hierarchy. std::unordered_map pin_marker; load_pin_class_by_depth(pb_graph_node, i, &input_count, &output_count, pin_marker); } diff --git a/vpr/src/pack/cluster_feasibility_filter.h b/vpr/src/pack/cluster_feasibility_filter.h index 53e452bc90..0430327f4e 100644 --- a/vpr/src/pack/cluster_feasibility_filter.h +++ b/vpr/src/pack/cluster_feasibility_filter.h @@ -7,7 +7,7 @@ * 2) Robustness issue. During packing, we have a limited size queue to store candidates to try to pack. A good filter helps keep that queue filled with candidates likely to pass. * * 1st major filter: Pin counting based on pin classes - * Rationale: If the number of a particular gruop of pins supplied by the pb_graph_node in the architecture is insufficient to meet a candidate packing solution's demand for that group of pins, then that + * Rationale: If the number of a particular group of pins supplied by the pb_graph_node in the architecture is insufficient to meet a candidate packing solution's demand for that group of pins, then that * candidate solution is for sure invalid without any further legalization checks. For example, if a candidate solution requires 2 clock pins but the architecture only has one clock, then that solution * can't be legal. * diff --git a/vpr/src/pack/cluster_legalizer.cpp b/vpr/src/pack/cluster_legalizer.cpp index 1daf3791cc..f6183cb8af 100644 --- a/vpr/src/pack/cluster_legalizer.cpp +++ b/vpr/src/pack/cluster_legalizer.cpp @@ -314,7 +314,7 @@ static enum e_block_pack_status check_chain_root_placement_feasibility(const t_p /* * @brief Check that the two atom blocks blk_id and sibling_blk_id (which should * both be memory slices) are feasible, in the sense that they have - * precicely the same net connections (with the exception of nets in data + * precisely the same net connections (with the exception of nets in data * port classes). * * Note that this routine does not check pin feasibility against the cur_pb_type; so @@ -368,7 +368,7 @@ static bool primitive_memory_sibling_feasible(const AtomBlockId blk_id, const t_ //We can get the actual net provided the port exists // //Note that if the port did not exist, the net is left - //as invalid/disconneced + //as invalid/disconnected if (blk_port_id) { blk_net_id = atom_ctx.netlist().port_net(blk_port_id, ipin); } @@ -503,7 +503,7 @@ try_place_atom_block_rec(const t_pb_graph_node* pb_graph_node, } const t_pb_type* pb_type = pb_graph_node->pb_type; - /* Any pb_type under an mode, which is disabled for packing, should not be considerd for mapping + /* Any pb_type under an mode, which is disabled for packing, should not be considered for mapping * Early exit to flag failure */ if (true == pb_type->parent_mode->disable_packing) { diff --git a/vpr/src/pack/cluster_legalizer.h b/vpr/src/pack/cluster_legalizer.h index d2c89598ae..51b2306378 100644 --- a/vpr/src/pack/cluster_legalizer.h +++ b/vpr/src/pack/cluster_legalizer.h @@ -144,7 +144,7 @@ struct LegalizationCluster { * 2) FULL * * 1) SKIP_INTRA_LB_ROUTE Legalization Strategy Example: - * This strategy will not fully route the interal connections of the clusters + * This strategy will not fully route the internal connections of the clusters * until when the user specifies. An example of how to use this strategy would * look something like this. Note, this example is simplified and the result * of the packings should be checked and handled. @@ -166,7 +166,7 @@ struct LegalizationCluster { * if (!legalizer.check_cluster_legality(new_cluster_id)) * // Destroy the illegal cluster. * legalizer.destroy_cluster(new_cluster_id); - * // Clean-up the internal bookeeping of the class (required after + * // Clean-up the internal bookkeeping of the class (required after * // destroying a cluster). * legalizer.compress(); * // Handle how to try again (maybe use FULL strategy). @@ -372,7 +372,7 @@ class ClusterLegalizer { bool check_cluster_legality(LegalizationClusterId cluster_id); /* - * @brief Cleans the cluster of unnessary data, reducing the memory footprint. + * @brief Cleans the cluster of unnecessary data, reducing the memory footprint. * * After this function is called, no more molecules can be added to the * cluster. This method will ensure that the cluster has enough information @@ -417,7 +417,7 @@ class ClusterLegalizer { * * A molecule is compatible with a cluster if there exists a free primitive * (a primitive that is not currently occupied by other atoms) of the correct - * type to accomodate each type of atom in the molecule. + * type to accommodate each type of atom in the molecule. * * This is a quick check to see if a molecule can go in the given cluster. * "This is a necessary but not sufficient test for a molecule to be able to diff --git a/vpr/src/pack/cluster_placement.cpp b/vpr/src/pack/cluster_placement.cpp index 275e2f0b60..ca63cb1258 100644 --- a/vpr/src/pack/cluster_placement.cpp +++ b/vpr/src/pack/cluster_placement.cpp @@ -207,7 +207,7 @@ bool get_next_primitive_list(t_intra_cluster_placement_stats* cluster_placement_ * 4. Return NULL if not found */ - // Intialize variables + // Initialize variables bool found_best = false; lowest_cost = std::numeric_limits::max(); diff --git a/vpr/src/pack/cluster_router.cpp b/vpr/src/pack/cluster_router.cpp index bfcdbf7d89..434eca51a2 100644 --- a/vpr/src/pack/cluster_router.cpp +++ b/vpr/src/pack/cluster_router.cpp @@ -246,7 +246,7 @@ static bool check_edge_for_route_conflicts(std::unordered_mapillegal_modes.push_back(result.first->second->index); } - // If the number of illegal modes equals the number of available mode for a specific pb_graph_node it means that no cluster can be generated. This resuts + // If the number of illegal modes equals the number of available mode for a specific pb_graph_node it means that no cluster can be generated. This results // in a fatal error. if ((int)pb_graph_node->illegal_modes.size() >= pb_graph_node->pb_type->num_modes) { VPR_FATAL_ERROR(VPR_ERROR_PACK, "There are no more available modes to be used. Routing Failed!"); @@ -693,7 +693,7 @@ static void add_pin_to_rt_terminals(t_lb_router_data* router_data, const AtomPin if (lb_nets[ipos].terminals.empty()) { /* Add terminals */ - //Default assumption is that the source is outside the current cluster (will be overriden later if required) + //Default assumption is that the source is outside the current cluster (will be overridden later if required) int source_terminal = get_lb_type_rr_graph_ext_source_index(lb_type); lb_nets[ipos].terminals.push_back(source_terminal); @@ -782,10 +782,10 @@ static void add_pin_to_rt_terminals(t_lb_router_data* router_data, const AtomPin //Sanity checks int num_extern_sources = 0; int num_extern_sinks = 0; - for (size_t iterm = 0; iterm < lb_nets[ipos].terminals.size(); ++iterm) { - int inode = lb_nets[ipos].terminals[iterm]; - AtomPinId atom_pin = lb_nets[ipos].atom_pins[iterm]; - if (iterm == 0) { + for (size_t term_idx = 0; term_idx < lb_nets[ipos].terminals.size(); ++term_idx) { + int inode = lb_nets[ipos].terminals[term_idx]; + AtomPinId atom_pin = lb_nets[ipos].atom_pins[term_idx]; + if (term_idx == 0) { //Net driver VTR_ASSERT_SAFE_MSG(lb_type_graph[inode].type == LB_SOURCE, "Driver must be a source RR node"); VTR_ASSERT_SAFE_MSG(atom_pin, "Driver have an associated atom pin"); @@ -867,7 +867,7 @@ static void remove_pin_from_rt_terminals(t_lb_router_data* router_data, const At /* Remove sink from list of terminals */ int pin_index = pb_graph_pin->pin_count_in_cluster; - unsigned int iterm; + size_t term_idx; VTR_ASSERT(lb_type_graph[pin_index].num_modes == 1); VTR_ASSERT(lb_type_graph[pin_index].num_fanout[0] == 1); @@ -877,8 +877,8 @@ static void remove_pin_from_rt_terminals(t_lb_router_data* router_data, const At int target_index = -1; //Search for the sink found = false; - for (iterm = 0; iterm < lb_nets[ipos].terminals.size(); iterm++) { - if (lb_nets[ipos].terminals[iterm] == sink_index) { + for (term_idx = 0; term_idx < lb_nets[ipos].terminals.size(); term_idx++) { + if (lb_nets[ipos].terminals[term_idx] == sink_index) { target_index = sink_index; found = true; break; @@ -887,8 +887,8 @@ static void remove_pin_from_rt_terminals(t_lb_router_data* router_data, const At if (!found) { //Search for the pin found = false; - for (iterm = 0; iterm < lb_nets[ipos].terminals.size(); iterm++) { - if (lb_nets[ipos].terminals[iterm] == pin_index) { + for (term_idx = 0; term_idx < lb_nets[ipos].terminals.size(); term_idx++) { + if (lb_nets[ipos].terminals[term_idx] == pin_index) { target_index = pin_index; found = true; break; @@ -896,14 +896,13 @@ static void remove_pin_from_rt_terminals(t_lb_router_data* router_data, const At } } VTR_ASSERT(found == true); - VTR_ASSERT(lb_nets[ipos].terminals[iterm] == target_index); - VTR_ASSERT(iterm > 0); + VTR_ASSERT(lb_nets[ipos].terminals[term_idx] == target_index); /* Drop terminal from list */ - lb_nets[ipos].terminals[iterm] = lb_nets[ipos].terminals.back(); + lb_nets[ipos].terminals[term_idx] = lb_nets[ipos].terminals.back(); lb_nets[ipos].terminals.pop_back(); - lb_nets[ipos].atom_pins[iterm] = lb_nets[ipos].atom_pins.back(); + lb_nets[ipos].atom_pins[term_idx] = lb_nets[ipos].atom_pins.back(); lb_nets[ipos].atom_pins.pop_back(); if (lb_nets[ipos].terminals.size() == 1 && lb_nets[ipos].terminals[0] != get_lb_type_rr_graph_ext_source_index(lb_type)) { @@ -946,12 +945,12 @@ static void fix_duplicate_equivalent_pins(t_lb_router_data* router_data, const A std::vector& lb_nets = *router_data->intra_lb_nets; for (size_t ilb_net = 0; ilb_net < lb_nets.size(); ++ilb_net) { - //Collect all the sink terminals indicies which target a particular node + //Collect all the sink terminals indices which target a particular node std::map> duplicate_terminals; - for (size_t iterm = 1; iterm < lb_nets[ilb_net].terminals.size(); ++iterm) { - int node = lb_nets[ilb_net].terminals[iterm]; + for (size_t term_idx = 1; term_idx < lb_nets[ilb_net].terminals.size(); ++term_idx) { + int node = lb_nets[ilb_net].terminals[term_idx]; - duplicate_terminals[node].push_back(iterm); + duplicate_terminals[node].push_back(term_idx); } for (auto kv : duplicate_terminals) { @@ -959,10 +958,10 @@ static void fix_duplicate_equivalent_pins(t_lb_router_data* router_data, const A //Remap all the duplicate terminals so they target the pin instead of the sink for (size_t idup_term = 0; idup_term < kv.second.size(); ++idup_term) { - int iterm = kv.second[idup_term]; //The index in terminals which is duplicated + int term_idx = kv.second[idup_term]; //The index in terminals which is duplicated VTR_ASSERT(lb_nets[ilb_net].atom_pins.size() == lb_nets[ilb_net].terminals.size()); - AtomPinId atom_pin = lb_nets[ilb_net].atom_pins[iterm]; + AtomPinId atom_pin = lb_nets[ilb_net].atom_pins[term_idx]; VTR_ASSERT(atom_pin); const t_pb_graph_pin* pb_graph_pin = find_pb_graph_pin(atom_ctx.netlist(), atom_to_pb, atom_pin); @@ -984,10 +983,10 @@ static void fix_duplicate_equivalent_pins(t_lb_router_data* router_data, const A VTR_ASSERT(lb_type_graph[pin_index].num_fanout[0] == 1); int sink_index = lb_type_graph[pin_index].outedges[0][0].node_index; VTR_ASSERT(lb_type_graph[sink_index].type == LB_SINK); - VTR_ASSERT_MSG(sink_index == lb_nets[ilb_net].terminals[iterm], "Remapped pin must be connected to original sink"); + VTR_ASSERT_MSG(sink_index == lb_nets[ilb_net].terminals[term_idx], "Remapped pin must be connected to original sink"); //Change the target - lb_nets[ilb_net].terminals[iterm] = pin_index; + lb_nets[ilb_net].terminals[term_idx] = pin_index; } } } @@ -1370,8 +1369,8 @@ static void save_and_reset_lb_route(t_lb_router_data* router_data) { */ saved_lb_nets[inet].atom_net_id = lb_nets[inet].atom_net_id; saved_lb_nets[inet].terminals.resize(lb_nets[inet].terminals.size()); - for (int iterm = 0; iterm < (int)lb_nets[inet].terminals.size(); iterm++) { - saved_lb_nets[inet].terminals[iterm] = lb_nets[inet].terminals[iterm]; + for (int term_idx = 0; term_idx < (int)lb_nets[inet].terminals.size(); term_idx++) { + saved_lb_nets[inet].terminals[term_idx] = lb_nets[inet].terminals[term_idx]; } saved_lb_nets[inet].rt_tree = lb_nets[inet].rt_tree; lb_nets[inet].rt_tree = nullptr; diff --git a/vpr/src/pack/greedy_candidate_selector.cpp b/vpr/src/pack/greedy_candidate_selector.cpp index 58fe3203bc..63a9412b79 100644 --- a/vpr/src/pack/greedy_candidate_selector.cpp +++ b/vpr/src/pack/greedy_candidate_selector.cpp @@ -271,7 +271,7 @@ void GreedyCandidateSelector::update_cluster_gain_stats_candidate_success( // TODO: If this threshold lookup gets expensive, move outside. int high_fanout_net_threshold = high_fanout_thresholds_.get_threshold(cluster_legalizer.get_cluster_type(cluster_id)->name); - // Mark and update the gain stats for each block in the succesfully + // Mark and update the gain stats for each block in the successfully // clustered molecule. // Makes calls to update cluster stats such as the gain map for atoms, used // pins, and clock structures, in order to reflect the new content of the diff --git a/vpr/src/pack/greedy_candidate_selector.h b/vpr/src/pack/greedy_candidate_selector.h index 4e547a58de..a3cf8d3927 100644 --- a/vpr/src/pack/greedy_candidate_selector.h +++ b/vpr/src/pack/greedy_candidate_selector.h @@ -127,10 +127,10 @@ struct ClusterGainStats { /// @brief Indicator for the initial search for feasible blocks. bool initial_search_for_feasible_blocks; - /// @brief Limit for the number of candiate proposed at each stage. + /// @brief Limit for the number of candidates proposed at each stage. unsigned candidates_propose_limit; - /// @brief Counter for the number of candiate proposed at each stage. + /// @brief Counter for the number of candidates proposed at each stage. unsigned num_candidates_proposed; /// @brief Check if the current stage candidates proposed limit is reached. @@ -232,7 +232,7 @@ class GreedyCandidateSelector { * @param is_global * The set of global nets in the Atom Netlist. These will be * routed on special dedicated networks, and hence are less - * relavent to locality / attraction. + * relevant to locality / attraction. * @param net_output_feeds_driving_block_input * The set of nets whose output feeds the block that drives * itself. This may cause double-counting in the gain diff --git a/vpr/src/pack/greedy_clusterer.h b/vpr/src/pack/greedy_clusterer.h index ae22949f56..bfa4f1f465 100644 --- a/vpr/src/pack/greedy_clusterer.h +++ b/vpr/src/pack/greedy_clusterer.h @@ -76,7 +76,7 @@ class GreedyClusterer { * @param is_global * The set of global nets in the Atom Netlist. These will be * routed on special dedicated networks, and hence are less - * relavent to locality / attraction. + * relevant to locality / attraction. * @param pre_cluster_timing_manager * Timing manager class which holds the timing information of * the primitive netlist. Used by the seed selector to select @@ -151,7 +151,7 @@ class GreedyClusterer { * * If the strategy is set to SKIP_INTRA_LB_ROUTE, the cluster will grow * without performing intra-lb route every time a molecule is added to the - * cluster. It will perfrom intra-lb route at the end, after all molecules + * cluster. It will perform intra-lb route at the end, after all molecules * have been added. If this final intra-lb route fails, the cluster will be * destroyed and an invalid cluster ID will be returned. * @@ -180,7 +180,7 @@ class GreedyClusterer { * to balance logical block type utilization. * * If the device is to be auto-sized, this method will try to grow the - * device grid if it find thats more clusters of specific logical block + * device grid if it finds that more clusters of specific logical block * types have been created than the device can support. */ LegalizationClusterId start_new_cluster(PackMoleculeId seed_mol_id, diff --git a/vpr/src/pack/lb_type_rr_graph.cpp b/vpr/src/pack/lb_type_rr_graph.cpp index a903e40ba4..8c2407e254 100644 --- a/vpr/src/pack/lb_type_rr_graph.cpp +++ b/vpr/src/pack/lb_type_rr_graph.cpp @@ -12,7 +12,7 @@ * Common acryonyms: * rr - routing resource * lb - logic block - * pb - phsyical block (the top level physical block is the logic block, a leaf physical block is a primitive) + * pb - physical block (the top level physical block is the logic block, a leaf physical block is a primitive) * * Author: Jason Luu * Date: July 22, 2013 diff --git a/vpr/src/pack/output_clustering.cpp b/vpr/src/pack/output_clustering.cpp index ee40949fe2..441b8c076a 100644 --- a/vpr/src/pack/output_clustering.cpp +++ b/vpr/src/pack/output_clustering.cpp @@ -473,7 +473,7 @@ static void clustering_xml_block(pugi::xml_node& parent_node, t_logical_block_ty port_node.text().set(vtr::join(pins.begin(), pins.end(), " ").c_str()); //The cluster router may have rotated equivalent pins (e.g. LUT inputs), - //record the resulting rotation here so it can be unambigously mapped + //record the resulting rotation here so it can be unambiguously mapped //back to the atom netlist if (pb_type->ports[i].equivalent != PortEquivalence::NONE && pb_type->parent_mode != nullptr && pb_type->is_primitive()) { //This is a primitive with equivalent inputs diff --git a/vpr/src/pack/pack.cpp b/vpr/src/pack/pack.cpp index aa8253c553..ac3ed4a161 100644 --- a/vpr/src/pack/pack.cpp +++ b/vpr/src/pack/pack.cpp @@ -35,7 +35,7 @@ namespace { enum class e_packer_state { /// @brief Default packer state. DEFAULT, - /// @brief Succcess state for the packer. The packing looks feasible to + /// @brief Success state for the packer. The packing looks feasible to /// fit on the device (does not exceed number of blocks of each /// type in the grid) and meets floorplanning constraints. SUCCESS, diff --git a/vpr/src/pack/pack_types.h b/vpr/src/pack/pack_types.h index d40115a485..a8ef14f81d 100644 --- a/vpr/src/pack/pack_types.h +++ b/vpr/src/pack/pack_types.h @@ -60,7 +60,7 @@ struct t_lb_type_rr_node_edge { struct t_lb_type_rr_node { short capacity; /* Number of nets that can simultaneously use this node */ int num_modes; - short* num_fanout; /* [0..num_modes - 1] Mode dependant fanout */ + short* num_fanout; /* [0..num_modes - 1] Mode dependent fanout */ enum e_lb_rr_type type; /* Type of logic cluster_ctx.blocks resource node */ t_lb_type_rr_node_edge** outedges; /* [0..num_modes - 1][0..num_fanout-1] index and cost of out edges */ @@ -169,10 +169,10 @@ class compare_expansion_node { /* Stores explored nodes by router */ struct t_explored_node_tb { - int prev_index; /* Prevous node that drives this one */ + int prev_index; /* Previous node that drives this one */ int explored_id; /* ID used to determine if this node has been explored */ int inet; /* net index of route tree */ - int enqueue_id; /* ID used ot determine if this node has been pushed on exploration priority queue */ + int enqueue_id; /* ID used to determine if this node has been pushed on exploration priority queue */ float enqueue_cost; /* cost of node pused on exploration priority queue */ t_explored_node_tb() { diff --git a/vpr/src/pack/pb_type_graph.cpp b/vpr/src/pack/pb_type_graph.cpp index 030f4fca0c..2d3108cc3d 100644 --- a/vpr/src/pack/pb_type_graph.cpp +++ b/vpr/src/pack/pb_type_graph.cpp @@ -1928,7 +1928,7 @@ const t_pb_graph_edge* get_edge_between_pins(const t_pb_graph_pin* driver_pin, c * Purpose: This subroutine computes the index of a pb graph node at its * level of the pb hierarchy; it is computed by the parent and * passed to each child of each child pb type. When the child is - * a primitive, the computed indes is its flat site index. + * a primitive, the computed index is its flat site index. * For example, if there are 10 ALMs, each with 2 FFs and 2 LUTs, * then the ALM at index N, when calling this function for * its FF child at index M, would compute the child's index as: diff --git a/vpr/src/pack/pb_type_graph_annotations.h b/vpr/src/pack/pb_type_graph_annotations.h index 3a55e2c0ed..86e9610dc9 100644 --- a/vpr/src/pack/pb_type_graph_annotations.h +++ b/vpr/src/pack/pb_type_graph_annotations.h @@ -2,7 +2,7 @@ /** * Jason Luu * April 15, 2011 - * pb_type_graph_annotations loads statistical information onto the different nodes/edges of a pb_type_graph. These statistical informations include delays, capacitance, etc. + * pb_type_graph_annotations loads statistical information onto the different nodes/edges of a pb_type_graph. These statistical information include delays, capacitance, etc. */ class t_pb_graph_node; diff --git a/vpr/src/pack/prepack.cpp b/vpr/src/pack/prepack.cpp index c4445bc407..635d09206d 100644 --- a/vpr/src/pack/prepack.cpp +++ b/vpr/src/pack/prepack.cpp @@ -1502,7 +1502,7 @@ static void expand_search(const t_pb_graph_pin* input_pin, std::queuenum_output_edges; iedge++) { const auto& pin_edge = input_pin->output_edges[iedge]; - // if this edge is not anotated with this pattern and its pattern cannot be inferred, ignore it. + // if this edge is not annotated with this pattern and its pattern cannot be inferred, ignore it. if (!pin_edge->annotated_with_pattern(pattern_index) && !pin_edge->infer_pattern) { continue; } diff --git a/vpr/src/pack/prepack.h b/vpr/src/pack/prepack.h index c17e7dae61..d1cf3f687c 100644 --- a/vpr/src/pack/prepack.h +++ b/vpr/src/pack/prepack.h @@ -186,10 +186,10 @@ class Prepacker { ~Prepacker(); /** - * @brief Construtor. Performs prepacking. + * @brief Constructor. Performs prepacking. * * Initializes the prepacker by performing prepacking and allocating the - * necessary data strucutres. + * necessary data structures. * * @param atom_nlist The atom netlist to prepack. * @param models @@ -242,7 +242,7 @@ class Prepacker { const LogicalModels& models) const; /** - * @brief Calculates maximum molecule statistics accross all molecules, + * @brief Calculates maximum molecule statistics across all molecules, */ t_molecule_stats calc_max_molecule_stats(const AtomNetlist& netlist, const LogicalModels& models) const; diff --git a/vpr/src/pack/verify_clustering.cpp b/vpr/src/pack/verify_clustering.cpp index ec08e10a40..b6b3e9fe64 100644 --- a/vpr/src/pack/verify_clustering.cpp +++ b/vpr/src/pack/verify_clustering.cpp @@ -62,7 +62,7 @@ static unsigned check_clustering_atom_consistency(const ClusteredNetlist& clb_nl if (atoms_in_clb.find(atom_blk_id) == atoms_in_clb.end()) { VTR_LOG_ERROR( "Atom block %zu is in clb %zu according to the atom lookup, " - "howeever it is not in the cluster according to the cluster.\n", + "however it is not in the cluster according to the cluster.\n", size_t(atom_blk_id), size_t(atom_clb_blk_id)); num_errors++; } @@ -88,7 +88,7 @@ static unsigned check_clustering_atom_consistency(const ClusteredNetlist& clb_nl // clusters). if (atom_lookup.atom_clb(atom_blk_id) != clb_blk_id) { VTR_LOG_ERROR( - "Cluster block %zu constains atom block %zu which does " + "Cluster block %zu contains atom block %zu which does " "not appear to be in it according to the atom lookup.\n", size_t(clb_blk_id), size_t(atom_blk_id)); num_errors++; @@ -195,7 +195,7 @@ static unsigned check_clustering_pb_consistency(const ClusteredNetlist& clb_nlis size_t(atom_blk_id), size_t(atom_clb_blk_id)); num_errors++; } - // Make sure it is a primitve + // Make sure it is a primitive if (!atom_pb->is_primitive()) { VTR_LOG_ERROR( "Atom block %zu in cluster block %zu has a pb which is not " @@ -406,7 +406,7 @@ unsigned verify_clustering(const ClusteredNetlist& clb_nlist, // Return here since this error can cause serious issues below. return num_errors; } - // Check conssitency between which clusters the atom's think thet are in and + // Check consistency between which clusters the atom's think they are in and // which atoms the clusters think they have. num_errors += check_clustering_atom_consistency(clb_nlist, atom_nlist, diff --git a/vpr/src/pack/verify_clustering.h b/vpr/src/pack/verify_clustering.h index 34ea01cf80..2b6493554c 100644 --- a/vpr/src/pack/verify_clustering.h +++ b/vpr/src/pack/verify_clustering.h @@ -72,7 +72,7 @@ unsigned verify_clustering(const ClusteredNetlist& clb_nlist, * through the rest of the flow is valid. * * NOTE: The verify_clustering method with more arguments is used when one - * wishes to verify a temporary clustering befor updating the actual + * wishes to verify a temporary clustering before updating the actual * global VPR context. * * @param ctx The global VPR context variable found in g_vpr_ctx. diff --git a/vpr/src/power/PowerSpicedComponent.cpp b/vpr/src/power/PowerSpicedComponent.cpp index 621fece123..1d5c16a1aa 100644 --- a/vpr/src/power/PowerSpicedComponent.cpp +++ b/vpr/src/power/PowerSpicedComponent.cpp @@ -187,7 +187,7 @@ float PowerSpicedComponent::scale_factor(int num_inputs, factor_lower = perc_upper * size_upper->factor + (1 - perc_upper) * size_lower->factor; } else { - VPR_FATAL_ERROR(VPR_ERROR_POWER, "Failed to interpolate transitor size"); + VPR_FATAL_ERROR(VPR_ERROR_POWER, "Failed to interpolate transistor size"); } } @@ -203,7 +203,7 @@ float PowerSpicedComponent::scale_factor(int num_inputs, factor_upper = perc_upper * size_upper->factor + (1 - perc_upper) * size_lower->factor; } else { - VPR_FATAL_ERROR(VPR_ERROR_POWER, "Failed to interpolate transitor size"); + VPR_FATAL_ERROR(VPR_ERROR_POWER, "Failed to interpolate transistor size"); } } diff --git a/vpr/src/power/power.cpp b/vpr/src/power/power.cpp index 1adedffd27..ab538d52ac 100644 --- a/vpr/src/power/power.cpp +++ b/vpr/src/power/power.cpp @@ -118,7 +118,7 @@ void power_routing_init(const t_det_routing_arch& routing_arch); * This function calculates the power of primitives (ff, lut, etc), * by calling the appropriate primitive function. * - power_usage: (Return value) - * - pb: The pysical block + * - pb: The physical block * - pb_graph_node: The physical block graph node * - calc_dynamic: Calculate dynamic power? Otherwise ignore * - calc_static: Calculate static power? Otherwise ignore @@ -303,7 +303,7 @@ static void power_usage_local_buffers_and_wires(t_power_usage* power_usage, * First checks if dynamic/static power is provided by user in arch file. If not: * - Calculate power of all interconnect * - Call recursively for children - * - If no children, must be a primitive. Call primitive hander. + * - If no children, must be a primitive. Call primitive handler. */ static void power_usage_pb(t_power_usage* power_usage, t_pb* pb, t_pb_graph_node* pb_node, ClusterBlockId iblk) { t_power_usage power_usage_bufs_wires; @@ -592,7 +592,7 @@ static void power_reset_tile_usage() { } /* - * Calcultes the power usage of all tiles in the FPGA + * Calculates the power usage of all tiles in the FPGA */ static void power_usage_blocks(t_power_usage* power_usage) { auto& device_ctx = g_vpr_ctx.device(); @@ -1331,7 +1331,7 @@ bool power_init(const char* power_out_filepath, /* Initialize sub-modules */ power_components_init(); - /* Perform callibration */ + /* Perform calibration */ power_callibrate(); /* Initialize routing information */ @@ -1408,7 +1408,7 @@ bool power_uninit() { #if 0 /** - * Prints the power of all pb structures, in an xml format that matches the archicture file + * Prints the power of all pb structures, in an xml format that matches the architecture file */ static void power_print_pb_usage_recursive(FILE * fp, t_pb_type * type, int indent_level, float parent_power, float total_power) { @@ -1577,7 +1577,7 @@ static const char* power_estimation_method_name(e_power_estimation_method power_ case POWER_METHOD_SUM_OF_CHILDREN: return "Sum of Children"; default: - return "Unkown"; + return "Unknown"; } } @@ -1771,7 +1771,7 @@ e_power_ret_code power_total(float* run_time_s, const t_vpr_setup& vpr_setup, co /** * Prints the power usage for all components - * - fp: File descripter to print out to + * - fp: File descriptor to print out to */ static void power_print_breakdown_summary(FILE* fp) { power_print_breakdown_entry(fp, 0, POWER_BREAKDOWN_ENTRY_TYPE_TITLE, nullptr, diff --git a/vpr/src/power/power.h b/vpr/src/power/power.h index 9183bcb0b2..1621d52424 100644 --- a/vpr/src/power/power.h +++ b/vpr/src/power/power.h @@ -170,7 +170,7 @@ struct t_power_mux_volt_pair { float v_out_max; }; -/* Buffer information for a given buffer stength */ +/* Buffer information for a given buffer strength */ struct t_power_buffer_strength_inf { float stage_gain; @@ -234,7 +234,7 @@ struct t_power_commonly_used { float INV_1X_C; float INV_2X_C; - /* Component Callibrations Array [0..POWER_COMPONENT_MAX_NUM-1] */ + /* Component Calibrations Array [0..POWER_COMPONENT_MAX_NUM-1] */ PowerSpicedComponent** component_callibration; /* Subthreshold leakages */ diff --git a/vpr/src/power/power_callibrate.cpp b/vpr/src/power/power_callibrate.cpp index 2d14f467d0..6b83daeada 100644 --- a/vpr/src/power/power_callibrate.cpp +++ b/vpr/src/power/power_callibrate.cpp @@ -16,7 +16,7 @@ ********************************************************************/ /* This file provides functions used to verify the power estimations - * againt SPICE. + * against SPICE. */ /************************* INCLUDES *********************************/ diff --git a/vpr/src/power/power_callibrate.h b/vpr/src/power/power_callibrate.h index 2aee2b717d..eaf51cfb90 100644 --- a/vpr/src/power/power_callibrate.h +++ b/vpr/src/power/power_callibrate.h @@ -17,7 +17,7 @@ ********************************************************************/ /* This file provides functions used to verify the power estimations - * againt SPICE. + * against SPICE. */ /************************* DEFINES **********************************/ diff --git a/vpr/src/power/power_cmos_tech.cpp b/vpr/src/power/power_cmos_tech.cpp index e8cbb8ec0f..1858c001df 100644 --- a/vpr/src/power/power_cmos_tech.cpp +++ b/vpr/src/power/power_cmos_tech.cpp @@ -107,7 +107,7 @@ void power_tech_load_xml_file(const char* cmos_tech_behavior_filepath) { auto next = child.next_sibling("transistor"); if (next) { vpr_throw(VPR_ERROR_POWER, loc_data.filename_c_str(), loc_data.line(next), - "Encountered extra section (expect 2 only: pmos and nmos)\n"); + "Encountered extra section (expect 2 only: pmos and nmos)\n"); } /* Multiplexer Voltage Information */ @@ -501,7 +501,7 @@ void power_find_buffer_strength_inf(t_power_buffer_strength_inf** lower, * based on the size of the multiplexer driving the input * - lower: (Return value) The lower-bound matching record * - upper: (Return value) The upper-bound matching record - * - buffer_strength: The set of records to search withing, which are for a specific buffer size/strength + * - buffer_strength: The set of records to search within, which are for a specific buffer size/strength * - input_mux_size: The input mux size to search for */ void power_find_buffer_sc_levr(t_power_buffer_sc_levr_inf** lower, diff --git a/vpr/src/power/power_components.cpp b/vpr/src/power/power_components.cpp index b0542e64f9..0b189a7214 100644 --- a/vpr/src/power/power_components.cpp +++ b/vpr/src/power/power_components.cpp @@ -397,7 +397,7 @@ void power_usage_lut(t_power_usage* power_usage, int lut_size, float transistor_ * This function calculates power of a local interconnect structure * - power_usage: (Return value) Power usage of the structure * - pb: The physical block to which this interconnect belongs - * - interc_pins: The interconnect input/ouput pin information + * - interc_pins: The interconnect input/output pin information * - interc_length: The physical length spanned by the interconnect (meters) */ void power_usage_local_interc_mux(t_power_usage* power_usage, t_pb* pb, t_interconnect_pins* interc_pins, ClusterBlockId iblk) { diff --git a/vpr/src/power/power_components.h b/vpr/src/power/power_components.h index 9e467f88c2..df0cdae0d5 100644 --- a/vpr/src/power/power_components.h +++ b/vpr/src/power/power_components.h @@ -27,7 +27,7 @@ /************************* Defines **********************************/ -/* This controlls the level of accuracy used for transition density +/* This controls the level of accuracy used for transition density * calculations of internal LUT nodes. The more detailed model * looks at SRAM values in deciding if toggles on the inputs will * toggle the internal nets. The fast method uses only signal diff --git a/vpr/src/power/power_lowlevel.cpp b/vpr/src/power/power_lowlevel.cpp index 2f74c7fd73..770766a5ef 100644 --- a/vpr/src/power/power_lowlevel.cpp +++ b/vpr/src/power/power_lowlevel.cpp @@ -482,14 +482,14 @@ void power_usage_MUX2_transmission(t_power_usage* power_usage, float size, float } /** - * Calucates the power of a static, single-level multiplexer + * Calculates the power of a static, single-level multiplexer * - power_usage: (Return value) power usage of the mux * - out_prob: (Return value) Signal probability of the output * - out_dens: (Return value) Transition density of the output * - num_inputs: Number of inputs of the mux * - selected_idx: The input index that is selected by the select lines * - in_prob: Array of input signal probabilities - * - in_dens: Array of input tranistion densities + * - in_dens: Array of input transition densities * - v_in: Array of input max voltages * - transistor_size: Size of the NMOS transistors (must be 1.0) * - v_out_restored: Whether the output will be level restored to Vdd @@ -520,7 +520,7 @@ void power_usage_mux_singlelevel_static(t_power_usage* power_usage, v_in_selected = v_in[selected_idx]; } else { - /* In this case, the multiplexer is not symetrical. The + /* In this case, the multiplexer is not symmetrical. The * other branch of the mux has more inputs than this one, * and the selected input index is not a valid index for * this portion of the mux. If the mux was actually built @@ -585,10 +585,10 @@ void power_usage_mux_singlelevel_static(t_power_usage* power_usage, } /** - * This function calcualtes the output voltage of a single-level multiplexer + * This function calculates the output voltage of a single-level multiplexer * - num_inputs: Number of inputs of the multiplexer * - transistor_size: The size of the NMOS transistors (must be 1.0) - * - v_in: The input voltage of the selcted input + * - v_in: The input voltage of the selected input * - in_prob_avg: The average signal probabilities of the non-selected inputs */ float power_calc_mux_v_out(int num_inputs, float transistor_size, float v_in, float in_prob_avg) { @@ -690,7 +690,7 @@ float power_calc_mux_v_out(int num_inputs, float transistor_size, float v_in, fl * - out_prob: The signal probability of the output * - v_out: The output max voltage * - in_prob: Array of input signal probabilities - * - in_dens: Array of input tranistion densities + * - in_dens: Array of input transition densities * - v_in: Array of input voltages * - sel_dens: Transition density of the select line * - sel_prob: Signal probability of the select line diff --git a/vpr/src/power/power_sizing.cpp b/vpr/src/power/power_sizing.cpp index b00a9bc419..2764aaff7c 100644 --- a/vpr/src/power/power_sizing.cpp +++ b/vpr/src/power/power_sizing.cpp @@ -382,7 +382,7 @@ static double power_count_transistors_switchbox() { auto& device_ctx = g_vpr_ctx.device(); const auto& rr_graph = device_ctx.rr_graph; for (size_t seg_idx = 0; seg_idx < rr_graph.num_rr_segments(); seg_idx++) { - /* In each switchbox, the different types of segments occur with relative freqencies. + /* In each switchbox, the different types of segments occur with relative frequencies. * Thus the total number of wires of each segment type is (#tracks * freq * 2). * The (x2) factor accounts for vertical and horizontal tracks. * Of the wires of each segment type only (1/seglength) will have a mux&buffer. @@ -855,7 +855,7 @@ static void power_size_pin_buffers_and_wires(t_pb_graph_pin* pin, pin->pin_power->buffer_size = pin->port->port_power->buffer_size; break; case POWER_BUFFER_TYPE_AUTO: - /* Asume the buffer drives the wire & fanout muxes */ + /* Assume the buffer drives the wire & fanout muxes */ C_load = pin->pin_power->C_wire + (fanout)*power_ctx.commonly_used->INV_1X_C_in; //power_ctx.commonly_used->NMOS_1X_C_d; if (C_load > power_ctx.commonly_used->INV_1X_C_in) {