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.

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

Small clean up in assertionprop for relops #109987

Merged
merged 3 commits into from
Nov 21, 2024

Conversation

EgorBo
Copy link
Member

@EgorBo EgorBo commented Nov 19, 2024

This PR:

  1. Simplifies optVNConstantPropOnJTrue
  2. Enables constant folding for relops with side-effects
  3. optAssertionProp_RangeProperties now for array[idx] = 42; tells that array.Length is never negative and never zero.

@dotnet-issue-labeler dotnet-issue-labeler bot added the area-CodeGen-coreclr CLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMI label Nov 19, 2024
Copy link
Contributor

Tagging subscribers to this area: @JulieLeeMSFT, @jakobbotsch
See info in area-owners.md if you want to be subscribed.

@EgorBo EgorBo marked this pull request as ready for review November 20, 2024 00:26
@EgorBo
Copy link
Member Author

EgorBo commented Nov 20, 2024

PTAL @jakobbotsch @dotnet/jit-contrib PTAL, small diffs (mostly just a code cleanup)

fgMorphBlockStmt(block, newStmt DEBUGARG(__FUNCTION__));
}

const bool evalsToTrue = (vnStore->CoercedConstantValue<INT64>(vnCns) != 0);
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

note: we already produce a lot of JTRUE(1) nodes when opts are enabled (they're not allowed in tier0 since lower might not expect it)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think we do. At this point in the JIT we have the invariant that the child of a JTRUE is always a relop.
Is this change making assertion prop produce JTRUE(non-relop) that other phases will see? That's changing IR invariants. The other opts phases might not handle that well (so specifically when JitOptRepeat is enabled). Lowering should handle it fine both with and without optimizations enabled as I removed the invariant from the backend in #82766.

Some phases (like morph when optimizing) temporarily introduce the pattern, but they also fold it away before the phase ends.

I would be fine with removing the invariant, but then the change should be explicit about the fact that it's changing the invariants, and I think we should do it more globally (e.g. validate that it's fine for all the opts phases).

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jakobbotsch this code feeds morph so it is always folded, but ok, I've relaxed it back to 0==0. Looks like there is a room for improvement here, e.g. we refuse to fold branches where one of the constant has side-effects via COMMA

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If this is folded within assertion prop then the previous implementation was ok as well, but this one looks fine with me too.

// Let's maintain the invariant that JTRUE's operand is always a relop.
// and if we have side effects, we wrap one of the operands with them, not the relop.
const bool evalsToTrue = (vnStore->CoercedConstantValue<INT64>(vnCns) != 0);
test->AsOp()->gtOp1 = gtNewOperNode(evalsToTrue ? GT_EQ : GT_NE, relop->TypeGet(), gtNewFalse(), gtNewFalse());
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does it matter that this doesn't VN the new nodes? The old logic did.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does it matter that this doesn't VN the new nodes? The old logic did.

My understanding that it always invokes morph right after this and morph folds JTRUE(0==0) so it's not necessary. It also has no impact on diffs

@am11
Copy link
Member

am11 commented Nov 21, 2024

Ignore format jit errors. Once zlib-ng/zlib-ng#1810 is reviewed/merged, I'll port the patch.

@EgorBo EgorBo merged commit c929990 into dotnet:main Nov 21, 2024
107 of 108 checks passed
@EgorBo EgorBo deleted the improve-assertprop-relop branch November 21, 2024 15:45
@EgorBo EgorBo restored the improve-assertprop-relop branch November 22, 2024 09:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area-CodeGen-coreclr CLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMI
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants