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

Removing black-parrot-tools and black-parrot-sdk #2660

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Removing black-parrot-tools and black-parrot-sdk #2660

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8a474ef
Removing black-parrot-tools and black-parrot-sdk
dpetrisko Nov 16, 2024
17aa1bc
Bump BP
dpetrisko Nov 21, 2024
1c950ff
Updating patch
dpetrisko Nov 22, 2024
f25392c
Bump BlackParrot
dpetrisko Nov 25, 2024
076a32c
Fixing BP patch with 1rw_bit from 1r1w
dpetrisko Nov 26, 2024
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
8 changes: 0 additions & 8 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,6 @@
path = third_party/black_parrot
url = https://github.com/black-parrot/black-parrot.git
update = none
[submodule "uhdm-tests/black-parrot/black-parrot-tools"]
path = third_party/black_parrot_tools
url = https://github.com/black-parrot/black-parrot-tools
update = none
[submodule "uhdm-tests/black-parrot/black-parrot-sdk"]
path = third_party/black_parrot_sdk
url = https://github.com/black-parrot-sdk/black-parrot-sdk.git
update = none
[submodule "uhdm-tests/bsg_micro_designs/bsg_micro_designs"]
path = third_party/bsg_micro_designs
url = https://github.com/bsg-idea/bsg_micro_designs.git
Expand Down
3 changes: 0 additions & 3 deletions tests/black_parrot/Makefile.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@ CONFIG_FILE = ${curr_dir}/config.mk
ORFS_DIR = ${root_dir}/../third_party/OpenROAD-flow-scripts
ORFS_PATCHES_DIR = ${curr_dir}/orfs_patches/

export BP_TOOLS_DIR = $(BLACKPARROT)/../black_parrot_tools
export BP_SDK_DIR = $(BLACKPARROT)/../black_parrot_sdk

