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
Changes from 1 commit
Commits
Show all changes
73 commits
Select commit Hold shift + click to select a range
6fc20a7
creeping toward commonality
steveri Nov 12, 2022
393469c
creeping toward a common merged master branch
steveri Nov 13, 2022
c193811
converging on a single branch -- inconsequential bk pipes
steveri Nov 13, 2022
7f43707
restore original mflowgen tests
steveri Nov 13, 2022
d472df2
first test of conditional pipeline
steveri Nov 13, 2022
4849cb6
first test of conditional pipeline II
steveri Nov 13, 2022
c628fec
first test of conditional pipeline III
steveri Nov 13, 2022
f1779f9
conditional pipeline IV: expand number of branch cases
steveri Nov 13, 2022
cec7500
refined mflowgen test
steveri Nov 14, 2022
9698f20
(re)fixing the run_sim scripts
steveri Nov 16, 2022
142a47f
setup-buildkite: merging good changes from both branches
steveri Nov 16, 2022
c97dba3
merging gen_rtl
steveri Nov 16, 2022
77a9d97
oops not reday for ANAIOPADs yet
steveri Nov 16, 2022
8c4cfa7
added a couple more files from tsmc branch
steveri Nov 17, 2022
0fb6db9
tsmc portion of clk_gate was wrong for some reason...
steveri Nov 17, 2022
10672ca
should work for both gf and tsmc
steveri Nov 17, 2022
2b681f2
should work for both gf and tsmc
steveri Nov 17, 2022
3b66147
if TSMC / elif GF ....
steveri Nov 17, 2022
fcb25b4
if TSMC / elif GF ....
steveri Nov 17, 2022
b5f2420
cleaned up a file
steveri Nov 17, 2022
6658c5d
changed to match master-dense
steveri Nov 17, 2022
f3eec40
streamout is different for tsmc
steveri Nov 17, 2022
6f32cc6
one branch to rule them all
steveri Nov 17, 2022
eea6ab8
merging another file
steveri Nov 18, 2022
c50c745
Merge remote-tracking branch 'origin/spVspV' into spv-merge-to-spv-1
steveri Nov 28, 2022
53d275e
fixing a typo
steveri Nov 29, 2022
07c2d61
Merged Tile_Memcore/contruct.py
steveri Nov 30, 2022
fedae26
Merged Tile_PE/contruct.py
steveri Nov 30, 2022
7c5e000
merged fullchip construct.py
steveri Dec 5, 2022
3646e06
Merged mflowgen/pad_frame/construct.py
steveri Dec 8, 2022
eaebea2
Merged mflowgen/glb_tile/construct.py
steveri Dec 8, 2022
98c6749
tweak mflowgen/full_chip/construct.py to match dense version
steveri Dec 9, 2022
e635f73
common mflowgen/tile_array/construct.py for amber, onyx
steveri Dec 9, 2022
f9132a1
common mflowgen/glb_top/construct.py for amber, onyx
steveri Dec 9, 2022
85b8634
common mflowgen/global_controller/construct.py for amber, onyx
steveri Dec 9, 2022
bc3bc37
undid an error
steveri Dec 9, 2022
0866a07
undid an(other?) error
steveri Dec 9, 2022
d03ca24
final tweak on fc/construct.py -- this one passed full build
steveri Dec 13, 2022
a2f4ad9
added a check to early-out TSMC build failures
steveri Dec 13, 2022
759b4fa
buildkite pipeline tweaks
steveri Dec 13, 2022
6007a4b
updated vs. latest garnet.py from spVspV branch
steveri Dec 13, 2022
96e8115
emergency(?) fix for CI
steveri Dec 14, 2022
21fe6f2
try the previously-passing version of rtl_only.yml
steveri Dec 14, 2022
570850e
try with local garnet
steveri Dec 14, 2022
672cecb
fixed a thing maybe
steveri Dec 14, 2022
643a9a2
fixed a thing maybe 2
steveri Dec 14, 2022
c38db63
try again with previously-merged rtl-only pipeline
steveri Dec 14, 2022
16b2b86
final merge-tweak of this stupid file
steveri Dec 14, 2022
234a672
merged latest set of files from $smd
steveri Dec 15, 2022
df91ffc
gf/tsmc merge of GLB sim files
steveri Dec 15, 2022
7d4cbcb
final tweaks on global_buffer_parameter.py
steveri Dec 16, 2022
c0ca0a8
unified amber/onyx global_buffer.py
steveri Dec 24, 2022
b2a3053
unified amber/onyx gen_global_buffer_rdl.py
steveri Dec 24, 2022
1435267
merged design/glb_addr_gen.py
steveri Dec 30, 2022
f213b69
merged glb_header.py
steveri Dec 30, 2022
cfd6741
another glb_header.py merge
steveri Dec 30, 2022
46859f0
merged glb_cfg.py
steveri Dec 30, 2022
b5defae
(re)merge glb_bank_sram_gen.py
steveri Dec 30, 2022
30d5a4a
merged glb_loop_iter.py
steveri Dec 31, 2022
57bf453
new design_amber dir for amber compatibility
steveri Jan 4, 2023
8941795
use design_amber for global_buffer.py diffs instead of if-then-else
steveri Jan 4, 2023
d780d1b
use design_amber for global_buffer.py diffs instead of if-then-else
steveri Jan 4, 2023
6147f4f
merge final few GLB files w/dense version(s)
steveri Jan 6, 2023
21955a3
resolve merge diffs
steveri Jan 9, 2023
b00523f
last minute fix to improper code
steveri Jan 13, 2023
2132a56
onyx/amber merge of nic400 files
steveri Jan 17, 2023
97b9de8
onyx/amber merge of GLC files
steveri Jan 23, 2023
718d051
Merge remote-tracking branch 'origin/spVspV' into spv-merge-to-spv-6
steveri Jan 31, 2023
1acf2bc
Issue warning if cannot git pull tsmc16 adk
steveri Feb 1, 2023
7737dc7
Issue warning if cannot git pull tsmc16 adk 2
steveri Feb 1, 2023
34a0fb9
Issue warning if cannot git pull tsmc16 adk 3
steveri Feb 1, 2023
97f970b
full_chip constraints merge part 1: constraints_amber
steveri Feb 8, 2023
1e49333
full_chip constraints merge part 2: construct.py continues to use con…
steveri Feb 8, 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
Prev Previous commit
Next Next commit
Merge remote-tracking branch 'origin/spVspV' into spv-merge-to-spv-1
  • Loading branch information
steveri committed Nov 28, 2022
commit c50c74549c738949d9b561a7fdb50739bd502773

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.