Skip to content

Commit 49b51ba

Browse files
authored
Merge pull request #1585 from ucb-bar/enable-precommit
Enable precommit | Format files
2 parents 7440f56 + c7f1fe2 commit 49b51ba

28 files changed

+38
-49
lines changed

docs/Advanced-Concepts/Architectural-Checkpoints.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,3 @@ The target config should also match the architectural configuration of however s
3636
3737
cd sims/vcs
3838
make CONFIG=dmiRocketConfig run-binary LOADARCH=../../hello.riscv.0x80000000.1000.loadarch
39-

docs/Advanced-Concepts/Harness-Clocks.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,3 @@ Take the following example:
2121
:end-before: DOC include end: HarnessClockInstantiatorEx
2222

2323
Here you can see the ``th.harnessClockInstantiator`` is used to request a clock and reset at ``memFreq`` frequency.
24-

docs/Customization/Custom-Chisel.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ Then add ``yourproject`` to the Chipyard top-level build.sbt file.
5252
5353
You can then import the classes defined in the submodule in a new project if
5454
you add it as a dependency. For instance, if you want to use this code in
55-
the ``chipyard`` project, add your project to the list of sub-projects in the
55+
the ``chipyard`` project, add your project to the list of sub-projects in the
5656
`.dependsOn()` for `lazy val chipyard`. The original code may change over time, but it
5757
should look something like this:
5858

docs/Customization/RoCC-Accelerators.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,4 +112,3 @@ For instance, if we wanted to add the previously defined accelerator and route c
112112
new RocketConfig)
113113
114114
To add RoCC instructions in your program, use the RoCC C macros provided in ``tests/rocc.h``. You can find examples in the files ``tests/accum.c`` and ``charcount.c``.
115-

docs/Generators/SiFive-Generators.rst

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Peripheral Devices Overview
1616
``sifive-blocks`` includes multiple peripheral device generators, such as UART, SPI, PWM, JTAG, GPIO and more.
1717

1818
These peripheral devices usually affect the memory map of the SoC, and its top-level IO as well.
19-
All the peripheral blocks comes with a default memory address that would not collide with each other, but if integrating multiple duplicated blocks in the SoC is needed, you will need to explicitly specify an approriate memory address for that device.
19+
All the peripheral blocks comes with a default memory address that would not collide with each other, but if integrating multiple duplicated blocks in the SoC is needed, you will need to explicitly specify an approriate memory address for that device.
2020

2121
Additionally, if the device requires top-level IOs, you will need to define a config fragment to change the top-level configuration of your SoC.
2222
When adding a top-level IO, you should also be aware of whether it interacts with the test-harness.
@@ -34,7 +34,7 @@ Finally, you add the relevant config fragment to the SoC config. For example:
3434
General Purpose I/Os (GPIO) Device
3535
----------------------------------
3636

37-
GPIO device is a periphery device provided by ``sifive-blocks``. Each general-purpose I/O port has five 32-bit configuration registers, two 32-bit data registers controlling pin input and output values, and eight 32-bit interrupt control/status register for signal level and edge triggering. In addition, all GPIOs can have two 32-bit alternate function selection registers.
37+
GPIO device is a periphery device provided by ``sifive-blocks``. Each general-purpose I/O port has five 32-bit configuration registers, two 32-bit data registers controlling pin input and output values, and eight 32-bit interrupt control/status register for signal level and edge triggering. In addition, all GPIOs can have two 32-bit alternate function selection registers.
3838

3939

4040
GPIO main features
@@ -67,7 +67,7 @@ Including GPIO in the SoC
6767
// Set up Memory Devices
6868
// ==================================
6969
// ...
70-
70+
7171
// Peripheral section
7272
new chipyard.config.WithGPIO(address = 0x10010000, width = 32) ++
7373
@@ -115,7 +115,7 @@ Including UART in the SoC
115115
// Set up Memory Devices
116116
// ==================================
117117
// ...
118-
118+
119119
// Peripheral section
120120
new chipyard.config.WithUART(address = 0x10020000, baudrate = 115200) ++
121121
@@ -125,7 +125,7 @@ Including UART in the SoC
125125
Inter-Integrated Circuit (I2C) Interface Device
126126
-------------------------------------------------
127127

128-
I2C device is a periphery device provided by ``sifive-blocks``. The I2C (inter-integrated circuit) bus interface handles communications to the serial I2C bus. It provides multi-master capability, and controls all I2C bus-specific sequencing, protocol, arbitration and timing. It supports Standard-mode (Sm), Fast-mode (Fm) and Fast-mode Plus (Fm+).
128+
I2C device is a periphery device provided by ``sifive-blocks``. The I2C (inter-integrated circuit) bus interface handles communications to the serial I2C bus. It provides multi-master capability, and controls all I2C bus-specific sequencing, protocol, arbitration and timing. It supports Standard-mode (Sm), Fast-mode (Fm) and Fast-mode Plus (Fm+).
129129