${ORFS_DIR}/.gitpatch:
cd $(ORFS_DIR) && git apply ${ORFS_PATCHES_DIR}/*.patch && touch $@

Expand Down
40 changes: 29 additions & 11 deletions tests/black_parrot/black_parrot_patches/0001_use_synth_filelist.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,32 @@
diff --git a/bp_top/syn/flist.vcs b/bp_top/syn/flist.vcs
index f889ef17..a268f121 100644
index 7aec15da..5f9e5035 100644
--- a/bp_top/syn/flist.vcs
+++ b/bp_top/syn/flist.vcs
@@ -84,8 +84,7 @@ $BASEJUMP_STL_DIR/bsg_mem/bsg_mem_1r1w_sync_synth.v
$BASEJUMP_STL_DIR/bsg_mem/bsg_mem_1r1w_sync.v
$BASEJUMP_STL_DIR/bsg_mem/bsg_mem_1r1w_synth.v
$BASEJUMP_STL_DIR/bsg_mem/bsg_mem_1rw_sync.v
-$BASEJUMP_STL_DIR/bsg_mem/bsg_mem_1rw_sync_mask_write_bit.v
-$BASEJUMP_STL_DIR/bsg_mem/bsg_mem_1rw_sync_mask_write_bit_synth.v
+$BASEJUMP_STL_DIR/hard/ultrascale_plus/bsg_mem/bsg_mem_1rw_sync_mask_write_bit.v
$BASEJUMP_STL_DIR/bsg_mem/bsg_mem_1rw_sync_mask_write_byte.v
$BASEJUMP_STL_DIR/bsg_mem/bsg_mem_1rw_sync_mask_write_byte_synth.v
$BASEJUMP_STL_DIR/bsg_mem/bsg_mem_1rw_sync_synth.v
@@ -82,15 +82,13 @@ $BASEJUMP_STL_DIR/bsg_mem/bsg_cam_1r1w_sync.sv
$BASEJUMP_STL_DIR/bsg_mem/bsg_cam_1r1w_tag_array.sv
$BASEJUMP_STL_DIR/bsg_mem/bsg_mem_1r1w.sv
$BASEJUMP_STL_DIR/bsg_mem/bsg_mem_1r1w_one_hot.sv
-$BASEJUMP_STL_DIR/bsg_mem/bsg_mem_1r1w_sync_synth.sv
-$BASEJUMP_STL_DIR/bsg_mem/bsg_mem_1r1w_sync.sv
$BASEJUMP_STL_DIR/bsg_mem/bsg_mem_1r1w_synth.sv
-$BASEJUMP_STL_DIR/bsg_mem/bsg_mem_1rw_sync.sv
-$BASEJUMP_STL_DIR/bsg_mem/bsg_mem_1rw_sync_mask_write_bit.sv
-$BASEJUMP_STL_DIR/bsg_mem/bsg_mem_1rw_sync_mask_write_bit_synth.sv
-$BASEJUMP_STL_DIR/bsg_mem/bsg_mem_1rw_sync_mask_write_byte.sv
-$BASEJUMP_STL_DIR/bsg_mem/bsg_mem_1rw_sync_mask_write_byte_synth.sv
-$BASEJUMP_STL_DIR/bsg_mem/bsg_mem_1rw_sync_synth.sv
+$BASEJUMP_STL_DIR/bsg_mem/bsg_mem_1rw_sync_mask_write_bit_from_1r1w.sv
+$BASEJUMP_STL_DIR/hard/ultrascale_plus/bsg_mem/bsg_mem_1r1w_sync.sv
+$BASEJUMP_STL_DIR/hard/ultrascale_plus/bsg_mem/bsg_mem_1r1w_sync_mask_write_byte.sv
+$BASEJUMP_STL_DIR/hard/ultrascale_plus/bsg_mem/bsg_mem_1rw_sync.sv
+$BASEJUMP_STL_DIR/hard/ultrascale_plus/bsg_mem/bsg_mem_1rw_sync_mask_write_bit.sv
+$BASEJUMP_STL_DIR/hard/ultrascale_plus/bsg_mem/bsg_mem_1rw_sync_mask_write_byte.sv
$BASEJUMP_STL_DIR/bsg_mem/bsg_mem_2r1w_sync.sv
$BASEJUMP_STL_DIR/bsg_mem/bsg_mem_2r1w_sync_synth.sv
$BASEJUMP_STL_DIR/bsg_mem/bsg_mem_3r1w_sync.sv
diff --git a/external/basejump_stl b/external/basejump_stl
--- a/external/basejump_stl
+++ b/external/basejump_stl
@@ -1 +1 @@
-Subproject commit de84d1100f7c786e8006e26bb806f804cf6a3ce8
+Subproject commit de84d1100f7c786e8006e26bb806f804cf6a3ce8-dirty
6 changes: 3 additions & 3 deletions tests/scripts/run_large_designs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,9 +114,9 @@ do
"'install_dependencies'") install_dependencies ;;
"'load_submodules'")
[ "$name" == "'veer'" ] && load_submodules -r veer
[ "$name" == "'blackparrot_AMD'" ] && load_submodules black_parrot_tools black_parrot_sdk -r black_parrot
[ "$name" == "'blackparrot_AMD_python'" ] && load_submodules black_parrot_tools black_parrot_sdk -r black_parrot
[ "$name" == "'blackparrot_ASIC'" ] && load_submodules black_parrot_tools black_parrot_sdk OpenROAD-flow-scripts -r black_parrot
[ "$name" == "'blackparrot_AMD'" ] && load_submodules -r black_parrot
[ "$name" == "'blackparrot_AMD_python'" ] && load_submodules -r black_parrot
[ "$name" == "'blackparrot_ASIC'" ] && load_submodules OpenROAD-flow-scripts -r black_parrot
[ "$name" == "'ibex'" ] && load_submodules -r make_env ibex
[ "$name" == "'ibex_f4pga'" ] && load_submodules -r make_env ibex yosys_f4pga_plugins
[ "$name" == "'opentitan_9d82960888'" ] && load_submodules -r opentitan_9d82960888
Expand Down
2 changes: 1 addition & 1 deletion third_party/black_parrot
Open in desktop
Submodule black_parrot updated 279 files
1 change: 0 additions & 1 deletion third_party/black_parrot_sdk
Open in desktop
Submodule black_parrot_sdk deleted from f92dc4
1 change: 0 additions & 1 deletion third_party/black_parrot_tools
Open in desktop
Submodule black_parrot_tools deleted from 7aa025
Loading