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.

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

Clone 40s-dv (Delete 40s directory) #2541

Open
wants to merge 2 commits into
base: cv32e40s/dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
16 changes: 15 additions & 1 deletion bin/clonetb
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Do you plan to change the merge.sh script: https://github.com/openhwgroup/core-v-verif/blob/cv32e40x/dev/bin/merge.sh, at least I think it would need a change, or be deleted to avoid confusion.

(Moving this to a thread, to keep related comments bundled together, and to make it resolveable. @silabs-krdosvik )

Yes, that should be changed as well. Good point.

It should be easy?
Where git subtree is used, we can simply add a remote to the cv32e40s-dv repo instead.
Then everything else should work as before.

Do you think it should be done as part of this PR, or could it wait until later?
I also plan to merge cv32e40s-dv -> cv32e40x-dv, so at that time the script would be useful again and prompt a change.

Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@


# Description:
# This script is used to clone core-specific verification environments.
# This script clones core-specific verification environments.
# (E.g. "core-v-verif/cv32e40x/".)
# Try running it, and it will assist you with helpful messages.
#
Expand All @@ -41,6 +41,7 @@ usage() {
echo "usage: $0 [-x] [--clone] [--ignore] [--unignore]"
echo " -x clone cv32e40x subtree, known stable hash"
echo " --x-main clone cv32e40x subtree, latest main branch"
echo " --s-main clone cv32e40s subtree, latest main branch"
Copy link
Contributor Author

@silabs-robin silabs-robin Oct 15, 2024

Choose a reason for hiding this comment

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

There should be an -s flag too! ("known stable hash".)

But I want it to point to the merge-commit from openhwgroup/cv32e40s-dv#3 after that PR is merged.

echo " --clone clone a subtree based on env vars"
echo " --ignore tell git to ignore the cloned subtree"
echo " --unignore tell git to not ignore the cloned subtree"
Expand Down Expand Up @@ -97,6 +98,16 @@ clone_cv32e40x_main() {
ignore_cloned_directory
}

clone_cv32e40s_main() {
CV_CORE=cv32e40s
VERIF_ENV_REPO=https://github.com/openhwgroup/cv32e40s-dv.git
VERIF_ENV_REF=main

clone

ignore_cloned_directory
}

ignore_cloned_directory() {
check_env_vars_cvcore

Expand Down Expand Up @@ -128,6 +139,9 @@ main() {
"--x-main")
clone_cv32e40x_main
;;
"--s-main")
clone_cv32e40s_main
;;
"--clone")
clone
;;
Expand Down
16 changes: 7 additions & 9 deletions cv32e40s/README.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
# CV32E40S: Verification Environment for the CV32E40S CORE-V processor core.
# Verification Environment for the CV32E40S CORE-V processor core.

## Directories:
- **bsp**: the "board support package" for test-programs compiled/assembled/linked for the CV32E40S. This BSP is used by both the `core` testbench and the `uvmt` UVM verification environment.
- **env**: the UVM environment class and its associated infrastrucutre.
- **sim**: directory where you run the simulations.
- **fv**: directory where you run formal verification.
- **tb**: the Testbench module that instanitates the core.
- **tests**: this is where all the testcases are.
This directory is empty, because the content must be cloned with git.

There are README files in each directory with additional information.
Run "core-v-verif/bin/clonetb" to clone the [correct content](https://github.com/openhwgroup/cv32e40s-dv/).

Examples:
* `./bin/clonetb`
* `./bin/clonetb --s-main`
* `./bin/clonetb -s`
1 change: 0 additions & 1 deletion cv32e40s/bsp/.gitignore

This file was deleted.

36 changes: 0 additions & 36 deletions cv32e40s/bsp/Makefile

This file was deleted.

166 changes: 0 additions & 166 deletions cv32e40s/bsp/README.md

This file was deleted.

Loading