Skip to content

Commit a50b1c5

Browse files
[Spelling] Fixed Spelling in Base, Noc, and Util
Started fixing the spelling in VPR. Keeping the PRs in pieces to make it easier to review. I am skipping the strange changes that may be needed.
1 parent 7a9dc71 commit a50b1c5

28 files changed

+80
-80
lines changed

vpr/src/base/atom_lookup_fwd.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
class AtomLookup;
44

55
enum class BlockTnode {
6-
INTERNAL, ///<tnodes corresponding to internal paths withing atom blocks
6+
INTERNAL, ///<tnodes corresponding to internal paths within atom blocks
77
EXTERNAL ///<tnodes corresponding to external interface of atom blocks
88
};

vpr/src/base/atom_netlist.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ class AtomNetlist : public Netlist<AtomBlockId, AtomPortId, AtomPinId, AtomNetId
127127
*/
128128

129129
/**
130-
* @brief Returns the AtomPortId of the specifed port if it exists or AtomPortId::INVALID() if not
130+
* @brief Returns the AtomPortId of the specified port if it exists or AtomPortId::INVALID() if not
131131
* @note This method is typically more efficient than searching by name
132132
*
133133
* @param blk_id The ID of the block who's ports will be checked

vpr/src/base/atom_netlist_utils.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020
*/
2121
int infer_and_mark_constant_pins(AtomNetlist& netlist, e_const_gen_inference const_gen_inference_method, const LogicalModels& models, int verbosity);
2222

23-
///@brief Marks all primtive output pins which have no combinationally connected inputs as constant pins
23+
///@brief Marks all primitive output pins which have no combinationally connected inputs as constant pins
2424
int mark_undriven_primitive_outputs_as_constant(AtomNetlist& netlist, int verbosity);
2525

