Skip to content

Commit

Permalink
Merge pull request #126 from ucb-bar/rc-bump-50de8a
Browse files Browse the repository at this point in the history 
RC Bump - 50de8a
  • Loading branch information
@abejgonzalez
abejgonzalez authored Jul 2, 2019
2 parents 6e097e6 + c44b6b7 commit ad35d57
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 15 deletions.
2 changes: 1 addition & 1 deletion generators/boom
Submodule boom updated 58 files
+4 −2 .circleci/README.md
+9 −4 .circleci/build-riscv-tools.sh
+1 −1 .circleci/build-run-csmith-tests.sh
+149 −164 .circleci/config.yml
+3 −3 .circleci/do-rtl-build.sh
+0 −14 .circleci/get-bhd-hash.sh
+0 −14 .circleci/get-riscv-tools-hash.sh
+10 −24 .circleci/prepare-for-rtl-build.sh
+1 −0 CHIPYARD.hash
+0 −1 ROCKETCHIP_VERSION
+2 −2 docs/sections/boom-ecosystem.rst
+0 −1 docs/sections/verification.rst
+5 −2 src/main/scala/bpu/bpd-pipeline.scala
+5 −5 src/main/scala/bpu/bpd/gshare/gshare.scala
+4 −3 src/main/scala/bpu/bpd/simple-predictors/base-only.scala
+11 −7 src/main/scala/bpu/bpd/simple-predictors/simple-predictors.scala
+6 −5 src/main/scala/bpu/bpd/tage/tage-table.scala
+5 −5 src/main/scala/bpu/bpd/tage/tage.scala
+4 −5 src/main/scala/bpu/btb/bim.scala
+6 −7 src/main/scala/bpu/btb/btb-sa.scala
+4 −3 src/main/scala/bpu/btb/btb.scala
+9 −9 src/main/scala/bpu/btb/dense-btb.scala
+4 −4 src/main/scala/bpu/misc/2bc-table.scala
+148 −136 src/main/scala/common/configs.scala
+324 −329 src/main/scala/common/consts.scala
+131 −131 src/main/scala/common/micro-op.scala
+6 −6 src/main/scala/common/package.scala
+228 −235 src/main/scala/common/parameters.scala
+26 −27 src/main/scala/common/rocc.scala
+49 −44 src/main/scala/common/tile.scala
+2 −2 src/main/scala/common/types.scala
+191 −312 src/main/scala/exu/core.scala
+8 −8 src/main/scala/exu/decode.scala
+18 −18 src/main/scala/exu/execution-units/execution-unit.scala
+14 −9 src/main/scala/exu/execution-units/execution-units.scala
+8 −8 src/main/scala/exu/execution-units/functional-unit.scala
+20 −20 src/main/scala/exu/execution-units/rocc.scala
+8 −6 src/main/scala/exu/fp-pipeline.scala
+113 −119 src/main/scala/exu/issue-units/issue-slot.scala
+4 −4 src/main/scala/exu/issue-units/issue-unit-age-ordered.scala
+3 −3 src/main/scala/exu/issue-units/issue-unit-unordered.scala
+9 −8 src/main/scala/exu/issue-units/issue-unit.scala
+1 −1 src/main/scala/exu/register-read/func-unit-decode.scala
+9 −8 src/main/scala/exu/register-read/regfile.scala
+10 −10 src/main/scala/exu/register-read/register-read.scala
+41 −177 src/main/scala/exu/rename/rename-busytable.scala
+63 −291 src/main/scala/exu/rename/rename-freelist.scala
+69 −278 src/main/scala/exu/rename/rename-maptable.scala
+143 −150 src/main/scala/exu/rename/rename-stage.scala
+29 −30 src/main/scala/exu/rob.scala
+8 −2 src/main/scala/ifu/frontend.scala
+14 −13 src/main/scala/ifu/icache.scala
+2 −2 src/main/scala/lsu/dcache-shim.scala
+17 −15 src/main/scala/lsu/lsu.scala
+5 −2 src/main/scala/system/BoomRocketSubsystem.scala
+10 −17 src/main/scala/system/ConfigMixins.scala
+54 −26 src/main/scala/system/Configs.scala
+35 −12 src/main/scala/util/util.scala
25 changes: 15 additions & 10 deletions generators/example/src/main/scala/Configs.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ class GB1MemoryConfig extends Config(

class BaseBoomConfig extends Config(
new WithBootROM ++
new boom.system.BoomConfig)
new boom.system.LargeBoomConfig)