130130

131131
I2C main features
@@ -158,7 +158,7 @@ Including I2C in the SoC
158158
// Set up Memory Devices
159159
// ==================================
160160
// ...
161-
161+
162162
// Peripheral section
163163
new chipyard.config.WithI2C(address = 0x10040000) ++
164164
@@ -169,9 +169,9 @@ Including I2C in the SoC
169169
Serial Peripheral Interface (SPI) Device
170170
-------------------------------------------------
171171

172-
SPI device is a periphery device provided by ``sifive-blocks``. The SPI interface can be used to communicate with external devices using the SPI protocol.
172+
SPI device is a periphery device provided by ``sifive-blocks``. The SPI interface can be used to communicate with external devices using the SPI protocol.
173173

174-
The serial peripheral interface (SPI) protocol supports half-duplex, full-duplex and simplex synchronous, serial communication with external devices. The interface can be configured as master and in this case it provides the communication clock (SCLK) to the external slave device.
174+
The serial peripheral interface (SPI) protocol supports half-duplex, full-duplex and simplex synchronous, serial communication with external devices. The interface can be configured as master and in this case it provides the communication clock (SCLK) to the external slave device.
175175

176176

177177
SPI main features
@@ -208,7 +208,7 @@ Including SPI in the SoC
208208
// Set up Memory Devices
209209
// ==================================
210210
// ...
211-
211+
212212
// Peripheral section
213213
new chipyard.config.WithSPI(address = 0x10031000) ++
214214

docs/Simulation/Software-RTL-Simulation.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ During verilog creation, a graphml file is emitted that will allow you to visual
187187

188188
To view the graph, first download a viewer such as `yEd <https://www.yworks.com/products/yed/>`__.
189189

190-
The ``*.graphml`` file will be located in ``generated-src/<...>/``. Open the file in the graph viewer.
190+
The ``*.graphml`` file will be located in ``generated-src/<...>/``. Open the file in the graph viewer.
191191
To get a clearer view of the SoC, switch to "hierarchical" view. For yEd, this would be done by selecting ``layout`` -> ``hierarchical``, and then choosing "Ok" without changing any settings.
192192

193193
.. _sw-sim-verilator-opts:

docs/VLSI/Advanced-Usage.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Hammer Development and Upgrades
88
If you need to develop Hammer within Chipyard or use a version of Hammer beyond the latest PyPI release, clone the `Hammer repository <https://github.com/ucb-bar/hammer>`__ somewhere else on your disk. Then:
99

1010
.. code-block:: shell
11-
11+
1212
pip install -e <path/to/hammer>
1313
1414
To bump specific plugins to their latest commits and install them, you can use the upgrade script from the Chipyard root directory, with arguments for match patterns for the plugin names:
@@ -120,7 +120,7 @@ The given example in ``UPFInputs`` corresponds to a dual-core Rocket config with
120120
To run the flow:
121121

122122
.. code-block:: shell
123-
123+
124124
cd chipyard/vlsi
125125
make verilog ASPECTS=chipyard.upf.ChipTopUPFAspect
126126

docs/VLSI/Sky130-Commercial-Tutorial.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ Prerequisites
4848
* Python 3.9+
4949
* Genus, Innovus, Voltus, VCS, and Calibre licenses
5050
* Sky130A PDK, install `using conda <https://anaconda.org/litex-hub/open_pdks.sky130a>`__ or `these directions <https://github.com/ucb-bar/hammer/blob/master/hammer/technology/sky130>`__
51-
* `Sram22 Sky130 SRAM macros <https://github.com/rahulk29/sram22_sky130_macros>`__
51+
* `Sram22 Sky130 SRAM macros <https://github.com/rahulk29/sram22_sky130_macros>`__
5252

5353
* These SRAM macros were generated using the `Sram22 SRAM generator <https://github.com/rahulk29/sram22>`__ (still very heavily under development)
5454

@@ -75,7 +75,7 @@ In the Chipyard root, ensure that you have the Chipyard conda environment activa
7575
7676
to pull and install the plugin submodules. Note that for technologies other than ``sky130`` or ``asap7``, the tech submodule must be added in the ``vlsi`` folder first.
7777

78-
Now navigate to the ``vlsi`` directory. The remainder of the tutorial will assume you are in this directory.
78+
Now navigate to the ``vlsi`` directory. The remainder of the tutorial will assume you are in this directory.
7979
We will summarize a few files in this directory that will be important for the rest of the tutorial.
8080

