[𝘀𝗽𝗿] changes introduced through rebase

Created using spr 1.3.5

[skip ci]

Author: aemerson

llvm/include/llvm/CodeGen/GlobalISel/LegalizerHelper.h

@@ -22,6 +22,7 @@
 
 #include "llvm/CodeGen/GlobalISel/CallLowering.h"
 #include "llvm/CodeGen/GlobalISel/GISelKnownBits.h"
+#include "llvm/CodeGen/GlobalISel/MachineIRBuilder.h"
 #include "llvm/CodeGen/RuntimeLibcallUtil.h"
 #include "llvm/CodeGen/TargetOpcodes.h"
 
@@ -297,9 +298,9 @@ class LegalizerHelper {
   MachineInstrBuilder createStackTemporary(TypeSize Bytes, Align Alignment,
                                            MachinePointerInfo &PtrInfo);
 
-  /// Create a store of \p Val to a stack temporary and return a load of the
-  /// same value as type \p DestVT.
-  MachineInstrBuilder createStackStoreLoad(Register Val, LLT DstTy);
+  /// Create a store of \p Val to a stack temporary and return a load as the
+  /// same type as \p Res.
+  MachineInstrBuilder createStackStoreLoad(const DstOp &Res, const SrcOp &Val);
 
   /// Get a pointer to vector element \p Index located in memory for a vector of
   /// type \p VecTy starting at a base address of \p VecPtr. If \p Index is out

llvm/lib/CodeGen/GlobalISel/LegalizerHelper.cpp

@@ -3023,6 +3023,7 @@ LegalizerHelper::widenScalar(MachineInstr &MI, unsigned TypeIdx, LLT WideTy) {
       return UnableToLegalize;
 
     LLT Ty = MRI.getType(MI.getOperand(0).getReg());
+    assert(!Ty.isPointerOrPointerVector() && "Can't widen type");
     if (!Ty.isScalar()) {
       // We need to widen the vector element type.
       Observer.changingInstr(MI);
@@ -4664,18 +4665,18 @@ LegalizerHelper::createStackTemporary(TypeSize Bytes, Align Alignment,
   return MIRBuilder.buildFrameIndex(FramePtrTy, FrameIdx);
 }
 
-MachineInstrBuilder LegalizerHelper::createStackStoreLoad(Register Val,
-                                                          LLT DstTy) {
-  LLT SrcTy = MRI.getType(Val);
-  Align StackTypeAlign = getStackTemporaryAlignment(SrcTy);
+MachineInstrBuilder LegalizerHelper::createStackStoreLoad(const DstOp &Res,
+                                                          const SrcOp &Val) {
+  LLT SrcTy = Val.getLLTTy(MRI);
+  Align StackTypeAlign =
+      std::max(getStackTemporaryAlignment(SrcTy),
+               getStackTemporaryAlignment(Res.getLLTTy(MRI)));
   MachinePointerInfo PtrInfo;
   auto StackTemp =
       createStackTemporary(SrcTy.getSizeInBytes(), StackTypeAlign, PtrInfo);
 
   MIRBuilder.buildStore(Val, StackTemp, PtrInfo, StackTypeAlign);
-  return MIRBuilder.buildLoad(
-      DstTy, StackTemp, PtrInfo,
-      std::min(StackTypeAlign, getStackTemporaryAlignment(DstTy)));
+  return MIRBuilder.buildLoad(Res, StackTemp, PtrInfo, StackTypeAlign);
 }
 
 static Register clampVectorIndex(MachineIRBuilder &B, Register IdxReg,

llvm/lib/Target/AArch64/GISel/AArch64LegalizerInfo.cpp

@@ -1429,8 +1429,7 @@ bool AArch64LegalizerInfo::legalizeBitcast(MachineInstr &MI,
       SrcTy.getElementType() != LLT::scalar(1))
     return false;
 
-  auto Load = Helper.createStackStoreLoad(SrcReg, DstTy);
-  Helper.MIRBuilder.buildCopy(DstReg, Load.getReg(0));
+  Helper.createStackStoreLoad(DstReg, SrcReg);
   MI.eraseFromParent();
   return true;
 }

llvm/test/CodeGen/AArch64/GlobalISel/legalize-bitcast.mir

@@ -59,8 +59,7 @@ body:             |
     ; CHECK-NEXT: [[FRAME_INDEX:%[0-9]+]]:_(p0) = G_FRAME_INDEX %stack.0
     ; CHECK-NEXT: [[ANYEXT:%[0-9]+]]:_(<8 x s8>) = G_ANYEXT %vec(<8 x s1>)
     ; CHECK-NEXT: G_STORE [[ANYEXT]](<8 x s8>), [[FRAME_INDEX]](p0) :: (store (<8 x s1>) into %stack.0)
-    ; CHECK-NEXT: [[LOAD:%[0-9]+]]:_(s8) = G_LOAD [[FRAME_INDEX]](p0) :: (load (s8) from %stack.0)
-    ; CHECK-NEXT: %bc:_(s8) = COPY [[LOAD]](s8)
+    ; CHECK-NEXT: %bc:_(s8) = G_LOAD [[FRAME_INDEX]](p0) :: (load (s8) from %stack.0)
     ; CHECK-NEXT: %ext:_(s32) = G_ANYEXT %bc(s8)
     ; CHECK-NEXT: $w0 = COPY %ext(s32)
     ; CHECK-NEXT: RET_ReallyLR implicit $w0