fix rebase issues

Pierre-vh · Pierre-vh · commit 339de5d5a2e6 · 2025-04-30T11:31:20.000+02:00
diff --git a/llvm/lib/Target/AMDGPU/AMDGPUInstCombineIntrinsic.cpp b/llvm/lib/Target/AMDGPU/AMDGPUInstCombineIntrinsic.cpp
@@ -1265,8 +1265,10 @@ GCNTTIImpl::instCombineIntrinsic(InstCombiner &IC, IntrinsicInst &II) const {
       }
     }
 
-    if (Instruction *Res = hoistLaneIntrinsicThroughOperand(IC, II))
-      return Res;
+    if (IID != Intrinsic::amdgcn_ds_bpermute) {
+      if (Instruction *Res = hoistLaneIntrinsicThroughOperand(IC, II))
+        return Res;
+    }
 
     return std::nullopt;
   }

Original file line number	Diff line number	Diff line change
`@@ -1265,8 +1265,10 @@ GCNTTIImpl::instCombineIntrinsic(InstCombiner &IC, IntrinsicInst &II) const {`
`1265`	`1265`	`}`
`1266`	`1266`	`}`
`1267`	`1267`
`1268`		`- if (Instruction *Res = hoistLaneIntrinsicThroughOperand(IC, II))`
`1269`		`- return Res;`
	`1268`	`+ if (IID != Intrinsic::amdgcn_ds_bpermute) {`
	`1269`	`+ if (Instruction *Res = hoistLaneIntrinsicThroughOperand(IC, II))`
	`1270`	`+ return Res;`
	`1271`	`+ }`
`1270`	`1272`
`1271`	`1273`	`return std::nullopt;`
`1272`	`1274`	`}`