Author: Benjamin Maxwell Date: 2024-12-08T21:28:33Z New Revision: 8498dafe9856865e1f9e4d1e3161bcc844e36053
URL: https://github.com/llvm/llvm-project/commit/8498dafe9856865e1f9e4d1e3161bcc844e36053 DIFF: https://github.com/llvm/llvm-project/commit/8498dafe9856865e1f9e4d1e3161bcc844e36053.diff LOG: Revert "[InstSimplify] Add basic constant folding for `llvm.sincos` (#114527)" This reverts commit 47df46b1e7a397af428bc455b8e173fbdf4869af. Added: Modified: llvm/lib/Analysis/ConstantFolding.cpp Removed: llvm/test/Transforms/InstSimplify/sincos.ll ################################################################################ diff --git a/llvm/lib/Analysis/ConstantFolding.cpp b/llvm/lib/Analysis/ConstantFolding.cpp index 0233d31459062d..efbccee76f2c51 100644 --- a/llvm/lib/Analysis/ConstantFolding.cpp +++ b/llvm/lib/Analysis/ConstantFolding.cpp @@ -1632,7 +1632,6 @@ bool llvm::canConstantFoldCallTo(const CallBase *Call, const Function *F) { case Intrinsic::sqrt: case Intrinsic::sin: case Intrinsic::cos: - case Intrinsic::sincos: case Intrinsic::pow: case Intrinsic::powi: case Intrinsic::ldexp: @@ -3535,40 +3534,6 @@ ConstantFoldStructCall(StringRef Name, Intrinsic::ID IntrinsicID, return nullptr; return ConstantStruct::get(StTy, Result0, Result1); } - case Intrinsic::sincos: { - Type *Ty = StTy->getContainedType(0); - Type *TyScalar = Ty->getScalarType(); - - auto ConstantFoldScalarSincosCall = - [&](Constant *Op) -> std::pair<Constant *, Constant *> { - Constant *SinResult = - ConstantFoldScalarCall(Name, Intrinsic::sin, TyScalar, Op, TLI, Call); - Constant *CosResult = - ConstantFoldScalarCall(Name, Intrinsic::cos, TyScalar, Op, TLI, Call); - return std::make_pair(SinResult, CosResult); - }; - - if (auto *FVTy = dyn_cast<FixedVectorType>(Ty)) { - SmallVector<Constant *> SinResults(FVTy->getNumElements()); - SmallVector<Constant *> CosResults(FVTy->getNumElements()); - - for (unsigned I = 0, E = FVTy->getNumElements(); I != E; ++I) { - Constant *Lane = Operands[0]->getAggregateElement(I); - std::tie(SinResults[I], CosResults[I]) = - ConstantFoldScalarSincosCall(Lane); - if (!SinResults[I] || !CosResults[I]) - return nullptr; - } - - return ConstantStruct::get(StTy, ConstantVector::get(SinResults), - ConstantVector::get(CosResults)); - } - - auto [SinResult, CosResult] = ConstantFoldScalarSincosCall(Operands[0]); - if (!SinResult || !CosResult) - return nullptr; - return ConstantStruct::get(StTy, SinResult, CosResult); - } default: // TODO: Constant folding of vector intrinsics that fall through here does // not work (e.g. overflow intrinsics) diff --git a/llvm/test/Transforms/InstSimplify/sincos.ll b/llvm/test/Transforms/InstSimplify/sincos.ll deleted file mode 100644 index 8f6d346e6c624a..00000000000000 --- a/llvm/test/Transforms/InstSimplify/sincos.ll +++ /dev/null @@ -1,148 +0,0 @@ -; RUN: opt -S -passes=instsimplify %s | FileCheck %s - -define { float, float } @sincos_zero() { -; CHECK-LABEL: define { float, float } @sincos_zero() { -; CHECK-NEXT: ret { float, float } { float 0.000000e+00, float 1.000000e+00 } -; - %ret = call { float, float } @llvm.sincos.f32(float zeroinitializer) - ret { float, float } %ret -} - -define { float, float } @sincos_neg_zero() { -; CHECK-LABEL: define { float, float } @sincos_neg_zero() { -; CHECK-NEXT: ret { float, float } { float -0.000000e+00, float 1.000000e+00 } -; - %ret = call { float, float } @llvm.sincos.f32(float -0.0) - ret { float, float } %ret -} - -define { float, float } @sincos_one() { -; CHECK-LABEL: define { float, float } @sincos_one() { -; CHECK-NEXT: ret { float, float } { float [[$SIN_ONE:.+]], float [[$COS_ONE:.+]] } -; - %ret = call { float, float } @llvm.sincos.f32(float 1.0) - ret { float, float } %ret -} - -define { float, float } @sincos_two() { -; CHECK-LABEL: define { float, float } @sincos_two() { -; CHECK-NEXT: ret { float, float } { float [[$SIN_TWO:.+]], float [[$COS_TWO:.+]] } -; - %ret = call { float, float } @llvm.sincos.f32(float 2.0) - ret { float, float } %ret -} - -define { <2 x float>, <2 x float> } @sincos_vector() { -; CHECK-LABEL: define { <2 x float>, <2 x float> } @sincos_vector() { -; CHECK-NEXT: ret { <2 x float>, <2 x float> } { <2 x float> <float [[$SIN_ONE]], float [[$SIN_TWO]]>, <2 x float> <float [[$COS_ONE]], float [[$COS_TWO]]> } -; - %ret = call { <2 x float>, <2 x float> } @llvm.sincos.v2f32(<2 x float> <float 1.0, float 2.0>) - ret { <2 x float>, <2 x float> } %ret -} - -define { <2 x float>, <2 x float> } @sincos_zero_vector() { -; CHECK-LABEL: define { <2 x float>, <2 x float> } @sincos_zero_vector() { -; CHECK-NEXT: ret { <2 x float>, <2 x float> } { <2 x float> zeroinitializer, <2 x float> <float 1.000000e+00, float 1.000000e+00> } -; - %ret = call { <2 x float>, <2 x float> } @llvm.sincos.v2f32(<2 x float> zeroinitializer) - ret { <2 x float>, <2 x float> } %ret -} - -define { float, float } @sincos_poison() { -; CHECK-LABEL: define { float, float } @sincos_poison() { -; CHECK-NEXT: [[RET:%.*]] = call { float, float } @llvm.sincos.f32(float poison) -; CHECK-NEXT: ret { float, float } [[RET]] -; - %ret = call { float, float } @llvm.sincos.f32(float poison) - ret { float, float } %ret -} - -define { <2 x float>, <2 x float> } @sincos_poison_vector() { -; CHECK-LABEL: define { <2 x float>, <2 x float> } @sincos_poison_vector() { -; CHECK-NEXT: [[RET:%.*]] = call { <2 x float>, <2 x float> } @llvm.sincos.v2f32(<2 x float> poison) -; CHECK-NEXT: ret { <2 x float>, <2 x float> } [[RET]] -; - %ret = call { <2 x float>, <2 x float> } @llvm.sincos.v2f32(<2 x float> poison) - ret { <2 x float>, <2 x float> } %ret -} - -define { <vscale x 2 x float>, <vscale x 2 x float> } @sincos_poison_scalable_vector() { -; CHECK-LABEL: define { <vscale x 2 x float>, <vscale x 2 x float> } @sincos_poison_scalable_vector() { -; CHECK-NEXT: [[RET:%.*]] = call { <vscale x 2 x float>, <vscale x 2 x float> } @llvm.sincos.nxv2f32(<vscale x 2 x float> poison) -; CHECK-NEXT: ret { <vscale x 2 x float>, <vscale x 2 x float> } [[RET]] -; - %ret = call { <vscale x 2 x float>, <vscale x 2 x float> } @llvm.sincos.nxv2f32(<vscale x 2 x float> poison) - ret { <vscale x 2 x float>, <vscale x 2 x float> } %ret -} - -define { float, float } @sincos_undef() { -; CHECK-LABEL: define { float, float } @sincos_undef() { -; CHECK-NEXT: [[RET:%.*]] = call { float, float } @llvm.sincos.f32(float undef) -; CHECK-NEXT: ret { float, float } [[RET]] -; - %ret = call { float, float } @llvm.sincos.f32(float undef) - ret { float, float } %ret -} - -define { <2 x float>, <2 x float> } @sincos_undef_vector() { -; CHECK-LABEL: define { <2 x float>, <2 x float> } @sincos_undef_vector() { -; CHECK-NEXT: [[RET:%.*]] = call { <2 x float>, <2 x float> } @llvm.sincos.v2f32(<2 x float> undef) -; CHECK-NEXT: ret { <2 x float>, <2 x float> } [[RET]] -; - %ret = call { <2 x float>, <2 x float> } @llvm.sincos.v2f32(<2 x float> undef) - ret { <2 x float>, <2 x float> } %ret -} - -define { <vscale x 2 x float>, <vscale x 2 x float> } @sincos_undef_scalable_vector() { -; CHECK-LABEL: define { <vscale x 2 x float>, <vscale x 2 x float> } @sincos_undef_scalable_vector() { -; CHECK-NEXT: [[RET:%.*]] = call { <vscale x 2 x float>, <vscale x 2 x float> } @llvm.sincos.nxv2f32(<vscale x 2 x float> undef) -; CHECK-NEXT: ret { <vscale x 2 x float>, <vscale x 2 x float> } [[RET]] -; - %ret = call { <vscale x 2 x float>, <vscale x 2 x float> } @llvm.sincos.nxv2f32(<vscale x 2 x float> undef) - ret { <vscale x 2 x float>, <vscale x 2 x float> } %ret -} - -define { <vscale x 2 x float>, <vscale x 2 x float> } @sincos_zero_scalable_vector() { -; CHECK-LABEL: define { <vscale x 2 x float>, <vscale x 2 x float> } @sincos_zero_scalable_vector() { -; CHECK-NEXT: [[RET:%.*]] = call { <vscale x 2 x float>, <vscale x 2 x float> } @llvm.sincos.nxv2f32(<vscale x 2 x float> zeroinitializer) -; CHECK-NEXT: ret { <vscale x 2 x float>, <vscale x 2 x float> } [[RET]] -; - %ret = call { <vscale x 2 x float>, <vscale x 2 x float> } @llvm.sincos.nxv2f32(<vscale x 2 x float> zeroinitializer) - ret { <vscale x 2 x float>, <vscale x 2 x float> } %ret -} - -define { float, float } @sincos_inf() { -; CHECK-LABEL: define { float, float } @sincos_inf() { -; CHECK-NEXT: [[RET:%.*]] = call { float, float } @llvm.sincos.f32(float 0x7FF0000000000000) -; CHECK-NEXT: ret { float, float } [[RET]] -; - %ret = call { float, float } @llvm.sincos.f32(float 0x7FF0000000000000) - ret { float, float } %ret -} - -define { float, float } @sincos_neginf() { -; CHECK-LABEL: define { float, float } @sincos_neginf() { -; CHECK-NEXT: [[RET:%.*]] = call { float, float } @llvm.sincos.f32(float 0xFFF0000000000000) -; CHECK-NEXT: ret { float, float } [[RET]] -; - %ret = call { float, float } @llvm.sincos.f32(float 0xFFF0000000000000) - ret { float, float } %ret -} - -define { float, float } @sincos_qnan() { -; CHECK-LABEL: define { float, float } @sincos_qnan() { -; CHECK-NEXT: [[RET:%.*]] = call { float, float } @llvm.sincos.f32(float 0x7FF8000000000000) -; CHECK-NEXT: ret { float, float } [[RET]] -; - %ret = call { float, float } @llvm.sincos.f32(float 0x7FF8000000000000) - ret { float, float } %ret -} - -define { float, float } @sincos_snan() { -; CHECK-LABEL: define { float, float } @sincos_snan() { -; CHECK-NEXT: [[RET:%.*]] = call { float, float } @llvm.sincos.f32(float 0x7FF0000020000000) -; CHECK-NEXT: ret { float, float } [[RET]] -; - %ret = call { float, float } @llvm.sincos.f32(float bitcast (i32 2139095041 to float)) - ret { float, float } %ret -} _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
