Skip to content

release/21.x: [X86] Fix assertion in AVX512 setcc combine due to invalid APInt mask width (#155775) #158206

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 22, 2025
Merged

release/21.x: [X86] Fix assertion in AVX512 setcc combine due to invalid APInt mask width (#155775) #158206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion llvm/lib/Target/X86/X86ISelLowering.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56212,7 +56212,13 @@ static SDValue combineAVX512SetCCToKMOV(EVT VT, SDValue Op0, ISD::CondCode CC,

SDValue Masked = BroadcastOp;
if (N != 0) {
APInt Mask = APInt::getLowBitsSet(BroadcastOpVT.getSizeInBits(), Len);
unsigned BroadcastOpBitWidth = BroadcastOpVT.getSizeInBits();
unsigned NumDefinedElts = UndefElts.countTrailingZeros();

if (NumDefinedElts > BroadcastOpBitWidth)
return SDValue();

APInt Mask = APInt::getLowBitsSet(BroadcastOpBitWidth, NumDefinedElts);
SDValue ShiftedValue = DAG.getNode(ISD::SRL, DL, BroadcastOpVT, BroadcastOp,
DAG.getConstant(N, DL, BroadcastOpVT));
Masked = DAG.getNode(ISD::AND, DL, BroadcastOpVT, ShiftedValue,
Expand Down
51 changes: 51 additions & 0 deletions llvm/test/CodeGen/X86/kmov.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,57 @@ define <8 x i1> @invert_i8_mask_extract_8(i8 %mask) {
ret <8 x i1> %cmp.45
}

define <8 x i1> @i8_mask_extract_7(i8 %mask) {
; X64-AVX512-LABEL: i8_mask_extract_7:
; X64-AVX512: # %bb.0:
; X64-AVX512-NEXT: shrb %dil
; X64-AVX512-NEXT: movzbl %dil, %eax
; X64-AVX512-NEXT: kmovd %eax, %k0
; X64-AVX512-NEXT: vpmovm2w %k0, %xmm0
; X64-AVX512-NEXT: retq
;
; X64-KNL-LABEL: i8_mask_extract_7:
; X64-KNL: # %bb.0:
; X64-KNL-NEXT: vmovd %edi, %xmm0
; X64-KNL-NEXT: vpbroadcastb %xmm0, %xmm0
; X64-KNL-NEXT: vpbroadcastq {{.*#+}} xmm1 = [2,4,8,16,32,64,128,0,2,4,8,16,32,64,128,0]
; X64-KNL-NEXT: vpand %xmm1, %xmm0, %xmm0
; X64-KNL-NEXT: vpcmpeqb %xmm1, %xmm0, %xmm0
; X64-KNL-NEXT: vpmovzxbw {{.*#+}} xmm0 = xmm0[0],zero,xmm0[1],zero,xmm0[2],zero,xmm0[3],zero,xmm0[4],zero,xmm0[5],zero,xmm0[6],zero,xmm0[7],zero
; X64-KNL-NEXT: retq
%.splatinsert = insertelement <8 x i8> poison, i8 %mask, i64 0
%.splat = shufflevector <8 x i8> %.splatinsert, <8 x i8> poison, <8 x i32> zeroinitializer
%1 = and <8 x i8> %.splat, <i8 2, i8 4, i8 8, i8 16, i8 32, i8 64, i8 128, i8 poison>
%cmp.45 = icmp ne <8 x i8> %1, zeroinitializer
ret <8 x i1> %cmp.45
}

define <8 x i1> @invert_i8_mask_extract_7(i8 %mask) {
; X64-AVX512-LABEL: invert_i8_mask_extract_7:
; X64-AVX512: # %bb.0:
; X64-AVX512-NEXT: shrb %dil
; X64-AVX512-NEXT: movzbl %dil, %eax
; X64-AVX512-NEXT: kmovd %eax, %k0
; X64-AVX512-NEXT: knotb %k0, %k0
; X64-AVX512-NEXT: vpmovm2w %k0, %xmm0
; X64-AVX512-NEXT: retq
;
; X64-KNL-LABEL: invert_i8_mask_extract_7:
; X64-KNL: # %bb.0:
; X64-KNL-NEXT: vmovd %edi, %xmm0
; X64-KNL-NEXT: vpbroadcastb %xmm0, %xmm0
; X64-KNL-NEXT: vpand {{\.?LCPI[0-9]+_[0-9]+}}(%rip), %xmm0, %xmm0
; X64-KNL-NEXT: vpxor %xmm1, %xmm1, %xmm1
; X64-KNL-NEXT: vpcmpeqb %xmm1, %xmm0, %xmm0
; X64-KNL-NEXT: vpmovzxbw {{.*#+}} xmm0 = xmm0[0],zero,xmm0[1],zero,xmm0[2],zero,xmm0[3],zero,xmm0[4],zero,xmm0[5],zero,xmm0[6],zero,xmm0[7],zero
; X64-KNL-NEXT: retq
%.splatinsert = insertelement <8 x i8> poison, i8 %mask, i64 0
%.splat = shufflevector <8 x i8> %.splatinsert, <8 x i8> poison, <8 x i32> zeroinitializer
%1 = and <8 x i8> %.splat, <i8 2, i8 4, i8 8, i8 16, i8 32, i8 64, i8 128, i8 poison>
%cmp.45 = icmp eq <8 x i8> %1, zeroinitializer
ret <8 x i1> %cmp.45
}

define <4 x i1> @i16_mask_extract_4(i16 %mask) {
; X64-AVX512-LABEL: i16_mask_extract_4:
; X64-AVX512: # %bb.0:
Expand Down
Loading