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

Bump Barstools for Deprecations Fixes #795

Merged
merged 7 commits into from
Feb 23, 2021
Merged

Bump Barstools for Deprecations Fixes #795

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6e85147
[DO NOT MERGE] This is to test changes to barstools
chick Feb 11, 2021
3723a53
trying new fixes for barstools, get all transforms in right order
chick Feb 18, 2021
6024feb
try latest changes to circle ci settings
chick Feb 19, 2021
0ca13a4
Revert "try latest changes to circle ci settings"
chick Feb 19, 2021
12d4553
undo circleci docker image change test; up 2 timeouts
chick Feb 19, 2021
5b6a2b3
Bump barstools
abejgonzalez Feb 22, 2021
08555db
Use origin/dev config.yml
abejgonzalez Feb 22, 2021
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: 3 additions & 3 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ parameters:
executors:
main-env:
docker:
- image: ucbbar/chipyard-image:1.0.1
- image: ucbbar/chipyard-ci-image:84cfc73
Copy link
Contributor

Choose a reason for hiding this comment

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

For this PR, can you revert this change. Just modify the timeout settings and not this image.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Reverted docker change, and re-changed lines 115 and 234 to use 20m timeout

environment:
JVM_OPTS: -Xmx3200m # Customize the JVM maximum heap limit

Expand Down Expand Up @@ -112,7 +112,7 @@ commands:
default: "run-tests.sh"
timeout:
type: string
default: "10m"
default: "20m"
steps:
- setup-tools:
tools-version: "<< parameters.tools-version >>"
Expand Down Expand Up @@ -231,7 +231,7 @@ jobs:
- run-tests:
group-key: "group-cores"
project-key: "chipyard-hetero"
timeout: "15m"
timeout: "20m"
chipyard-boom-run-tests:
executor: main-env
steps:
Expand Down
2 changes: 1 addition & 1 deletion tools/barstools
Open in desktop
Submodule barstools updated 45 files
+2 −2 .scalafmt.conf
+3 −7 build.sbt
+4 −2 iocell/src/main/scala/barstools/iocell/chisel/Analog.scala
+65 −65 iocell/src/main/scala/barstools/iocell/chisel/IOCell.scala
+0 −141 macros/src/main/scala/SynFlops.scala
+0 −221 macros/src/main/scala/Utils.scala
+47 −44 macros/src/main/scala/barstools/macros/CostMetric.scala
+338 −273 macros/src/main/scala/barstools/macros/MacroCompiler.scala
+151 −0 macros/src/main/scala/barstools/macros/SynFlops.scala
+269 −0 macros/src/main/scala/barstools/macros/Utils.scala
+25 −23 macros/src/test/resources/lib-MaskPortTest.json
+22 −20 macros/src/test/resources/lib-WriteEnableTest.json
+0 −453 macros/src/test/scala/MacroCompilerSpec.scala
+19 −20 macros/src/test/scala/barstools/macros/CostFunction.scala
+0 −0 macros/src/test/scala/barstools/macros/Functional.scala
+556 −0 macros/src/test/scala/barstools/macros/MacroCompilerSpec.scala
+126 −41 macros/src/test/scala/barstools/macros/Masks.scala
+203 −91 macros/src/test/scala/barstools/macros/MultiPort.scala
+1 −4 macros/src/test/scala/barstools/macros/SRAMCompiler.scala
+100 −90 macros/src/test/scala/barstools/macros/SimpleSplitDepth.scala
+161 −96 macros/src/test/scala/barstools/macros/SimpleSplitWidth.scala
+53 −53 macros/src/test/scala/barstools/macros/SpecificExamples.scala
+81 −52 macros/src/test/scala/barstools/macros/SynFlops.scala
+0 −110 scalastyle-config.xml
+0 −109 scalastyle-test-config.xml
+8 −9 tapeout/src/main/scala/barstools/tapeout/transforms/AddSuffixToModuleNames.scala
+7 −8 tapeout/src/main/scala/barstools/tapeout/transforms/AvoidExtModuleCollisions.scala
+7 −8 tapeout/src/main/scala/barstools/tapeout/transforms/ConvertToExtModPass.scala
+6 −5 tapeout/src/main/scala/barstools/tapeout/transforms/EnumerateModules.scala
+274 −0 tapeout/src/main/scala/barstools/tapeout/transforms/Generate.scala
+123 −0 tapeout/src/main/scala/barstools/tapeout/transforms/GenerateTopAndHarness.scala
+7 −9 tapeout/src/main/scala/barstools/tapeout/transforms/ReParentCircuit.scala
+14 −14 tapeout/src/main/scala/barstools/tapeout/transforms/RemoveUnusedModules.scala
+6 −7 tapeout/src/main/scala/barstools/tapeout/transforms/ResetInverter.scala
+13 −12 tapeout/src/main/scala/barstools/tapeout/transforms/retime/Retime.scala
+181 −0 tapeout/src/main/scala/barstools/tapeout/transforms/stage/TapeoutStage.scala
+8 −11 tapeout/src/main/scala/barstools/tapeout/transforms/utils/FileUtils.scala
+3 −3 tapeout/src/main/scala/barstools/tapeout/transforms/utils/LowerAnnotations.scala
+9 −6 tapeout/src/main/scala/barstools/tapeout/transforms/utils/ProgrammaticBundle.scala
+7 −6 tapeout/src/main/scala/barstools/tapeout/transforms/utils/YamlHelpers.scala
+0 −254 tapeout/src/main/scala/transforms/Generate.scala
+93 −0 tapeout/src/test/scala/barstools/tapeout/transforms/GenerateSpec.scala
+69 −0 tapeout/src/test/scala/barstools/tapeout/transforms/GenerateTopSpec.scala
+15 −11 tapeout/src/test/scala/barstools/tapeout/transforms/ResetInverterSpec.scala
+32 −25 tapeout/src/test/scala/barstools/tapeout/transforms/retime/RetimeSpec.scala