Skip to content

Commit a20fdfd

Browse files
ronliebronlieb
committed
merge main into amd-staging
2 parents e31494e + ca7ffaa commit a20fdfd

File tree

245 files changed

+18933
-2565
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

245 files changed

+18933
-2565
lines changed

‎clang/docs/LanguageExtensions.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -756,7 +756,8 @@ Unless specified otherwise operation(±0) = ±0 and operation(±infinity) = ±in
756756

757757
The integer elementwise intrinsics, including ``__builtin_elementwise_popcount``,
758758
``__builtin_elementwise_bitreverse``, ``__builtin_elementwise_add_sat``,
759-
``__builtin_elementwise_sub_sat`` can be called in a ``constexpr`` context.
759+
``__builtin_elementwise_sub_sat``, ``__builtin_elementwise_max``,
760+
``__builtin_elementwise_min`` can be called in a ``constexpr`` context.
760761

761762
No implicit promotion of integer types takes place. The mixing of integer types
762763
of different sizes and signs is forbidden in binary and ternary builtins.

‎clang/docs/ReleaseNotes.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,9 @@ Non-comprehensive list of changes in this release
118118
This feature is enabled by default but can be disabled by compiling with
119119
``-fno-sanitize-annotate-debug-info-traps``.
120120

121+
- ``__builtin_elementwise_max`` and ``__builtin_elementwise_min`` functions for integer types can
122+
now be used in constant expressions.
123+
121124
New Compiler Flags
122125
------------------
123126
- New option ``-fno-sanitize-annotate-debug-info-traps`` added to disable emitting trap reasons into the debug info when compiling with trapping UBSan (e.g. ``-fsanitize-trap=undefined``).

