Skip to content

Commit

Permalink
[Clang] Add __builtin_reduce_xor
Browse files Browse the repository at this point in the history
This patch implements __builtin_reduce_xor as specified in D111529.

Reviewed By: fhahn, aaron.ballman

Differential Revision: https://reviews.llvm.org/D115231
  • Loading branch information
junaire authored and fhahn committed Dec 22, 2021
1 parent e07736f commit b55ea2f
Show file tree
Hide file tree
Showing 7 changed files with 70 additions and 13 deletions.
1 change: 1 addition & 0 deletions clang/include/clang/Basic/Builtins.def
Original file line number Diff line number Diff line change
Expand Up @@ -649,6 +649,7 @@ BUILTIN(__builtin_elementwise_min, "v.", "nct")
BUILTIN(__builtin_elementwise_ceil, "v.", "nct")
BUILTIN(__builtin_reduce_max, "v.", "nct")
BUILTIN(__builtin_reduce_min, "v.", "nct")
BUILTIN(__builtin_reduce_xor, "v.", "nct")

BUILTIN(__builtin_matrix_transpose, "v.", "nFt")
BUILTIN(__builtin_matrix_column_major_load, "v.", "nFt")
Expand Down
3 changes: 2 additions & 1 deletion clang/include/clang/Basic/DiagnosticSemaKinds.td
Original file line number Diff line number Diff line change
Expand Up @@ -11378,7 +11378,8 @@ def err_builtin_invalid_arg_type: Error <
"%select{vector, integer or floating point type|matrix|"
"pointer to a valid matrix element type|"
"signed integer or floating point type|vector type|"
"floating point type}1 (was %2)">;
"floating point type|"
"vector of integers}1 (was %2)">;

