[DXIL] Add radians intrinsic #110616

adam-yang · 2024-10-01T01:29:21Z

makes progress on #99151

Changes

Added int_dx_radians intrinsic in IntrinsicsDirectX.td
Added expansion for int_dx_radians in DXILIntrinsicExpansion.cpp`
Added DXIL backend test case

Related PRs

github-actions · 2024-10-01T01:29:40Z

Thank you for submitting a Pull Request (PR) to the LLVM Project!

This PR will be automatically labeled and the relevant teams will be notified.

If you wish to, you can add reviewers by using the "Reviewers" section on this page.

If this is not working for you, it is probably because you do not have write permissions for the repository. In which case you can instead tag reviewers by name in a comment by using @ followed by their GitHub username.

If you have received no comments on your PR for a week, you can request a review by "ping"ing the PR by adding a comment “Ping”. The common courtesy "ping" rate is once a week. Please remember that you are asking for valuable time from other developers.

If you have further questions, they may be answered by the LLVM GitHub User Guide.

You can also ask questions in a comment on this PR, on the LLVM Discord or on the forums.

llvmbot · 2024-10-02T08:51:42Z

@llvm/pr-subscribers-llvm-ir

Author: Adam Yang (adam-yang)

Changes

makes progress on #99151

Changes

Added int_dx_radians intrinsic in IntrinsicsDirectX.td
Added expansion for int_dx_radians in DXILIntrinsicExpansion.cpp`
Added DXIL backend test case

Related PRs

Full diff: https://github.com/llvm/llvm-project/pull/110616.diff

3 Files Affected:

(modified) llvm/include/llvm/IR/IntrinsicsDirectX.td (+1)
(modified) llvm/lib/Target/DirectX/DXILIntrinsicExpansion.cpp (+13)
(added) llvm/test/CodeGen/DirectX/radians.ll (+56)

diff --git a/llvm/include/llvm/IR/IntrinsicsDirectX.td b/llvm/include/llvm/IR/IntrinsicsDirectX.td
index 555877e7aaf0e5..f9acddf17f8c17 100644
--- a/llvm/include/llvm/IR/IntrinsicsDirectX.td
+++ b/llvm/include/llvm/IR/IntrinsicsDirectX.td
@@ -85,4 +85,5 @@ def int_dx_rsqrt  : DefaultAttrsIntrinsic<[llvm_anyfloat_ty], [LLVMMatchType<0>]
 def int_dx_wave_is_first_lane : DefaultAttrsIntrinsic<[llvm_i1_ty], [], [IntrConvergent]>;
 def int_dx_sign : DefaultAttrsIntrinsic<[LLVMScalarOrSameVectorWidth<0, llvm_i32_ty>], [llvm_any_ty], [IntrNoMem]>;
 def int_dx_step : DefaultAttrsIntrinsic<[LLVMMatchType<0>], [llvm_anyfloat_ty, LLVMMatchType<0>], [IntrNoMem]>;
+def int_dx_radians : DefaultAttrsIntrinsic<[llvm_anyfloat_ty], [LLVMMatchType<0>], [IntrNoMem]>;
 }
diff --git a/llvm/lib/Target/DirectX/DXILIntrinsicExpansion.cpp b/llvm/lib/Target/DirectX/DXILIntrinsicExpansion.cpp
index 926cbe97f24fda..33d1a12bd7c75a 100644
--- a/llvm/lib/Target/DirectX/DXILIntrinsicExpansion.cpp
+++ b/llvm/lib/Target/DirectX/DXILIntrinsicExpansion.cpp
@@ -53,6 +53,7 @@ static bool isIntrinsicExpansion(Function &F) {
   case Intrinsic::dx_udot:
   case Intrinsic::dx_sign:
   case Intrinsic::dx_step:
+  case Intrinsic::dx_radians:
     return true;
   }
   return false;
@@ -395,6 +396,15 @@ static Value *expandStepIntrinsic(CallInst *Orig) {
   return Builder.CreateSelect(Cond, Zero, One);
 }
 
