Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
36 changes: 32 additions & 4 deletions lib/src/synthesizers/utilities/synth_module_definition.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2814,6 +2814,27 @@ class SynthModuleDefinition {
entry.key: entry.value.range,
};

final outputDrivingSignals = {
for (final output in outputs)
if (!output.isArray && !output.isNet) output.resolved,
};
final outputDriverQueue = ListQueue<SynthLogic>.from(outputDrivingSignals);
while (outputDriverQueue.isNotEmpty) {
final destination = outputDriverQueue.removeFirst();
final driver =
_singleFullWidthAssignment(destination, assignmentsByDestination);
if (driver == null ||
driver is PartialSynthAssignment ||
driver.src.isArray ||
driver.src.isNet ||
!driver.src.isClearable) {
continue;
}
if (outputDrivingSignals.add(driver.src.resolved)) {
outputDriverQueue.add(driver.src.resolved);
}
}

final replacements = <SynthAssignment, SynthAssignment>{};
final consumedAssignments = <SynthAssignment>{};
final outputMappingReplacements = <({
Expand Down Expand Up @@ -2913,6 +2934,12 @@ class SynthModuleDefinition {
realOutputMappingsBySignal[producer.src.resolved]?.isNotEmpty ??
false)
.length;
final canMapMultipleOutputs = outputDrivingSignals.contains(output) &&
producers.fold<int>(
0,
(width, producer) =>
width + _assignmentDestinationRange(producer).width) ==
output.width;
final seenDestinationBits = <int>{};
var canReplaceAll = true;
for (final producer in producers) {
Expand Down Expand Up @@ -2956,10 +2983,11 @@ class SynthModuleDefinition {
realOutputMappingsBySignal[producer.src.resolved] ?? const [];
final producerSourceUsers =
assignmentsBySource[producer.src.resolved] ?? const [];
final canMapDirectly = realMappedOutputProducerCount == 1 &&
(!hasConstantProducer ||
producerDst.lower == 0 ||
producerDst.upper == intermediate.width - 1);
final canMapDirectly =
(realMappedOutputProducerCount == 1 || canMapMultipleOutputs) &&
(!hasConstantProducer ||
producerDst.lower == 0 ||
producerDst.upper == intermediate.width - 1);
if (canMapDirectly &&
outputMappings.length == 1 &&
producerSourceUsers.length == 1 &&
Expand Down
Loading
Loading