def err_builtin_matrix_disabled: Error<
"matrix types extension is disabled. Pass -fenable-matrix to enable it">;
Expand Down
2 changes: 1 addition & 1 deletion clang/include/clang/Sema/Sema.h
Original file line number Diff line number Diff line change
Expand Up @@ -12784,7 +12784,7 @@ class Sema final {

bool SemaBuiltinElementwiseMath(CallExpr *TheCall);
bool PrepareBuiltinElementwiseMathOneArgCall(CallExpr *TheCall);
bool SemaBuiltinReduceMath(CallExpr *TheCall);
bool PrepareBuiltinReduceMathOneArgCall(CallExpr *TheCall);

// Matrix builtin handling.
ExprResult SemaBuiltinMatrixTranspose(CallExpr *TheCall,
Expand Down
7 changes: 7 additions & 0 deletions clang/lib/CodeGen/CGBuiltin.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3211,6 +3211,13 @@ RValue CodeGenFunction::EmitBuiltinExpr(const GlobalDecl GD, unsigned BuiltinID,
return RValue::get(Result);
}

case Builtin::BI__builtin_reduce_xor: {
Value *Op0 = EmitScalarExpr(E->getArg(0));
Value *Result = Builder.CreateUnaryIntrinsic(
llvm::Intrinsic::vector_reduce_xor, Op0, nullptr, "rdx.xor");
return RValue::get(Result);
}

case Builtin::BI__builtin_matrix_transpose: {
const auto *MatrixTy = E->getArg(0)->getType()->getAs<ConstantMatrixType>();
Value *MatValue = EmitScalarExpr(E->getArg(0));
Expand Down
42 changes: 31 additions & 11 deletions clang/lib/Sema/SemaChecking.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2216,10 +2216,38 @@ Sema::CheckBuiltinFunctionCall(FunctionDecl *FDecl, unsigned BuiltinID,
return ExprError();
break;
case Builtin::BI__builtin_reduce_max:
case Builtin::BI__builtin_reduce_min:
if (SemaBuiltinReduceMath(TheCall))
case Builtin::BI__builtin_reduce_min: {
if (PrepareBuiltinReduceMathOneArgCall(TheCall))
return ExprError();

const Expr *Arg = TheCall->getArg(0);
const auto *TyA = Arg->getType()->getAs<VectorType>();
if (!TyA) {
Diag(Arg->getBeginLoc(), diag::err_builtin_invalid_arg_type)
<< 1 << /* vector ty*/ 4 << Arg->getType();
return ExprError();
}

TheCall->setType(TyA->getElementType());
break;
}

// __builtin_reduce_xor supports vector of integers only.
case Builtin::BI__builtin_reduce_xor: {
if (PrepareBuiltinReduceMathOneArgCall(TheCall))
return ExprError();

const Expr *Arg = TheCall->getArg(0);
const auto *TyA = Arg->getType()->getAs<VectorType>();
if (!TyA || !TyA->getElementType()->isIntegerType()) {
Diag(Arg->getBeginLoc(), diag::err_builtin_invalid_arg_type)
<< 1 << /* vector of integers */ 6 << Arg->getType();
return ExprError();
}
TheCall->setType(TyA->getElementType());
break;
}

case Builtin::BI__builtin_matrix_transpose:
return SemaBuiltinMatrixTranspose(TheCall, TheCallResult);

Expand Down Expand Up @@ -16882,7 +16910,7 @@ bool Sema::SemaBuiltinElementwiseMath(CallExpr *TheCall) {
return false;
}

bool Sema::SemaBuiltinReduceMath(CallExpr *TheCall) {
bool Sema::PrepareBuiltinReduceMathOneArgCall(CallExpr *TheCall) {
if (checkArgCount(*this, TheCall, 1))
return true;

Expand All @@ -16891,14 +16919,6 @@ bool Sema::SemaBuiltinReduceMath(CallExpr *TheCall) {
return true;

TheCall->setArg(0, A.get());
const VectorType *TyA = A.get()->getType()->getAs<VectorType>();
if (!TyA) {
SourceLocation ArgLoc = TheCall->getArg(0)->getBeginLoc();
return Diag(ArgLoc, diag::err_builtin_invalid_arg_type)
<< 1 << /* vector ty*/ 4 << A.get()->getType();
}

TheCall->setType(TyA->getElementType());
return false;
}

Expand Down
11 changes: 11 additions & 0 deletions clang/test/CodeGen/builtins-reduction-math.c
Original file line number Diff line number Diff line change
Expand Up @@ -57,3 +57,14 @@ void test_builtin_reduce_min(float4 vf1, si8 vi1, u4 vu1) {
const si8 cvi1 = vi1;
unsigned long long r5 = __builtin_reduce_min(cvi1);
}

void test_builtin_reduce_xor(si8 vi1, u4 vu1) {

// CHECK: [[VI1:%.+]] = load <8 x i16>, <8 x i16>* %vi1.addr, align 16
// CHECK-NEXT: call i16 @llvm.vector.reduce.xor.v8i16(<8 x i16> [[VI1]])
short r2 = __builtin_reduce_xor(vi1);

// CHECK: [[VU1:%.+]] = load <4 x i32>, <4 x i32>* %vu1.addr, align 16
// CHECK-NEXT: call i32 @llvm.vector.reduce.xor.v4i32(<4 x i32> [[VU1]])
unsigned r3 = __builtin_reduce_xor(vu1);
}
17 changes: 17 additions & 0 deletions clang/test/Sema/builtins-reduction-math.c
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,20 @@ void test_builtin_reduce_min(int i, float4 v, int3 iv) {
i = __builtin_reduce_min(i);
// expected-error@-1 {{1st argument must be a vector type (was 'int')}}
}

void test_builtin_reduce_xor(int i, float4 v, int3 iv) {
struct Foo s = __builtin_reduce_xor(iv);
// expected-error@-1 {{initializing 'struct Foo' with an expression of incompatible type 'int'}}

i = __builtin_reduce_xor();
// expected-error@-1 {{too few arguments to function call, expected 1, have 0}}

i = __builtin_reduce_xor(iv, iv);
// expected-error@-1 {{too many arguments to function call, expected 1, have 2}}

i = __builtin_reduce_xor(i);
// expected-error@-1 {{1st argument must be a vector of integers (was 'int')}}

i = __builtin_reduce_xor(v);
// expected-error@-1 {{1st argument must be a vector of integers (was 'float4' (vector of 4 'float' values))}}
}

0 comments on commit b55ea2f

Please sign in to comment.