Skip to content

Commit 907c94b

Browse files
medhatiwarimedhatiwari
authored
[X86][Clang] Add constexpr support for AVX512 kshift intrinsics (llvm#170480)
Add AVX512 kshiftli/kshiftri mask intrinsics to be used in constexpr. Enables constexpr evaluation for: - `_kshiftli_mask8/16/32/64` - `_kshiftri_mask8/16/32/64` Fixes llvm#162056
1 parent 7c33b82 commit 907c94b

File tree

6 files changed

+86
-6
lines changed

6 files changed

+86
-6
lines changed

‎clang/include/clang/Basic/BuiltinsX86.td‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3148,28 +3148,28 @@ let Features = "avx512bw", Attributes = [NoThrow, Const, Constexpr] in {
31483148
def kxordi : X86Builtin<"unsigned long long int(unsigned long long int, unsigned long long int)">;
31493149
}
31503150

3151-
let Features = "avx512dq", Attributes = [NoThrow, Const] in {
3151+
let Features = "avx512dq", Attributes = [NoThrow, Const, Constexpr] in {
31523152
def kshiftliqi : X86Builtin<"unsigned char(unsigned char, _Constant unsigned int)">;
31533153
}
31543154

3155-
let Features = "avx512f", Attributes = [NoThrow, Const] in {
3155+
let Features = "avx512f", Attributes = [NoThrow, Const, Constexpr] in {
31563156
def kshiftlihi : X86Builtin<"unsigned short(unsigned short, _Constant unsigned int)">;
31573157
}
31583158

3159-
let Features = "avx512bw", Attributes = [NoThrow, Const] in {
3159+
let Features = "avx512bw", Attributes = [NoThrow, Const, Constexpr] in {
31603160
def kshiftlisi : X86Builtin<"unsigned int(unsigned int, _Constant unsigned int)">;
31613161
def kshiftlidi : X86Builtin<"unsigned long long int(unsigned long long int, _Constant unsigned int)">;
31623162
}
31633163

3164-
let Features = "avx512dq", Attributes = [NoThrow, Const] in {
3164+
let Features = "avx512dq", Attributes = [NoThrow, Const, Constexpr] in {
31653165
def kshiftriqi : X86Builtin<"unsigned char(unsigned char, _Constant unsigned int)">;
31663166
}
31673167

3168-
let Features = "avx512f", Attributes = [NoThrow, Const] in {
3168+
let Features = "avx512f", Attributes = [NoThrow, Const, Constexpr] in {
31693169
def kshiftrihi : X86Builtin<"unsigned short(unsigned short, _Constant unsigned int)">;
31703170
}
31713171

3172-
let Features = "avx512bw", Attributes = [NoThrow, Const] in {
3172+
let Features = "avx512bw", Attributes = [NoThrow, Const, Constexpr] in {
31733173
def kshiftrisi : X86Builtin<"unsigned int(unsigned int, _Constant unsigned int)">;
31743174
def kshiftridi : X86Builtin<"unsigned long long int(unsigned long long int, _Constant unsigned int)">;
31753175
}

‎clang/lib/AST/ByteCode/InterpBuiltin.cpp‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4255,6 +4255,30 @@ bool InterpretBuiltin(InterpState &S, CodePtr OpPC, const CallExpr *Call,
42554255
return APInt(sizeof(unsigned char) * 8, (A | B) == 0);
42564256
});
42574257

4258+
case clang::X86::BI__builtin_ia32_kshiftliqi:
4259+
case clang::X86::BI__builtin_ia32_kshiftlihi:
4260+
case clang::X86::BI__builtin_ia32_kshiftlisi:
4261+
case clang::X86::BI__builtin_ia32_kshiftlidi:
4262+
return interp__builtin_elementwise_int_binop(
4263+
S, OpPC, Call, [](const APSInt &LHS, const APSInt &RHS) {
4264+
unsigned Amt = RHS.getZExtValue() & 0xFF;
4265+
if (Amt >= LHS.getBitWidth())
4266+
return APInt::getZero(LHS.getBitWidth());
4267+
return LHS.shl(Amt);
4268+
});
4269+
4270+
case clang::X86::BI__builtin_ia32_kshiftriqi:
4271+
case clang::X86::BI__builtin_ia32_kshiftrihi:
4272+
case clang::X86::BI__builtin_ia32_kshiftrisi:
4273+
case clang::X86::BI__builtin_ia32_kshiftridi:
4274+
return interp__builtin_elementwise_int_binop(
4275+
S, OpPC, Call, [](const APSInt &LHS, const APSInt &RHS) {
4276+
unsigned Amt = RHS.getZExtValue() & 0xFF;
4277+
if (Amt >= LHS.getBitWidth())
4278+
return APInt::getZero(LHS.getBitWidth());
4279+
return LHS.lshr(Amt);
4280+
});
4281+
42584282
case clang::X86::BI__builtin_ia32_lzcnt_u16:
42594283
case clang::X86::BI__builtin_ia32_lzcnt_u32:
42604284
case clang::X86::BI__builtin_ia32_lzcnt_u64:

‎clang/lib/AST/ExprConstant.cpp‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17054,6 +17054,30 @@ bool IntExprEvaluator::VisitBuiltinCallExpr(const CallExpr *E,
1705417054
return Success(Val, E);
1705517055
}
1705617056

17057+
case X86::BI__builtin_ia32_kshiftliqi:
17058+
case X86::BI__builtin_ia32_kshiftlihi:
17059+
case X86::BI__builtin_ia32_kshiftlisi:
17060+
case X86::BI__builtin_ia32_kshiftlidi: {
17061+
return HandleMaskBinOp([](const APSInt &LHS, const APSInt &RHS) {
17062+
unsigned Amt = RHS.getZExtValue() & 0xFF;
17063+
if (Amt >= LHS.getBitWidth())
17064+
return APSInt(APInt::getZero(LHS.getBitWidth()), LHS.isUnsigned());
17065+
return APSInt(LHS.shl(Amt), LHS.isUnsigned());
17066+
});
17067+
}
17068+
17069+
case X86::BI__builtin_ia32_kshiftriqi:
17070+
case X86::BI__builtin_ia32_kshiftrihi:
17071+
case X86::BI__builtin_ia32_kshiftrisi:
17072+
case X86::BI__builtin_ia32_kshiftridi: {
17073+
return HandleMaskBinOp([](const APSInt &LHS, const APSInt &RHS) {
17074+
unsigned Amt = RHS.getZExtValue() & 0xFF;
17075+
if (Amt >= LHS.getBitWidth())
17076+
return APSInt(APInt::getZero(LHS.getBitWidth()), LHS.isUnsigned());
17077+
return APSInt(LHS.lshr(Amt), LHS.isUnsigned());
17078+
});
17079+
}
17080+
1705717081
case clang::X86::BI__builtin_ia32_vec_ext_v4hi:
1705817082
case clang::X86::BI__builtin_ia32_vec_ext_v16qi:
1705917083
case clang::X86::BI__builtin_ia32_vec_ext_v8hi:

‎clang/test/CodeGen/X86/avx512bw-builtins.c‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -534,27 +534,43 @@ __mmask32 test_kshiftli_mask32(__m512i A, __m512i B, __m512i C, __m512i D) {
534534
// CHECK: [[RES:%.*]] = shufflevector <32 x i1> zeroinitializer, <32 x i1> [[VAL]], <32 x i32> <i32 1, i32 2, i32 3, i32 4, i32 5, i32 6, i32 7, i32 8, i32 9, i32 10, i32 11, i32 12, i32 13, i32 14, i32 15, i32 16, i32 17, i32 18, i32 19, i32 20, i32 21, i32 22, i32 23, i32 24, i32 25, i32 26, i32 27, i32 28, i32 29, i32 30, i32 31, i32 32>
535535
return _mm512_mask_cmpneq_epu16_mask(_kshiftli_mask32(_mm512_cmpneq_epu16_mask(A, B), 31), C, D);
536536
}
537+
TEST_CONSTEXPR(_kshiftli_mask32(0x00000001, 1) == 0x00000002);
538+
TEST_CONSTEXPR(_kshiftli_mask32(0x00000001, 31) == 0x80000000);
539+
TEST_CONSTEXPR(_kshiftli_mask32(0x00000001, 32) == 0x00000000);
540+
TEST_CONSTEXPR(_kshiftli_mask32(0x0000FFFF, 8) == 0x00FFFF00);
537541

538542
__mmask32 test_kshiftri_mask32(__m512i A, __m512i B, __m512i C, __m512i D) {
539543
// CHECK-LABEL: test_kshiftri_mask32
540544
// CHECK: [[VAL:%.*]] = bitcast i32 %{{.*}} to <32 x i1>
541545
// CHECK: [[RES:%.*]] = shufflevector <32 x i1> [[VAL]], <32 x i1> zeroinitializer, <32 x i32> <i32 31, i32 32, i32 33, i32 34, i32 35, i32 36, i32 37, i32 38, i32 39, i32 40, i32 41, i32 42, i32 43, i32 44, i32 45, i32 46, i32 47, i32 48, i32 49, i32 50, i32 51, i32 52, i32 53, i32 54, i32 55, i32 56, i32 57, i32 58, i32 59, i32 60, i32 61, i32 62>
542546
return _mm512_mask_cmpneq_epu16_mask(_kshiftri_mask32(_mm512_cmpneq_epu16_mask(A, B), 31), C, D);
543547
}
548+
TEST_CONSTEXPR(_kshiftri_mask32(0x80000000, 1) == 0x40000000);
549+
TEST_CONSTEXPR(_kshiftri_mask32(0x80000000, 31) == 0x00000001);
550+
TEST_CONSTEXPR(_kshiftri_mask32(0x80000000, 32) == 0x00000000);
551+
TEST_CONSTEXPR(_kshiftri_mask32(0xFFFF0000, 8) == 0x00FFFF00);
544552

545553
__mmask64 test_kshiftli_mask64(__m512i A, __m512i B, __m512i C, __m512i D) {
546554
// CHECK-LABEL: test_kshiftli_mask64
547555
// CHECK: [[VAL:%.*]] = bitcast i64 %{{.*}} to <64 x i1>
548556
// CHECK: [[RES:%.*]] = shufflevector <64 x i1> zeroinitializer, <64 x i1> [[VAL]], <64 x i32> <i32 32, i32 33, i32 34, i32 35, i32 36, i32 37, i32 38, i32 39, i32 40, i32 41, i32 42, i32 43, i32 44, i32 45, i32 46, i32 47, i32 48, i32 49, i32 50, i32 51, i32 52, i32 53, i32 54, i32 55, i32 56, i32 57, i32 58, i32 59, i32 60, i32 61, i32 62, i32 63, i32 64, i32 65, i32 66, i32 67, i32 68, i32 69, i32 70, i32 71, i32 72, i32 73, i32 74, i32 75, i32 76, i32 77, i32 78, i32 79, i32 80, i32 81, i32 82, i32 83, i32 84, i32 85, i32 86, i32 87, i32 88, i32 89, i32 90, i32 91, i32 92, i32 93, i32 94, i32 95>
549557
return _mm512_mask_cmpneq_epu8_mask(_kshiftli_mask64(_mm512_cmpneq_epu8_mask(A, B), 32), C, D);
550558
}
559+
TEST_CONSTEXPR(_kshiftli_mask64(0x0000000000000001ULL, 1) == 0x0000000000000002ULL);
560+
TEST_CONSTEXPR(_kshiftli_mask64(0x0000000000000001ULL, 63) == 0x8000000000000000ULL);
561+
TEST_CONSTEXPR(_kshiftli_mask64(0x0000000000000001ULL, 64) == 0x0000000000000000ULL);
562+
TEST_CONSTEXPR(_kshiftli_mask64(0x00000000FFFFFFFFULL, 16) == 0x0000FFFFFFFF0000ULL);
551563

552564
__mmask64 test_kshiftri_mask64(__m512i A, __m512i B, __m512i C, __m512i D) {
553565
// CHECK-LABEL: test_kshiftri_mask64
554566
// CHECK: [[VAL:%.*]] = bitcast i64 %{{.*}} to <64 x i1>
555567
// CHECK: [[RES:%.*]] = shufflevector <64 x i1> [[VAL]], <64 x i1> zeroinitializer, <64 x i32> <i32 32, i32 33, i32 34, i32 35, i32 36, i32 37, i32 38, i32 39, i32 40, i32 41, i32 42, i32 43, i32 44, i32 45, i32 46, i32 47, i32 48, i32 49, i32 50, i32 51, i32 52, i32 53, i32 54, i32 55, i32 56, i32 57, i32 58, i32 59, i32 60, i32 61, i32 62, i32 63, i32 64, i32 65, i32 66, i32 67, i32 68, i32 69, i32 70, i32 71, i32 72, i32 73, i32 74, i32 75, i32 76, i32 77, i32 78, i32 79, i32 80, i32 81, i32 82, i32 83, i32 84, i32 85, i32 86, i32 87, i32 88, i32 89, i32 90, i32 91, i32 92, i32 93, i32 94, i32 95>
556568
return _mm512_mask_cmpneq_epu8_mask(_kshiftri_mask64(_mm512_cmpneq_epu8_mask(A, B), 32), C, D);
557569
}
570+
TEST_CONSTEXPR(_kshiftri_mask64(0x8000000000000000ULL, 1) == 0x4000000000000000ULL);
571+
TEST_CONSTEXPR(_kshiftri_mask64(0x8000000000000000ULL, 63) == 0x0000000000000001ULL);
572+
TEST_CONSTEXPR(_kshiftri_mask64(0x8000000000000000ULL, 64) == 0x0000000000000000ULL);
573+
TEST_CONSTEXPR(_kshiftri_mask64(0xFFFFFFFF00000000ULL, 16) == 0x0000FFFFFFFF0000ULL);
558574

559575
unsigned int test_cvtmask32_u32(__m512i A, __m512i B) {
560576
// CHECK-LABEL: test_cvtmask32_u32

‎clang/test/CodeGen/X86/avx512dq-builtins.c‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -364,13 +364,21 @@ __mmask8 test_kshiftli_mask8(__m512i A, __m512i B, __m512i C, __m512i D) {
364364
// CHECK: [[RES:%.*]] = shufflevector <8 x i1> zeroinitializer, <8 x i1> [[VAL]], <8 x i32> <i32 6, i32 7, i32 8, i32 9, i32 10, i32 11, i32 12, i32 13>
365365
return _mm512_mask_cmpneq_epu64_mask(_kshiftli_mask8(_mm512_cmpneq_epu64_mask(A, B), 2), C, D);
366366
}
367+
TEST_CONSTEXPR(_kshiftli_mask8(0x01, 1) == 0x02);
368+
TEST_CONSTEXPR(_kshiftli_mask8(0x01, 7) == 0x80);
369+
TEST_CONSTEXPR(_kshiftli_mask8(0x01, 8) == 0x00);
370+
TEST_CONSTEXPR(_kshiftli_mask8(0x0F, 2) == 0x3C);
367371

368372
__mmask8 test_kshiftri_mask8(__m512i A, __m512i B, __m512i C, __m512i D) {
369373
// CHECK-LABEL: test_kshiftri_mask8
370374
// CHECK: [[VAL:%.*]] = bitcast i8 %{{.*}} to <8 x i1>
371375
// CHECK: [[RES:%.*]] = shufflevector <8 x i1> [[VAL]], <8 x i1> zeroinitializer, <8 x i32> <i32 2, i32 3, i32 4, i32 5, i32 6, i32 7, i32 8, i32 9>
372376
return _mm512_mask_cmpneq_epu64_mask(_kshiftri_mask8(_mm512_cmpneq_epu64_mask(A, B), 2), C, D);
373377
}
378+
TEST_CONSTEXPR(_kshiftri_mask8(0x80, 1) == 0x40);
379+
TEST_CONSTEXPR(_kshiftri_mask8(0x80, 7) == 0x01);
380+
TEST_CONSTEXPR(_kshiftri_mask8(0x80, 8) == 0x00);
381+
TEST_CONSTEXPR(_kshiftri_mask8(0xF0, 2) == 0x3C);
374382

375383
unsigned int test_cvtmask8_u32(__m512i A, __m512i B) {
376384
// CHECK-LABEL: test_cvtmask8_u32

‎clang/test/CodeGen/X86/avx512f-builtins.c‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9572,6 +9572,10 @@ __mmask16 test_kshiftli_mask16(__m512i A, __m512i B, __m512i C, __m512i D) {
95729572
// CHECK: bitcast <16 x i1> {{.*}} to i16
95739573
return _mm512_mask_cmpneq_epu32_mask(_kshiftli_mask16(_mm512_cmpneq_epu32_mask(A, B), 1), C, D);
95749574
}
9575+
TEST_CONSTEXPR(_kshiftli_mask16(0x0001, 1) == 0x0002);
9576+
TEST_CONSTEXPR(_kshiftli_mask16(0x0001, 15) == 0x8000);
9577+
TEST_CONSTEXPR(_kshiftli_mask16(0x0001, 16) == 0x0000);
9578+
TEST_CONSTEXPR(_kshiftli_mask16(0x00FF, 4) == 0x0FF0);
95759579

95769580
__mmask16 test_kshiftri_mask16(__m512i A, __m512i B, __m512i C, __m512i D) {
95779581
// CHECK-LABEL: test_kshiftri_mask16
@@ -9580,6 +9584,10 @@ __mmask16 test_kshiftri_mask16(__m512i A, __m512i B, __m512i C, __m512i D) {
95809584
// CHECK: bitcast <16 x i1> {{.*}} to i16
95819585
return _mm512_mask_cmpneq_epu32_mask(_kshiftri_mask16(_mm512_cmpneq_epu32_mask(A, B), 1), C, D);
95829586
}
9587+
TEST_CONSTEXPR(_kshiftri_mask16(0x8000, 1) == 0x4000);
9588+
TEST_CONSTEXPR(_kshiftri_mask16(0x8000, 15) == 0x0001);
9589+
TEST_CONSTEXPR(_kshiftri_mask16(0x8000, 16) == 0x0000);
9590+
TEST_CONSTEXPR(_kshiftri_mask16(0xFF00, 4) == 0x0FF0);
95839591

95849592
unsigned int test_cvtmask16_u32(__m512i A, __m512i B) {
95859593
// CHECK-LABEL: test_cvtmask16_u32

0 commit comments

Comments
 (0)