Skip to content

Commit 1ba6829

Browse files
Merge pull request #3369 from AlexandreSinger/feature-spelling
[Spelling] Fixed Spelling in VQM2Blif
2 parents 3518951 + 98da7f3 commit 1ba6829

File tree

16 files changed

+155
-152
lines changed

16 files changed

+155
-152
lines changed

.codespellrc

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ skip = ./build,
55
*.pdf,
66
*.svg,
77
*.log,
8+
*.vqm,
9+
*.blif,
810
# External projects that do not belong to us.
911
./libs/EXTERNAL,
1012
./parmys,
@@ -16,7 +18,6 @@ skip = ./build,
1618
./verilog_preprocessor,
1719
# WIP spelling cleanups.
1820
./vtr_flow,
19-
./utils/vqm2blif,
2021
# Temporary as we wait for some PRs to merge.
2122
*_graph_uxsdcxx_capnp.h,
2223
./vpr/src/route/rr_graph_generation/rr_graph.cpp,
@@ -37,10 +38,12 @@ ignore-words-list = subtile,
3738
FPT,
3839
Synopsys,
3940
inout,
41+
inouts,
4042
INOUT,
4143
Dout,
4244
dout,
4345
DATIN,
46+
ACCout,
4447
ShowIn,
4548
# Special case: pres fac / pres cost for example.
4649
Pres,

utils/vqm2blif/README.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
-------------------------------------
2-
VQM to BLIF Convertor
2+
VQM to BLIF Converter
33
-------------------------------------
44

