(cherry picked from commit 93869cce

)

Co-authored-by: Megan Wachs <megan@sifive.com>

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
(cherry picked from commit b02bea66

)

Co-authored-by: Jack Koenig <koenig@sifive.com>

* Restore publish settings to before sbt-ci-release (#1999)

sbt-ci-release changes the commands required to publish to Sonatype.
While this may be a desirable change at some point, it is inconsistent
with other repos. Reverting for the time being.

(cherry picked from commit 594f783b

)

# Conflicts:
#	build.sbt

* Resolve merge conflicts

Co-authored-by: Jack Koenig <koenig@sifive.com>

* Make MultiTargetAnnotation.targets a def (#1969)

* Make MultiTargetAnnotation.targets a def

This enables the annotation writer to choose their own underlying data structure

* Update MultiTargetAnnotation ScalaDoc

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
(cherry picked from commit cd845bdb

)

# Conflicts:
#	src/main/scala/firrtl/annotations/Annotation.scala

* Resolve merge conflicts

Co-authored-by: Jack Koenig <koenig@sifive.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>

Verilator 4.034 was complaining about wires being named weak and strong
because those are SV 2009 keywords.  Added them to the Utils.v_keywords list

(cherry picked from commit 3be73de2

)

Co-authored-by: Tim Snyder <timothy.snyder@sifive.com>

(cherry picked from commit c9feb47d

)

Co-authored-by: Jack Koenig <koenig@sifive.com>

* Automatically publish SNAPSHOTs on pushes to master (#1955)

Uses sbt-ci-release for automation

(cherry picked from commit 06843bd9

)

# Conflicts:
#	.travis.yml
#	build.sbt
#	project/plugins.sbt

* Resolve merge conflicts

Co-authored-by: Jack Koenig <koenig@sifive.com>

* Faster dedup instance graph (#1732)

* dedup: add faster InstanceGraph implementation and use it in dedup

The new implementation takes care not to hash the instance
types contained in DefInstance nodes.
This should make dedup considerably faster.

* FastInstanceGraph: cache vertices for faster findInstancesInHierarchy

* FastInstanceGraph: remove the parent name field since it isn't actually necessary

* FastInstanceGraph -> InstanceKeyGraph

* InstanceGraph: describe performance problems.

* InstanceKeyGraph: turn moduleMap into a def instead of a val

This will make changing implementation details much easier
in the future.

* InstanceKeyGraph: return childInstances as Seq instead of Map

This ensures a deterministic iteration order and it
can easily be turned into a Map for O(1) accesses.

* InstanceKeyGraph: add tests for public methods

* InstanceKeyGraph: group public methods together

* InstanceKeyGraphSpec: fix wording of a comment

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
(cherry picked from commit 1b9f4ddf

)

# Conflicts:
#	src/main/scala/firrtl/transforms/Dedup.scala

* Fix conflicts

Co-authored-by: Kevin Laeufer <kevin.laeufer@sifive.com>
Co-authored-by: Jack Koenig <koenig@sifive.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>

* Build ArrayBuffers in Block.mapStmt (#1669)

* Build ArrayBuffers in Block.mapStmt

* Have empty Block serialize as "skip"

The FIRRTL parser requires at least one indented line in each module.
Sometimes tests emit and parse modules with no contents; this ensures
there's always at least a "skip" in empty modules.

Also fix tests that expected certain skips

* Use var List as stack in Block.mapStmt impl

This replaces Iterator concatenation. In Scala 2.11, RHS recursion on
Iterators is not stack safe. This seems to have been fixed in 2.12 by
Scala PR 5033.

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
(cherry picked from commit 1e497ce3

)

# Conflicts:
#	src/test/scala/firrtlTests/annotationTests/EliminateTargetPathsSpec.scala
#	src/test/scala/firrtlTests/annotationTests/MorphismSpec.scala

* Fix up backport conflict in EliminateTargetPathsSpec

Co-authored-by: Jack Koenig <koenig@sifive.com>
Co-authored-by: chick <chick@qrhino.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>

* DRY out transform running and annotation remapping

(cherry picked from commit 1930b7b0)

# Conflicts:
#	src/main/scala/firrtl/Compiler.scala
#	src/main/scala/firrtl/stage/transforms/UpdateAnnotations.scala

* Do not throw NonFatal exceptions in annotation logging

If an annotation cannot be serialized by json4s, we should not throw
exceptions when doing trace-level logging.

(cherry picked from commit db7928a4

)

# Conflicts:
#	src/main/scala/firrtl/Compiler.scala

* Fixup backport

Signed-off-by: Schuyler Eldridge <schuyler.eldridge@sifive.com>

Co-authored-by: Jack Koenig <koenig@sifive.com>
Co-authored-by: Schuyler Eldridge <schuyler.eldridge@sifive.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>

* Refactor benchmark_code_compile.py to have job running utility

This provides a common Python interfaces for monitoring resource usage
of subprocesses

Co-authored-by: Schuyler Eldridge <schuyler.eldridge@ibm.com>
(cherry picked from commit 038faf9f

)

* Add find_heap_bound.py script for finding minimum heap size

Co-authored-by: Schuyler Eldridge <schuyler.eldridge@ibm.com>
(cherry picked from commit f7ae514f

)

# Conflicts:
#	.travis.yml

* Fix conflicts

Co-authored-by: Jack Koenig <koenig@sifive.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>

Bump MiMa previous artifacts to 1.2.7

* Backport #1908

Co-authored-by: Albert Magyar <albert.magyar@gmail.com>

Signed-off-by: Schuyler Eldridge <schuyler.eldridge@ibm.com>

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
(cherry picked from commit 5f410f0e

)

Co-authored-by: Schuyler Eldridge <schuyler.eldridge@ibm.com>

Specify appropriate Chisel and Treadle branches for CI tests (bp #1892)

(cherry picked from commit e87f3f63)

* add sign-extend const-prop test

* Emitter: don't wrap Neg operand in concat

(cherry picked from commit b24b9a01

)

Co-authored-by: Albert Chen <40366337+albertchen-sifive@users.noreply.github.com>

* test const prop of addition of negative literals

* Emitter: handle minimum negative values correctly

* update expected verilog in AsyncResetSpec

[1.2.x] mask bits when propagating bitwise ops (bp #1745)

* ConstProp: test bitwise op of signed literals

* ConstProp: use bit mask for FoldOr/FoldXor

* handle and also

* add UIntLiteral.masked helper

Co-authored-by: Jack Koenig <koenig@sifive.com>

* WiringUtils.sinksToSources: make sinkInsts order deterministic

* WiringUtils: make owners a LinkedHashMap

* Wiring: only make something a Wire if it isn't a port already

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
(cherry picked from commit c02c9b7f

)

Co-authored-by: Kevin Laeufer <kevin.laeufer@sifive.com>

* Change ProtoBuf generated directory (#1762)

Changed from target/<scala-version>/src_managed/main/firrtl/ to
target/<scala-version>/src_managed/main/compiled_protobuf/firrtl/
The protobuf generation clears its target directory so it would clear
the generated ANTLR-generated files.

(cherry picked from commit c14330d6

)

# Conflicts:
#	build.sbt

* Fix for 1.2.x

Co-authored-by: Jack Koenig <koenig@sifive.com>

Batch renames in LowerTypes (bp #1718)

Signed-off-by: Schuyler Eldridge <schuyler.eldridge@ibm.com>

# Conflicts:
#	build.sbt

* Don't Dedup modules if it would change semantics (#1713)

If a module has ports of type Bundle that are used in aggregate
connections in parent modules, Dedup cannot change the names of the
fields of the Bundle or it would change the semantics of the connection.
Dedup now detects this case and refrains from agnostifying the ports of
such modules to prevent this issue.

(cherry picked from commit e0e68568

)

# Conflicts:
#	src/main/scala/firrtl/transforms/Dedup.scala
#	src/test/scala/firrtlTests/transforms/DedupTests.scala

* Fixup for 1.2.x

Co-authored-by: Jack Koenig <koenig@sifive.com>

* Add support for ValidIf to ProtoBuf [de]serialization

(cherry picked from commit d1db9067

)

# Conflicts:
#	src/test/scala/firrtlTests/ProtoBufSpec.scala

* Fixup ProtoBuf ValidIf test for 1.2.x

Co-authored-by: Jack Koenig <koenig@sifive.com>

* Use Travis Workspaces (#1675)

* Use Travis Workspaces

Add stage to build FIRRTL and share it with later steps running the
tests

* [CI] Do not sbt clean in formal_equiv.sh

This change takes advantage of shared workspace in Travis

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
(cherry picked from commit 1769f8d7

)

# Conflicts:
#	.travis.yml

* Resolve conflicts

* Bump SBT to 1.3.10

Co-authored-by: Jack Koenig <koenig@sifive.com>

* Speed up ExpandWhens for very large designs (#1666)

Use WrappedExpression instead of MemoizedHash. The benefit of memoizing
the hash pales in comparison to the cost of hashing deeply nested Types
in the AST.

Co-authored-by: Schuyler Eldridge <schuyler.eldridge@ibm.com>
(cherry picked from commit bffc340e

)

* Change deprecated since to 1.2.7

Co-authored-by: Jack Koenig <koenig@sifive.com>

Limit recursion (and reduce total work) in CheckWidths (bp #1646)

* Backport to 1.2.x
* Avoid excessively deep recursion
* Avoid overhead of DFS for shallow expression trees
* Reduce work: skip expressions that cannot contain error-containing subtrees
* Review feedback: added commentary to explain new check_widths_e structure

(cherry picked from commit d7bd6d64)

* Use HashMap instead of LinkedHashMap in InferTypes
* Remove a redundant Expression traversal in InferTypes
* fixup! Use HashMap instead of LinkedHashMap in InferTypes

Signed-off-by: Schuyler Eldridge <schuyler.eldridge@ibm.com>