[Mlir-commits] [mlir] 1042f3c - [mlir][ComplexToStandard] Use negf/subf instead of multiplying by -1 (#222877)
llvmlistbot at llvm.org
llvmlistbot at llvm.org
Mon Sep 14 02:50:00 PDT 2026
Author: Mattéo Rizza Murgier
Date: 2026-09-14T11:49:55+02:00
New Revision: 1042f3cd8299003876babb567d78540d30c019aa
URL: https://github.com/llvm/llvm-project/commit/1042f3cd8299003876babb567d78540d30c019aa
DIFF: https://github.com/llvm/llvm-project/commit/1042f3cd8299003876babb567d78540d30c019aa.diff
LOG: [mlir][ComplexToStandard] Use negf/subf instead of multiplying by -1 (#222877)
Added:
Modified:
mlir/lib/Conversion/ComplexToStandard/ComplexToStandard.cpp
mlir/test/Conversion/ComplexToStandard/convert-to-standard.mlir
Removed:
################################################################################
diff --git a/mlir/lib/Conversion/ComplexToStandard/ComplexToStandard.cpp b/mlir/lib/Conversion/ComplexToStandard/ComplexToStandard.cpp
index 37876c441b1ae..d1cdd8ae17e3f 100644
--- a/mlir/lib/Conversion/ComplexToStandard/ComplexToStandard.cpp
+++ b/mlir/lib/Conversion/ComplexToStandard/ComplexToStandard.cpp
@@ -428,7 +428,7 @@ struct Expm1OpConversion : public OpConversionPattern<complex::Expm1Op> {
ImplicitLocOpBuilder &b) const {
auto argType = mlir::cast<FloatType>(arg.getType());
auto negHalf = arith::ConstantOp::create(b, b.getFloatAttr(argType, -0.5));
- auto negOne = arith::ConstantOp::create(b, b.getFloatAttr(argType, -1.0));
+ auto one = arith::ConstantOp::create(b, b.getFloatAttr(argType, 1.0));
// Algorithm copied from cephes cosm1.
SmallVector<double, 7> kCoeffs{
@@ -438,7 +438,7 @@ struct Expm1OpConversion : public OpConversionPattern<complex::Expm1Op> {
4.1666666666666666609054E-2,
};
Value cos = math::CosOp::create(b, arg, fmf);
- Value forLargeArg = arith::AddFOp::create(b, cos, negOne, fmf);
+ Value forLargeArg = arith::SubFOp::create(b, cos, one, fmf);
Value argPow2 = arith::MulFOp::create(b, arg, arg, fmf);
Value argPow4 = arith::MulFOp::create(b, argPow2, argPow2, fmf);
@@ -760,13 +760,11 @@ struct TanTanhOpConversion : public OpConversionPattern<Op> {
complex::ReOp::create(b, loc, elementType, adaptor.getComplex());
Value imag =
complex::ImOp::create(b, loc, elementType, adaptor.getComplex());
- Value negOne = arith::ConstantOp::create(b, elementType,
- b.getFloatAttr(elementType, -1.0));
if constexpr (std::is_same_v<Op, complex::TanOp>) {
// tan(x+yi) = -i*tanh(-y + xi)
std::swap(real, imag);
- real = arith::MulFOp::create(b, real, negOne, fmf);
+ real = arith::NegFOp::create(b, real, fmf);
}
auto cst = [&](APFloat v) {
@@ -777,14 +775,14 @@ struct TanTanhOpConversion : public OpConversionPattern<Op> {
Value four = arith::ConstantOp::create(b, elementType,
b.getFloatAttr(elementType, 4.0));
Value twoReal = arith::AddFOp::create(b, real, real, fmf);
- Value negTwoReal = arith::MulFOp::create(b, negOne, twoReal, fmf);
+ Value negTwoReal = arith::NegFOp::create(b, twoReal, fmf);
Value expTwoRealMinusOne = math::ExpM1Op::create(b, twoReal, fmf);
Value expNegTwoRealMinusOne = math::ExpM1Op::create(b, negTwoReal, fmf);
Value realNum = arith::SubFOp::create(b, expTwoRealMinusOne,
expNegTwoRealMinusOne, fmf);
Value expProduct = arith::MulFOp::create(b, expTwoRealMinusOne,
expNegTwoRealMinusOne, fmf);
- Value expSumMinusTwo = arith::MulFOp::create(b, negOne, expProduct, fmf);
+ Value expSumMinusTwo = arith::NegFOp::create(b, expProduct, fmf);
Value cosImag = math::CosOp::create(b, imag, fmf);
Value cosImagSq = arith::MulFOp::create(b, cosImag, cosImag, fmf);
@@ -799,6 +797,8 @@ struct TanTanhOpConversion : public OpConversionPattern<Op> {
Value isInf = arith::CmpFOp::create(b, arith::CmpFPredicate::OEQ,
expSumMinusTwo, inf, fmf);
+ Value negOne = arith::ConstantOp::create(b, elementType,
+ b.getFloatAttr(elementType, -1.0));
Value realLimit = math::CopySignOp::create(b, negOne, real, fmf);
Value resultReal = arith::SelectOp::create(
@@ -834,7 +834,7 @@ struct TanTanhOpConversion : public OpConversionPattern<Op> {
if constexpr (std::is_same_v<Op, complex::TanOp>) {
// tan(x+yi) = -i*tanh(-y + xi)
std::swap(resultReal, resultImag);
- resultImag = arith::MulFOp::create(b, resultImag, negOne, fmf);
+ resultImag = arith::NegFOp::create(b, resultImag, fmf);
}
rewriter.replaceOpWithNewOp<complex::CreateOp>(op, type, resultReal,
@@ -1053,13 +1053,9 @@ struct RsqrtOpConversion : public OpConversionPattern<complex::RsqrtOp> {
if (!arith::bitEnumContainsAll(fmf, arith::FastMathFlags::nnan |
arith::FastMathFlags::ninf)) {
- Value negOne = arith::ConstantOp::create(b, elementType,
- b.getFloatAttr(elementType, -1));
-
Value realSignedZero = math::CopySignOp::create(b, zero, real, fmf);
Value imagSignedZero = math::CopySignOp::create(b, zero, imag, fmf);
- Value negImagSignedZero =
- arith::MulFOp::create(b, negOne, imagSignedZero, fmf);
+ Value negImagSignedZero = arith::NegFOp::create(b, imagSignedZero, fmf);
Value absReal = math::AbsFOp::create(b, real, fmf);
Value absImag = math::AbsFOp::create(b, imag, fmf);
diff --git a/mlir/test/Conversion/ComplexToStandard/convert-to-standard.mlir b/mlir/test/Conversion/ComplexToStandard/convert-to-standard.mlir
index 10cfe2b061f56..448d82df50320 100644
--- a/mlir/test/Conversion/ComplexToStandard/convert-to-standard.mlir
+++ b/mlir/test/Conversion/ComplexToStandard/convert-to-standard.mlir
@@ -249,9 +249,9 @@ func.func @complex_expm1(%arg: complex<f32>) -> complex<f32> {
// CHECK: %[[VAL_6:.*]] = arith.addf %[[EXPM1]], %[[C1_F32]] fastmath<nnan,contract> : f32
// CHECK: %[[VAL_7:.*]] = math.sin %[[IMAG]] fastmath<nnan,contract> : f32
// CHECK: %[[VAL_8:.*]] = arith.constant -5.000000e-01 : f32
-// CHECK: %[[VAL_9:.*]] = arith.constant -1.000000e+00 : f32
+// CHECK: %[[VAL_9:.*]] = arith.constant 1.000000e+00 : f32
// CHECK: %[[VAL_10:.*]] = math.cos %[[IMAG]] fastmath<nnan,contract> : f32
-// CHECK: %[[VAL_11:.*]] = arith.addf %[[VAL_10]], %[[VAL_9]] fastmath<nnan,contract> : f32
+// CHECK: %[[VAL_11:.*]] = arith.subf %[[VAL_10]], %[[VAL_9]] fastmath<nnan,contract> : f32
// CHECK: %[[VAL_12:.*]] = arith.mulf %[[IMAG]], %[[IMAG]] fastmath<nnan,contract> : f32
// CHECK: %[[VAL_13:.*]] = arith.mulf %[[VAL_12]], %[[VAL_12]] fastmath<nnan,contract> : f32
// CHECK-DAG: %[[COEF0:.*]] = arith.constant 4.73775072E-14 : f32
@@ -484,17 +484,16 @@ func.func @complex_tan(%arg: complex<f32>) -> complex<f32> {
// CHECK: %[[IMAG:.*]] = complex.re %[[ARG]] : complex<f32>
// CHECK: %[[V0:.*]] = complex.im %[[ARG]] : complex<f32>
-// CHECK: %[[NEG_ONE:.*]] = arith.constant -1.000000e+00 : f32
-// CHECK: %[[REAL:.*]] = arith.mulf %[[V0]], %[[NEG_ONE]] : f32
+// CHECK: %[[REAL:.*]] = arith.negf %[[V0]] : f32
// CHECK: %[[INF:.*]] = arith.constant 0x7F800000 : f32
// CHECK: %[[FOUR:.*]] = arith.constant 4.000000e+00 : f32
// CHECK: %[[TWO_REAL:.*]] = arith.addf %[[REAL]], %[[REAL]] : f32
-// CHECK: %[[NEG_TWO_REAL:.*]] = arith.mulf %[[NEG_ONE]], %[[TWO_REAL]] : f32
+// CHECK: %[[NEG_TWO_REAL:.*]] = arith.negf %[[TWO_REAL]] : f32
// CHECK: %[[EXP_TWO_REAL_M1:.*]] = math.expm1 %[[TWO_REAL]] : f32
// CHECK: %[[EXP_NEG_TWO_REAL_M1:.*]] = math.expm1 %[[NEG_TWO_REAL]] : f32
// CHECK: %[[REAL_NUM:.*]] = arith.subf %[[EXP_TWO_REAL_M1]], %[[EXP_NEG_TWO_REAL_M1]] : f32
// CHECK: %[[EXP_PRODUCT:.*]] = arith.mulf %[[EXP_TWO_REAL_M1]], %[[EXP_NEG_TWO_REAL_M1]] : f32
-// CHECK: %[[EXP_SUM_M2:.*]] = arith.mulf %[[NEG_ONE]], %[[EXP_PRODUCT]] : f32
+// CHECK: %[[EXP_SUM_M2:.*]] = arith.negf %[[EXP_PRODUCT]] : f32
// CHECK: %[[COS:.*]] = math.cos %[[IMAG]] : f32
// CHECK: %[[COS_SQ:.*]] = arith.mulf %[[COS]], %[[COS]] : f32
// CHECK: %[[FOUR_COS_SQ:.*]] = arith.mulf %[[COS_SQ]], %[[FOUR]] : f32
@@ -503,6 +502,7 @@ func.func @complex_tan(%arg: complex<f32>) -> complex<f32> {
// CHECK: %[[IMAG_NUM:.*]] = arith.mulf %[[FOUR]], %[[MUL]] : f32
// CHECK: %[[DENOM:.*]] = arith.addf %[[EXP_SUM_M2]], %[[FOUR_COS_SQ]] : f32
// CHECK: %[[IS_INF:.*]] = arith.cmpf oeq, %[[EXP_SUM_M2]], %[[INF]] : f32
+// CHECK: %[[NEG_ONE:.*]] = arith.constant -1.000000e+00 : f32
// CHECK: %[[LIMIT:.*]] = math.copysign %[[NEG_ONE]], %[[REAL]] : f32
// CHECK: %[[RESULT_REAL:.*]] = arith.divf %[[REAL_NUM]], %[[DENOM]] : f32
// CHECK: %[[RESULT_REAL2:.*]] = arith.select %[[IS_INF]], %[[LIMIT]], %[[RESULT_REAL]] : f32
@@ -520,7 +520,7 @@ func.func @complex_tan(%arg: complex<f32>) -> complex<f32> {
// CHECK: %[[IMAG_IS_NAN2:.*]] = arith.ori %[[IMAG_ZERO]], %[[AND]] : i1
// CHECK: %[[RESULT_REAL3:.*]] = arith.select %[[REAL_IS_NAN]], %[[NAN]], %[[RESULT_REAL2]] : f32
// CHECK: %[[RESULT_REAL:.*]] = arith.select %[[IMAG_IS_NAN2]], %[[ZERO]], %[[RESULT_IMAG]] : f32
-// CHECK: %[[RESULT_IMAG:.*]] = arith.mulf %[[RESULT_REAL3]], %[[NEG_ONE]]
+// CHECK: %[[RESULT_IMAG:.*]] = arith.negf %[[RESULT_REAL3]]
// CHECK: %[[RESULT:.*]] = complex.create %[[RESULT_REAL]], %[[RESULT_IMAG]] : complex<f32>
// CHECK: return %[[RESULT]] : complex<f32>
@@ -534,16 +534,15 @@ func.func @complex_tanh(%arg: complex<f32>) -> complex<f32> {
}
// CHECK: %[[REAL:.*]] = complex.re %[[ARG]] : complex<f32>
// CHECK: %[[IMAG:.*]] = complex.im %[[ARG]] : complex<f32>
-// CHECK: %[[NEG_ONE:.*]] = arith.constant -1.000000e+00 : f32
// CHECK: %[[INF:.*]] = arith.constant 0x7F800000 : f32
// CHECK: %[[FOUR:.*]] = arith.constant 4.000000e+00 : f32
// CHECK: %[[TWO_REAL:.*]] = arith.addf %[[REAL]], %[[REAL]] : f32
-// CHECK: %[[NEG_TWO_REAL:.*]] = arith.mulf %[[NEG_ONE]], %[[TWO_REAL]] : f32
+// CHECK: %[[NEG_TWO_REAL:.*]] = arith.negf %[[TWO_REAL]] : f32
// CHECK: %[[EXP_TWO_REAL_M1:.*]] = math.expm1 %[[TWO_REAL]] : f32
// CHECK: %[[EXP_NEG_TWO_REAL_M1:.*]] = math.expm1 %[[NEG_TWO_REAL]] : f32
// CHECK: %[[REAL_NUM:.*]] = arith.subf %[[EXP_TWO_REAL_M1]], %[[EXP_NEG_TWO_REAL_M1]] : f32
// CHECK: %[[EXP_PRODUCT:.*]] = arith.mulf %[[EXP_TWO_REAL_M1]], %[[EXP_NEG_TWO_REAL_M1]] : f32
-// CHECK: %[[EXP_SUM_M2:.*]] = arith.mulf %[[NEG_ONE]], %[[EXP_PRODUCT]] : f32
+// CHECK: %[[EXP_SUM_M2:.*]] = arith.negf %[[EXP_PRODUCT]] : f32
// CHECK: %[[COS:.*]] = math.cos %[[IMAG]] : f32
// CHECK: %[[COS_SQ:.*]] = arith.mulf %[[COS]], %[[COS]] : f32
// CHECK: %[[FOUR_COS_SQ:.*]] = arith.mulf %[[COS_SQ]], %[[FOUR]] : f32
@@ -552,6 +551,7 @@ func.func @complex_tanh(%arg: complex<f32>) -> complex<f32> {
// CHECK: %[[IMAG_NUM:.*]] = arith.mulf %[[FOUR]], %[[MUL]] : f32
// CHECK: %[[DENOM:.*]] = arith.addf %[[EXP_SUM_M2]], %[[FOUR_COS_SQ]] : f32
// CHECK: %[[IS_INF:.*]] = arith.cmpf oeq, %[[EXP_SUM_M2]], %[[INF]] : f32
+// CHECK: %[[NEG_ONE:.*]] = arith.constant -1.000000e+00 : f32
// CHECK: %[[LIMIT:.*]] = math.copysign %[[NEG_ONE]], %[[REAL]] : f32
// CHECK: %[[RESULT_REAL:.*]] = arith.divf %[[REAL_NUM]], %[[DENOM]] : f32
// CHECK: %[[RESULT_REAL2:.*]] = arith.select %[[IS_INF]], %[[LIMIT]], %[[RESULT_REAL]] : f32
@@ -1440,17 +1440,16 @@ func.func @complex_tan_with_fmf(%arg: complex<f32>) -> complex<f32> {
// CHECK: %[[IMAG:.*]] = complex.re %[[ARG]] : complex<f32>
// CHECK: %[[V0:.*]] = complex.im %[[ARG]] : complex<f32>
-// CHECK: %[[NEG_ONE:.*]] = arith.constant -1.000000e+00 : f32
-// CHECK: %[[REAL:.*]] = arith.mulf %[[V0]], %cst fastmath<nnan,contract> : f32
+// CHECK: %[[REAL:.*]] = arith.negf %[[V0]] fastmath<nnan,contract> : f32
// CHECK: %[[INF:.*]] = arith.constant 0x7F800000 : f32
// CHECK: %[[FOUR:.*]] = arith.constant 4.000000e+00 : f32
// CHECK: %[[TWO_REAL:.*]] = arith.addf %[[REAL]], %[[REAL]] fastmath<nnan,contract> : f32
-// CHECK: %[[NEG_TWO_REAL:.*]] = arith.mulf %[[NEG_ONE]], %[[TWO_REAL]] fastmath<nnan,contract> : f32
+// CHECK: %[[NEG_TWO_REAL:.*]] = arith.negf %[[TWO_REAL]] fastmath<nnan,contract> : f32
// CHECK: %[[EXP_TWO_REAL_M1:.*]] = math.expm1 %[[TWO_REAL]] fastmath<nnan,contract> : f32
// CHECK: %[[EXP_NEG_TWO_REAL_M1:.*]] = math.expm1 %[[NEG_TWO_REAL]] fastmath<nnan,contract> : f32
// CHECK: %[[REAL_NUM:.*]] = arith.subf %[[EXP_TWO_REAL_M1]], %[[EXP_NEG_TWO_REAL_M1]] fastmath<nnan,contract> : f32
// CHECK: %[[EXP_PRODUCT:.*]] = arith.mulf %[[EXP_TWO_REAL_M1]], %[[EXP_NEG_TWO_REAL_M1]] fastmath<nnan,contract> : f32
-// CHECK: %[[EXP_SUM_M2:.*]] = arith.mulf %[[NEG_ONE]], %[[EXP_PRODUCT]] fastmath<nnan,contract> : f32
+// CHECK: %[[EXP_SUM_M2:.*]] = arith.negf %[[EXP_PRODUCT]] fastmath<nnan,contract> : f32
// CHECK: %[[COS:.*]] = math.cos %[[IMAG]] fastmath<nnan,contract> : f32
// CHECK: %[[COS_SQ:.*]] = arith.mulf %[[COS]], %[[COS]] fastmath<nnan,contract> : f32
// CHECK: %[[FOUR_COS_SQ:.*]] = arith.mulf %[[COS_SQ]], %[[FOUR]] fastmath<nnan,contract> : f32
@@ -1459,6 +1458,7 @@ func.func @complex_tan_with_fmf(%arg: complex<f32>) -> complex<f32> {
// CHECK: %[[IMAG_NUM:.*]] = arith.mulf %[[FOUR]], %[[MUL]] fastmath<nnan,contract> : f32
// CHECK: %[[DENOM:.*]] = arith.addf %[[EXP_SUM_M2]], %[[FOUR_COS_SQ]] fastmath<nnan,contract> : f32
// CHECK: %[[IS_INF:.*]] = arith.cmpf oeq, %[[EXP_SUM_M2]], %[[INF]] fastmath<nnan,contract> : f32
+// CHECK: %[[NEG_ONE:.*]] = arith.constant -1.000000e+00 : f32
// CHECK: %[[LIMIT:.*]] = math.copysign %[[NEG_ONE]], %[[REAL]] fastmath<nnan,contract> : f32
// CHECK: %[[RESULT_REAL:.*]] = arith.divf %[[REAL_NUM]], %[[DENOM]] fastmath<nnan,contract> : f32
// CHECK: %[[RESULT_REAL2:.*]] = arith.select %[[IS_INF]], %[[LIMIT]], %[[RESULT_REAL]] : f32
@@ -1476,7 +1476,7 @@ func.func @complex_tan_with_fmf(%arg: complex<f32>) -> complex<f32> {
// CHECK: %[[IMAG_IS_NAN2:.*]] = arith.ori %[[IMAG_ZERO]], %[[AND]] : i1
// CHECK: %[[RESULT_REAL3:.*]] = arith.select %[[REAL_IS_NAN]], %[[NAN]], %[[RESULT_REAL2]] : f32
// CHECK: %[[RESULT_REAL:.*]] = arith.select %[[IMAG_IS_NAN2]], %[[ZERO]], %[[RESULT_IMAG]] : f32
-// CHECK: %[[RESULT_IMAG:.*]] = arith.mulf %[[RESULT_REAL3]], %[[NEG_ONE]] fastmath<nnan,contract> : f32
+// CHECK: %[[RESULT_IMAG:.*]] = arith.negf %[[RESULT_REAL3]] fastmath<nnan,contract> : f32
// CHECK: %[[RESULT:.*]] = complex.create %[[RESULT_REAL]], %[[RESULT_IMAG]] : complex<f32>
// CHECK: return %[[RESULT]] : complex<f32>
@@ -1491,16 +1491,15 @@ func.func @complex_tanh_with_fmf(%arg: complex<f32>) -> complex<f32> {
// CHECK: %[[REAL:.*]] = complex.re %[[ARG]] : complex<f32>
// CHECK: %[[IMAG:.*]] = complex.im %[[ARG]] : complex<f32>
-// CHECK: %[[NEG_ONE:.*]] = arith.constant -1.000000e+00 : f32
// CHECK: %[[INF:.*]] = arith.constant 0x7F800000 : f32
// CHECK: %[[FOUR:.*]] = arith.constant 4.000000e+00 : f32
// CHECK: %[[TWO_REAL:.*]] = arith.addf %[[REAL]], %[[REAL]] fastmath<nnan,contract> : f32
-// CHECK: %[[NEG_TWO_REAL:.*]] = arith.mulf %[[NEG_ONE]], %[[TWO_REAL]] fastmath<nnan,contract> : f32
+// CHECK: %[[NEG_TWO_REAL:.*]] = arith.negf %[[TWO_REAL]] fastmath<nnan,contract> : f32
// CHECK: %[[EXP_TWO_REAL_M1:.*]] = math.expm1 %[[TWO_REAL]] fastmath<nnan,contract> : f32
// CHECK: %[[EXP_NEG_TWO_REAL_M1:.*]] = math.expm1 %[[NEG_TWO_REAL]] fastmath<nnan,contract> : f32
// CHECK: %[[REAL_NUM:.*]] = arith.subf %[[EXP_TWO_REAL_M1]], %[[EXP_NEG_TWO_REAL_M1]] fastmath<nnan,contract> : f32
// CHECK: %[[EXP_PRODUCT:.*]] = arith.mulf %[[EXP_TWO_REAL_M1]], %[[EXP_NEG_TWO_REAL_M1]] fastmath<nnan,contract> : f32
-// CHECK: %[[EXP_SUM_M2:.*]] = arith.mulf %[[NEG_ONE]], %[[EXP_PRODUCT]] fastmath<nnan,contract> : f32
+// CHECK: %[[EXP_SUM_M2:.*]] = arith.negf %[[EXP_PRODUCT]] fastmath<nnan,contract> : f32
// CHECK: %[[COS:.*]] = math.cos %[[IMAG]] fastmath<nnan,contract> : f32
// CHECK: %[[COS_SQ:.*]] = arith.mulf %[[COS]], %[[COS]] fastmath<nnan,contract> : f32
// CHECK: %[[FOUR_COS_SQ:.*]] = arith.mulf %[[COS_SQ]], %[[FOUR]] fastmath<nnan,contract> : f32
@@ -1509,6 +1508,7 @@ func.func @complex_tanh_with_fmf(%arg: complex<f32>) -> complex<f32> {
// CHECK: %[[IMAG_NUM:.*]] = arith.mulf %[[FOUR]], %[[MUL]] fastmath<nnan,contract> : f32
// CHECK: %[[DENOM:.*]] = arith.addf %[[EXP_SUM_M2]], %[[FOUR_COS_SQ]] fastmath<nnan,contract> : f32
// CHECK: %[[IS_INF:.*]] = arith.cmpf oeq, %[[EXP_SUM_M2]], %[[INF]] fastmath<nnan,contract> : f32
+// CHECK: %[[NEG_ONE:.*]] = arith.constant -1.000000e+00 : f32
// CHECK: %[[LIMIT:.*]] = math.copysign %[[NEG_ONE]], %[[REAL]] fastmath<nnan,contract> : f32
// CHECK: %[[RESULT_REAL:.*]] = arith.divf %[[REAL_NUM]], %[[DENOM]] fastmath<nnan,contract> : f32
// CHECK: %[[RESULT_REAL2:.*]] = arith.select %[[IS_INF]], %[[LIMIT]], %[[RESULT_REAL]] : f32
More information about the Mlir-commits
mailing list