+static Value *expandRadiansIntrinsic(CallInst *Orig) {
+  Value *X = Orig->getOperand(0);
+  Type *Ty = X->getType();
+  IRBuilder<> Builder(Orig);
+  Value *OneEightyOverPi = ConstantFP::get(Ty, llvm::numbers::pi / 180.0);
+  return Builder.CreateFMul(X, OneEightyOverPi);
+}
+
+
 static Intrinsic::ID getMaxForClamp(Type *ElemTy,
                                     Intrinsic::ID ClampIntrinsic) {
   if (ClampIntrinsic == Intrinsic::dx_uclamp)
@@ -511,6 +521,9 @@ static bool expandIntrinsic(Function &F, CallInst *Orig) {
     break;
   case Intrinsic::dx_step:
     Result = expandStepIntrinsic(Orig);
+  case Intrinsic::dx_radians:
+    Result = expandRadiansIntrinsic(Orig);
+    break;
   }
   if (Result) {
     Orig->replaceAllUsesWith(Result);
diff --git a/llvm/test/CodeGen/DirectX/radians.ll b/llvm/test/CodeGen/DirectX/radians.ll
new file mode 100644
index 00000000000000..3d7fdb3b090093
--- /dev/null
+++ b/llvm/test/CodeGen/DirectX/radians.ll
@@ -0,0 +1,56 @@
+; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --version 5
+; RUN: opt -S  -dxil-op-lower  -mtriple=dxil-pc-shadermodel6.3-library %s | FileCheck %s
+
+declare half @llvm.dx.radians.f16(half)
+declare float @llvm.dx.radians.f32(float)
+
+declare <4 x half> @llvm.dx.radians.v4f16(<4 x half>)
+declare <4 x float> @llvm.dx.radians.v4f32(<4 x float>)
+
+define noundef half @radians_half(half noundef %a) {
+; CHECK-LABEL: define noundef half @radians_half(
+; CHECK-SAME: half noundef [[A:%.*]]) {
+; CHECK-NEXT:  [[ENTRY:.*:]]
+; CHECK-NEXT:    [[TMP0:%.*]] = fmul half [[A]], 0xH2478
+; CHECK-NEXT:    ret half [[TMP0]]
+;
+entry:
+  %elt.radians = call half @llvm.dx.radians.f16(half %a)
+  ret half %elt.radians
+}
+
+define noundef float @radians_float(float noundef %a) {
+; CHECK-LABEL: define noundef float @radians_float(
+; CHECK-SAME: float noundef [[A:%.*]]) {
+; CHECK-NEXT:  [[ENTRY:.*:]]
+; CHECK-NEXT:    [[TMP0:%.*]] = fmul float [[A]], 0x3F91DF46A0000000
+; CHECK-NEXT:    ret float [[TMP0]]
+;
+entry:
+  %elt.radians = call float @llvm.dx.radians.f32(float %a)
+  ret float %elt.radians
+}
+
+define noundef <4 x half> @radians_half_vector(<4 x half> noundef %a) {
+; CHECK-LABEL: define noundef <4 x half> @radians_half_vector(
+; CHECK-SAME: <4 x half> noundef [[A:%.*]]) {
+; CHECK-NEXT:  [[ENTRY:.*:]]
+; CHECK-NEXT:    [[TMP0:%.*]] = fmul <4 x half> [[A]], <half 0xH2478, half 0xH2478, half 0xH2478, half 0xH2478>
+; CHECK-NEXT:    ret <4 x half> [[TMP0]]
+;
+entry:
+  %elt.radians = call <4 x half> @llvm.dx.radians.v4f16(<4 x half> %a)
+  ret <4 x half> %elt.radians
+}
+
+define noundef <4 x float> @radians_float_vector(<4 x float> noundef %a) {
+; CHECK-LABEL: define noundef <4 x float> @radians_float_vector(
+; CHECK-SAME: <4 x float> noundef [[A:%.*]]) {
+; CHECK-NEXT:  [[ENTRY:.*:]]
+; CHECK-NEXT:    [[TMP0:%.*]] = fmul <4 x float> [[A]], <float 0x3F91DF46A0000000, float 0x3F91DF46A0000000, float 0x3F91DF46A0000000, float 0x3F91DF46A0000000>
+; CHECK-NEXT:    ret <4 x float> [[TMP0]]
+;
+entry:
+  %elt.radians = call <4 x float> @llvm.dx.radians.v4f32(<4 x float> %a)
+  ret <4 x float> %elt.radians
+}

llvmbot · 2024-10-02T08:51:43Z

@llvm/pr-subscribers-backend-directx

Author: Adam Yang (adam-yang)

Changes

makes progress on #99151

Changes

Added int_dx_radians intrinsic in IntrinsicsDirectX.td
Added expansion for int_dx_radians in DXILIntrinsicExpansion.cpp`
Added DXIL backend test case

Related PRs

Full diff: https://github.com/llvm/llvm-project/pull/110616.diff

3 Files Affected:

(modified) llvm/include/llvm/IR/IntrinsicsDirectX.td (+1)
(modified) llvm/lib/Target/DirectX/DXILIntrinsicExpansion.cpp (+13)
(added) llvm/test/CodeGen/DirectX/radians.ll (+56)

diff --git a/llvm/include/llvm/IR/IntrinsicsDirectX.td b/llvm/include/llvm/IR/IntrinsicsDirectX.td
index 555877e7aaf0e5..f9acddf17f8c17 100644
--- a/llvm/include/llvm/IR/IntrinsicsDirectX.td
+++ b/llvm/include/llvm/IR/IntrinsicsDirectX.td
@@ -85,4 +85,5 @@ def int_dx_rsqrt  : DefaultAttrsIntrinsic<[llvm_anyfloat_ty], [LLVMMatchType<0>]
 def int_dx_wave_is_first_lane : DefaultAttrsIntrinsic<[llvm_i1_ty], [], [IntrConvergent]>;
 def int_dx_sign : DefaultAttrsIntrinsic<[LLVMScalarOrSameVectorWidth<0, llvm_i32_ty>], [llvm_any_ty], [IntrNoMem]>;
 def int_dx_step : DefaultAttrsIntrinsic<[LLVMMatchType<0>], [llvm_anyfloat_ty, LLVMMatchType<0>], [IntrNoMem]>;
+def int_dx_radians : DefaultAttrsIntrinsic<[llvm_anyfloat_ty], [LLVMMatchType<0>], [IntrNoMem]>;
 }
diff --git a/llvm/lib/Target/DirectX/DXILIntrinsicExpansion.cpp b/llvm/lib/Target/DirectX/DXILIntrinsicExpansion.cpp
index 926cbe97f24fda..33d1a12bd7c75a 100644
--- a/llvm/lib/Target/DirectX/DXILIntrinsicExpansion.cpp
+++ b/llvm/lib/Target/DirectX/DXILIntrinsicExpansion.cpp
@@ -53,6 +53,7 @@ static bool isIntrinsicExpansion(Function &F) {
   case Intrinsic::dx_udot:
   case Intrinsic::dx_sign:
   case Intrinsic::dx_step:
+  case Intrinsic::dx_radians:
     return true;
   }
   return false;
@@ -395,6 +396,15 @@ static Value *expandStepIntrinsic(CallInst *Orig) {
   return Builder.CreateSelect(Cond, Zero, One);
 }
 
+static Value *expandRadiansIntrinsic(CallInst *Orig) {
+  Value *X = Orig->getOperand(0);
+  Type *Ty = X->getType();
+  IRBuilder<> Builder(Orig);
+  Value *OneEightyOverPi = ConstantFP::get(Ty, llvm::numbers::pi / 180.0);
+  return Builder.CreateFMul(X, OneEightyOverPi);
+}
+
+
 static Intrinsic::ID getMaxForClamp(Type *ElemTy,
                                     Intrinsic::ID ClampIntrinsic) {
   if (ClampIntrinsic == Intrinsic::dx_uclamp)
@@ -511,6 +521,9 @@ static bool expandIntrinsic(Function &F, CallInst *Orig) {
     break;
   case Intrinsic::dx_step:
     Result = expandStepIntrinsic(Orig);
+  case Intrinsic::dx_radians:
+    Result = expandRadiansIntrinsic(Orig);
+    break;
   }
   if (Result) {
     Orig->replaceAllUsesWith(Result);
diff --git a/llvm/test/CodeGen/DirectX/radians.ll b/llvm/test/CodeGen/DirectX/radians.ll
new file mode 100644
index 00000000000000..3d7fdb3b090093
--- /dev/null
+++ b/llvm/test/CodeGen/DirectX/radians.ll
@@ -0,0 +1,56 @@
+; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --version 5
+; RUN: opt -S  -dxil-op-lower  -mtriple=dxil-pc-shadermodel6.3-library %s | FileCheck %s
+
+declare half @llvm.dx.radians.f16(half)
+declare float @llvm.dx.radians.f32(float)
+
+declare <4 x half> @llvm.dx.radians.v4f16(<4 x half>)
+declare <4 x float> @llvm.dx.radians.v4f32(<4 x float>)
+
+define noundef half @radians_half(half noundef %a) {
+; CHECK-LABEL: define noundef half @radians_half(
+; CHECK-SAME: half noundef [[A:%.*]]) {
+; CHECK-NEXT:  [[ENTRY:.*:]]
+; CHECK-NEXT:    [[TMP0:%.*]] = fmul half [[A]], 0xH2478
+; CHECK-NEXT:    ret half [[TMP0]]
+;
+entry:
+  %elt.radians = call half @llvm.dx.radians.f16(half %a)
+  ret half %elt.radians
+}
+
+define noundef float @radians_float(float noundef %a) {
+; CHECK-LABEL: define noundef float @radians_float(
+; CHECK-SAME: float noundef [[A:%.*]]) {
+; CHECK-NEXT:  [[ENTRY:.*:]]
+; CHECK-NEXT:    [[TMP0:%.*]] = fmul float [[A]], 0x3F91DF46A0000000
+; CHECK-NEXT:    ret float [[TMP0]]
+;
+entry:
+  %elt.radians = call float @llvm.dx.radians.f32(float %a)
+  ret float %elt.radians
+}
+
+define noundef <4 x half> @radians_half_vector(<4 x half> noundef %a) {
+; CHECK-LABEL: define noundef <4 x half> @radians_half_vector(
+; CHECK-SAME: <4 x half> noundef [[A:%.*]]) {
+; CHECK-NEXT:  [[ENTRY:.*:]]
+; CHECK-NEXT:    [[TMP0:%.*]] = fmul <4 x half> [[A]], <half 0xH2478, half 0xH2478, half 0xH2478, half 0xH2478>
+; CHECK-NEXT:    ret <4 x half> [[TMP0]]
+;
+entry:
+  %elt.radians = call <4 x half> @llvm.dx.radians.v4f16(<4 x half> %a)
+  ret <4 x half> %elt.radians
+}
+
+define noundef <4 x float> @radians_float_vector(<4 x float> noundef %a) {
+; CHECK-LABEL: define noundef <4 x float> @radians_float_vector(
+; CHECK-SAME: <4 x float> noundef [[A:%.*]]) {
+; CHECK-NEXT:  [[ENTRY:.*:]]
+; CHECK-NEXT:    [[TMP0:%.*]] = fmul <4 x float> [[A]], <float 0x3F91DF46A0000000, float 0x3F91DF46A0000000, float 0x3F91DF46A0000000, float 0x3F91DF46A0000000>
+; CHECK-NEXT:    ret <4 x float> [[TMP0]]
+;
+entry:
+  %elt.radians = call <4 x float> @llvm.dx.radians.v4f32(<4 x float> %a)
+  ret <4 x float> %elt.radians
+}

llvm/lib/Target/DirectX/DXILIntrinsicExpansion.cpp

github-actions · 2024-10-02T19:53:11Z

✅ With the latest revision this PR passed the C/C++ code formatter.

llvm/test/CodeGen/DirectX/radians.ll

farzonl · 2024-10-02T20:00:08Z

Please run clang-format.

farzonl

Mostly looks good. You will need to rebase or your tests will break.

partially fixes #99151 ### Changes * Added int_spv_radians intrinsic in IntrinsicsSPIRV.td * Added lowering for int_spv_radians in SPIRVInstructionSelector.cpp * Added DXIL backend test case ### Related PRs * [[clang][HLSL] Add radians intrinsic #110802](#110802) * [[DXIL] Add radians intrinsic #110616](#110616)

adam-yang · 2024-10-04T18:52:00Z

@farzonl This PR is ready for checkin.

github-actions · 2024-10-04T18:54:26Z

@adam-yang Congratulations on having your first Pull Request (PR) merged into the LLVM Project!

Your changes will be combined with recent changes from other authors, then tested by our build bots. If there is a problem with a build, you may receive a report in an email or a comment on this PR.

Please check whether problems have been caused by your change specifically, as the builds can include changes from many authors. It is not uncommon for your change to be included in a build that fails due to someone else's changes, or infrastructure issues.

How to do this, and the rest of the post-merge process, is covered in detail here.

If your change does cause a problem, it may be reverted, or you can revert it yourself. This is a normal part of LLVM development. You can fix your changes and open a new PR to merge them again.

If you don't get any reports, no action is required from you. Your changes are working as expected, well done!

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](#110616) * [[SPIRV] Add radians intrinsic #110800](#110800)

I had too many tabs open and reverted #110800 by mistake, it was supposed to be #110616. This reverts commit dec6fe3.

This reverts commit 1e75d08.

Fix an obvious typo in these tests to get them passing, and also fix the -Wimplicit-fallthrough warning that fires when trying to build.

) Fix an obvious typo in these tests to get them passing, and also fix the -Wimplicit-fallthrough warning that fires when trying to build. Reverting #110616 was tricky because of dependencies, so I'm just doing the easy fix directly here.

This was referenced Oct 2, 2024

[clang][HLSL] Add radians intrinsic #110802

Merged

[SPIRV] Add radians intrinsic #110800

Merged

adam-yang marked this pull request as ready for review October 2, 2024 08:51

llvmbot added backend:DirectX llvm:ir labels Oct 2, 2024

bogner reviewed Oct 2, 2024

View reviewed changes

llvm/lib/Target/DirectX/DXILIntrinsicExpansion.cpp Outdated Show resolved Hide resolved

farzonl reviewed Oct 2, 2024

View reviewed changes

llvm/test/CodeGen/DirectX/radians.ll Outdated Show resolved Hide resolved

farzonl reviewed Oct 2, 2024

View reviewed changes

llvm/test/CodeGen/DirectX/radians.ll Outdated Show resolved Hide resolved

farzonl requested changes Oct 2, 2024

View reviewed changes

adam-yang added 4 commits October 2, 2024 14:44

The radian dxil intrinsic lowering working

12d3ab7

No more double support

93fdecf

Fixed wrong variable name

7110065

Removed -dxil-op-lower and added -scalarizer. Fixed formatting

8c07f8a

adam-yang force-pushed the hlsl-radians-dxil branch from 80c303b to 8c07f8a Compare October 2, 2024 22:45

farzonl approved these changes Oct 2, 2024

View reviewed changes

bob80905 approved these changes Oct 4, 2024

View reviewed changes

farzonl merged commit 1e75d08 into llvm:main Oct 4, 2024
8 checks passed

bogner added a commit that referenced this pull request Oct 7, 2024

Reapply "[SPIRV] Add radians intrinsic"

b2c615f

I had too many tabs open and reverted #110800 by mistake, it was supposed to be #110616. This reverts commit dec6fe3.

bogner added a commit that referenced this pull request Oct 7, 2024

Revert "[DXIL] Add radians intrinsic (#110616)"

26ed065

This reverts commit 1e75d08.

This was referenced Oct 7, 2024

Revert "[DXIL] Add radians intrinsic" #111399

Closed

[DirectX] Fix broken test and accidental fallthrough in #110616 #111410

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[DXIL] Add radians intrinsic #110616

[DXIL] Add radians intrinsic #110616

adam-yang commented Oct 1, 2024 •

edited

Loading

github-actions bot commented Oct 1, 2024

llvmbot commented Oct 2, 2024

Changes

Related PRs

llvmbot commented Oct 2, 2024

Changes

Related PRs

github-actions bot commented Oct 2, 2024 •

edited

Loading

farzonl commented Oct 2, 2024

farzonl left a comment

adam-yang commented Oct 4, 2024

github-actions bot commented Oct 4, 2024

[DXIL] Add radians intrinsic #110616

[DXIL] Add radians intrinsic #110616

Conversation

adam-yang commented Oct 1, 2024 • edited Loading

Changes

Related PRs

github-actions bot commented Oct 1, 2024

llvmbot commented Oct 2, 2024

Changes

Related PRs

llvmbot commented Oct 2, 2024

Changes

Related PRs

github-actions bot commented Oct 2, 2024 • edited Loading

farzonl commented Oct 2, 2024

farzonl left a comment

Choose a reason for hiding this comment

adam-yang commented Oct 4, 2024

github-actions bot commented Oct 4, 2024

adam-yang commented Oct 1, 2024 •

edited

Loading

github-actions bot commented Oct 2, 2024 •

edited

Loading