Skip to content

Commit 13c9d31

Browse files
committed
Squash
1 parent 4e3b7df commit 13c9d31

File tree

5 files changed

+91
-3
lines changed

5 files changed

+91
-3
lines changed

clang/include/clang/Basic/BuiltinsX86.td

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -334,8 +334,8 @@ let Features = "sse4.1", Attributes = [NoThrow, Const, RequiredVectorWidth<128>]
334334
def dpps : X86Builtin<"_Vector<4, float>(_Vector<4, float>, _Vector<4, float>, _Constant char)">;
335335
def dppd : X86Builtin<"_Vector<2, double>(_Vector<2, double>, "
336336
"_Vector<2,double>, _Constant char)">;
337-
def mpsadbw128 : X86Builtin<"_Vector<16, char>(_Vector<16, char>, _Vector<16, char>, _Constant char)">;
338-
def phminposuw128 : X86Builtin<"_Vector<8, short>(_Vector<8, short>)">;
337+
def mpsadbw128 : X86Builtin<"_Vector<16, char>(_Vector<16, char>, "
338+
"_Vector<16, char>, _Constant char)">;
339339
}
340340

341341
let Features = "sse4.1",
@@ -358,6 +358,7 @@ let Features = "sse4.1", Attributes = [NoThrow, Const, Constexpr, RequiredVector
358358

359359
def pmuldq128 : X86Builtin<"_Vector<2, long long int>(_Vector<4, int>, _Vector<4, int>)">;
360360
def packusdw128 : X86Builtin<"_Vector<8, short>(_Vector<4, int>, _Vector<4, int>)">;
361+
def phminposuw128 : X86Builtin<"_Vector<8, short>(_Vector<8, short>)">;
361362

362363
def vec_ext_v16qi : X86Builtin<"char(_Vector<16, char>, _Constant int)">;
363364
def vec_set_v16qi : X86Builtin<"_Vector<16, char>(_Vector<16, char>, char, _Constant int)">;

clang/lib/AST/ByteCode/InterpBuiltin.cpp

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2975,6 +2975,45 @@ static bool interp__builtin_x86_insert_subvector(InterpState &S, CodePtr OpPC,
29752975
return true;
29762976
}
29772977

2978+
static bool interp__builtin_ia32_phminposuw(InterpState &S, CodePtr OpPC,
2979+
const CallExpr *Call) {
2980+
assert(Call->getNumArgs() == 1);
2981+
2982+
const Pointer &Source = S.Stk.pop<Pointer>();
2983+
const Pointer &Dest = S.Stk.peek<Pointer>();
2984+
2985+
unsigned SourceLen = Source.getNumElems();
2986+
QualType ElemQT = getElemType(Source);
2987+
OptPrimType ElemT = S.getContext().classify(ElemQT);
2988+
unsigned LaneBitWidth = S.getASTContext().getTypeSize(ElemQT);
2989+
2990+
bool DestUnsigned = Call->getCallReturnType(S.getASTContext())
2991+
->castAs<VectorType>()
2992+
->getElementType()
2993+
->isUnsignedIntegerOrEnumerationType();
2994+
2995+
INT_TYPE_SWITCH_NO_BOOL(*ElemT, {
2996+
APSInt MinIndex(LaneBitWidth, DestUnsigned);
2997+
APSInt MinVal = Source.elem<T>(0).toAPSInt();
2998+
2999+
for (unsigned I = 1; I != SourceLen; ++I) {
3000+
APSInt Val = Source.elem<T>(I).toAPSInt();
3001+
if (MinVal.ugt(Val)) {
3002+
MinVal = Val;
3003+
MinIndex = I;
3004+
}
3005+
}
3006+
3007+
Dest.elem<T>(0) = static_cast<T>(MinVal);
3008+
Dest.elem<T>(1) = static_cast<T>(MinIndex);
3009+
for (unsigned I = 2; I != SourceLen; ++I) {
3010+
Dest.elem<T>(I) = static_cast<T>(APSInt(LaneBitWidth, DestUnsigned));
3011+
}
3012+
});
3013+
Dest.initializeAllElements();
3014+
return true;
3015+
}
3016+
29783017
static bool interp__builtin_ia32_pternlog(InterpState &S, CodePtr OpPC,
29793018
const CallExpr *Call, bool MaskZ) {
29803019
assert(Call->getNumArgs() == 5);
@@ -4013,6 +4052,9 @@ bool InterpretBuiltin(InterpState &S, CodePtr OpPC, const CallExpr *Call,
40134052
S, OpPC, Call,
40144053
[](const APSInt &LHS, const APSInt &RHS) { return LHS + RHS; });
40154054

4055+
case X86::BI__builtin_ia32_phminposuw128:
4056+
return interp__builtin_ia32_phminposuw(S, OpPC, Call);
4057+
40164058
case X86::BI__builtin_ia32_pternlogd128_mask:
40174059
case X86::BI__builtin_ia32_pternlogd256_mask:
40184060
case X86::BI__builtin_ia32_pternlogd512_mask:

clang/lib/AST/ExprConstant.cpp

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12268,6 +12268,40 @@ bool VectorExprEvaluator::VisitCallExpr(const CallExpr *E) {
1226812268
return Success(R, E);
1226912269
}
1227012270

12271+
case X86::BI__builtin_ia32_phminposuw128: {
12272+
APValue Source;
12273+
if (!Evaluate(Source, Info, E->getArg(0)))
12274+
return false;
12275+
unsigned SourceLen = Source.getVectorLength();
12276+
const VectorType *VT = E->getArg(0)->getType()->castAs<VectorType>();
12277+
QualType ElemQT = VT->getElementType();
12278+
unsigned LaneBitWidth = Info.Ctx.getTypeSize(ElemQT);
12279+
12280+
APInt MinIndex(LaneBitWidth, 0);
12281+
APInt MinVal = Source.getVectorElt(0).getInt();
12282+
for (unsigned I = 0; I != SourceLen; ++I) {
12283+
APInt Val = Source.getVectorElt(I).getInt();
12284+
if (MinVal.ugt(Val)) {
12285+
MinVal = Val;
12286+
MinIndex = I;
12287+
}
12288+
}
12289+
12290+
bool ResultUnsigned = E->getCallReturnType(Info.Ctx)
12291+
->castAs<VectorType>()
12292+
->getElementType()
12293+
->isUnsignedIntegerOrEnumerationType();
12294+
12295+
SmallVector<APValue, 8> Result;
12296+
Result.reserve(SourceLen);
12297+
Result.emplace_back(APSInt(MinVal, ResultUnsigned));
12298+
Result.emplace_back(APSInt(MinIndex, ResultUnsigned));
12299+
for (unsigned I = 0; I != SourceLen - 2; ++I) {
12300+
Result.emplace_back(APSInt(APInt(LaneBitWidth, 0), ResultUnsigned));
12301+
}
12302+
return Success(APValue(Result.data(), Result.size()), E);
12303+
}
12304+
1227112305
case X86::BI__builtin_ia32_pternlogd128_mask:
1227212306
case X86::BI__builtin_ia32_pternlogd256_mask:
1227312307
case X86::BI__builtin_ia32_pternlogd512_mask:

clang/lib/Headers/smmintrin.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1524,7 +1524,8 @@ _mm_packus_epi32(__m128i __V1, __m128i __V2) {
15241524
/// \returns A 128-bit value where bits [15:0] contain the minimum value found
15251525
/// in parameter \a __V, bits [18:16] contain the index of the minimum value
15261526
/// and the remaining bits are set to 0.
1527-
static __inline__ __m128i __DEFAULT_FN_ATTRS _mm_minpos_epu16(__m128i __V) {
1527+
static __inline__ __m128i __DEFAULT_FN_ATTRS_CONSTEXPR
1528+
_mm_minpos_epu16(__m128i __V) {
15281529
return (__m128i)__builtin_ia32_phminposuw128((__v8hi)__V);
15291530
}
15301531

clang/test/CodeGen/X86/sse41-builtins.c

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -376,6 +376,16 @@ __m128i test_mm_minpos_epu16(__m128i x) {
376376
// CHECK: call <8 x i16> @llvm.x86.sse41.phminposuw(<8 x i16> %{{.*}})
377377
return _mm_minpos_epu16(x);
378378
}
379+
TEST_CONSTEXPR(match_v8hu(_mm_minpos_epu16((__m128i)(__v8hu){0,0,0,0, 0,0,0,0}), 0,0,0,0, 0,0,0,0));
380+
TEST_CONSTEXPR(match_v8hu(_mm_minpos_epu16((__m128i)(__v8hu){1,0,0,0, 0,0,0,0}), 0,1,0,0, 0,0,0,0));
381+
TEST_CONSTEXPR(match_v8hu(_mm_minpos_epu16((__m128i)(__v8hu){65535,65535,65535,65535,65535,65535,65535,65535}), 65535,0,0,0, 0,0,0,0));
382+
TEST_CONSTEXPR(match_v8hu(_mm_minpos_epu16((__m128i)(__v8hu){9,8,7,6,5,4,3,2}), 2,7,0,0, 0,0,0,0));
383+
TEST_CONSTEXPR(match_v8hu(_mm_minpos_epu16((__m128i)(__v8hu){5,5,5,5,5,5,5,5}), 5,0,0,0, 0,0,0,0));
384+
TEST_CONSTEXPR(match_v8hu(_mm_minpos_epu16((__m128i)(__v8hu){5,7,9,4,10,4,11,12}), 4,3,0,0, 0,0,0,0));
385+
TEST_CONSTEXPR(match_v8hu(_mm_minpos_epu16((__m128i)(__v8hu){6,0,0,0,0,0,0,0}), 0,1,0,0, 0,0,0,0));
386+
TEST_CONSTEXPR(match_v8hu(_mm_minpos_epu16((__m128i)(__v8hu){1000,2000,3000,4000,5000,6000,7000,1}), 1,7,0,0, 0,0,0,0));
387+
TEST_CONSTEXPR(match_v8hu(_mm_minpos_epu16((__m128i)(__v8hu){1234,5678,42,9999,65535,0,4242,42}), 0,5,0,0, 0,0,0,0));
388+
TEST_CONSTEXPR(match_v8hu(_mm_minpos_epu16((__m128i)(__v8hu){400,500,12,600,12,700,800,900}), 12,2,0,0, 0,0,0,0));
379389

380390
__m128i test_mm_mpsadbw_epu8(__m128i x, __m128i y) {
381391
// CHECK-LABEL: test_mm_mpsadbw_epu8

0 commit comments

Comments
 (0)