diff --git a/clang/include/clang/Basic/Builtins.td b/clang/include/clang/Basic/Builtins.td index 2c83dca248fb7..232a97c013677 100644 --- a/clang/include/clang/Basic/Builtins.td +++ b/clang/include/clang/Basic/Builtins.td @@ -4518,6 +4518,12 @@ def GetDeviceSideMangledName : LangBuiltin<"CUDA_LANG"> { } // HLSL +def HLSLAny : LangBuiltin<"HLSL_LANG"> { + let Spellings = ["__builtin_hlsl_elementwise_any"]; + let Attributes = [NoThrow, Const]; + let Prototype = "bool(...)"; +} + def HLSLWaveActiveCountBits : LangBuiltin<"HLSL_LANG"> { let Spellings = ["__builtin_hlsl_wave_active_count_bits"]; let Attributes = [NoThrow, Const]; diff --git a/clang/lib/CodeGen/CGBuiltin.cpp b/clang/lib/CodeGen/CGBuiltin.cpp index 9ee51ca7142c7..7ca173586cb11 100644 --- a/clang/lib/CodeGen/CGBuiltin.cpp +++ b/clang/lib/CodeGen/CGBuiltin.cpp @@ -17963,6 +17963,12 @@ Value *CodeGenFunction::EmitHLSLBuiltinExpr(unsigned BuiltinID, return nullptr; switch (BuiltinID) { + case Builtin::BI__builtin_hlsl_elementwise_any: { + Value *Op0 = EmitScalarExpr(E->getArg(0)); + return Builder.CreateIntrinsic( + /*ReturnType*/ llvm::Type::getInt1Ty(getLLVMContext()), + Intrinsic::dx_any, ArrayRef{Op0}, nullptr, "dx.any"); + } case Builtin::BI__builtin_hlsl_dot: { Value *Op0 = EmitScalarExpr(E->getArg(0)); Value *Op1 = EmitScalarExpr(E->getArg(1)); diff --git a/clang/lib/Headers/hlsl/hlsl_basic_types.h b/clang/lib/Headers/hlsl/hlsl_basic_types.h index 3d0d296aadca3..da6903df65ffe 100644 --- a/clang/lib/Headers/hlsl/hlsl_basic_types.h +++ b/clang/lib/Headers/hlsl/hlsl_basic_types.h @@ -42,7 +42,9 @@ typedef vector uint16_t2; typedef vector uint16_t3; typedef vector uint16_t4; #endif - +typedef vector bool2; +typedef vector bool3; +typedef vector bool4; typedef vector int2; typedef vector int3; typedef vector int4; diff --git a/clang/lib/Headers/hlsl/hlsl_intrinsics.h b/clang/lib/Headers/hlsl/hlsl_intrinsics.h index 5180530363889..3cb357b87b50e 100644 --- a/clang/lib/Headers/hlsl/hlsl_intrinsics.h +++ b/clang/lib/Headers/hlsl/hlsl_intrinsics.h @@ -100,6 +100,118 @@ double3 abs(double3); _HLSL_BUILTIN_ALIAS(__builtin_elementwise_abs) double4 abs(double4); +//===----------------------------------------------------------------------===// +// any builtins +//===----------------------------------------------------------------------===// + +/// \fn bool any(T x) +/// \brief Returns True if any components of the \a x parameter are non-zero; +/// otherwise, false. \param x The input value. + +#ifdef __HLSL_ENABLE_16_BIT +_HLSL_AVAILABILITY(shadermodel, 6.2) +_HLSL_BUILTIN_ALIAS(__builtin_hlsl_elementwise_any) +bool any(int16_t); +_HLSL_AVAILABILITY(shadermodel, 6.2) +_HLSL_BUILTIN_ALIAS(__builtin_hlsl_elementwise_any) +bool any(int16_t2); +_HLSL_AVAILABILITY(shadermodel, 6.2) +_HLSL_BUILTIN_ALIAS(__builtin_hlsl_elementwise_any) +bool any(int16_t3); +_HLSL_AVAILABILITY(shadermodel, 6.2) +_HLSL_BUILTIN_ALIAS(__builtin_hlsl_elementwise_any) +bool any(int16_t4); +_HLSL_AVAILABILITY(shadermodel, 6.2) +_HLSL_BUILTIN_ALIAS(__builtin_hlsl_elementwise_any) +bool any(uint16_t); +_HLSL_AVAILABILITY(shadermodel, 6.2) +_HLSL_BUILTIN_ALIAS(__builtin_hlsl_elementwise_any) +bool any(uint16_t2); +_HLSL_AVAILABILITY(shadermodel, 6.2) +_HLSL_BUILTIN_ALIAS(__builtin_hlsl_elementwise_any) +bool any(uint16_t3); +_HLSL_AVAILABILITY(shadermodel, 6.2) +_HLSL_BUILTIN_ALIAS(__builtin_hlsl_elementwise_any) +bool any(uint16_t4); +#endif + +_HLSL_16BIT_AVAILABILITY(shadermodel, 6.2) +_HLSL_BUILTIN_ALIAS(__builtin_hlsl_elementwise_any) +bool any(half); +_HLSL_16BIT_AVAILABILITY(shadermodel, 6.2) +_HLSL_BUILTIN_ALIAS(__builtin_hlsl_elementwise_any) +bool any(half2); +_HLSL_16BIT_AVAILABILITY(shadermodel, 6.2) +_HLSL_BUILTIN_ALIAS(__builtin_hlsl_elementwise_any) +bool any(half3); +_HLSL_16BIT_AVAILABILITY(shadermodel, 6.2) +_HLSL_BUILTIN_ALIAS(__builtin_hlsl_elementwise_any) +bool any(half4); + +_HLSL_BUILTIN_ALIAS(__builtin_hlsl_elementwise_any) +bool any(bool); +_HLSL_BUILTIN_ALIAS(__builtin_hlsl_elementwise_any) +bool any(bool2); +_HLSL_BUILTIN_ALIAS(__builtin_hlsl_elementwise_any) +bool any(bool3); +_HLSL_BUILTIN_ALIAS(__builtin_hlsl_elementwise_any) +bool any(bool4); +_HLSL_BUILTIN_ALIAS(__builtin_hlsl_elementwise_any) + +_HLSL_BUILTIN_ALIAS(__builtin_hlsl_elementwise_any) +bool any(int); +_HLSL_BUILTIN_ALIAS(__builtin_hlsl_elementwise_any) +bool any(int2); +_HLSL_BUILTIN_ALIAS(__builtin_hlsl_elementwise_any) +bool any(int3); +_HLSL_BUILTIN_ALIAS(__builtin_hlsl_elementwise_any) +bool any(int4); + +_HLSL_BUILTIN_ALIAS(__builtin_hlsl_elementwise_any) +bool any(uint); +_HLSL_BUILTIN_ALIAS(__builtin_hlsl_elementwise_any) +bool any(uint2); +_HLSL_BUILTIN_ALIAS(__builtin_hlsl_elementwise_any) +bool any(uint3); +_HLSL_BUILTIN_ALIAS(__builtin_hlsl_elementwise_any) +bool any(uint4); + +_HLSL_BUILTIN_ALIAS(__builtin_hlsl_elementwise_any) +bool any(float); +_HLSL_BUILTIN_ALIAS(__builtin_hlsl_elementwise_any) +bool any(float2); +_HLSL_BUILTIN_ALIAS(__builtin_hlsl_elementwise_any) +bool any(float3); +_HLSL_BUILTIN_ALIAS(__builtin_hlsl_elementwise_any) +bool any(float4); + +_HLSL_BUILTIN_ALIAS(__builtin_hlsl_elementwise_any) +bool any(int64_t); +_HLSL_BUILTIN_ALIAS(__builtin_hlsl_elementwise_any) +bool any(int64_t2); +_HLSL_BUILTIN_ALIAS(__builtin_hlsl_elementwise_any) +bool any(int64_t3); +_HLSL_BUILTIN_ALIAS(__builtin_hlsl_elementwise_any) +bool any(int64_t4); + +_HLSL_BUILTIN_ALIAS(__builtin_hlsl_elementwise_any) +bool any(uint64_t); +_HLSL_BUILTIN_ALIAS(__builtin_hlsl_elementwise_any) +bool any(uint64_t2); +_HLSL_BUILTIN_ALIAS(__builtin_hlsl_elementwise_any) +bool any(uint64_t3); +_HLSL_BUILTIN_ALIAS(__builtin_hlsl_elementwise_any) +bool any(uint64_t4); + +_HLSL_BUILTIN_ALIAS(__builtin_hlsl_elementwise_any) +bool any(double); +_HLSL_BUILTIN_ALIAS(__builtin_hlsl_elementwise_any) +bool any(double2); +_HLSL_BUILTIN_ALIAS(__builtin_hlsl_elementwise_any) +bool any(double3); +_HLSL_BUILTIN_ALIAS(__builtin_hlsl_elementwise_any) +bool any(double4); + //===----------------------------------------------------------------------===// // ceil builtins //===----------------------------------------------------------------------===// diff --git a/clang/lib/Sema/SemaChecking.cpp b/clang/lib/Sema/SemaChecking.cpp index 0d4d57db01c93..9ff717056bcb2 100644 --- a/clang/lib/Sema/SemaChecking.cpp +++ b/clang/lib/Sema/SemaChecking.cpp @@ -5271,6 +5271,11 @@ bool CheckAllArgsHaveFloatRepresentation(Sema *S, CallExpr *TheCall) { // returning an ExprError bool Sema::CheckHLSLBuiltinFunctionCall(unsigned BuiltinID, CallExpr *TheCall) { switch (BuiltinID) { + case Builtin::BI__builtin_hlsl_elementwise_any: { + if (checkArgCount(*this, TheCall, 1)) + return true; + break; + } case Builtin::BI__builtin_hlsl_dot: { if (checkArgCount(*this, TheCall, 2)) return true; diff --git a/clang/test/CodeGenHLSL/builtins/any.hlsl b/clang/test/CodeGenHLSL/builtins/any.hlsl new file mode 100644 index 0000000000000..ae348fec756b3 --- /dev/null +++ b/clang/test/CodeGenHLSL/builtins/any.hlsl @@ -0,0 +1,186 @@ +// RUN: %clang_cc1 -finclude-default-header -x hlsl -triple \ +// RUN: dxil-pc-shadermodel6.3-library %s -fnative-half-type \ +// RUN: -emit-llvm -disable-llvm-passes -o - | FileCheck %s \ +// RUN: --check-prefixes=CHECK,NATIVE_HALF +// RUN: %clang_cc1 -finclude-default-header -x hlsl -triple \ +// RUN: dxil-pc-shadermodel6.3-library %s -emit-llvm -disable-llvm-passes \ +// RUN: -o - | FileCheck %s --check-prefixes=CHECK,NO_HALF + +#ifdef __HLSL_ENABLE_16_BIT +// NATIVE_HALF: define noundef i1 @ +// NATIVE_HALF: %dx.any = call i1 @llvm.dx.any.i16 +// NATIVE_HALF: ret i1 %dx.any +bool test_any_int16_t(int16_t p0) { return any(p0); } +// NATIVE_HALF: define noundef i1 @ +// NATIVE_HALF: %dx.any = call i1 @llvm.dx.any.v2i16 +// NATIVE_HALF: ret i1 %dx.any +bool test_any_int16_t2(int16_t2 p0) { return any(p0); } +// NATIVE_HALF: define noundef i1 @ +// NATIVE_HALF: %dx.any = call i1 @llvm.dx.any.v3i16 +// NATIVE_HALF: ret i1 %dx.any +bool test_any_int16_t3(int16_t3 p0) { return any(p0); } +// NATIVE_HALF: define noundef i1 @ +// NATIVE_HALF: %dx.any = call i1 @llvm.dx.any.v4i16 +// NATIVE_HALF: ret i1 %dx.any +bool test_any_int16_t4(int16_t4 p0) { return any(p0); } + +// NATIVE_HALF: define noundef i1 @ +// NATIVE_HALF: %dx.any = call i1 @llvm.dx.any.i16 +// NATIVE_HALF: ret i1 %dx.any +bool test_any_uint16_t(uint16_t p0) { return any(p0); } +// NATIVE_HALF: define noundef i1 @ +// NATIVE_HALF: %dx.any = call i1 @llvm.dx.any.v2i16 +// NATIVE_HALF: ret i1 %dx.any +bool test_any_uint16_t2(uint16_t2 p0) { return any(p0); } +// NATIVE_HALF: define noundef i1 @ +// NATIVE_HALF: %dx.any = call i1 @llvm.dx.any.v3i16 +// NATIVE_HALF: ret i1 %dx.any +bool test_any_uint16_t3(uint16_t3 p0) { return any(p0); } +// NATIVE_HALF: define noundef i1 @ +// NATIVE_HALF: %dx.any = call i1 @llvm.dx.any.v4i16 +// NATIVE_HALF: ret i1 %dx.any +bool test_any_uint16_t4(uint16_t4 p0) { return any(p0); } +#endif // __HLSL_ENABLE_16_BIT + +// CHECK: define noundef i1 @ +// NATIVE_HALF: %dx.any = call i1 @llvm.dx.any.f16 +// NO_HALF: %dx.any = call i1 @llvm.dx.any.f32 +// CHECK: ret i1 %dx.any +bool test_any_half(half p0) { return any(p0); } + +// CHECK: define noundef i1 @ +// NATIVE_HALF: %dx.any = call i1 @llvm.dx.any.v2f16 +// NO_HALF: %dx.any = call i1 @llvm.dx.any.v2f32 +// CHECK: ret i1 %dx.any +bool test_any_half2(half2 p0) { return any(p0); } + +// CHECK: define noundef i1 @ +// NATIVE_HALF: %dx.any = call i1 @llvm.dx.any.v3f16 +// NO_HALF: %dx.any = call i1 @llvm.dx.any.v3f32 +// CHECK: ret i1 %dx.any +bool test_any_half3(half3 p0) { return any(p0); } + +// CHECK: define noundef i1 @ +// NATIVE_HALF: %dx.any = call i1 @llvm.dx.any.v4f16 +// NO_HALF: %dx.any = call i1 @llvm.dx.any.v4f32 +// CHECK: ret i1 %dx.any +bool test_any_half4(half4 p0) { return any(p0); } + +// CHECK: define noundef i1 @ +// CHECK: %dx.any = call i1 @llvm.dx.any.f32 +// CHECK: ret i1 %dx.any +bool test_any_float(float p0) { return any(p0); } +// CHECK: define noundef i1 @ +// CHECK: %dx.any = call i1 @llvm.dx.any.v2f32 +// CHECK: ret i1 %dx.any +bool test_any_float2(float2 p0) { return any(p0); } +// CHECK: define noundef i1 @ +// CHECK: %dx.any = call i1 @llvm.dx.any.v3f32 +// CHECK: ret i1 %dx.any +bool test_any_float3(float3 p0) { return any(p0); } +// CHECK: define noundef i1 @ +// CHECK: %dx.any = call i1 @llvm.dx.any.v4f32 +// CHECK: ret i1 %dx.any +bool test_any_float4(float4 p0) { return any(p0); } + +// CHECK: define noundef i1 @ +// CHECK: %dx.any = call i1 @llvm.dx.any.f64 +// CHECK: ret i1 %dx.any +bool test_any_double(double p0) { return any(p0); } +// CHECK: define noundef i1 @ +// CHECK: %dx.any = call i1 @llvm.dx.any.v2f64 +// CHECK: ret i1 %dx.any +bool test_any_double2(double2 p0) { return any(p0); } +// CHECK: define noundef i1 @ +// CHECK: %dx.any = call i1 @llvm.dx.any.v3f64 +// CHECK: ret i1 %dx.any +bool test_any_double3(double3 p0) { return any(p0); } +// CHECK: define noundef i1 @ +// CHECK: %dx.any = call i1 @llvm.dx.any.v4f64 +// CHECK: ret i1 %dx.any +bool test_any_double4(double4 p0) { return any(p0); } + +// CHECK: define noundef i1 @ +// CHECK: %dx.any = call i1 @llvm.dx.any.i32 +// CHECK: ret i1 %dx.any +bool test_any_int(int p0) { return any(p0); } +// CHECK: define noundef i1 @ +// CHECK: %dx.any = call i1 @llvm.dx.any.v2i32 +// CHECK: ret i1 %dx.any +bool test_any_int2(int2 p0) { return any(p0); } +// CHECK: define noundef i1 @ +// CHECK: %dx.any = call i1 @llvm.dx.any.v3i32 +// CHECK: ret i1 %dx.any +bool test_any_int3(int3 p0) { return any(p0); } +// CHECK: define noundef i1 @ +// CHECK: %dx.any = call i1 @llvm.dx.any.v4i32 +// CHECK: ret i1 %dx.any +bool test_any_int4(int4 p0) { return any(p0); } + +// CHECK: define noundef i1 @ +// CHECK: %dx.any = call i1 @llvm.dx.any.i32 +// CHECK: ret i1 %dx.any +bool test_any_uint(uint p0) { return any(p0); } +// CHECK: define noundef i1 @ +// CHECK: %dx.any = call i1 @llvm.dx.any.v2i32 +// CHECK: ret i1 %dx.any +bool test_any_uint2(uint2 p0) { return any(p0); } +// CHECK: define noundef i1 @ +// CHECK: %dx.any = call i1 @llvm.dx.any.v3i32 +// CHECK: ret i1 %dx.any +bool test_any_uint3(uint3 p0) { return any(p0); } +// CHECK: define noundef i1 @ +// CHECK: %dx.any = call i1 @llvm.dx.any.v4i32 +// CHECK: ret i1 %dx.any +bool test_any_uint4(uint4 p0) { return any(p0); } + +// CHECK: define noundef i1 @ +// CHECK: %dx.any = call i1 @llvm.dx.any.i64 +// CHECK: ret i1 %dx.any +bool test_any_int64_t(int64_t p0) { return any(p0); } +// CHECK: define noundef i1 @ +// CHECK: %dx.any = call i1 @llvm.dx.any.v2i64 +// CHECK: ret i1 %dx.any +bool test_any_int64_t2(int64_t2 p0) { return any(p0); } +// CHECK: define noundef i1 @ +// CHECK: %dx.any = call i1 @llvm.dx.any.v3i64 +// CHECK: ret i1 %dx.any +bool test_any_int64_t3(int64_t3 p0) { return any(p0); } +// CHECK: define noundef i1 @ +// CHECK: %dx.any = call i1 @llvm.dx.any.v4i64 +// CHECK: ret i1 %dx.any +bool test_any_int64_t4(int64_t4 p0) { return any(p0); } + +// CHECK: define noundef i1 @ +// CHECK: %dx.any = call i1 @llvm.dx.any.i64 +// CHECK: ret i1 %dx.any +bool test_any_uint64_t(uint64_t p0) { return any(p0); } +// CHECK: define noundef i1 @ +// CHECK: %dx.any = call i1 @llvm.dx.any.v2i64 +// CHECK: ret i1 %dx.any +bool test_any_uint64_t2(uint64_t2 p0) { return any(p0); } +// CHECK: define noundef i1 @ +// CHECK: %dx.any = call i1 @llvm.dx.any.v3i64 +// CHECK: ret i1 %dx.any +bool test_any_uint64_t3(uint64_t3 p0) { return any(p0); } +// CHECK: define noundef i1 @ +// CHECK: %dx.any = call i1 @llvm.dx.any.v4i64 +// CHECK: ret i1 %dx.any +bool test_any_uint64_t4(uint64_t4 p0) { return any(p0); } + +// CHECK: define noundef i1 @ +// CHECK: %dx.any = call i1 @llvm.dx.any.i1 +// CHECK: ret i1 %dx.any +bool test_any_bool(bool p0) { return any(p0); } +// CHECK: define noundef i1 @ +// CHECK: %dx.any = call i1 @llvm.dx.any.v2i1 +// CHECK: ret i1 %dx.any +bool test_any_bool2(bool2 p0) { return any(p0); } +// CHECK: define noundef i1 @ +// CHECK: %dx.any = call i1 @llvm.dx.any.v3i1 +// CHECK: ret i1 %dx.any +bool test_any_bool3(bool3 p0) { return any(p0); } +// CHECK: define noundef i1 @ +// CHECK: %dx.any = call i1 @llvm.dx.any.v4i1 +// CHECK: ret i1 %dx.any +bool test_any_bool4(bool4 p0) { return any(p0); } diff --git a/clang/test/SemaHLSL/BuiltIns/any-errors.hlsl b/clang/test/SemaHLSL/BuiltIns/any-errors.hlsl new file mode 100644 index 0000000000000..862b946520731 --- /dev/null +++ b/clang/test/SemaHLSL/BuiltIns/any-errors.hlsl @@ -0,0 +1,12 @@ + +// RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.6-library %s -fnative-half-type -emit-llvm -disable-llvm-passes -verify -verify-ignore-unexpected + +bool test_too_few_arg() { + return __builtin_hlsl_elementwise_any(); + // expected-error@-1 {{too few arguments to function call, expected 1, have 0}} +} + +bool test_too_many_arg(float2 p0) { + return __builtin_hlsl_elementwise_any(p0, p0); + // expected-error@-1 {{too many arguments to function call, expected 1, have 2}} +} diff --git a/llvm/include/llvm/IR/IntrinsicsDirectX.td b/llvm/include/llvm/IR/IntrinsicsDirectX.td index b44d1c6d3d2f0..7c730702db2c9 100644 --- a/llvm/include/llvm/IR/IntrinsicsDirectX.td +++ b/llvm/include/llvm/IR/IntrinsicsDirectX.td @@ -20,6 +20,8 @@ def int_dx_flattened_thread_id_in_group : Intrinsic<[llvm_i32_ty], [], [IntrNoMe def int_dx_create_handle : ClangBuiltin<"__builtin_hlsl_create_handle">, Intrinsic<[ llvm_ptr_ty ], [llvm_i8_ty], [IntrWillReturn]>; +def int_dx_any : DefaultAttrsIntrinsic<[llvm_i1_ty], [llvm_any_ty]>; + def int_dx_dot : Intrinsic<[LLVMVectorElementType<0>], [llvm_anyvector_ty, LLVMScalarOrSameVectorWidth<0, LLVMVectorElementType<0>>],