8181
.. code-block:: shell
@@ -123,7 +123,7 @@ The ``buildfile`` make target has dependencies on both (1) the Verilog that is e
123123
and (2) the mapping of memory instances in the design to SRAM macros;
124124
all files related to these two steps reside in the ``generated-src/chipyard.harness.TestHarness.TinyRocketConfig-ChipTop`` directory.
125125
Note that the files in ``generated-src`` vary for each tool/technology flow.
126-
This especially applies to the Sky130 Commercial vs OpenROAD tutorial flows
126+
This especially applies to the Sky130 Commercial vs OpenROAD tutorial flows
127127
(due to the ``ENABLE_YOSYS_FLOW`` flag present for the OpenROAD flow), so these flows should be run in separate
128128
chipyard installations. If the wrong sources are generated, simply run ``make buildfile -B`` to rebuild all targets correctly.
129129

docs/VLSI/Sky130-OpenROAD-Tutorial.rst

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ Prerequisites
5555
* NetGen (LVS), , install `using conda <https://anaconda.org/litex-hub/netgen>`__ or `from source <http://www.opencircuitdesign.com/netgen/install.html>`__
5656

5757
* Sky130A PDK, install `using conda <https://anaconda.org/litex-hub/open_pdks.sky130a>`__ or `these directions <https://github.com/ucb-bar/hammer/blob/master/hammer/technology/sky130>`__
58-
* `Sram22 Sky130 SRAM macros <https://github.com/rahulk29/sram22_sky130_macros>`__
58+
* `Sram22 Sky130 SRAM macros <https://github.com/rahulk29/sram22_sky130_macros>`__
5959

6060
* These SRAM macros were generated using the `Sram22 SRAM generator <https://github.com/rahulk29/sram22>`__ (still very heavily under development)
6161

@@ -86,10 +86,10 @@ In the Chipyard root, ensure that you have the Chipyard conda environment activa
8686
8787
./scripts/init-vlsi.sh sky130 openroad
8888
89-
to pull and install the plugin submodules. Note that for technologies other than ``sky130`` or ``asap7``, the tech submodule is cloned in the ``vlsi`` folder,
89+
to pull and install the plugin submodules. Note that for technologies other than ``sky130`` or ``asap7``, the tech submodule is cloned in the ``vlsi`` folder,
9090
and for the commercial tool flow (set up by omitting the ``openroad`` argument), the tool plugin submodules are cloned into the ``vlsi`` folder.
9191

92-
Now navigate to the ``vlsi`` directory. The remainder of the tutorial will assume you are in this directory.
92+
Now navigate to the ``vlsi`` directory. The remainder of the tutorial will assume you are in this directory.
9393
We will summarize a few files in this directory that will be important for the rest of the tutorial.
9494

9595
.. code-block:: shell
@@ -151,7 +151,7 @@ The ``buildfile`` make target has dependencies on both (1) the Verilog that is e
151151
and (2) the mapping of memory instances in the design to SRAM macros;
152152
all files related to these two steps reside in the ``generated-src/chipyard.harness.TestHarness.TinyRocketConfig-ChipTop`` directory.
153153
Note that the files in ``generated-src`` vary for each tool/technology flow.
154-
This especially applies to the Sky130 Commercial vs OpenROAD tutorial flows
154+
This especially applies to the Sky130 Commercial vs OpenROAD tutorial flows
155155
(due to the ``ENABLE_YOSYS_FLOW`` flag, explained below), so these flows should be run in separate
156156
chipyard installations. If the wrong sources are generated, simply run ``make buildfile -B`` to rebuild all targets correctly.
157157

@@ -188,7 +188,7 @@ Place-and-Route
188188
make par tutorial=sky130-openroad
189189
190190
Note that sometimes OpenROAD freezes on commands following the ``detailed_route`` step,
191-
so for now we recomment running place-and-route until the ``extraction`` step,
191+
so for now we recomment running place-and-route until the ``extraction`` step,
192192
then re-starting the flow at this step. See the :ref:`VLSI/Sky130-OpenROAD-Tutorial:VLSI Flow Control` documentation
193193
below for how to break up the flow into these steps.
194194

@@ -273,7 +273,7 @@ Firt, refer to the :ref:`VLSI/Hammer:VLSI Flow Control` documentation. The below
273273
make par HAMMER_EXTRA_ARGS="--stop_after_step extraction"
274274
make redo-par HAMMER_EXTRA_ARGS="--start_before_step extraction"
275275
276-
# the following two commands are equivalent because the extraction
276+
# the following two commands are equivalent because the extraction
277277
# step immediately precedes the write_design step
278278
make redo-par HAMMER_EXTRA_ARGS="--start_after_step extraction"
279279
make redo-par HAMMER_EXTRA_ARGS="--start_before_step write_design"

generators/chipyard/src/main/resources/csrc/cospike.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,7 @@ extern "C" void cospike_cosim(long long int cycle,
424424
bool vector_wb = false;
425425
uint32_t vector_cnt = 0;
426426
std::vector<reg_t> vector_rds;
427-
427+
428428
for (auto &regwrite : log) {
429429

430430
//TODO: scaling to multi issue reads?

0 commit comments

Comments
 (0)