-
Notifications
You must be signed in to change notification settings - Fork 15.1k
[X86][ISel] Improve VPTERNLOG matching for negated logic trees #164863
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
Merged
Merged
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4721,9 +4721,6 @@ bool X86DAGToDAGISel::tryVPTERNLOG(SDNode *N) { | |
| if (!(Subtarget->hasVLX() || NVT.is512BitVector())) | ||
| return false; | ||
|
|
||
| SDValue N0 = N->getOperand(0); | ||
| SDValue N1 = N->getOperand(1); | ||
|
|
||
| auto getFoldableLogicOp = [](SDValue Op) { | ||
| // Peek through single use bitcast. | ||
| if (Op.getOpcode() == ISD::BITCAST && Op.hasOneUse()) | ||
|
|
@@ -4740,6 +4737,35 @@ bool X86DAGToDAGISel::tryVPTERNLOG(SDNode *N) { | |
| return SDValue(); | ||
| }; | ||
|
|
||
| // Identify and (optionally) peel an outer NOT that wraps a pure logic tree | ||
| auto tryPeelOuterNotWrappingLogic = [&](SDNode *Op) { | ||
| if (Op->getOpcode() == ISD::XOR && Op->hasOneUse() && | ||
| ISD::isBuildVectorAllOnes(Op->getOperand(1).getNode())) { | ||
| SDNode *InnerN = Op->getOperand(0).getNode(); | ||
|
|
||
| unsigned InnerOpc = InnerN->getOpcode(); | ||
| if (InnerOpc != ISD::AND && InnerOpc != ISD::OR && InnerOpc != ISD::XOR && | ||
| InnerOpc != X86ISD::ANDNP) { | ||
| return Op; | ||
| } | ||
yichi170 marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
|
|
||
| SDValue InnerN0 = InnerN->getOperand(0); | ||
| SDValue InnerN1 = InnerN->getOperand(1); | ||
| if (getFoldableLogicOp(InnerN1) || getFoldableLogicOp(InnerN0)) | ||
| return InnerN; | ||
|
||
| } | ||
| return Op; | ||
| }; | ||
|
|
||
| SDNode *OriN = N; | ||
| bool PeeledOuterNot = false; | ||
| N = tryPeelOuterNotWrappingLogic(N); | ||
| if (N != OriN) | ||
| PeeledOuterNot = true; | ||
|
|
||
| SDValue N0 = N->getOperand(0); | ||
| SDValue N1 = N->getOperand(1); | ||
|
|
||
| SDValue A, FoldableOp; | ||
| if ((FoldableOp = getFoldableLogicOp(N1))) { | ||
| A = N0; | ||
|
|
@@ -4798,7 +4824,10 @@ bool X86DAGToDAGISel::tryVPTERNLOG(SDNode *N) { | |
| case ISD::XOR: Imm ^= TernlogMagicA; break; | ||
| } | ||
|
|
||
| return matchVPTERNLOG(N, ParentA, ParentB, ParentC, A, B, C, Imm); | ||
| if (PeeledOuterNot) | ||
| Imm = ~Imm; | ||
|
|
||
| return matchVPTERNLOG(OriN, ParentA, ParentB, ParentC, A, B, C, Imm); | ||
| } | ||
|
|
||
| /// If the high bits of an 'and' operand are known zero, try setting the | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| ; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py UTC_ARGS: --version 6 | ||
| ; RUN: llc < %s -mtriple=x86_64-- -mattr=+avx512f,+avx512vl | FileCheck %s --check-prefixes=CHECK | ||
|
|
||
| define <8 x i64> @foo(<8 x i64> %a, <8 x i64> %b, <8 x i64> %c) { | ||
| ; CHECK-LABEL: foo: | ||
| ; CHECK: # %bb.0: | ||
| ; CHECK-NEXT: vpternlogq {{.*#+}} zmm0 = ~(zmm0 | zmm2 | zmm1) | ||
| ; CHECK-NEXT: retq | ||
| %and.demorgan = or <8 x i64> %b, %a | ||
| %and3.demorgan = or <8 x i64> %and.demorgan, %c | ||
| %and3 = xor <8 x i64> %and3.demorgan, splat (i64 -1) | ||
| ret <8 x i64> %and3 | ||
| } |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.