|
 |
9e8e83 |
From 69bb97a917250d0d299c4aa3d03bde9513351159 Mon Sep 17 00:00:00 2001
|
|
|
9e8e83 |
From: Tom Stellard <tstellar@redhat.com>
|
|
|
9e8e83 |
Date: Mon, 9 Jul 2018 10:35:30 -0700
|
|
|
9e8e83 |
Subject: [PATCH] Don't run BV DAG Combine before legalization if it assumes legal types
|
|
|
9e8e83 |
|
|
|
9e8e83 |
---
|
|
|
9e8e83 |
lib/Target/PowerPC/PPCISelLowering.cpp | 13 ++++++++++---
|
|
|
9e8e83 |
1 file changed, 10 insertions(+), 3 deletions(-)
|
|
|
9e8e83 |
|
|
|
9e8e83 |
diff --git a/lib/Target/PowerPC/PPCISelLowering.cpp b/lib/Target/PowerPC/PPCISelLowering.cpp
|
|
|
9e8e83 |
index 4966e88..378e494 100644
|
|
|
9e8e83 |
--- a/lib/Target/PowerPC/PPCISelLowering.cpp
|
|
|
9e8e83 |
+++ b/lib/Target/PowerPC/PPCISelLowering.cpp
|
|
|
9e8e83 |
@@ -11923,10 +11923,15 @@ static SDValue combineBVOfVecSExt(SDNode *N, SelectionDAG &DAG) {
|
|
|
9e8e83 |
auto isSExtOfVecExtract = [&](SDValue Op) -> bool {
|
|
|
9e8e83 |
if (!Op)
|
|
|
9e8e83 |
return false;
|
|
|
9e8e83 |
- if (Op.getOpcode() != ISD::SIGN_EXTEND)
|
|
|
9e8e83 |
+ if (Op.getOpcode() != ISD::SIGN_EXTEND &&
|
|
|
9e8e83 |
+ Op.getOpcode() != ISD::SIGN_EXTEND_INREG)
|
|
|
9e8e83 |
return false;
|
|
|
9e8e83 |
|
|
|
9e8e83 |
+ // A SIGN_EXTEND_INREG might be fed by an ANY_EXTEND to produce a value
|
|
|
9e8e83 |
+ // of the right width.
|
|
|
9e8e83 |
SDValue Extract = Op.getOperand(0);
|
|
|
9e8e83 |
+ if (Extract.getOpcode() == ISD::ANY_EXTEND)
|
|
|
9e8e83 |
+ Extract = Extract.getOperand(0);
|
|
|
9e8e83 |
if (Extract.getOpcode() != ISD::EXTRACT_VECTOR_ELT)
|
|
|
9e8e83 |
return false;
|
|
|
9e8e83 |
|
|
|
9e8e83 |
@@ -12014,8 +12019,10 @@ SDValue PPCTargetLowering::DAGCombineBuildVector(SDNode *N,
|
|
|
9e8e83 |
return Reduced;
|
|
|
9e8e83 |
|
|
|
9e8e83 |
// If we're building a vector out of extended elements from another vector
|
|
|
9e8e83 |
- // we have P9 vector integer extend instructions.
|
|
|
9e8e83 |
- if (Subtarget.hasP9Altivec()) {
|
|
|
9e8e83 |
+ // we have P9 vector integer extend instructions. The code assumes legal
|
|
|
9e8e83 |
+ // input types (i.e. it can't handle things like v4i16) so do not run before
|
|
|
9e8e83 |
+ // legalization.
|
|
|
9e8e83 |
+ if (Subtarget.hasP9Altivec() && !DCI.isBeforeLegalize()) {
|
|
|
9e8e83 |
Reduced = combineBVOfVecSExt(N, DAG);
|
|
|
9e8e83 |
if (Reduced)
|
|
|
9e8e83 |
return Reduced;
|
|
|
9e8e83 |
--
|
|
|
9e8e83 |
1.8.3.1
|
|
|
9e8e83 |
|