[llvm] [WIP][AMDGPU] Enable "amdgpu-uniform-intrinsic-combine" pass in pipeline. (PR #128687)

[Matt Arsenault via llvm-commits]

================
@@ -62,14 +62,22 @@ isDivergentUseWithNew(const Use &U, const UniformityInfo &UI,
 static bool optimizeUniformIntrinsic(IntrinsicInst &II,
                                      const UniformityInfo &UI,
                                      ValueMap<const Value *, bool> &Tracker) {
-  llvm::Intrinsic::ID IID = II.getIntrinsicID();
 
   switch (IID) {
   case Intrinsic::amdgcn_permlane64:
   case Intrinsic::amdgcn_readfirstlane:
+<<<<<<< HEAD
----------------
arsenm wrote:

Conflict markers? Merge is broken 

https://github.com/llvm/llvm-project/pull/128687