class SmallBaseBoomConfig extends Config(
new WithBootROM ++
Expand Down Expand Up @@ -121,7 +121,8 @@ class DualCoreBoomConfig extends Config(
new WithNormalBoomRocketTop ++
new WithBootROM ++
new boom.common.WithRVC ++
new boom.common.DefaultBoomConfig ++
new boom.common.WithLargeBooms ++
new boom.common.BaseBoomConfig ++
new boom.system.WithNBoomCores(2) ++
new freechips.rocketchip.subsystem.WithoutTLMonitors ++
new freechips.rocketchip.system.BaseConfig)
Expand All @@ -131,7 +132,7 @@ class DualCoreSmallBoomConfig extends Config(
new WithBootROM ++
new boom.common.WithRVC ++
new boom.common.WithSmallBooms ++
new boom.common.DefaultBoomConfig ++
new boom.common.BaseBoomConfig ++
new boom.system.WithNBoomCores(2) ++
new freechips.rocketchip.subsystem.WithoutTLMonitors ++
new freechips.rocketchip.system.BaseConfig)
Expand All @@ -149,7 +150,8 @@ class BaseBoomAndRocketConfig extends Config(
new WithBootROM ++
new boom.system.WithRenumberHarts ++
new boom.common.WithRVC ++
new boom.common.DefaultBoomConfig ++
new boom.common.WithLargeBooms ++
new boom.common.BaseBoomConfig ++
new boom.system.WithNBoomCores(1) ++
new freechips.rocketchip.subsystem.WithoutTLMonitors ++
new freechips.rocketchip.subsystem.WithNBigCores(1) ++
Expand All @@ -160,7 +162,7 @@ class SmallBaseBoomAndRocketConfig extends Config(
new boom.system.WithRenumberHarts ++
new boom.common.WithRVC ++
new boom.common.WithSmallBooms ++
new boom.common.DefaultBoomConfig ++
new boom.common.BaseBoomConfig ++
new boom.system.WithNBoomCores(1) ++
new freechips.rocketchip.subsystem.WithoutTLMonitors ++
new freechips.rocketchip.subsystem.WithNBigCores(1) ++
Expand Down Expand Up @@ -205,12 +207,13 @@ class GPIOBoomAndRocketConfig extends Config(
new WithGPIOBoomRocketTop ++
new BaseBoomAndRocketConfig)

class DualBoomAndOneRocketConfig extends Config(
class DualCoreBoomAndOneRocketConfig extends Config(
new WithNormalBoomRocketTop ++
new WithBootROM ++
new boom.system.WithRenumberHarts ++
new boom.common.WithRVC ++
new boom.common.DefaultBoomConfig ++
new boom.common.WithLargeBooms ++
new boom.common.BaseBoomConfig ++
new boom.system.WithNBoomCores(2) ++
new freechips.rocketchip.subsystem.WithoutTLMonitors ++
new freechips.rocketchip.subsystem.WithNBigCores(1) ++
Expand All @@ -224,7 +227,8 @@ class DualBoomAndOneHwachaRocketConfig extends Config(
new boom.system.WithRenumberHarts(rocketFirst = true) ++
new hwacha.DefaultHwachaConfig ++
new boom.common.WithRVC ++
new boom.common.DefaultBoomConfig ++
new boom.common.WithLargeBooms ++
new boom.common.BaseBoomConfig ++
new boom.system.WithNBoomCores(2) ++
new freechips.rocketchip.subsystem.WithoutTLMonitors ++
new freechips.rocketchip.subsystem.WithNBigCores(1) ++
Expand All @@ -236,9 +240,10 @@ class RV32BoomAndRocketConfig extends Config(
new boom.system.WithRenumberHarts ++
new boom.common.WithBoomRV32 ++
new boom.common.WithRVC ++
new boom.common.DefaultBoomConfig ++
new boom.common.WithLargeBooms ++
new boom.common.BaseBoomConfig ++
new boom.system.WithNBoomCores(1) ++
new freechips.rocketchip.subsystem.WithoutTLMonitors ++
new WithRV32 ++
new freechips.rocketchip.subsystem.WithRV32 ++
new freechips.rocketchip.subsystem.WithNBigCores(1) ++
new freechips.rocketchip.system.BaseConfig)
2 changes: 1 addition & 1 deletion generators/rocket-chip
Submodule rocket-chip updated from b8baef to 50de8a
2 changes: 1 addition & 1 deletion generators/testchipip
Submodule testchipip updated 9 files
+22 −0 README.md
+19 −18 src/main/resources/testchipip/bootrom/bootrom.S
+1 −25 src/main/resources/testchipip/csrc/SimSerial.cc
+12 −4 src/main/resources/testchipip/vsrc/ClockUtil.v
+4 −4 src/main/scala/NoDebug.scala
+92 −54 src/main/scala/Serdes.scala
+2 −2 src/main/scala/SerialAdapter.scala
+11 −11 src/main/scala/Switcher.scala
+6 −6 src/main/scala/Unittests.scala
2 changes: 1 addition & 1 deletion tools/firrtl
Submodule firrtl updated from 99ae1d to 228c9a
2 changes: 1 addition & 1 deletion variables.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ ifeq ($(SUB_PROJECT),boom)
MODEL ?= TestHarness
VLOG_MODEL ?= TestHarness
MODEL_PACKAGE ?= boom.system
CONFIG ?= BoomConfig
CONFIG ?= LargeBoomConfig
CONFIG_PACKAGE ?= boom.system
GENERATOR_PACKAGE ?= boom.system
TB ?= TestDriver
Expand Down

0 comments on commit ad35d57

Please sign in to comment.