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

Spv merge to spv 7 #942

Closed
wants to merge 73 commits into from
Closed

Spv merge to spv 7 #942

wants to merge 73 commits into from

Conversation

steveri
Copy link
Contributor

@steveri steveri commented Feb 8, 2023

This pull is 7th in a series that so far includes #934 , #935 , #937 , #938 , #939 , #941 , slowly merging gf/onyx and tsmc/amber versions back into one, for a single common master branch.

After the most recent pull #941 , the two branches had 101 files difference between them. This pull cuts that down to 90:

official_dense_branch=origin/master-dense-tsmc-amber
official_sparse_branch=origin/spVspV
new_sparse_branch=spv-merge-to-spv-7

git diff $official_dense_branch $new_sparse_branch | egrep ^diff | wc -l
    90

Below is a summary of the changes included in this pull, along with an explanation of why each change should have no adverse impact on existing spVspV functionality.

  1. Obviously, full-chip constraints for Onyx are very different than those for Amber builds. So I made a separate directory full_chip/constraints_amber/ for the older constraints and kept the existing directory full_chip/constraints/ for the (unchanged) onyx constraints as the default. This required two changes:

1a) Created a new directory mflowgen/full_chip/constraints_amber/ containing the files
:

    configure.yml
    cons_scripts/clocks_0_params.tcl
    cons_scripts/clocks_1_master.tcl
    cons_scripts/clocks_2_sys.tcl
    cons_scripts/clocks_3_tlx.tcl
    cons_scripts/clocks_4_cgra.tcl
    cons_scripts/clocks_5_periph.tcl
    cons_scripts/clocks_6_jtag.tcl
    cons_scripts/clocks_7_trace.tcl
    cons_scripts/clocks_8_xgcd.tcl
    cons_scripts/clocks_except_soc.tcl
    cons_scripts/constraints.tcl
    cons_scripts/design_context.tcl
    cons_scripts/design_info.tcl
    cons_scripts/garnet_constraints.tcl
    cons_scripts/io.tcl
    cons_scripts/pad_strength.tcl
    cons_scripts/tech_params.tcl

1b) Updated full_chip/construct.py to use the older constraints only when it detects that we are building with the amber process (tsmc16).

    diff --git a/mflowgen/full_chip/construct.py b/mflowgen/full_chip/construct.py
    @@ -180,7 +180,12 @@ def construct():
    -  constraints    = Step( this_dir + '/constraints'                            )
    +
    +  if adk_name == "tsmc16":
    +    constraints    = Step( this_dir + '/constraints_amber'                      )
    +  else:
    +    constraints    = Step( this_dir + '/constraints'                            )
    +
  1. These changes have been vetted and have passed both amber full-chip build and onyx aha-flow CI tests.

@steveri
Copy link
Contributor Author

steveri commented Feb 8, 2023

There's something weird/wrong about this pull request, I'm suspending it until I can figure it out...

@steveri steveri closed this Feb 8, 2023
@steveri steveri deleted the spv-merge-to-spv-7 branch February 10, 2023 16:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant