Skip to content

Commit 6fa3a7b

Browse files
committed
parmys doc update
1 parent 640da8d commit 6fa3a7b

File tree

4 files changed

+17
-12
lines changed

4 files changed

+17
-12
lines changed

doc/src/odin/index.rst

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@ Odin II
66

77
Odin II is used for logic synthesis and elaboration, converting a subset of the Verilog Hardware Description Language (HDL) into a BLIF netlist.
88

9+
.. note::
10+
Odin-II has been deprecated and will be removed in a future version. Now VTR uses Parmys as the default frontend which utilizes Yosys as elaborator with partial mapping features enabled.
11+
12+
To build the VTR flow with the Odin-II front-end you may use the VTR Makefile wrapper, by calling the ``make CMAKE_PARAMS="-DWITH_ODIN=ON"`` command in the `$VTR_ROOT` directory.
13+
914
.. toctree::
1015
:glob:
1116
:maxdepth: 2

doc/src/parmys/parmys_plugin.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Parmys Plugin
66
Parmys (Partial Mapper for Yosys) is a Yosys plugin that performs intelligent partial mapping (inference, binding, and hard/soft logic trade-offs) from Odin-II.
77
Please see `Parmys-Plugin GitHub <https://github.com/CAS-Atlantic/parmys-plugin.git>`_ repository for more information.
88

9-
Available parameters are:
9+
Available parameters
1010
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1111

1212
.. option:: -a ARCHITECTURE_FILE

doc/src/vtr/run_vtr_flow.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,10 @@ They will cause VPR to perform only :ref:`packing and placement <general_options
6363
.. code-block:: bash
6464
6565
# Using the Yosys conventional Verilog parser
66-
./run_vtr_flow <path/to/Verilog/File> <path/to/arch/file> -start yosys
66+
./run_vtr_flow <path/to/Verilog/File> <path/to/arch/file>
6767
6868
# Using the Yosys-SystemVerilog plugin if installed, otherwise the Yosys conventional Verilog parser
69-
./run_vtr_flow <path/to/SystemVerilog/File> <path/to/arch/file> -start yosys
69+
./run_vtr_flow <path/to/SystemVerilog/File> <path/to/arch/file> -parser system-verilog
7070
7171
Running the VTR flow with the default configuration using the Yosys standalone front-end.
7272
The parser for these runs is considered the Yosys conventional Verilog/SystemVerilog parser (i.e., ``read_verilog -sv``), as the parser is not explicitly specified.
@@ -77,7 +77,7 @@ The parser for these runs is considered the Yosys conventional Verilog/SystemVer
7777
./run_vtr_flow <path/to/SystemVerilog/File> <path/to/arch/file> -parser system-verilog
7878
7979
# Using the Surelog plugin if installed, otherwise failure on the unsupported file type
80-
./run_vtr_flow <path/to/UHDM/File> <path/to/arch/file> -start yosys -parser surelog
80+
./run_vtr_flow <path/to/UHDM/File> <path/to/arch/file> -parser surelog
8181
8282
Running the default VTR flow using the Parmys standalone front-end.
8383
The Yosys HDL parser is considered as Yosys-SystemVerilog plugin (i.e., ``read_systemverilog``) and Yosys UHDM plugin (i.e., ``read_uhdm``), respectively.
@@ -86,7 +86,7 @@ Utilizing Yosys plugins requires passing the ``-DYOSYS_SV_UHDM_PLUGIN=ON`` compi
8686
.. code-block:: bash
8787
8888
# Using the Parmys (Partial Mapper for Yosys) plugin as partial mapper
89-
./run_vtr_flow <path/to/Verilog/File> <path/to/arch/file> -start yosys
89+
./run_vtr_flow <path/to/Verilog/File> <path/to/arch/file>
9090
9191
Will run the VTR flow (default configuration) with Yosys frontend using Parmys plugin as partial mapper. To utilize the Parmys plugin, the ``-DYOSYS_PARMYS_PLUGIN=ON`` compile flag should be passed while building the VTR project with Yosys as a frontend.
9292

vtr_flow/scripts/python_libs/vtr/parmys/parmys.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
"""
2-
Module to run YOSYS with its various arguments
2+
Module to run Parmys with its various arguments
33
"""
44
import os
55
import shutil
@@ -82,11 +82,11 @@ def init_config_file(
8282
min_hard_mult_size,
8383
min_hard_adder_size,
8484
):
85-
"""initializing the raw odin config file"""
85+
"""initializing the raw xml config file"""
8686
# specify the input files type
8787
file_extension = os.path.splitext(circuit_list[0])[-1]
8888
if file_extension not in FILE_TYPES:
89-
raise vtr.VtrError("Inavlid input file type '{}'".format(file_extension))
89+
raise vtr.VtrError("Invalid input file type '{}'".format(file_extension))
9090
input_file_type = FILE_TYPES[file_extension]
9191

9292
# Update the config file
@@ -135,7 +135,7 @@ def run(
135135
min_hard_adder_size=1,
136136
):
137137
"""
138-
Runs YOSYS on the specified architecture file and circuit file
138+
Runs Yosys on the specified architecture file and circuit
139139
140140
.. note :: Usage: vtr.parmys.run(<architecture_file>,<circuit_file>,<output_netlist>,[OPTIONS])
141141
@@ -162,16 +162,16 @@ def run(
162162
Directory to run in (created if non-existent)
163163
164164
parmys_args:
165-
A dictionary of keyword arguments to pass on to PARMYS
165+
A dictionary of keyword arguments to pass on to Parmys
166166
167167
log_filename :
168168
File to log result to
169169
170170
yosys_exec:
171-
YOSYS executable to be run
171+
Yosys executable to be run
172172
173173
yosys_script:
174-
The YOSYS script file
174+
The Yosys script file
175175
176176
"""
177177
temp_dir = Path(temp_dir) if not isinstance(temp_dir, Path) else temp_dir

0 commit comments

Comments
 (0)