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

[Expression Simplifcation] Relax checks in CollapseNestedConstants to allow more simplifcations #425

Merged
merged 4 commits into from
Jul 8, 2024
Merged

[Expression Simplifcation] Relax checks in CollapseNestedConstants to allow more simplifcations #425

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
24faaef
Relaxe checks in collapse_nested_constants.py to allow more simplific…
rihi Jul 3, 2024
88ee97f
Fix exception catching
rihi Jul 3, 2024
2d71042
black
rihi Jul 3, 2024
0a02daa
Update comment
rihi Jul 4, 2024
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
13 changes: 8 additions & 5 deletions ...pipeline/controlflowanalysis/expression_simplification/rules/collapse_nested_constants.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,10 @@ def apply(self, operation: Operation) -> list[tuple[Expression, Expression]]:
first, *rest = constants

# We don't need to catch UnsupportedOperationType, because check that operation is in _COLLAPSIBLE_OPERATIONS
# We don't need to catch UnsupportedMismatchedSizes, because '_collect_constants' only returns constants of the same type
# We don't need to catch UnsupportedMismatchedSizes, because '_collect_constants' only returns constants of the same size
# We don't need to catch UnsupportedValueType, because '_collect_constants' only returns constants with supported value types
try:
folded_constant = reduce(lambda c0, c1: constant_fold(operation.operation, [c0, c1], operation.type), rest, first)
except UnsupportedValueType:
return []
except IncompatibleOperandCount as e:
raise MalformedData() from e

Expand All @@ -61,14 +60,18 @@ def _collect_constants(operation: Operation) -> Iterator[Constant]:
current_operation = context_stack.pop()

for i, operand in enumerate(current_operation.operands):
if operand.type != operand_type: # This check could potentially be relaxed to only check for equal size
if operand.type.size != operand_type.size:
continue

if isinstance(operand, Operation):
if operand.operation == operation_type:
context_stack.append(operand)
continue
elif isinstance(operand, Constant) and _identity_constant(operation_type, operand_type).value != operand.value:
elif (
isinstance(operand, Constant)
and isinstance(operand.value, int)
and _identity_constant(operation_type, operand_type).value != operand.value
):
yield operand


Expand Down
Loading