Skip to content

Commit c4ad99e

Browse files
Fix formatting in libarchfpga/physical_types.h
1 parent fbe6a40 commit c4ad99e

File tree

2 files changed

+36
-37
lines changed

2 files changed

+36
-37
lines changed

libs/libarchfpga/src/physical_types.h

+36-36
Original file line numberDiff line numberDiff line change
@@ -1586,7 +1586,7 @@ enum e_directionality {
15861586
};
15871587

15881588
/* X_AXIS: Data that describes an x-directed wire segment (CHANX) *
1589-
* Y_AXIS: Data that describes an y-directed wire segment (CHANY) *
1589+
* Y_AXIS: Data that describes an y-directed wire segment (CHANY) *
15901590
* BOTH_AXIS: Data that can be applied to both x-directed and y-directed wire segment */
15911591
enum e_parallel_axis {
15921592
X_AXIS,
@@ -1643,65 +1643,65 @@ enum e_Fc_type {
16431643
*/
16441644
struct t_segment_inf {
16451645
/**
1646-
* @brief The name of the segment type
1646+
* @brief The name of the segment type
16471647
*/
16481648
std::string name;
16491649

16501650
/**
1651-
* @brief ratio of tracks which are of this segment type.
1651+
* @brief ratio of tracks which are of this segment type.
16521652
*/
16531653
int frequency;
16541654

16551655
/**
1656-
* @brief Length (in clbs) of the segment.
1656+
* @brief Length (in clbs) of the segment.
16571657
*/
16581658
int length;
16591659

16601660
/**
1661-
* @brief Index of the switch type that connects other wires to this segment.
1662-
* Note that this index is in relation to the switches from the architecture file,
1663-
* not the expanded list of switches that is built at the end of build_rr_graph.
1661+
* @brief Index of the switch type that connects other wires to this segment.
1662+
* Note that this index is in relation to the switches from the architecture file,
1663+
* not the expanded list of switches that is built at the end of build_rr_graph.
16641664
*/
16651665
short arch_wire_switch;
16661666

16671667
/**
1668-
* @brief Index of the switch type that connects output pins to this segment.
1669-
* Note that this index is in relation to the switches from the architecture file,
1670-
* not the expanded list of switches that is built at the end of build_rr_graph.
1668+
* @brief Index of the switch type that connects output pins to this segment.
1669+
* Note that this index is in relation to the switches from the architecture file,
1670+
* not the expanded list of switches that is built at the end of build_rr_graph.
16711671
*/
16721672
short arch_opin_switch;
16731673

16741674
/**
1675-
* @brief Same as arch_wire_switch but used only for decremental tracks if it is
1676-
* specified in the architecture file. If -1, this value was not set in the
1677-
* architecture file and arch_wire_switch should be used for "DEC_DIR" wire segments.
1675+
* @brief Same as arch_wire_switch but used only for decremental tracks if it is
1676+
* specified in the architecture file. If -1, this value was not set in the
1677+
* architecture file and arch_wire_switch should be used for "DEC_DIR" wire segments.
16781678
*/
16791679
short arch_wire_switch_dec = -1;
16801680

16811681
/**
1682-
* @brief Same as arch_opin_switch but used only for decremental tracks if
1683-
* it is specified in the architecture file. If -1, this value was not set in
1684-
* the architecture file and arch_opin_switch should be used for "DEC_DIR" wire segments.
1682+
* @brief Same as arch_opin_switch but used only for decremental tracks if
1683+
* it is specified in the architecture file. If -1, this value was not set in
1684+
* the architecture file and arch_opin_switch should be used for "DEC_DIR" wire segments.
16851685
*/
16861686
short arch_opin_switch_dec = -1;
16871687

16881688
/**
1689-
* @brief Index of the switch type that connects output pins (OPINs) to this
1690-
* segment from another die (layer). Note that this index is in relation to
1691-
* the switches from the architecture file, not the expanded list of switches
1692-
* that is built at the end of build_rr_graph.
1689+
* @brief Index of the switch type that connects output pins (OPINs) to this
1690+
* segment from another die (layer). Note that this index is in relation to
1691+
* the switches from the architecture file, not the expanded list of switches
1692+
* that is built at the end of build_rr_graph.
16931693
*/
16941694
short arch_inter_die_switch = -1;
16951695

16961696
/**
1697-
* @brief The fraction of logic blocks along its length to which this segment can connect.
1698-
* (i.e. internal population).
1697+
* @brief The fraction of logic blocks along its length to which this segment can connect.
1698+
* (i.e. internal population).
16991699
*/
17001700
float frac_cb;
17011701

17021702
/**
1703-
* @brief The fraction of the length + 1 switch blocks along the segment to which the segment can connect.
1704-
* Segments that aren't long lines must connect to at least two switch boxes.
1703+
* @brief The fraction of the length + 1 switch blocks along the segment to which the segment can connect.
1704+
* Segments that aren't long lines must connect to at least two switch boxes.
17051705
*/
17061706
float frac_sb;
17071707

@@ -1718,27 +1718,27 @@ struct t_segment_inf {
17181718
enum e_directionality directionality;
17191719

17201720
/**
1721-
* @brief Defines what axis the segment is parallel to. See e_parallel_axis
1722-
* comments for more details on the values.
1721+
* @brief Defines what axis the segment is parallel to. See e_parallel_axis
1722+
* comments for more details on the values.
17231723
*/
17241724
enum e_parallel_axis parallel_axis;
17251725

17261726
/**
1727-
* @brief A vector of booleans indicating whether the segment can connect to a logic block.
1727+
* @brief A vector of booleans indicating whether the segment can connect to a logic block.
17281728
*/
17291729
std::vector<bool> cb;
17301730

17311731
/**
1732-
* @brief A vector of booleans indicating whether the segment can connect to a switch block.
1732+
* @brief A vector of booleans indicating whether the segment can connect to a switch block.
17331733
*/
17341734
std::vector<bool> sb;
17351735

17361736
/**
17371737
* @brief The index of the segment as stored in the appropriate Segs list.
1738-
* Upon loading the architecture, we use this field to keep track of the
1739-
* segment's index in the unified segment_inf vector. This is useful when
1740-
* building the rr_graph for different Y & X channels in terms of track
1741-
* distribution and segment type.
1738+
* Upon loading the architecture, we use this field to keep track of the
1739+
* segment's index in the unified segment_inf vector. This is useful when
1740+
* building the rr_graph for different Y & X channels in terms of track
1741+
* distribution and segment type.
17421742
*/
17431743
int seg_index;
17441744

@@ -1747,7 +1747,7 @@ struct t_segment_inf {
17471747
* Possible values are:
17481748
* - GENERAL: The segment is part of the general routing resources.
17491749
* - GCLK: The segment is part of the global routing network.
1750-
* For backward compatibility, this attribute is optional. If not specified,
1750+
* For backward compatibility, this attribute is optional. If not specified,
17511751
* the resource type for the segment is considered to be GENERAL.
17521752
*/
17531753
enum SegResType res_type = SegResType::GENERAL;
@@ -1797,12 +1797,12 @@ constexpr std::array<const char*, size_t(SwitchType::NUM_SWITCH_TYPES)> SWITCH_T
17971797

17981798
/* Constant/Reserved names for switches in architecture XML
17991799
* Delayless switch:
1800-
* The zero-delay switch created by VPR internally
1800+
* The zero-delay switch created by VPR internally
18011801
* This is a special switch just to ease CAD algorithms
18021802
* It is mainly used in
1803-
* - the edges between SOURCE and SINK nodes in routing resource graphs
1803+
* - the edges between SOURCE and SINK nodes in routing resource graphs
18041804
* - the edges in CLB-to-CLB connections (defined by <directlist> in arch XML)
1805-
*
1805+
*
18061806
*/
18071807
constexpr const char* VPR_DELAYLESS_SWITCH_NAME = "__vpr_delayless_switch__";
18081808

vpr/src/pack/cluster_legalizer.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -833,7 +833,6 @@ static void try_update_lookahead_pins_used(t_pb* cur_pb,
833833
// find if this child (primitive) pb block has an atom mapped to it,
834834
// if yes compute and mark lookahead pins used for that pb block
835835
AtomBlockId blk_id = atom_to_pb.pb_atom(cur_pb);
836-
// TODO: Primitive pb_types should have non-null blif_model. Shoud this be an assertion?
837836
if (pb_type->blif_model != nullptr && blk_id) {
838837
compute_and_mark_lookahead_pins_used(blk_id, atom_cluster, atom_to_pb);
839838
}

0 commit comments

Comments
 (0)