Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Don't initialize nvdla-workload with init-submodules #1063

Merged
merged 3 commits into from
Dec 17, 2021
Merged

Don't initialize nvdla-workload with init-submodules #1063

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9215231
Don't initialize nvdla-workload with init-submodules
jerryz123 Dec 16, 2021
888abc3
Add init-software script
jerryz123 Dec 16, 2021
b3e160d
Add documentation mentioning init-software
jerryz123 Dec 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions docs/Software/index.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,15 @@ official RISC-V ISA reference implementation. Qemu is a high-performance
functional simulator that can run nearly as fast as native code, but can be
challenging to modify.

To initialize additional software repositories, such as wrappers for Coremark,
SPEC2017, and workloads for the NVDLA, run the following script. The
submodules are located in the ``software`` directory.

.. code-block:: shell

./scripts/init-software.sh


.. toctree::
:maxdepth: 2
:caption: Contents:
Expand Down
14 changes: 14 additions & 0 deletions scripts/init-software.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
#!/usr/bin/env bash
# exit script if any command fails
set -e
set -o pipefail

# Enable submodule update for software submodules
git config --unset submodule.software/nvdla-workload.update || :
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't this be git config --local --unset like what the init-submodules.sh script does?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

chipyard/scripts/init-submodules-no-riscv-tools-nolog.sh

Line 54 in 02adf86

_unskip() { git config --local --unset-all "submodule.${1}.update" || : ; }

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe the --local flag is default.

These values are specific to that single repository, and represent passing the --local option to git config. If you don’t specify which level you want to work with, this is the default.

git config --unset submodule.software/coremark.update || :
git config --unset submodule.software/spec2017.update || :

# Initialize local software submodules
git submodule update --init --recursive software/nvdla-workload
git submodule update --init --recursive software/coremark
git submodule update --init --recursive software/spec2017
5 changes: 4 additions & 1 deletion scripts/init-submodules-no-riscv-tools-nolog.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,13 @@ cd "$CHIPYARD_DIR"
generators/sha3 \
generators/gemmini \
sims/firesim \
software/nvdla-workload \
software/coremark \
software/firemarshal \
software/spec2017 \
vlsi/hammer-cadence-plugins \
vlsi/hammer-synopsys-plugins \
vlsi/hammer-mentor-plugins \
software/firemarshal \
fpga/fpga-shells
do
"$1" "${name%/}"
Expand Down