55
Created By: S. Whitty
@@ -238,7 +238,7 @@ Architecture file containing the constinuent primitives of the circuit [e.g. ../
238238

239239
-multiclock_primitives
240240
By default the tool will attempt to identify netlist primitives with multiple clocks, and then
241-
drop the extra clocks from the primtive. This is a work-around for VPR, since VPR currently
241+
drop the extra clocks from the primitive. This is a work-around for VPR, since VPR currently
242242
does not support multiple clocks per primitive.
243243

244244
If this option is provided, the tool will keep (i.e. not drop) extra clocks from netlist primitives.
@@ -256,7 +256,7 @@ Architecture file containing the constinuent primitives of the circuit [e.g. ../
256256
VII. VQM GENERATION
257257
------------------------
258258
NOTE: If using VQM2BLIF as part of Titan, see scripts/titan_flow.py and scripts/q2_flow.tcl as
259-
they automate this process. This section is maintained for referrence.
259+
they automate this process. This section is maintained for reference.
260260

261261
This method uses a Linux Shell environment to generate a VQM file using Quartus II. Other methods,
262262
such as using a Windows environment or the Quartus II GUI, are not covered here.
@@ -319,7 +319,7 @@ IX. LUT RECOGNITION
319319
BLIF netlist has low-level WYSIWYG blackboxes that do not have any configurability; their functionality
320320
is predetermined and static and only their connectivity can be varied. A VQM primitive, on the other hand,
321321
has associated parameter information that defines lower-level functionality than that which is explicitly
322-
described. Thus, this convertor must bridge the gap between these two levels. For most blocks, (e.g. RAMs,
322+
described. Thus, this converter must bridge the gap between these two levels. For most blocks, (e.g. RAMs,
323323
DSPs, etc.) this involves approximating the configuration by appending a code to the name of the block
324324
to essentially split the single initial type of block into multiple similar but differently-functioning
325325
ones.

utils/vqm2blif/src/base/cleanup.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ void remove_one_lut_nodes ( busvec* buses, std::unordered_map<std::string, int>
280280
- Srivatsan Srinivasan, September 2021:
281281
- removed the function parameters "original_num_nodes" and "nodes". These values can be from the "module" parameter and are now assigned internally within this function.
282282
- Srivatsan Srinivasan, August 2021:
283-
- Moved the incrementing of the "oneluts_elim" variable to this fuction from the "remove_node" function. The purpose of this change was to localise any vairable attached to removing one lut nodes within this function. Additionally, now the "remove_node" function is generalized and is not limited to be only used by "remove_one_lut_nodes".
283+
- Moved the incrementing of the "oneluts_elim" variable to this function from the "remove_node" function. The purpose of this change was to localise any variable attached to removing one lut nodes within this function. Additionally, now the "remove_node" function is generalized and is not limited to be only used by "remove_one_lut_nodes".
284284
*/
285285
oneluts_elim = 0;
286286

@@ -639,7 +639,7 @@ void verify_netlist ( t_node** nodes, int num_nodes, busvec* buses, std::unorder
639639

640640
cout << "\t>> Verifying netlist...\n" ;
641641

642-
//Step 0: Construct child_count "matrix" corresponding to the net indeces.
642+
//Step 0: Construct child_count "matrix" corresponding to the net indices.
643643
// The children of each net will be counted as the netlist is verified,
644644
// then compared against the number of children stored in the net.
645645
vector < vector <int> > child_count;
@@ -663,7 +663,7 @@ void verify_netlist ( t_node** nodes, int num_nodes, busvec* buses, std::unorder
663663
for (int j = 0; (unsigned int)j < temp_bus->size(); j++){
664664
temp_net = &(temp_bus->at(j));
665665

666-
VTR_ASSERT((temp_net->bus_index == i)&&(temp_net->wire_index == j)); //indeces must line up
666+
VTR_ASSERT((temp_net->bus_index == i)&&(temp_net->wire_index == j)); //indices must line up
667667
VTR_ASSERT(ref_pin == temp_net->pin); //all nets in a common bus share a pin
668668

669669
if (temp_net->driver == CONST){
@@ -726,7 +726,7 @@ void verify_netlist ( t_node** nodes, int num_nodes, busvec* buses, std::unorder
726726
VTR_ASSERT(temp_bus->size() > 0);
727727
for (int j = 0; (unsigned int)j < temp_bus->size(); j++){
728728
temp_net = &(temp_bus->at(j));
729-
VTR_ASSERT((temp_net->bus_index == i)&&(temp_net->wire_index == j)); //indeces must line up
729+
VTR_ASSERT((temp_net->bus_index == i)&&(temp_net->wire_index == j)); //indices must line up
730730
VTR_ASSERT(child_count[i][j] == temp_net->num_children);
731731
}
732732
}
@@ -855,7 +855,7 @@ void reorganize_module_node_list(t_module* module)
855855
856856
Please refer to the example below:
857857
858-
Inital Node array:
858+
Initial Node array:
859859
------ ------ ------ ------
860860
|LUT 1| --> |LUT 2| --> --> |LUT 3| --> |LUT 4|
861861
------ ------ ------ ------
@@ -871,7 +871,7 @@ void reorganize_module_node_list(t_module* module)
871871
Change Log:
872872
- Srivatsan Srinivasan, August 2021:
873873
- created this function to reorganize node arrays with gaps inside of them.
874-
- Initially the feature provided by this function was embedded indide the "remove_one_lut_nodes" function. By creating a seperate function, we are now not restricted to only removing one-lut nodes.
874+
- Initially the feature provided by this function was embedded inside the "remove_one_lut_nodes" function. By creating a separate function, we are now not restricted to only removing one-lut nodes.
875875
- Now we can remove any types of nodes and then run this function to reorganize the node array.
876876
*/
877877
// assign module related parameters

utils/vqm2blif/src/base/cleanup.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ void remove_node ( t_node* node, t_node** nodes, int original_num_nodes );
4444
* this function fills in those gaps so that the array is continuous.
4545
*
4646
* Parameters:
47-
* module - the module that contains a node list with elemets within it deleted
47+
* module - the module that contains a node list with elements within it deleted
4848
*
4949
*/
5050
void reorganize_module_node_list(t_module* module);

0 commit comments

Comments
 (0)