caio/clang-p2996
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "[GlobalISel] prevent G_UNMERGE_VALUES for vectors with different elements" (#144650)

Browse Source 
Reverts llvm/llvm-project#133335
This commit is contained in:
Robert Imschweiler
2025-06-18 09:49:32 +02:00
committed by GitHub
parent e07b1b26c3
commit a38932ac3c
2 changed files with 1 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
llvm/include/llvm/CodeGen/GlobalISel/LegalizationArtifactCombiner.h
View File

@@ -997,7 +997,6 @@ public:
// Recognize UnmergeSrc that can be unmerged to DstTy directly.
// Types have to be either both vector or both non-vector types.
// In case of vector types, the scalar elements need to match.
// Merge-like opcodes are combined one at the time. First one creates new
// unmerge, following should use the same unmerge (builder performs CSE).
//
@@ -1006,9 +1005,7 @@ public:
// %AnotherDst:_(DstTy) = G_merge_like_opcode %2:_(EltTy), %3
//
// %Dst:_(DstTy), %AnotherDst = G_UNMERGE_VALUES %UnmergeSrc
if (((!DstTy.isVector() && !UnmergeSrcTy.isVector()) ||
(DstTy.isVector() && UnmergeSrcTy.isVector() &&
DstTy.getScalarType() == UnmergeSrcTy.getScalarType())) &&
if ((DstTy.isVector() == UnmergeSrcTy.isVector()) &&
(Elt0UnmergeIdx % NumMIElts == 0) &&
getCoverTy(UnmergeSrcTy, DstTy) == UnmergeSrcTy) {
if (!isSequenceFromUnmerge(MI, 0, Unmerge, Elt0UnmergeIdx, NumMIElts,

55
llvm/test/CodeGen/AMDGPU/GlobalISel/insertelement.ll
View File

@@ -6506,58 +6506,3 @@ entry:
%insert = insertelement <5 x double> %vec, double %val, i32 %idx
ret <5 x double> %insert
}
; Found by fuzzer, reduced with llvm-reduce.
define amdgpu_kernel void @insert_very_small_from_very_large(<32 x i16> %L3, ptr %ptr) {
; GPRIDX-LABEL: insert_very_small_from_very_large:
; GPRIDX: ; %bb.0: ; %bb
; GPRIDX-NEXT: s_load_dwordx16 s[12:27], s[8:9], 0x0
; GPRIDX-NEXT: s_load_dwordx2 s[0:1], s[8:9], 0x40
; GPRIDX-NEXT: s_waitcnt lgkmcnt(0)
; GPRIDX-NEXT: s_lshr_b32 s2, s12, 1
; GPRIDX-NEXT: s_and_b32 s2, s2, 1
; GPRIDX-NEXT: s_lshl_b32 s2, s2, 1
; GPRIDX-NEXT: v_mov_b32_e32 v0, s0
; GPRIDX-NEXT: v_mov_b32_e32 v2, s2
; GPRIDX-NEXT: v_mov_b32_e32 v1, s1
; GPRIDX-NEXT: flat_store_byte v[0:1], v2
; GPRIDX-NEXT: s_endpgm
;
; GFX10-LABEL: insert_very_small_from_very_large:
; GFX10: ; %bb.0: ; %bb
; GFX10-NEXT: s_clause 0x1
; GFX10-NEXT: s_load_dwordx16 s[12:27], s[8:9], 0x0
; GFX10-NEXT: s_load_dwordx2 s[0:1], s[8:9], 0x40
; GFX10-NEXT: s_waitcnt lgkmcnt(0)
; GFX10-NEXT: s_lshr_b32 s2, s12, 1
; GFX10-NEXT: v_mov_b32_e32 v0, s0
; GFX10-NEXT: s_and_b32 s2, s2, 1
; GFX10-NEXT: v_mov_b32_e32 v1, s1
; GFX10-NEXT: s_lshl_b32 s2, s2, 1
; GFX10-NEXT: v_mov_b32_e32 v2, s2
; GFX10-NEXT: flat_store_byte v[0:1], v2
; GFX10-NEXT: s_endpgm
;
; GFX11-LABEL: insert_very_small_from_very_large:
; GFX11: ; %bb.0: ; %bb
; GFX11-NEXT: s_clause 0x1
; GFX11-NEXT: s_load_b512 s[8:23], s[4:5], 0x0
; GFX11-NEXT: s_load_b64 s[0:1], s[4:5], 0x40
; GFX11-NEXT: s_waitcnt lgkmcnt(0)
; GFX11-NEXT: s_lshr_b32 s2, s8, 1
; GFX11-NEXT: v_mov_b32_e32 v0, s0
; GFX11-NEXT: s_and_b32 s2, s2, 1
; GFX11-NEXT: v_mov_b32_e32 v1, s1
; GFX11-NEXT: s_lshl_b32 s2, s2, 1
; GFX11-NEXT: v_mov_b32_e32 v2, s2
; GFX11-NEXT: flat_store_b8 v[0:1], v2
; GFX11-NEXT: s_endpgm
bb:
%a = bitcast <32 x i16> %L3 to i512
%b = trunc i512 %a to i8
%c = trunc i8 %b to i2
%d = bitcast i2 %c to <2 x i1>
%insert = insertelement <2 x i1> %d, i1 false, i32 0
store <2 x i1> %insert, ptr %ptr, align 1
ret void
}