commit bc101ffd77738a5ec40fc16689eafaf1fb6fa8d6
author Matt Arsenault <Matthew.Arsenault@amd.com> Tue Jan 21 11:12:36 2020 -0500
committer Matt Arsenault <arsenm2@gmail.com> Sat Feb 01 10:47:03 2020 -0500
tree edd016b8089fe7cfe8fa6573fd646fcf350cfda7
parent 2eb80a99a2c6f8e2f090a2bc8cd2760fe1e1f267

GlobalISel: Support widening unmerge results with pointer source

llvm/lib/CodeGen/GlobalISel/LegalizerHelper.cpp

diff --git a/llvm/lib/CodeGen/GlobalISel/LegalizerHelper.cpp b/llvm/lib/CodeGen/GlobalISel/LegalizerHelper.cpp
index d9e097f..ae66c18 100644
--- a/llvm/lib/CodeGen/GlobalISel/LegalizerHelper.cpp
+++ b/llvm/lib/CodeGen/GlobalISel/LegalizerHelper.cpp
@@ -85,11 +85,34 @@
 }
 
 static LLT getLCMType(LLT Ty0, LLT Ty1) {
-  assert(Ty0.isScalar() && Ty1.isScalar() && "not yet handled");
-  unsigned Mul = Ty0.getSizeInBits() * Ty1.getSizeInBits();
-  int GCDSize = greatestCommonDivisor(Ty0.getSizeInBits(),
-                                      Ty1.getSizeInBits());
-  return LLT::scalar(Mul / GCDSize);
+  if (!Ty0.isVector() && !Ty1.isVector()) {
+    unsigned Mul = Ty0.getSizeInBits() * Ty1.getSizeInBits();
+    int GCDSize = greatestCommonDivisor(Ty0.getSizeInBits(),
+                                        Ty1.getSizeInBits());
+    return LLT::scalar(Mul / GCDSize);
+  }
+
+  if (Ty0.isVector() && !Ty1.isVector()) {
+    assert(Ty0.getElementType() == Ty1 && "not yet handled");
+    return Ty0;
+  }
+
+  if (Ty1.isVector() && !Ty0.isVector()) {
+    assert(Ty1.getElementType() == Ty0 && "not yet handled");
+    return Ty1;
+  }
+
+  if (Ty0.isVector() && Ty1.isVector()) {
+    assert(Ty0.getElementType() == Ty1.getElementType() && "not yet handled");
+
+    int GCDElts = greatestCommonDivisor(Ty0.getNumElements(),
+                                        Ty1.getNumElements());
+
+    int Mul = Ty0.getNumElements() * Ty1.getNumElements();
+    return LLT::vector(Mul / GCDElts, Ty0.getElementType());
+  }
+
+  llvm_unreachable("not yet handled");
 }
 
 LegalizerHelper::LegalizerHelper(MachineFunction &MF,
@@ -1399,7 +1422,7 @@
   int NumDst = MI.getNumOperands() - 1;
   Register SrcReg = MI.getOperand(NumDst).getReg();
   LLT SrcTy = MRI.getType(SrcReg);
-  if (!SrcTy.isScalar())
+  if (SrcTy.isVector())
     return UnableToLegalize;
 
   Register Dst0Reg = MI.getOperand(0).getReg();
@@ -1407,7 +1430,18 @@
   if (!DstTy.isScalar())
     return UnableToLegalize;
 
-  if (WideTy == SrcTy) {
+  if (WideTy.getSizeInBits() == SrcTy.getSizeInBits()) {
+    if (SrcTy.isPointer()) {
+      const DataLayout &DL = MIRBuilder.getDataLayout();
+      if (DL.isNonIntegralAddressSpace(SrcTy.getAddressSpace())) {
+        LLVM_DEBUG(dbgs() << "Not casting non-integral address space integer\n");
+        return UnableToLegalize;
+      }
+
+      SrcTy = LLT::scalar(SrcTy.getSizeInBits());
+      SrcReg = MIRBuilder.buildPtrToInt(SrcTy, SrcReg).getReg(0);
+    }
+
     // Theres no unmerge type to target. Directly extract the bits from the
     // source type
     unsigned DstSize = DstTy.getSizeInBits();
@@ -1431,8 +1465,16 @@
   LLT LCMTy = getLCMType(SrcTy, WideTy);
 
   Register WideSrc = SrcReg;
-  if (LCMTy != SrcTy)
+  if (LCMTy.getSizeInBits() != SrcTy.getSizeInBits()) {
+    // TODO: If this is an integral address space, cast to integer and anyext.
+    if (SrcTy.isPointer()) {
+      LLVM_DEBUG(dbgs() << "Widening pointer source types not implemented\n");
+      return UnableToLegalize;
+    }
+
     WideSrc = MIRBuilder.buildAnyExt(LCMTy, WideSrc).getReg(0);
+  }
+
   auto Unmerge = MIRBuilder.buildUnmerge(WideTy, WideSrc);
 
   // Create a sequence of unmerges to the original results. since we may have