llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT--> @llvm/pr-subscribers-clang Author: Adam Yang (adam-yang) <details> <summary>Changes</summary> partially fixes #<!-- -->99151 ### Changes * Implemented `radians` clang builtin * Linked `radians` clang builtin with `hlsl_intrinsics.h` * Added sema checks for `radians` to `CheckHLSLBuiltinFunctionCall` in `SemaChecking.cpp` * Add codegen for `radians` to `EmitHLSLBuiltinExpr` in `CGBuiltin.cpp` * Add codegen tests to `clang/test/CodeGenHLSL/builtins/radians.hlsl` * Add sema tests to `clang/test/SemaHLSL/BuiltIns/radians-errors.hlsl` ### Related PRs * [[DXIL] Add radians intrinsic #<!-- -->110616](https://github.com/llvm/llvm-project/pull/110616) * [[SPIRV] Add radians intrinsic #<!-- -->110800](https://github.com/llvm/llvm-project/pull/110800) --- Full diff: https://github.com/llvm/llvm-project/pull/110802.diff 7 Files Affected: - (modified) clang/include/clang/Basic/Builtins.td (+6) - (modified) clang/lib/CodeGen/CGBuiltin.cpp (+8) - (modified) clang/lib/CodeGen/CGHLSLRuntime.h (+1) - (modified) clang/lib/Headers/hlsl/hlsl_intrinsics.h (+30) - (modified) clang/lib/Sema/SemaHLSL.cpp (+1) - (added) clang/test/CodeGenHLSL/builtins/radians.hlsl (+66) - (added) clang/test/SemaHLSL/BuiltIns/radians-errors.hlsl (+27) ``````````diff diff --git a/clang/include/clang/Basic/Builtins.td b/clang/include/clang/Basic/Builtins.td index 8090119e512fbb..09b130e0def0d7 100644 --- a/clang/include/clang/Basic/Builtins.td +++ b/clang/include/clang/Basic/Builtins.td @@ -4788,6 +4788,12 @@ def HLSLStep: LangBuiltin<"HLSL_LANG"> { let Prototype = "void(...)"; } +def HLSLRadians : LangBuiltin<"HLSL_LANG"> { + let Spellings = ["__builtin_hlsl_elementwise_radians"]; + let Attributes = [NoThrow, Const]; + let Prototype = "void(...)"; +} + // Builtins for XRay. def XRayCustomEvent : Builtin { let Spellings = ["__xray_customevent"]; diff --git a/clang/lib/CodeGen/CGBuiltin.cpp b/clang/lib/CodeGen/CGBuiltin.cpp index d739597de4c855..6c24c66a81e73c 100644 --- a/clang/lib/CodeGen/CGBuiltin.cpp +++ b/clang/lib/CodeGen/CGBuiltin.cpp @@ -18852,6 +18852,14 @@ case Builtin::BI__builtin_hlsl_elementwise_isinf: { retType, CGM.getHLSLRuntime().getSignIntrinsic(), ArrayRef<Value *>{Op0}, nullptr, "hlsl.sign"); } + case Builtin::BI__builtin_hlsl_elementwise_radians: { + Value *Op0 = EmitScalarExpr(E->getArg(0)); + if (!E->getArg(0)->getType()->hasFloatingRepresentation()) + llvm_unreachable("radians operand must have a float representation"); + return Builder.CreateIntrinsic( + /*ReturnType=*/Op0->getType(), CGM.getHLSLRuntime().getRadiansIntrinsic(), + ArrayRef<Value *>{Op0}, nullptr, "hlsl.radians"); + } } return nullptr; } diff --git a/clang/lib/CodeGen/CGHLSLRuntime.h b/clang/lib/CodeGen/CGHLSLRuntime.h index a8aabca7348ffb..c807a3216ec9ee 100644 --- a/clang/lib/CodeGen/CGHLSLRuntime.h +++ b/clang/lib/CodeGen/CGHLSLRuntime.h @@ -82,6 +82,7 @@ class CGHLSLRuntime { GENERATE_HLSL_INTRINSIC_FUNCTION(Saturate, saturate) GENERATE_HLSL_INTRINSIC_FUNCTION(Sign, sign) GENERATE_HLSL_INTRINSIC_FUNCTION(Step, step) + GENERATE_HLSL_INTRINSIC_FUNCTION(Radians, radians) GENERATE_HLSL_INTRINSIC_FUNCTION(ThreadId, thread_id) GENERATE_HLSL_INTRINSIC_FUNCTION(FDot, fdot) GENERATE_HLSL_INTRINSIC_FUNCTION(SDot, sdot) diff --git a/clang/lib/Headers/hlsl/hlsl_intrinsics.h b/clang/lib/Headers/hlsl/hlsl_intrinsics.h index 810a16d75f0228..81b297723da3f5 100644 --- a/clang/lib/Headers/hlsl/hlsl_intrinsics.h +++ b/clang/lib/Headers/hlsl/hlsl_intrinsics.h @@ -2086,5 +2086,35 @@ _HLSL_BUILTIN_ALIAS(__builtin_hlsl_elementwise_sign) int3 sign(double3); _HLSL_BUILTIN_ALIAS(__builtin_hlsl_elementwise_sign) int4 sign(double4); + +//===----------------------------------------------------------------------===// +// radians builtins +//===----------------------------------------------------------------------===// + +/// \fn T radians(T Val) +/// \brief Converts the specified value from degrees to radians. + +_HLSL_16BIT_AVAILABILITY(shadermodel, 6.2) +_HLSL_BUILTIN_ALIAS(__builtin_hlsl_elementwise_radians) +half radians(half); +_HLSL_16BIT_AVAILABILITY(shadermodel, 6.2) +_HLSL_BUILTIN_ALIAS(__builtin_hlsl_elementwise_radians) +half2 radians(half2); +_HLSL_16BIT_AVAILABILITY(shadermodel, 6.2) +_HLSL_BUILTIN_ALIAS(__builtin_hlsl_elementwise_radians) +half3 radians(half3); +_HLSL_16BIT_AVAILABILITY(shadermodel, 6.2) +_HLSL_BUILTIN_ALIAS(__builtin_hlsl_elementwise_radians) +half4 radians(half4); + +_HLSL_BUILTIN_ALIAS(__builtin_hlsl_elementwise_radians) +float radians(float); +_HLSL_BUILTIN_ALIAS(__builtin_hlsl_elementwise_radians) +float2 radians(float2); +_HLSL_BUILTIN_ALIAS(__builtin_hlsl_elementwise_radians) +float3 radians(float3); +_HLSL_BUILTIN_ALIAS(__builtin_hlsl_elementwise_radians) +float4 radians(float4); + } // namespace hlsl #endif //_HLSL_HLSL_INTRINSICS_H_ diff --git a/clang/lib/Sema/SemaHLSL.cpp b/clang/lib/Sema/SemaHLSL.cpp index 43cc6c81ae5cb0..c0326cf280cf3f 100644 --- a/clang/lib/Sema/SemaHLSL.cpp +++ b/clang/lib/Sema/SemaHLSL.cpp @@ -1861,6 +1861,7 @@ bool SemaHLSL::CheckBuiltinFunctionCall(unsigned BuiltinID, CallExpr *TheCall) { return true; break; } + case Builtin::BI__builtin_hlsl_elementwise_radians: case Builtin::BI__builtin_hlsl_elementwise_rsqrt: case Builtin::BI__builtin_hlsl_elementwise_frac: { if (CheckFloatOrHalfRepresentations(&SemaRef, TheCall)) diff --git a/clang/test/CodeGenHLSL/builtins/radians.hlsl b/clang/test/CodeGenHLSL/builtins/radians.hlsl new file mode 100644 index 00000000000000..774300525dbf02 --- /dev/null +++ b/clang/test/CodeGenHLSL/builtins/radians.hlsl @@ -0,0 +1,66 @@ +// 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: -DTARGET=dx -DFNATTRS=noundef +// 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 \ +// RUN: -DTARGET=dx -DFNATTRS=noundef +// RUN: %clang_cc1 -finclude-default-header -x hlsl -triple \ +// RUN: spirv-unknown-vulkan-compute %s -fnative-half-type \ +// RUN: -emit-llvm -disable-llvm-passes -o - | FileCheck %s \ +// RUN: --check-prefixes=CHECK,NATIVE_HALF \ +// RUN: -DTARGET=spv -DFNATTRS="spir_func noundef" +// RUN: %clang_cc1 -finclude-default-header -x hlsl -triple \ +// RUN: spirv-unknown-vulkan-compute %s -emit-llvm -disable-llvm-passes \ +// RUN: -o - | FileCheck %s --check-prefixes=CHECK,NO_HALF \ +// RUN: -DTARGET=spv -DFNATTRS="spir_func noundef" + + +// NATIVE_HALF: define [[FNATTRS]] half @ +// NATIVE_HALF: %{{.*}} = call half @llvm.[[TARGET]].radians.f16( +// NATIVE_HALF: ret half %{{.*}} +// NO_HALF: define [[FNATTRS]] float @ +// NO_HALF: %{{.*}} = call float @llvm.[[TARGET]].radians.f32( +// NO_HALF: ret float %{{.*}} +half test_radians_half(half p0) { return radians(p0); } +// NATIVE_HALF: define [[FNATTRS]] <2 x half> @ +// NATIVE_HALF: %{{.*}} = call <2 x half> @llvm.[[TARGET]].radians.v2f16 +// NATIVE_HALF: ret <2 x half> %{{.*}} +// NO_HALF: define [[FNATTRS]] <2 x float> @ +// NO_HALF: %{{.*}} = call <2 x float> @llvm.[[TARGET]].radians.v2f32( +// NO_HALF: ret <2 x float> %{{.*}} +half2 test_radians_half2(half2 p0) { return radians(p0); } +// NATIVE_HALF: define [[FNATTRS]] <3 x half> @ +// NATIVE_HALF: %{{.*}} = call <3 x half> @llvm.[[TARGET]].radians.v3f16 +// NATIVE_HALF: ret <3 x half> %{{.*}} +// NO_HALF: define [[FNATTRS]] <3 x float> @ +// NO_HALF: %{{.*}} = call <3 x float> @llvm.[[TARGET]].radians.v3f32( +// NO_HALF: ret <3 x float> %{{.*}} +half3 test_radians_half3(half3 p0) { return radians(p0); } +// NATIVE_HALF: define [[FNATTRS]] <4 x half> @ +// NATIVE_HALF: %{{.*}} = call <4 x half> @llvm.[[TARGET]].radians.v4f16 +// NATIVE_HALF: ret <4 x half> %{{.*}} +// NO_HALF: define [[FNATTRS]] <4 x float> @ +// NO_HALF: %{{.*}} = call <4 x float> @llvm.[[TARGET]].radians.v4f32( +// NO_HALF: ret <4 x float> %{{.*}} +half4 test_radians_half4(half4 p0) { return radians(p0); } + +// CHECK: define [[FNATTRS]] float @ +// CHECK: %{{.*}} = call float @llvm.[[TARGET]].radians.f32( +// CHECK: ret float %{{.*}} +float test_radians_float(float p0) { return radians(p0); } +// CHECK: define [[FNATTRS]] <2 x float> @ +// CHECK: %{{.*}} = call <2 x float> @llvm.[[TARGET]].radians.v2f32 +// CHECK: ret <2 x float> %{{.*}} +float2 test_radians_float2(float2 p0) { return radians(p0); } +// CHECK: define [[FNATTRS]] <3 x float> @ +// CHECK: %{{.*}} = call <3 x float> @llvm.[[TARGET]].radians.v3f32 +// CHECK: ret <3 x float> %{{.*}} +float3 test_radians_float3(float3 p0) { return radians(p0); } +// CHECK: define [[FNATTRS]] <4 x float> @ +// CHECK: %{{.*}} = call <4 x float> @llvm.[[TARGET]].radians.v4f32 +// CHECK: ret <4 x float> %{{.*}} +float4 test_radians_float4(float4 p0) { return radians(p0); } + diff --git a/clang/test/SemaHLSL/BuiltIns/radians-errors.hlsl b/clang/test/SemaHLSL/BuiltIns/radians-errors.hlsl new file mode 100644 index 00000000000000..1d315c486d7250 --- /dev/null +++ b/clang/test/SemaHLSL/BuiltIns/radians-errors.hlsl @@ -0,0 +1,27 @@ +// RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.6-library %s -fnative-half-type -emit-llvm-only -disable-llvm-passes -verify -verify-ignore-unexpected + +float test_too_few_arg() { + return __builtin_hlsl_elementwise_radians(); + // expected-error@-1 {{too few arguments to function call, expected 1, have 0}} +} + +float2 test_too_many_arg(float2 p0) { + return __builtin_hlsl_elementwise_radians(p0, p0); + // expected-error@-1 {{too many arguments to function call, expected 1, have 2}} +} + +float builtin_bool_to_float_type_promotion(bool p1) { + return __builtin_hlsl_elementwise_radians(p1); + // expected-error@-1 {passing 'bool' to parameter of incompatible type 'float'}} +} + +float builtin_radians_int_to_float_promotion(int p1) { + return __builtin_hlsl_elementwise_radians(p1); + // expected-error@-1 {{passing 'int' to parameter of incompatible type 'float'}} +} + +float2 builtin_radians_int2_to_float2_promotion(int2 p1) { + return __builtin_hlsl_elementwise_radians(p1); + // expected-error@-1 {{passing 'int2' (aka 'vector<int, 2>') to parameter of incompatible type '__attribute__((__vector_size__(2 * sizeof(float)))) float' (vector of 2 'float' values)}} +} + `````````` </details> https://github.com/llvm/llvm-project/pull/110802 _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