‎clang/include/clang/Basic/Builtins.td

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1300,13 +1300,13 @@ def ElementwiseBitreverse : Builtin {
13001300

13011301
def ElementwiseMax : Builtin {
13021302
let Spellings = ["__builtin_elementwise_max"];
1303-
let Attributes = [NoThrow, Const, CustomTypeChecking];
1303+
let Attributes = [NoThrow, Const, CustomTypeChecking, Constexpr];
13041304
let Prototype = "void(...)";
13051305
}
13061306

13071307
def ElementwiseMin : Builtin {
13081308
let Spellings = ["__builtin_elementwise_min"];
1309-
let Attributes = [NoThrow, Const, CustomTypeChecking];
1309+
let Attributes = [NoThrow, Const, CustomTypeChecking, Constexpr];
13101310
let Prototype = "void(...)";
13111311
}
13121312

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

Lines changed: 78 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2259,7 +2259,6 @@ static bool interp__builtin_is_within_lifetime(InterpState &S, CodePtr OpPC,
22592259
static bool interp__builtin_elementwise_sat(InterpState &S, CodePtr OpPC,
22602260
const CallExpr *Call,
22612261
unsigned BuiltinID) {
2262-
Call->dumpColor();
22632262
assert(Call->getNumArgs() == 2);
22642263

22652264
// Single integer case.
@@ -2326,6 +2325,80 @@ static bool interp__builtin_elementwise_sat(InterpState &S, CodePtr OpPC,
23262325
return true;
23272326
}
23282327

2328+
static bool interp__builtin_elementwise_maxmin(InterpState &S, CodePtr OpPC,
2329+
const CallExpr *Call,
2330+
unsigned BuiltinID) {
2331+
assert(Call->getNumArgs() == 2);
2332+
2333+
QualType Arg0Type = Call->getArg(0)->getType();
2334+
2335+
// TODO: Support floating-point types.
2336+
if (!(Arg0Type->isIntegerType() ||
2337+
(Arg0Type->isVectorType() &&
2338+
Arg0Type->castAs<VectorType>()->getElementType()->isIntegerType())))
2339+
return false;
2340+
2341+
if (!Arg0Type->isVectorType()) {
2342+
assert(!Call->getArg(1)->getType()->isVectorType());
2343+
APSInt RHS = popToAPSInt(
2344+
S.Stk, *S.getContext().classify(Call->getArg(1)->getType()));
2345+
APSInt LHS = popToAPSInt(
2346+
S.Stk, *S.getContext().classify(Call->getArg(0)->getType()));
2347+
APInt Result;
2348+
if (BuiltinID == Builtin::BI__builtin_elementwise_max) {
2349+
Result = std::max(LHS, RHS);
2350+
} else if (BuiltinID == Builtin::BI__builtin_elementwise_min) {
2351+
Result = std::min(LHS, RHS);
2352+
} else {
2353+
llvm_unreachable("Wrong builtin ID");
2354+
}
2355+
2356+
pushInteger(S, APSInt(Result, !LHS.isSigned()), Call->getType());
2357+
return true;
2358+
}
2359+
2360+
// Vector case.
2361+
assert(Call->getArg(0)->getType()->isVectorType() &&
2362+
Call->getArg(1)->getType()->isVectorType());
2363+
const auto *VT = Call->getArg(0)->getType()->castAs<VectorType>();
2364+
assert(VT->getElementType() ==
2365+
Call->getArg(1)->getType()->castAs<VectorType>()->getElementType());
2366+
assert(VT->getNumElements() ==
2367+
Call->getArg(1)->getType()->castAs<VectorType>()->getNumElements());
2368+
assert(VT->getElementType()->isIntegralOrEnumerationType());
2369+
2370+
const Pointer &RHS = S.Stk.pop<Pointer>();
2371+
const Pointer &LHS = S.Stk.pop<Pointer>();
2372+
const Pointer &Dst = S.Stk.peek<Pointer>();
2373+
PrimType ElemT = *S.getContext().classify(VT->getElementType());
2374+
unsigned NumElems = VT->getNumElements();
2375+
for (unsigned I = 0; I != NumElems; ++I) {
2376+
APSInt Elem1;
2377+
APSInt Elem2;
2378+
INT_TYPE_SWITCH_NO_BOOL(ElemT, {
2379+
Elem1 = LHS.elem<T>(I).toAPSInt();
2380+
Elem2 = RHS.elem<T>(I).toAPSInt();
2381+
});
2382+
2383+
APSInt Result;
2384+
if (BuiltinID == Builtin::BI__builtin_elementwise_max) {
2385+
Result = APSInt(std::max(Elem1, Elem2),
2386+
Call->getType()->isUnsignedIntegerOrEnumerationType());
2387+
} else if (BuiltinID == Builtin::BI__builtin_elementwise_min) {
2388+
Result = APSInt(std::min(Elem1, Elem2),
2389+
Call->getType()->isUnsignedIntegerOrEnumerationType());
2390+
} else {
2391+
llvm_unreachable("Wrong builtin ID");
2392+
}
2393+
2394+
INT_TYPE_SWITCH_NO_BOOL(ElemT,
2395+
{ Dst.elem<T>(I) = static_cast<T>(Result); });
2396+
}
2397+
Dst.initializeAllElements();
2398+
2399+
return true;
2400+
}
2401+
23292402
bool InterpretBuiltin(InterpState &S, CodePtr OpPC, const CallExpr *Call,
23302403
uint32_t BuiltinID) {
23312404
if (!S.getASTContext().BuiltinInfo.isConstantEvaluated(BuiltinID))
@@ -2733,6 +2806,10 @@ bool InterpretBuiltin(InterpState &S, CodePtr OpPC, const CallExpr *Call,
27332806
case Builtin::BI__builtin_elementwise_sub_sat:
27342807
return interp__builtin_elementwise_sat(S, OpPC, Call, BuiltinID);
27352808

2809+
case Builtin::BI__builtin_elementwise_max:
2810+
case Builtin::BI__builtin_elementwise_min:
2811+
return interp__builtin_elementwise_maxmin(S, OpPC, Call, BuiltinID);
2812+
27362813
default:
27372814
S.FFDiag(S.Current->getLocation(OpPC),
27382815
diag::note_invalid_subexpr_in_const_expr)

‎clang/lib/AST/ExprConstant.cpp

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11676,6 +11676,41 @@ bool VectorExprEvaluator::VisitCallExpr(const CallExpr *E) {
1167611676

1167711677
return Success(APValue(ResultElements.data(), ResultElements.size()), E);
1167811678
}
11679+
case Builtin::BI__builtin_elementwise_max:
11680+
case Builtin::BI__builtin_elementwise_min: {
11681+
APValue SourceLHS, SourceRHS;
11682+
if (!EvaluateAsRValue(Info, E->getArg(0), SourceLHS) ||
11683+
!EvaluateAsRValue(Info, E->getArg(1), SourceRHS))
11684+
return false;
11685+
11686+
QualType DestEltTy = E->getType()->castAs<VectorType>()->getElementType();
11687+
11688+
if (!DestEltTy->isIntegerType())
11689+
return false;
11690+
11691+
unsigned SourceLen = SourceLHS.getVectorLength();
11692+
SmallVector<APValue, 4> ResultElements;
11693+
ResultElements.reserve(SourceLen);
11694+
11695+
for (unsigned EltNum = 0; EltNum < SourceLen; ++EltNum) {
11696+
APSInt LHS = SourceLHS.getVectorElt(EltNum).getInt();
11697+
APSInt RHS = SourceRHS.getVectorElt(EltNum).getInt();
11698+
switch (E->getBuiltinCallee()) {
11699+
case Builtin::BI__builtin_elementwise_max:
11700+
ResultElements.push_back(
11701+
APValue(APSInt(std::max(LHS, RHS),
11702+
DestEltTy->isUnsignedIntegerOrEnumerationType())));
11703+
break;
11704+
case Builtin::BI__builtin_elementwise_min:
11705+
ResultElements.push_back(
11706+
APValue(APSInt(std::min(LHS, RHS),
11707+
DestEltTy->isUnsignedIntegerOrEnumerationType())));
11708+
break;
11709+
}
11710+
}
11711+
11712+
return Success(APValue(ResultElements.data(), ResultElements.size()), E);
11713+
}
1167911714
}
1168011715
}
1168111716

@@ -13570,7 +13605,24 @@ bool IntExprEvaluator::VisitBuiltinCallExpr(const CallExpr *E,
1357013605
APInt Result = LHS.isSigned() ? LHS.ssub_sat(RHS) : LHS.usub_sat(RHS);
1357113606
return Success(APSInt(Result, !LHS.isSigned()), E);
1357213607
}
13608+
case Builtin::BI__builtin_elementwise_max: {
13609+
APSInt LHS, RHS;
13610+
if (!EvaluateInteger(E->getArg(0), LHS, Info) ||
13611+
!EvaluateInteger(E->getArg(1), RHS, Info))
13612+
return false;
13613+
13614+
APInt Result = std::max(LHS, RHS);
13615+
return Success(APSInt(Result, !LHS.isSigned()), E);
13616+
}
13617+
case Builtin::BI__builtin_elementwise_min: {
13618+
APSInt LHS, RHS;
13619+
if (!EvaluateInteger(E->getArg(0), LHS, Info) ||
13620+
!EvaluateInteger(E->getArg(1), RHS, Info))
13621+
return false;
1357313622

13623+
APInt Result = std::min(LHS, RHS);
13624+
return Success(APSInt(Result, !LHS.isSigned()), E);
13625+
}
1357413626
case Builtin::BIstrlen:
1357513627
case Builtin::BIwcslen:
1357613628
// A call to strlen is not a constant expression.

‎clang/lib/Headers/avx512fintrin.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,9 +180,9 @@ typedef enum
180180
#define __DEFAULT_FN_ATTRS512_CONSTEXPR __DEFAULT_FN_ATTRS512 constexpr
181181
#define __DEFAULT_FN_ATTRS128_CONSTEXPR __DEFAULT_FN_ATTRS128 constexpr
182182
#else
183-
#define __DEFAULT_FN_ATTRS_CONSTEXPR __DEFAULT_FN_ATTRS128
183+
#define __DEFAULT_FN_ATTRS_CONSTEXPR __DEFAULT_FN_ATTRS
184184
#define __DEFAULT_FN_ATTRS512_CONSTEXPR __DEFAULT_FN_ATTRS512
185-
#define __DEFAULT_FN_ATTRS128_CONSTEXPR __DEFAULT_FN_ATTRS
185+
#define __DEFAULT_FN_ATTRS128_CONSTEXPR __DEFAULT_FN_ATTRS128
186186
#endif
187187

188188
/* Create vectors with repeated elements */

‎clang/lib/Headers/avxintrin.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@ typedef __bf16 __m256bh __attribute__((__vector_size__(32), __aligned__(32)));
7070
#define __DEFAULT_FN_ATTRS_CONSTEXPR __DEFAULT_FN_ATTRS constexpr
7171
#define __DEFAULT_FN_ATTRS128_CONSTEXPR __DEFAULT_FN_ATTRS128 constexpr
7272
#else
73-
#define __DEFAULT_FN_ATTRS_CONSTEXPR __DEFAULT_FN_ATTRS128
74-
#define __DEFAULT_FN_ATTRS128_CONSTEXPR __DEFAULT_FN_ATTRS
73+
#define __DEFAULT_FN_ATTRS_CONSTEXPR __DEFAULT_FN_ATTRS
74+
#define __DEFAULT_FN_ATTRS128_CONSTEXPR __DEFAULT_FN_ATTRS128
7575
#endif
7676

7777
/* Arithmetic */

‎clang/test/CodeGen/builtins-elementwise-math.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -418,7 +418,7 @@ void test_builtin_elementwise_max(float f1, float f2, double d1, double d2,
418418
// CHECK-NEXT: call i32 @llvm.smax.i32(i32 [[IAS1]], i32 [[B]])
419419
int_as_one = __builtin_elementwise_max(int_as_one, b);
420420

421-
// CHECK: call i32 @llvm.smax.i32(i32 1, i32 97)
421+
// CHECK: store i64 97, ptr [[I1:%.+]], align 8
422422
i1 = __builtin_elementwise_max(1, 'a');
423423
}
424424

@@ -508,6 +508,9 @@ void test_builtin_elementwise_min(float f1, float f2, double d1, double d2,
508508
// CHECK-NEXT: [[B:%.+]] = load i32, ptr @b, align 4
509509
// CHECK-NEXT: call i32 @llvm.smin.i32(i32 [[IAS1]], i32 [[B]])
510510
int_as_one = __builtin_elementwise_min(int_as_one, b);
511+
512+
// CHECK: store i64 2, ptr [[I1:%.+]], align 8
513+
i1 = __builtin_elementwise_min(2, 'b');
511514
}
512515

513516
void test_builtin_elementwise_bitreverse(si8 vi1, si8 vi2,

‎clang/test/Interpreter/bad_percent_command.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
// UNSUPPORTED: system-aix
12
// RUN: cat %s | clang-repl 2>&1 | FileCheck %s
23
%foobar
34
// CHECK: Invalid % command "%foobar", use "%help" to list commands

‎clang/test/Interpreter/dynamic-library-bad-args.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
// UNSUPPORTED: system-aix
12
// RUN: cat %s | clang-repl 2>&1 | FileCheck %s
23
%lib
34
// CHECK: %lib expects 1 argument: the path to a dynamic library

0 commit comments

Comments
 (0)