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