Commit Graph

6850 Commits

Author SHA1 Message Date
Andrew Young 1fd4c9ec11 [SV] Use SymbolOpUserInterface to speed up verifiers
This change moves two InferfaceInstanceOp and GetModportOp to use the
symbol user op interface when checking the referenced operation. This
significantly reduces the cost of verifying this.
2024-11-02 00:03:49 -07:00
Fabian Schuiki a7bd275fb9
[FIRRTL] Fix folding of when conditions into LTL properties (#7760)
Make ExpandWhen's folding of the when condition into LTL properties work
for more inputs. This used to be very brittle and the condition would
be mapped to a new implication around the entire property:

    when (a):
      assert(@(posedge clock) b |-> c)

used to become

    assert(a |-> @(posedge clock) b |-> c)

This commit improves on this by always pushing implications behind
clocks, and by merging implications like `a |-> b |-> c` into a single
`(a & b) |-> c`. As a result, ExpandWhens now produces the following
output, which is more in line with what users expect:

    assert(@(posedge clock) a & b |-> c)

Also add a FIR-to-Verilog test to nail this behavior down and ensure we
don't regress on user expectations.
2024-11-01 12:42:45 -07:00
Fabian Schuiki c08df96a5a
[LTL] Canonicalize ltl.and to comb.and for i1 properties (#7759)
Extend `ltl.and`, `ltl.or`, and `ltl.intersect` to infer their return
type as `i1` if all operands are `i1`. Also add a canonicalization
method that replaces these ops with `comb.and` and `comb.or` if they
operate entirely on `i1`.
2024-11-01 09:11:00 -07:00
Jiahan Xie 6405aa7453
[Calyx] BuildControl for nested SCF::If ops (#7669) 2024-10-31 18:07:07 -04:00
Jiahan Xie 963d6950a8
Calyx Binary Floating Point AddF Operator (#7089)
* binary floating point add operator for IEEE754
2024-10-31 17:41:21 -04:00
Jiahan Xie d22a6957da
Flatten memref Global and its corresponding GetGlobal operations (#7758) 2024-10-31 17:11:52 -04:00
Martin Erhart e1e10ae469
[HW] Add port name accessors to HWInstanceLike (#7757)
HWInstanceLike is currently 'empty' and thus essentially the same as InstanceGraphInstanceOpInterface. On the other hand, HWModuleLike deals with port names and hw::InstanceOp caches them and verifies they match the referenced module's port names. This PR basically makes this behavior part of what it means to be an HWInstanceLike. If one has an instance operation that does not deal with port names, it's still possible to just make it an InstanceGraphInstanceOpInterface directly
2024-10-31 18:36:28 +00:00
Fabian Schuiki afd11bbca0 Revert "Flatten memref GetGlobal and Global operations (#7093)"
This reverts commit c5d16ee194. Noticed
CI started to fail after the commit was landed.
2024-10-31 10:17:03 -07:00
Jiahan Xie c5d16ee194
Flatten memref GetGlobal and Global operations (#7093) 2024-10-31 11:51:18 -04:00
Leon Hielscher f91b47e93d [NFC][Sim] Rename "formatting token" to "formatting fragment"
Avoid the ambigous "token" term and use the same naming as the Moore dialect for
a part of a formatting string.

Signed-off-by: Leon Hielscher <hielscher@fzi.de>
2024-10-31 13:34:56 +01:00
Fabian Schuiki 9d92072435
[Verif][NFC] Use auto-generated constructors for all passes (#7754)
Drop the `let constructor` line from the Verif pass definitions. This
causes TableGen to automatically generate the constructors for these
passes, and also handle pass options if we ever decide to add them.

This requires adding a `...Pass` to the end of each pass def to produce
a constructor name of the form `create...Pass()`.
2024-10-30 20:06:11 -07:00
Jiahan Xie 31e4f9eaae
fix memref flatten-load (#7298) 2024-10-30 20:42:20 -04:00
Jiahan Xie b49d2b3adc
Calyx ConstantOp Support (#7086)
* create register based on type

* support calyx constant op and the corresponding emitter

Co-authored-by: Chris Gyurgyik <Gyurgyikcp@gmail.com>

---------

Co-authored-by: Chris Gyurgyik <Gyurgyikcp@gmail.com>
2024-10-30 19:29:01 -04:00
Andrew Young f22f11aa40 [FIRRTL] enable properties for inherent attributes
This enables properties in the FIRRTL dialect. Some op parsers which
called `inferReturnTypes` had to be updated to store inherent attributes
as properties on the OperationState, as the call to `inferReturnTypes`
expects properties to have already been populated.  This is a change
that we should make for all operation parsers and builders, to make
things faster, but is not strictly necessary at this time.
2024-10-30 15:02:43 -07:00
Andrew Young fd56341db4 [FIRRTL] Clean up inferReturnTypes implementation
This is a big change to clean up our implementation of
`inferReturnTypes` in an effort to get ourselves ready to enable
properties in the FIRRTL dialect. We had structured our API so that
`inferReturnType` would call out to a simpler version of itself with
some of the useless arguments removed.  This prevented us from using op
adaptors to abstract over whether or not an inherent attribute was
contained inside the attr-dict or the properties.

This change keeps the old structure of a two level API, but with
different boundaries: The large API takes all arguments, creates an
adapter, pulls out the necessary attributes and then calls in to the
simpler interface. FIRParser uses the simpler API when inferring return
types.  The simpler interface is now specific to each operation and not
common with other operations.

This last change caused a problem for `parsePrimExp`, which relied on a
generic interface to create all expressions. This function is now
templated over exactly how many arguments the specific prim op takes,
parses exactly that many, and splats them out when calling
`inferReturnType`.  As an upside to this, we can also call a more
specific builder for each operation, which should speed up building
operations when we move to properties.
2024-10-30 15:02:43 -07:00
Asuna c68cbf5361
[FIRRTL][LowerTypes] Keep the order of bundle fields in lowered `cat` (#6376)
Ensure the ordering of the fields of a bundle, when its cast to a UInt.
This commit ensures that the left-to-right order of fields is the high-to-low-order.
2024-10-30 12:46:30 -07:00
Prithayan Barua 07133326ae
[OM] Add a new API to update fields of a ClassOp (#7748)
Add a new API to update the fields of an existing `FieldsOp` in a class.
This also renames the `addFields` to ensure it is used only to add a new op.
2024-10-29 12:17:32 -07:00
Fabian Schuiki 91b60a7da6
[Arc][NFC] Rename LowerState file back
Undo the renaming of `LowerState.cpp` done to facilitate review.
2024-10-29 07:43:29 -07:00
Hideto Ueno c301a0f15c
[AIGToComb] [circt-synth] Add a AIG to Comb conversion pass (#7742)
This adds a conversion pass from AIG dialect to Comb dialect. AndInverterOp can be easily converted into comb.and + comb.xor + hw.constant.

This enables us to utilize core dialects tools for synthesis results without any addition. Primarly use case is running LEC on IR before and after synthesis.
2024-10-29 14:15:41 +09:00
Fabian Schuiki 332fd27147
[Verif] Adjust contract ops to match documentation (#7745)
Slightly tweak the `verif.contract`, `verif.require`, and `verif.ensure`
ops to match the usage outlined in the Verif dialect documentation. This
also adjusts the operands and constraints slightly.
2024-10-28 15:24:03 -07:00
Fabian Schuiki ed17d333b1
[Arc] Remove obsolete arc.clock_tree and arc.passthrough ops (#7704)
The new LowerState pass does not produce `arc.clock_tree` and
`arc.passthrough` ops anymore. Remove them from the dialect entirely.
2024-10-28 15:01:34 -07:00
Fabian Schuiki 3181b0317d
[Arc] Improve LowerState to never produce read-after-write conflicts (#7703)
This is a complete rewrite of the `LowerState` pass that makes the
`LegalizeStateUpdate` pass obsolete.

The old implementation of `LowerState` produces `arc.model`s that still
contain read-after-write conflicts. This primarily happens because the
pass simply emits `arc.state_write` operations that write updated values
to simulation memory for each `arc.state`, and any user of `arc.state`
would use an `arc.state_read` operation to retrieve the original value
of the state before any writes occurred. Memories are similar. The Arc
dialect considers `arc.state_write` and `arc.memory_write` operations to
be _deferred_ writes until the `LegalizeStateUpdate` pass runs, at which
point they become _immediate_ since the legalization inserts the
necessary temporaries to resolve the read-after-write conflicts.

The previous implementation would also not handle state-to-output and
state-to-side-effecting-op propagation paths correctly. When a model's
eval function is called, registers are updated to their new value, and
any outputs that combinatorially depend on those new values should also
immediately update. Similarly, operations such as asserts or debug
trackers should observe new values for states immediately after they
have been written. However, since all writes are considered deferred,
there is no way for `LowerState` to produce a mixture of operations that
depend on a register's _old_ state (because they are used to compute a
register's new state), and on a _new_ state because they are
combinatorially derived values.

This new implementation of `LowerState` completely avoids
read-after-write conflicts. It does this by changing the way modules are
lowered in two ways:

**Phases:** The pass tracks in which _phase_ of the simulation lifecycle
a value is needed and allows for operations to have different lowerings
in different phases. An `arc.state` operation for example requires its
inputs, enable, and reset to be computed based on the _old_ value they
had, i.e. the value the end of the previous call to the model's eval
function. The clock however has to be computed based on the _new_ value
it has in the current call to eval. Therefore, the ops defining the
inputs, enable, and reset are lowered in the _old_ phase, while the ops
defining the clock are lowered in the _new_ phase. The `arc.state` op
lowering will then write its _new_ value to simulation storage.

This phase tracking allows registers to be used as the clock for other
registers: since the clocks require _new_ values, registers serving as
clock to others are lowered first, such that the dependent registers can
immediately react to the updated clock. It also allows for module
outputs and side-effecting ops based on `arc.state`s to be scheduled
after the states have been updated, since they depend on the state's
_new_ value.

The pass also covers the situation where an operation depends on a
module input and a state, and feeds into a module output as well as
another state. In this situation that operation has to be lowered twice:
once for the _old_ phase to serve as input to the subsequent state, and
once for the _new_ phase to compute the new module output.

In addition to the _old_ and _new_ phases representing the previous and
current call to eval, the pass also models an _initial_ and _final_
phase. These are used for `seq.initial` and `llhd.final` ops, and in
order to compute the initial values for states. If an `arc.state` op has
an initial value operand it is lowered in the _initial_ phase. Similarly
for the ops in `llhd.final`. The pass places all ops lowered in the
initial and final phases into corresponding `arc.initial` and
`arc.final` ops. At a later point we may want to generate the
`*_initial`, `*_eval`, and `*_final` functions directly.

**No more clock trees:** The new implementation also no longer generates
`arc.clock_tree` and `arc.passthrough` operations. These were a holdover
from the early days of the Arc dialect, where no eval function would be
generated. Instead, the user was required to directly call clock
functions. This was never able to model clocks changing at the exact
same moment, or having clocks derived from registers and other
combinatorial operations. Since Arc has since switched to generating an
eval function that can accurately interleave the effects of different
clocks, grouping ops by clock tree is no longer needed. In fact,
removing the clock tree ops allows for the pass to more efficiently
interleave the operations from different clock domains.

The Rocket core in the circt/arc-tests repository still works with this
new implementation of LowerState. In combination with the MergeIfs pass
the performance stays the same.

I have renamed the implementation and test files to make the git diffs
easier to read. The names will be changed back in a follow-up commit.

Fixes #6390.
2024-10-28 14:57:03 -07:00
Andrew Young 6f5e0a8744 [FIRRTL] Remove validation from type inference code
In FIRRTL, all expression operations have a `validate` hook which can be
used to check operands and attributes before passing them in to
`inferResultTypes`.  FIRParser will verify the same invariants right
before calling `validate`, making it redundant.  Since `validate` is
only called from the parser, we can delete the entire hook.
2024-10-28 14:46:24 -07:00
Schuyler Eldridge e08011253e
[OM] Add ClassOp region verifier
Add a region verifier to OM dialect's Class Op.  This verifies that the
terminator returns the right number of fields with the correct types that
match the declared type of the Class Op.

Fixes #7736.

Signed-off-by: Schuyler Eldridge <schuyler.eldridge@sifive.com>
2024-10-28 16:39:10 -04:00
Bea Healy dae5c1ef36
[circt-bmc] Add initial_values attribute to BMC op (#7729)
Adds support for register initial values in the BMC op and the lowering to the BMC op
2024-10-28 16:03:13 +00:00
Hideto Ueno c6983697fb
[AIG] Add CutOp (#7743)
The `aig.cut` operation represents a cut in the And-Inverter-Graph.
This operation is variadic and can take multiple inputs and outputs,
which corresponds to the input and output edges in AIG conceptually.
2024-10-28 19:40:56 +09:00
Hideto Ueno 5b8b18e9e4
[CombToAIG] Add CombToAIG conversion pass (#7740)
This adds a conversion pass from Comb to AIG. Currently conversion patterns for variadic `comb.or/and` 
and binary xor are supported. There will be a follow up to implement conversion patterns for arithmetic ops.
2024-10-26 20:57:00 +09:00
Hideto Ueno 4f0edf4cfe [AIG] Add LowerWordToBits pass
This commit ads LowerWordToBits pass that perform bit-blasting for
AndInverterOp.
2024-10-26 19:27:58 +09:00
Hideto Ueno f2fc8c7214 [AIG] Add LowerVariadic pass
This commit adds AIG LowerVariadic pass to lower variadic AndInverter
op to have at most two operands. This makes IR closer to traditinal
AIG representation combined with LowerWordToBits pass
2024-10-26 19:27:58 +09:00
Hideto Ueno c2c00c69e0
[AIG] Add AndInverterOp (#7738)
This commit adds `aig.and_inv` op that represents an And-Inverter in AIG.
DenseBoolArray `inverted` field specifies if each operand is inverted.
This commit also adds a basic canonicalizer for it.
2024-10-26 17:45:29 +09:00
Hideto Ueno e937bb7f56 [AIG] Add AIG dialect
This adds a template for AIG dialect, a dialect used for
representing and transforming And-Inverter Graphs.
2024-10-26 16:18:17 +09:00
Andrew Young 54aa4e3d05 Use properties for attributes for many dialects
This change enables the use of operation properties for more dialects in
CIRCT. The option to *not* use properties is going to be removed in a
future release of MLIR, but as well we expect this change to bring a
performance improvement.

For all these dialects, the only change required was to properly infer
return types.  Some operations were hardcoded to search through the
attributes, and the attribute was moved to the property storage. By
using the generated adaptor classes, we can abstract over where the
interesting attribute is stored.

For future work, some code may be refactored for further performance
wins now that we are using properties. In particular usages `setAttr`
and `getAttr` may be made faster by using a less generic op
transformation interface.
2024-10-25 23:42:32 -07:00
Andrew Young 542d7e5f37 [FIRRTL] Make FModuleLike op interface friendly with properties 2024-10-25 16:26:52 -07:00
Andrew Young 70df0eced7 [FIRRTL] Make FNameableOpInterface friendly with properties 2024-10-25 16:26:52 -07:00
Schuyler Eldridge 3c53d09bf1
[FIRRTL] Support "invalidate <mem, instance>"
Add support for invalidation syntax that invalidates an instance or a
memory.  This was never technically supported before, though it should
have been.  Previously, this was only supported through the "is invalid"
path which is has been deprecated for FIRRTL versions >=3.

Fixes #7730.

Signed-off-by: Schuyler Eldridge <schuyler.eldridge@sifive.com>
2024-10-25 18:30:37 -04:00
Schuyler Eldridge 8235381b9f
[FIRRTL] Reject '<=' connections in FIRRTL >=3
Reject '<=' style FIRRTL connections if the FIRRTL version is 3 or higher.

Signed-off-by: Schuyler Eldridge <schuyler.eldridge@sifive.com>
2024-10-25 16:59:27 -04:00
Schuyler Eldridge 85f4ca05dd
[FIRRTL] Reject "is invalid" if FIRRTL >=3
Fix the parser to reject "is invalid" if the specified FIRRTL version is
>= 3.0.0.

Signed-off-by: Schuyler Eldridge <schuyler.eldridge@sifive.com>
2024-10-25 16:26:37 -04:00
Schuyler Eldridge 97effa7357
[FIRRTL] Reject "reg with" if >=3.0.0
Reject parsing registers that use the "reg with" syntax if the FIRRTL
version is 3 or higher.

Towards #7731.

Signed-off-by: Schuyler Eldridge <schuyler.eldridge@sifive.com>
2024-10-25 14:29:49 -04:00
Schuyler Eldridge ad28fd2291
[FIRRTL] Add "effective" design to Instance Info
Expand the API of the InstanceInfo analysis to include queries for if
something is in the "effective" design.  This is equivalent to querying if
something is not under a layer.

Signed-off-by: Schuyler Eldridge <schuyler.eldridge@sifive.com>
2024-10-24 18:43:42 -04:00
Bea Healy b173a2745b
[circt-bmc] Add simple initial value support to ExternalizeRegisters (#7728) 2024-10-24 21:13:25 +01:00
Martin Erhart 56f5254e50
[HWToSMT] Proper error message for 0-bit constants (#7727) 2024-10-24 17:37:03 +01:00
Schuyler Eldridge d1250de93c
clang-format, NFC
Signed-off-by: Schuyler Eldridge <schuyler.eldridge@sifive.com>
2024-10-24 00:26:35 -04:00
Schuyler Eldridge 4d03e88ab6
[FIRRTL] Add "inDesign" to InstanceInfo Analysis
Extend the existing InstanceInfo analysis to track information about if a
module is in the "design".  The design is defined is everything that is or
is under the design-under-test, but is not in a layer.  I.e., this
excludes things that are in layers.

This is added because it is not possible to compute this using the
existing information about something being under the DUT or under a layer.
A module could have mixed instantiation under the DUT and mixed
instantiation under a layer, yet not be in the design.

Signed-off-by: Schuyler Eldridge <schuyler.eldridge@sifive.com>
2024-10-24 00:17:07 -04:00
Robert Young 7998f449b1
[FIRRTL][LayerSink] Fix: initialize an unitialized bool member (#7724) 2024-10-23 15:21:18 -04:00
Schuyler Eldridge b60df2062b
[FIRRTL] Use InstanceInfo in CreateSiFiveMetadata (#7720)
Update the CreateSiFiveMetadata pass to use the InstanceInfo analysis to
check if modules/memories are instantiated under the effective DUT as
opposed to using custom logic to check this.

Signed-off-by: Schuyler Eldridge <schuyler.eldridge@sifive.com>
2024-10-23 10:51:11 -04:00
Will Dietz efca772639 [FIRRTL][PrefixModules][NFC] Use else-if in dyn_cast chain.
Co-authored-by: Andrew Young <youngar17@gmail.com>
2024-10-22 11:34:13 -05:00
Will Dietz c6ece8d70a [FIRRTL][AdvLayerSink][NFC] Rename 'module' for C++20. 2024-10-22 11:30:46 -05:00
Robert Young ec8ffaf4fe
Advanced LayerSink (#7548) 2024-10-22 10:18:07 -04:00
Hideto Ueno c0e31955ce
[HW][Seq] Allow typed attr to be an element of aggregate_constant and make seq.const_clock typed attr (#7718)
This fixes https://github.com/llvm/circt/issues/7716. Aggregate constant verifier rejects unknown attributes hence hw.aggregate_constant cannot be used for attributes defined by other dialects (in this case seq.const_clock) was rejected even when hw.aggregate_create allows users to create clock type arrays. This PR loosen the restriction by allowing TypedAttribute. 

This commits also adds TypedAttrInterface to seq.const_clock and support its lowering.
2024-10-22 15:53:10 +09:00
Schuyler Eldridge bcee76272e
[FIRRTL] Fix InstanceInfo top-is-DUT bug
Fix a bug where the internal `underDut` member was not correctly asserted
if the top module is the DUT.

Signed-off-by: Schuyler Eldridge <schuyler.eldridge@sifive.com>
2024-10-21 18:35:42 -04:00