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

Uniquify module names that are common to Top & Model #1442

Merged
merged 14 commits into from
Apr 21, 2023
Merged

Uniquify module names that are common to Top & Model #1442

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
240c551
add python script, wip
joonho3020 Apr 14, 2023
e59ed50
script to unqify modules
joonho3020 Apr 14, 2023
c204e4a
rm print
joonho3020 Apr 14, 2023
632a895
add sh to conda env
joonho3020 Apr 15, 2023
611de45
update conda-lock file again
joonho3020 Apr 16, 2023
bb6f8be
bump testchipip
joonho3020 Apr 17, 2023
04f4260
rm wrong assertion
joonho3020 Apr 17, 2023
9ce0467
fixes
joonho3020 Apr 20, 2023
41592fd
address comments
joonho3020 Apr 20, 2023
10e6413
Revert "update conda-lock file again"
joonho3020 Apr 20, 2023
776419e
Revert "add sh to conda env"
joonho3020 Apr 20, 2023
dfe3487
Revert "bump testchipip"
joonho3020 Apr 20, 2023
57d7e55
oops
joonho3020 Apr 21, 2023
4d988a2
fix
joonho3020 Apr 21, 2023
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
6 changes: 6 additions & 0 deletions common.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,12 @@ $(TOP_MODS_FILELIST) $(MODEL_MODS_FILELIST) $(ALL_MODS_FILELIST) $(BB_MODS_FILEL
$(SED) -i 's/\.\///' $(TOP_MODS_FILELIST)
$(SED) -i 's/\.\///' $(MODEL_MODS_FILELIST)
$(SED) -i 's/\.\///' $(BB_MODS_FILELIST)
$(base_dir)/scripts/uniqify-module-names.py \
--top-filelist $(TOP_MODS_FILELIST) \
--mod-filelist $(MODEL_MODS_FILELIST) \
--gen-collateral-path $(GEN_COLLATERAL_DIR) \
--model-hier-json $(MFC_MODEL_HRCHY_JSON) \
--dut $(TOP)
sort -u $(TOP_MODS_FILELIST) $(MODEL_MODS_FILELIST) $(BB_MODS_FILELIST) > $(ALL_MODS_FILELIST)

$(TOP_BB_MODS_FILELIST) $(MODEL_BB_MODS_FILELIST) &: $(BB_MODS_FILELIST) $(MFC_TOP_HRCHY_JSON) $(FINAL_ANNO_FILE)
Expand Down
1 change: 1 addition & 0 deletions conda-reqs/chipyard.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ dependencies:
- coreutils
- jq
- pip
- sh

# firemarshal deps
- qemu # from ucb-bar channel - https://github.com/ucb-bar/qemu-feedstock
Expand Down
Loading