26-
///@brief Marks all primtive output pins of blk which have only constant inputs as constant pins
26+
///@brief Marks all primitive output pins of blk which have only constant inputs as constant pins
2727
int infer_and_mark_block_pins_constant(AtomNetlist& netlist, AtomBlockId blk, e_const_gen_inference const_gen_inference_method, const LogicalModels& models, int verbosity);
2828
int infer_and_mark_block_combinational_outputs_constant(AtomNetlist& netlist, AtomBlockId blk, e_const_gen_inference const_gen_inference_method, int verbosity);
2929
int infer_and_mark_block_sequential_outputs_constant(AtomNetlist& netlist, AtomBlockId blk, e_const_gen_inference const_gen_inference_method, const LogicalModels& models, int verbosity);
@@ -129,7 +129,7 @@ void print_netlist_as_blif(FILE* f, const AtomNetlist& netlist, const LogicalMod
129129

130130
//Artificial buffers
131131
for (auto buf_pair : artificial_buffer_connections_required) {
132-
fprintf(f, "#Artificially inserted primary-output assigment buffer\n");
132+
fprintf(f, "#Artificially inserted primary-output assignment buffer\n");
133133
fprintf(f, ".names %s %s\n", buf_pair.first.c_str(), buf_pair.second.c_str());
134134
fprintf(f, "1 1\n");
135135
fprintf(f, "\n");
@@ -194,7 +194,7 @@ void print_netlist_as_blif(FILE* f, const AtomNetlist& netlist, const LogicalMod
194194
auto type = "re";
195195

196196
//Latch initial value
197-
int init_val = 3; //Unkown or unspecified
197+
int init_val = 3; //Unknown or unspecified
198198
//The initial value is stored as a single value in the truth table
199199
const auto& so_cover = netlist.block_truth_table(blk_id);
200200
if (so_cover.size() == 1) {
@@ -849,7 +849,7 @@ bool remove_buffer_lut(AtomNetlist& netlist, AtomBlockId blk, const LogicalModel
849849
//We now need to determine the name of the 'new' net
850850
//
851851
// We need to be careful about this name since a net pin could be
852-
// a Primary-Input/Primary-Output, and we don't want to change PI/PO names (for equivalance checking)
852+
// a Primary-Input/Primary-Output, and we don't want to change PI/PO names (for equivalence checking)
853853
//
854854
//Check if we have any PI/POs in the new net's pins
855855
// Note that the driver can only (potentially) be an INPAD, and the sinks only (potentially) OUTPADs
@@ -873,10 +873,10 @@ bool remove_buffer_lut(AtomNetlist& netlist, AtomBlockId blk, const LogicalModel
873873
auto output_net_name = netlist.net_name(output_net);
874874

875875
if ((driver_is_pi || po_in_input_sinks) && !po_in_output_sinks) {
876-
//Must use the input name to perserve primary-input or primary-output name
876+
//Must use the input name to preserve primary-input or primary-output name
877877
new_net_name = input_net_name;
878878
} else if (!(driver_is_pi || po_in_input_sinks) && po_in_output_sinks) {
879-
//Must use the output name to perserve primary-output name
879+
//Must use the output name to preserve primary-output name
880880
new_net_name = output_net_name;
881881
} else {
882882
new_net_name = input_net_name;
@@ -1077,7 +1077,7 @@ size_t sweep_blocks(AtomNetlist& netlist, const LogicalModels& models, int verbo
10771077

10781078
AtomBlockType type = netlist.block_type(blk_id);
10791079

1080-
//Don't remove inpads/outpads here, we have seperate sweep functions for these
1080+
//Don't remove inpads/outpads here, we have separate sweep functions for these
10811081
if (type == AtomBlockType::INPAD || type == AtomBlockType::OUTPAD) continue;
10821082

10831083
//We remove any blocks with no fanout

vpr/src/base/atom_netlist_utils.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ size_t sweep_constant_primary_outputs(AtomNetlist& netlist, int verbosity);
5959
*/
6060

6161
/**
62-
* @brief Deterimine whether a truth table encodes the logic functions 'On' set (returns true)
62+
* @brief Determine whether a truth table encodes the logic functions 'On' set (returns true)
6363
* or 'Off' set (returns false)
6464
*/
6565
bool truth_table_encodes_on_set(const AtomNetlist::TruthTable& truth_table);
@@ -79,16 +79,16 @@ AtomNetlist::TruthTable expand_truth_table(const AtomNetlist::TruthTable& truth_
7979
*
8080
* @param truth_table The truth table to expand
8181
* @param num_inputs The number of inputs to use
82-
* @param permutation A vector indicies to permute, permutation[i] is the input pin where
82+
* @param permutation A vector indices to permute, permutation[i] is the input pin where
8383
* the signal currently connected to input i should be placed
8484
*/
8585
AtomNetlist::TruthTable permute_truth_table(const AtomNetlist::TruthTable& truth_table, const size_t num_inputs, const std::vector<int>& permutation);
8686

87-
///@brief Convers a truth table to a lut mask (sequence of binary values representing minterms)
87+
///@brief Converts a truth table to a lut mask (sequence of binary values representing minterms)
8888
std::vector<vtr::LogicValue> truth_table_to_lut_mask(const AtomNetlist::TruthTable& truth_table, const size_t num_inputs);
8989

9090
/**
91-
* @brief Convers a logic cube (potnetially including don't cares) into
91+
* @brief Converts a logic cube (potnetially including don't cares) into
9292
* a sequence of minterm numbers
9393
*/
9494
std::vector<size_t> cube_to_minterms(std::vector<vtr::LogicValue> cube);

vpr/src/base/clustered_netlist.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ class ClusteredNetlist : public Netlist<ClusterBlockId, ClusterPortId, ClusterPi
223223
*/
224224

225225
/**
226-
* @brief The intented use is to find the block id of a
226+
* @brief The intended use is to find the block id of a
227227
* hard block without knowing its name in the netlist. Instead
228228
* a pattern can be created that we know the block's name will
229229
* match to. Generally, we expect the pattern to be constructed
@@ -238,8 +238,8 @@ class ClusteredNetlist : public Netlist<ClusterBlockId, ClusterPortId, ClusterPi
238238
* function can be used by just providing the string pattern as
239239
* ".*test_ram.*". We know that the module name should be somewhere
240240
* within the string, so the pattern we provide says that the netlist
241-
* name of the block contains arbritary characters then the module
242-
* name and then some other arbritary characters after.
241+
* name of the block contains arbitrary characters then the module
242+
* name and then some other arbitrary characters after.
243243
* This pattern will then be used to match to the block in the
244244
* netlist. The matched cluster block id is returned, and if no
245245
* block matched to the input string then an invalid block id

vpr/src/base/flat_placement_types.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ class FlatPlacementInfo {
7777
// the flat placement to encode information about where atom blocks would
7878
// want to go if they cannot be placed at the grid position they are at.
7979
// (for example, a block placed at (0.9, 0.9) wants to be at tile (0, 0),
80-
// but if thats not possible it would prefer (1, 1) over anything else.
80+
// but if that's not possible it would prefer (1, 1) over anything else.
8181

8282
/// @brief The x-positions of each atom block. Is UNDEFINED_POS if undefined.
8383
vtr::vector<AtomBlockId, float> blk_x_pos;

vpr/src/base/gen/README.gen.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
`vpr_constraints_uxsdcxx.h`and
22
`vpr_constraints_uxsdcxx_interface.h` are generated via uxsdcxx and are checked in to
3-
avoid requiring python3 and the uxsdcxx depedencies to build VPR.
3+
avoid requiring python3 and the uxsdcxx dependencies to build VPR.

vpr/src/base/netlist.h

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -633,7 +633,7 @@ class Netlist {
633633
/**
634634
* @brief Removes a pin from the netlist.
635635
*
636-
* The pin is marked invalid, and removed from any assoicated nets
636+
* The pin is marked invalid, and removed from any associated nets
637637
* @param pin_id The pin_id of the pin to be removed
638638
*/
639639
void remove_pin(const PinId pin_id);
@@ -680,7 +680,7 @@ class Netlist {
680680
void remove_net(const NetId net_id);
681681

682682
/**
683-
* @brief Removes a connection betwen a net and pin.
683+
* @brief Removes a connection between a net and pin.
684684
*
685685
* The pin is removed from the net and the pin
686686
* will be marked as having no associated net
@@ -730,7 +730,7 @@ class Netlist {
730730
/**
731731
* @brief Finds a block where the block's name contains the
732732
* provided input name as a substring.
733-
* The intented use is to find the block id of a
733+
* The intended use is to find the block id of a
734734
* hard block without knowing its name in the netlist. Instead
735735
* the block's module name in the HDL design can be used as it will
736736
* be a substring within its full name in the netlist.
@@ -754,7 +754,7 @@ class Netlist {
754754
* The clustered netlist class defines another version of this
755755
* function that find blocks by checking for a pattern match,
756756
* meaning that the input is a pattern string and the pattern
757-
* is looked for ine each block name.
757+
* is looked for in each block name.
758758
*
759759
* @param name_substring A substring of a block name for which an ID needs
760760
* to be found.
@@ -765,7 +765,7 @@ class Netlist {
765765
BlockId find_block_by_name_fragment(const std::string& name_substring) const;
766766

767767
/**
768-
* @brief Returns the PortId of the specifed port if it exists or PortId::INVALID() if not
768+
* @brief Returns the PortId of the specified port if it exists or PortId::INVALID() if not
769769
*
770770
* @note This method is typically less efficient than searching by a t_model_port
771771
* With the overloaded AtomNetlist method
@@ -948,21 +948,21 @@ class Netlist {
948948
*/
949949

950950
/**
951-
* @brief Returns the StringId of the specifed string if it exists or StringId::INVALID() if not
951+
* @brief Returns the StringId of the specified string if it exists or StringId::INVALID() if not
952952
*
953953
* @param str The string to look for
954954
*/
955955
StringId find_string(const std::string& str) const;
956956

957957
/**
958-
* @brief Returns the BlockId of the specifed block if it exists or BlockId::INVALID() if not
958+
* @brief Returns the BlockId of the specified block if it exists or BlockId::INVALID() if not
959959
*
960960
* @param name_id : The block name to look for
961961
*/
962962
BlockId find_block(const StringId name_id) const;
963963

964964
/**
965-
* @brief Returns the NetId of the specifed port if it exists or NetId::INVALID() if not
965+
* @brief Returns the NetId of the specified port if it exists or NetId::INVALID() if not
966966
*
967967
* @param name_id The string ID of the net name to look for
968968
*/

vpr/src/base/netlist.tpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -532,7 +532,7 @@ PinId Netlist<BlockId, PortId, PinId, NetId>::find_pin(const PortId port_id, Bit
532532

533533
if (iter == pins_rng.end() || pin_port_bit(*iter) != port_bit) {
534534
//Either the end of the pins (i.e. not found), or
535-
//the value does not match (indicating a gap in the indicies, so also not found)
535+
//the value does not match (indicating a gap in the indices, so also not found)
536536
return PinId::INVALID();
537537
} else {
538538
//Found it
@@ -1325,7 +1325,7 @@ void Netlist<BlockId, PortId, PinId, NetId>::rebuild_block_refs(const vtr::vecto
13251325
VTR_ASSERT_SAFE_MSG(all_valid(pin_collection), "All Ids should be valid");
13261326
VTR_ASSERT(pin_collection.size() == size_t(block_num_input_pins_[blk_id] + block_num_output_pins_[blk_id] + block_num_clock_pins_[blk_id]));
13271327

1328-
//Similarily for ports
1328+
//Similarly for ports
13291329
size_t num_input_ports = count_valid_refs(block_input_ports(blk_id), port_id_map);
13301330
size_t num_output_ports = count_valid_refs(block_output_ports(blk_id), port_id_map);
13311331
size_t num_clock_ports = count_valid_refs(block_clock_ports(blk_id), port_id_map);
@@ -1710,12 +1710,12 @@ bool Netlist<BlockId, PortId, PinId, NetId>::validate_port_pin_refs() const {
17101710

17111711
//Verify that the pins are listed in increasing order of port bit index,
17121712
//we rely on this property to perform fast binary searches for pins with specific bit
1713-
//indicies
1713+
//indices
17141714
if (first_bit) {
17151715
prev_bit_index = port_bit_index;
17161716
first_bit = false;
17171717
} else if (prev_bit_index >= port_bit_index) {
1718-
VPR_FATAL_ERROR(VPR_ERROR_NETLIST, "Port pin indicies are not in ascending order");
1718+
VPR_FATAL_ERROR(VPR_ERROR_NETLIST, "Port pin indices are not in ascending order");
17191719
}
17201720
}
17211721
}
@@ -1909,7 +1909,7 @@ BlockId Netlist<BlockId, PortId, PinId, NetId>::find_block(const typename Netlis
19091909

19101910
template<typename BlockId, typename PortId, typename PinId, typename NetId>
19111911
void Netlist<BlockId, PortId, PinId, NetId>::associate_pin_with_block(const PinId pin_id, const PortType type, const BlockId blk_id) {
1912-
//Get an interator pointing to where we want to insert
1912+
//Get an iterator pointing to where we want to insert
19131913
pin_iterator iter;
19141914
if (type == PortType::INPUT) {
19151915
iter = block_input_pins(blk_id).end();
@@ -1981,7 +1981,7 @@ template<typename BlockId, typename PortId, typename PinId, typename NetId>
19811981
void Netlist<BlockId, PortId, PinId, NetId>::associate_port_with_block(const PortId port_id, const PortType type, const BlockId blk_id) {
19821982
//Associate the port with the blocks inputs/outputs/clocks
19831983

1984-
//Get an interator pointing to where we want to insert
1984+
//Get an iterator pointing to where we want to insert
19851985
port_iterator iter;
19861986
if (type == PortType::INPUT) {
19871987
iter = block_input_ports(blk_id).end();

vpr/src/base/netlist_utils.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ vtr::vector_map<Id, Id> compress_ids(const vtr::vector_map<Id, Id>& ids) {
5656
* @brief Returns a vector based on 'values', which has had entries
5757
* dropped & re-ordered according according to 'id_map'.
5858
*
59-
* Each entry in id_map corresponds to the assoicated element in 'values'.
59+
* Each entry in id_map corresponds to the associated element in 'values'.
6060
* The value of the id_map entry is the new ID of the entry in values.
6161
*
6262
* If it is an invalid ID, the element in values is dropped.

0 commit comments

Comments
 (0)