Revert "AMDGPU: Fix treating unknown mem operands as uniform (#168980)"

This reverts commit d23e176.

Author: arsenm

llvm/lib/Target/AMDGPU/AMDGPUISelDAGToDAG.cpp

@@ -4451,14 +4451,16 @@ bool AMDGPUDAGToDAGISel::isUniformLoad(const SDNode *N) const {
   const auto *Ld = cast<LoadSDNode>(N);
   const MachineMemOperand *MMO = Ld->getMemOperand();
 
-  // FIXME: We ought to able able to take the direct isDivergent result. We
-  // cannot rely on the MMO for a uniformity check, and should stop using
-  // it. This is a hack for 2 ways that the IR divergence analysis is superior
-  // to the DAG divergence: Recognizing shift-of-workitem-id as always
-  // uniform, and isSingleLaneExecution. These should be handled in the DAG
-  // version, and then this can be dropped.
-  if (Ld->isDivergent() && !AMDGPU::isUniformMMO(MMO))
-    return false;
+  if (Ld->isDivergent()) {
+    // FIXME: We ought to able able to take the direct isDivergent result. We
+    // cannot rely on the MMO for a uniformity check, and should stop using
+    // it. This is a hack for 2 ways that the IR divergence analysis is superior
+    // to the DAG divergence: Recognizing shift-of-workitem-id as always
+    // uniform, and isSingleLaneExecution. These should be handled in the DAG
+    // version, and then this can be dropped.
+    if (!MMO->getValue() || !AMDGPU::isUniformMMO(MMO))
+      return false;
+  }
 
   return MMO->getSize().hasValue() &&
          Ld->getAlign() >=

llvm/lib/Target/AMDGPU/AMDGPUInstrInfo.cpp

@@ -35,13 +35,15 @@ bool AMDGPU::isUniformMMO(const MachineMemOperand *MMO) {
              PSV->isJumpTable();
     }
 
-    // Unknown value.
-    return false;
+    // FIXME: null value is should be treated as unknown, not as uniform.
+    return true;
   }
 
   // UndefValue means this is a load of a kernel input.  These are uniform.
   // Sometimes LDS instructions have constant pointers.
-  if (isa<UndefValue, Constant, GlobalValue>(Ptr))
+  // If Ptr is null, then that means this mem operand contains a
+  // PseudoSourceValue like GOT.
+  if (!Ptr || isa<UndefValue, Constant, GlobalValue>(Ptr))
     return true;
 
   if (MMO->getAddrSpace() == AMDGPUAS::CONSTANT_ADDRESS_32BIT)

llvm/lib/Target/AMDGPU/AMDGPULegalizerInfo.cpp

@@ -2362,7 +2362,7 @@ Register AMDGPULegalizerInfo::getSegmentAperture(
   if (!loadInputValue(QueuePtr, B, AMDGPUFunctionArgInfo::QUEUE_PTR))
     return Register();
 
-  // TODO: Use custom PseudoSourceValue
+  // TODO: can we be smarter about machine pointer info?
   MachinePointerInfo PtrInfo(AMDGPUAS::CONSTANT_ADDRESS);
 
   // Offset into amd_queue_t for group_segment_aperture_base_hi /