rebase of the patches

This commit is contained in:
Sylvestre Ledru 2019-01-04 19:08:30 +01:00
parent ad29ec1841
commit 61d26018dd
2 changed files with 30 additions and 30 deletions

View File

@ -3,11 +3,11 @@ Author: Justin Hibbits <jrh29@alumni.cwru.edu>
Origin: https://reviews.llvm.org/D54583 Origin: https://reviews.llvm.org/D54583
Last-Update: 2018-12-04 Last-Update: 2018-12-04
Index: llvm-toolchain-snapshot_8~svn349138/lib/Target/PowerPC/PPCISelLowering.cpp Index: llvm-toolchain-snapshot_8~svn350421/lib/Target/PowerPC/PPCISelLowering.cpp
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_8~svn349138.orig/lib/Target/PowerPC/PPCISelLowering.cpp --- llvm-toolchain-snapshot_8~svn350421.orig/lib/Target/PowerPC/PPCISelLowering.cpp
+++ llvm-toolchain-snapshot_8~svn349138/lib/Target/PowerPC/PPCISelLowering.cpp +++ llvm-toolchain-snapshot_8~svn350421/lib/Target/PowerPC/PPCISelLowering.cpp
@@ -391,8 +391,16 @@ PPCTargetLowering::PPCTargetLowering(con @@ -385,8 +385,16 @@ PPCTargetLowering::PPCTargetLowering(con
} else { } else {
setOperationAction(ISD::BITCAST, MVT::f32, Expand); setOperationAction(ISD::BITCAST, MVT::f32, Expand);
setOperationAction(ISD::BITCAST, MVT::i32, Expand); setOperationAction(ISD::BITCAST, MVT::i32, Expand);
@ -25,7 +25,7 @@ Index: llvm-toolchain-snapshot_8~svn349138/lib/Target/PowerPC/PPCISelLowering.cp
} }
// We cannot sextinreg(i1). Expand to shifts. // We cannot sextinreg(i1). Expand to shifts.
@@ -1351,6 +1359,9 @@ const char *PPCTargetLowering::getTarget @@ -1366,6 +1374,9 @@ const char *PPCTargetLowering::getTarget
case PPCISD::QVLFSb: return "PPCISD::QVLFSb"; case PPCISD::QVLFSb: return "PPCISD::QVLFSb";
case PPCISD::BUILD_FP128: return "PPCISD::BUILD_FP128"; case PPCISD::BUILD_FP128: return "PPCISD::BUILD_FP128";
case PPCISD::EXTSWSLI: return "PPCISD::EXTSWSLI"; case PPCISD::EXTSWSLI: return "PPCISD::EXTSWSLI";
@ -35,7 +35,7 @@ Index: llvm-toolchain-snapshot_8~svn349138/lib/Target/PowerPC/PPCISelLowering.cp
} }
return nullptr; return nullptr;
} }
@@ -7859,6 +7870,15 @@ SDValue PPCTargetLowering::LowerBITCAST( @@ -7886,6 +7897,15 @@ SDValue PPCTargetLowering::LowerBITCAST(
SDLoc dl(Op); SDLoc dl(Op);
SDValue Op0 = Op->getOperand(0); SDValue Op0 = Op->getOperand(0);
@ -51,7 +51,7 @@ Index: llvm-toolchain-snapshot_8~svn349138/lib/Target/PowerPC/PPCISelLowering.cp
if (!EnableQuadPrecision || if (!EnableQuadPrecision ||
(Op.getValueType() != MVT::f128 ) || (Op.getValueType() != MVT::f128 ) ||
(Op0.getOpcode() != ISD::BUILD_PAIR) || (Op0.getOpcode() != ISD::BUILD_PAIR) ||
@@ -7870,6 +7890,26 @@ SDValue PPCTargetLowering::LowerBITCAST( @@ -7897,6 +7917,26 @@ SDValue PPCTargetLowering::LowerBITCAST(
Op0.getOperand(1)); Op0.getOperand(1));
} }
@ -78,7 +78,7 @@ Index: llvm-toolchain-snapshot_8~svn349138/lib/Target/PowerPC/PPCISelLowering.cp
// If this is a case we can't handle, return null and let the default // If this is a case we can't handle, return null and let the default
// expansion code take care of it. If we CAN select this case, and if it // expansion code take care of it. If we CAN select this case, and if it
// selects to a single instruction, return Op. Otherwise, if we can codegen // selects to a single instruction, return Op. Otherwise, if we can codegen
@@ -9643,6 +9683,8 @@ SDValue PPCTargetLowering::LowerOperatio @@ -9680,6 +9720,8 @@ SDValue PPCTargetLowering::LowerOperatio
return LowerBSWAP(Op, DAG); return LowerBSWAP(Op, DAG);
case ISD::ATOMIC_CMP_SWAP: case ISD::ATOMIC_CMP_SWAP:
return LowerATOMIC_CMP_SWAP(Op, DAG); return LowerATOMIC_CMP_SWAP(Op, DAG);
@ -87,10 +87,10 @@ Index: llvm-toolchain-snapshot_8~svn349138/lib/Target/PowerPC/PPCISelLowering.cp
} }
} }
Index: llvm-toolchain-snapshot_8~svn349138/lib/Target/PowerPC/PPCISelLowering.h Index: llvm-toolchain-snapshot_8~svn350421/lib/Target/PowerPC/PPCISelLowering.h
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_8~svn349138.orig/lib/Target/PowerPC/PPCISelLowering.h --- llvm-toolchain-snapshot_8~svn350421.orig/lib/Target/PowerPC/PPCISelLowering.h
+++ llvm-toolchain-snapshot_8~svn349138/lib/Target/PowerPC/PPCISelLowering.h +++ llvm-toolchain-snapshot_8~svn350421/lib/Target/PowerPC/PPCISelLowering.h
@@ -196,6 +196,15 @@ namespace llvm { @@ -196,6 +196,15 @@ namespace llvm {
/// Direct move of 2 consective GPR to a VSX register. /// Direct move of 2 consective GPR to a VSX register.
BUILD_FP128, BUILD_FP128,
@ -107,7 +107,7 @@ Index: llvm-toolchain-snapshot_8~svn349138/lib/Target/PowerPC/PPCISelLowering.h
/// Extract a subvector from signed integer vector and convert to FP. /// Extract a subvector from signed integer vector and convert to FP.
/// It is primarily used to convert a (widened) illegal integer vector /// It is primarily used to convert a (widened) illegal integer vector
/// type to a legal floating point vector type. /// type to a legal floating point vector type.
@@ -1089,6 +1098,7 @@ namespace llvm { @@ -1110,6 +1119,7 @@ namespace llvm {
SDValue lowerEH_SJLJ_SETJMP(SDValue Op, SelectionDAG &DAG) const; SDValue lowerEH_SJLJ_SETJMP(SDValue Op, SelectionDAG &DAG) const;
SDValue lowerEH_SJLJ_LONGJMP(SDValue Op, SelectionDAG &DAG) const; SDValue lowerEH_SJLJ_LONGJMP(SDValue Op, SelectionDAG &DAG) const;
SDValue LowerBITCAST(SDValue Op, SelectionDAG &DAG) const; SDValue LowerBITCAST(SDValue Op, SelectionDAG &DAG) const;
@ -115,10 +115,10 @@ Index: llvm-toolchain-snapshot_8~svn349138/lib/Target/PowerPC/PPCISelLowering.h
SDValue DAGCombineExtBoolTrunc(SDNode *N, DAGCombinerInfo &DCI) const; SDValue DAGCombineExtBoolTrunc(SDNode *N, DAGCombinerInfo &DCI) const;
SDValue DAGCombineBuildVector(SDNode *N, DAGCombinerInfo &DCI) const; SDValue DAGCombineBuildVector(SDNode *N, DAGCombinerInfo &DCI) const;
Index: llvm-toolchain-snapshot_8~svn349138/lib/Target/PowerPC/PPCInstrInfo.td Index: llvm-toolchain-snapshot_8~svn350421/lib/Target/PowerPC/PPCInstrInfo.td
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_8~svn349138.orig/lib/Target/PowerPC/PPCInstrInfo.td --- llvm-toolchain-snapshot_8~svn350421.orig/lib/Target/PowerPC/PPCInstrInfo.td
+++ llvm-toolchain-snapshot_8~svn349138/lib/Target/PowerPC/PPCInstrInfo.td +++ llvm-toolchain-snapshot_8~svn350421/lib/Target/PowerPC/PPCInstrInfo.td
@@ -231,6 +231,22 @@ def PPCbuild_fp128: SDNode<"PPCISD::BUIL @@ -231,6 +231,22 @@ def PPCbuild_fp128: SDNode<"PPCISD::BUIL
SDTCisSameAs<1,2>]>, SDTCisSameAs<1,2>]>,
[]>; []>;
@ -142,10 +142,10 @@ Index: llvm-toolchain-snapshot_8~svn349138/lib/Target/PowerPC/PPCInstrInfo.td
// These are target-independent nodes, but have target-specific formats. // These are target-independent nodes, but have target-specific formats.
def callseq_start : SDNode<"ISD::CALLSEQ_START", SDT_PPCCallSeqStart, def callseq_start : SDNode<"ISD::CALLSEQ_START", SDT_PPCCallSeqStart,
[SDNPHasChain, SDNPOutGlue]>; [SDNPHasChain, SDNPOutGlue]>;
Index: llvm-toolchain-snapshot_8~svn349138/lib/Target/PowerPC/PPCInstrSPE.td Index: llvm-toolchain-snapshot_8~svn350421/lib/Target/PowerPC/PPCInstrSPE.td
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_8~svn349138.orig/lib/Target/PowerPC/PPCInstrSPE.td --- llvm-toolchain-snapshot_8~svn350421.orig/lib/Target/PowerPC/PPCInstrSPE.td
+++ llvm-toolchain-snapshot_8~svn349138/lib/Target/PowerPC/PPCInstrSPE.td +++ llvm-toolchain-snapshot_8~svn350421/lib/Target/PowerPC/PPCInstrSPE.td
@@ -512,7 +512,7 @@ def EVLWWSPLATX : EVXForm_1<792, (out @@ -512,7 +512,7 @@ def EVLWWSPLATX : EVXForm_1<792, (out
def EVMERGEHI : EVXForm_1<556, (outs sperc:$RT), (ins sperc:$RA, sperc:$RB), def EVMERGEHI : EVXForm_1<556, (outs sperc:$RT), (ins sperc:$RA, sperc:$RB),
@ -171,10 +171,10 @@ Index: llvm-toolchain-snapshot_8~svn349138/lib/Target/PowerPC/PPCInstrSPE.td
+ (i32 (EXTRACT_SUBREG $rA, sub_32))>; + (i32 (EXTRACT_SUBREG $rA, sub_32))>;
+ +
} }
Index: llvm-toolchain-snapshot_8~svn349138/test/CodeGen/PowerPC/spe.ll Index: llvm-toolchain-snapshot_8~svn350421/test/CodeGen/PowerPC/spe.ll
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_8~svn349138.orig/test/CodeGen/PowerPC/spe.ll --- llvm-toolchain-snapshot_8~svn350421.orig/test/CodeGen/PowerPC/spe.ll
+++ llvm-toolchain-snapshot_8~svn349138/test/CodeGen/PowerPC/spe.ll +++ llvm-toolchain-snapshot_8~svn350421/test/CodeGen/PowerPC/spe.ll
@@ -472,10 +472,8 @@ entry: @@ -472,10 +472,8 @@ entry:
; CHECK-LABEL: test_dselect ; CHECK-LABEL: test_dselect
; CHECK: andi. ; CHECK: andi.

View File

@ -2,13 +2,13 @@
lldb/source/API/CMakeLists.txt | 14 +++++++------- lldb/source/API/CMakeLists.txt | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-) 1 file changed, 7 insertions(+), 7 deletions(-)
Index: llvm-toolchain-snapshot_8~svn349138/lldb/source/API/CMakeLists.txt Index: llvm-toolchain-snapshot_8~svn350421/lldb/source/API/CMakeLists.txt
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_8~svn349138.orig/lldb/source/API/CMakeLists.txt --- llvm-toolchain-snapshot_8~svn350421.orig/lldb/source/API/CMakeLists.txt
+++ llvm-toolchain-snapshot_8~svn349138/lldb/source/API/CMakeLists.txt +++ llvm-toolchain-snapshot_8~svn350421/lldb/source/API/CMakeLists.txt
@@ -4,7 +4,12 @@ endif() @@ -9,7 +9,12 @@ if(NOT LLDB_DISABLE_PYTHON)
set(lldb_python_wrapper ${lldb_scripts_dir}/LLDBWrapPython.cpp)
get_property(LLDB_ALL_PLUGINS GLOBAL PROPERTY LLDB_PLUGINS) endif()
-add_lldb_library(liblldb SHARED -add_lldb_library(liblldb SHARED
+set(output_name lldb) +set(output_name lldb)
@ -20,7 +20,7 @@ Index: llvm-toolchain-snapshot_8~svn349138/lldb/source/API/CMakeLists.txt
SBAddress.cpp SBAddress.cpp
SBAttachInfo.cpp SBAttachInfo.cpp
SBBlock.cpp SBBlock.cpp
@@ -113,7 +118,7 @@ endif () @@ -120,7 +125,7 @@ endif()
set_target_properties(liblldb set_target_properties(liblldb
PROPERTIES PROPERTIES
@ -29,7 +29,7 @@ Index: llvm-toolchain-snapshot_8~svn349138/lldb/source/API/CMakeLists.txt
) )
if (NOT CMAKE_SYSTEM_NAME MATCHES "Windows") if (NOT CMAKE_SYSTEM_NAME MATCHES "Windows")
@@ -137,11 +142,6 @@ if ( CMAKE_SYSTEM_NAME MATCHES "Windows" @@ -144,11 +149,6 @@ if ( CMAKE_SYSTEM_NAME MATCHES "Windows"
if (MSVC AND NOT LLDB_DISABLE_PYTHON) if (MSVC AND NOT LLDB_DISABLE_PYTHON)
target_link_libraries(liblldb PRIVATE ${PYTHON_LIBRARY}) target_link_libraries(liblldb PRIVATE ${PYTHON_LIBRARY})
endif() endif()
@ -40,4 +40,4 @@ Index: llvm-toolchain-snapshot_8~svn349138/lldb/source/API/CMakeLists.txt
- ) - )
endif() endif()
if (LLDB_BUILD_FRAMEWORK) if(LLDB_BUILD_FRAMEWORK)