[mlir] Add polynomial approximation for math::LogOp (using builders API)

[ezhulenev]

Summary

Replace math::LogOp with an approximations from the the Julien Pommier's SSE math library

Link: http://gruntthepeon.free.fr/ssemath

[ezhulenev]

Use ImplicitLocOpBuilder

[mehdi_amini]

Code LGTM, I didn't review carefully the numerics here, @asaadaldien is this something you'd like to look at?

[asaadaldien]

LGTM, The log-approximation looks very similar to another implementation I am familiar with (https://github.com/halide/Halide/blob/master/src/IROperator.cpp#L1147)
Some (approximation precision - performance) trade off can be revisited later IMO.

mlir/lib/Dialect/Math/Transforms/PolynomialApproximation.cpp

303

The shift adds more operations and still uses same 8-order polynomial as https://github.com/boulos/syrah/blob/master/src/include/syrah/FixedVectorMath.h#L460, I wonder does it add more precision? if yes Can we reach same precision as syrah's implementation with lower polynomial order ?

[asaadaldien]

mlir/lib/Dialect/Math/Transforms/PolynomialApproximation.cpp

146

abs isn't needed here if we are using a strictly positive frexp which is useful in the log(x), x > 0 we have below. This requires using a different cstInvMantMask see (https://github.com/boulos/syrah/blob/master/src/include/syrah/FixedVectorMath.h#L426)

[ezhulenev]

Minor fix

[ezhulenev]

Optimize frexp for positive values

[ezhulenev]

mlir/lib/Dialect/Math/Transforms/PolynomialApproximation.cpp

146

Added a flag to disable abs, it saved ~5% of cpu time in benchmarks. Re mask: didn't quite get it, I think it is irrelevant, and 0x807FFFF is exactly the inverse of 0x7f800000.

303

Added a note to explore this option in the followup PRs.

[dcaballe]

Hi @ezhulenev!

It looks like elementType and isI32 methods in PolynomialApproximation.cpp are not used. Would it be possible to remove them to avoid the warnings?

Thanks!
Diego

[ezhulenev]

They are actually used but only inside assert, is it a release build when it is a warning?

[dcaballe]

In D97304#2620165, @ezhulenev wrote:

They are actually used but only inside assert, is it a release build when it is a warning?

Oh, yes, it looks like it's only for release build. Not sure about the guidelines for this case. We couldn't use #ifndef NDEBUG since asserts can also be enabled in release build. Could we introduce some dummy casting for them as we do for other variables that are only used inside asserts (https://llvm.org/docs/CodingStandards.html#id44)?

[mehdi_amini]

#ifndef NDEBUG works because this is exactly what is controlled by enabling/disabling assert in release mode.

mlir/lib/Dialect/Math/Transforms/CMakeLists.txt

 add_mlir_dialect_library(MLIRMathTransforms
   ExpandTanh.cpp
   PolynomialApproximation.cpp
 
   ADDITIONAL_HEADER_DIRS
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/Math/Transforms
 
   LINK_LIBS PUBLIC
   MLIRIR
+  MLIRLLVMIR
   MLIRMath
   MLIRPass
   MLIRStandard
   MLIRTransforms
   )

mlir/lib/Dialect/Math/Transforms/PolynomialApproximation.cpp

 //===- PolynomialApproximation.cpp - Approximate math operations ----------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 //
 // This file implements expansion of math operations to fast approximations
 // that do not rely on any of the library functions.
 //
 //===----------------------------------------------------------------------===//
 
+#include "mlir/Dialect/LLVMIR/LLVMDialect.h"
+#include "mlir/Dialect/LLVMIR/LLVMTypes.h"
 #include "mlir/Dialect/Math/IR/Math.h"
 #include "mlir/Dialect/Math/Transforms/Passes.h"
 #include "mlir/Dialect/Vector/VectorOps.h"
 #include "mlir/IR/Builders.h"
+#include "mlir/IR/ImplicitLocOpBuilder.h"
 #include "mlir/Transforms/DialectConversion.h"
 #include "mlir/Transforms/GreedyPatternRewriteDriver.h"
 
 using namespace mlir;
 using namespace mlir::vector;
 
-static bool isValidFloatType(Type type) {
-  if (auto vectorType = type.dyn_cast<VectorType>())
-    return vectorType.getElementType().isa<FloatType>();
-  return type.isa<FloatType>();
-}
+using TypePredicate = llvm::function_ref<bool(Type)>;
 
-//----------------------------------------------------------------------------//
-// A PatternRewriter wrapper that provides concise API for building expansions
-// for operations on float scalars or vectors.
-//----------------------------------------------------------------------------//
+static bool isF32(Type type) { return type.isF32(); }
 
-namespace {
-class FloatApproximationBuilder {
-public:
-  FloatApproximationBuilder(Location loc, Type type, PatternRewriter &rewriter);
+// Returns vector width if the element type is matching the predicate (scalars
+// that do match the predicate have width equal to `1`).
+static Optional<int> vectorWidth(Type type, TypePredicate pred) {
+  // If the type matches the predicate then its width is `1`.
+  if (pred(type))
+    return 1;
 
-  Value constant(double value) const;
+  // Otherwise check if the type is a vector type.
+  auto vectorType = type.dyn_cast<VectorType>();
+  if (vectorType && pred(vectorType.getElementType())) {
+    assert(vectorType.getRank() == 1 && "only 1d vectors are supported");
+    return vectorType.getDimSize(0);
+  }
 
-  Value abs(Value a) const;
-  Value min(Value a, Value b) const;
-  Value max(Value a, Value b) const;
-  Value mul(Value a, Value b) const;
-  Value div(Value a, Value b) const;
-
-  // Fused multiple-add operation: a * b + c.
-  Value madd(Value a, Value b, Value c) const;
-
-  // Compares values `a` and `b` with the given `predicate`.
-  Value cmp(CmpFPredicate predicate, Value a, Value b) const;
-
-  // Selects values from `a` or `b` based on the `predicate`.
-  Value select(Value predicate, Value a, Value b) const;
-
-private:
-  Location loc;
-  PatternRewriter &rewriter;
-  VectorType vectorType; // can be null for scalar type
-  FloatType elementType;
-};
-} // namespace
+  return llvm::None;
+}
 
-FloatApproximationBuilder::FloatApproximationBuilder(Location loc, Type type,
-                                                     PatternRewriter &rewriter)
-    : loc(loc), rewriter(rewriter) {
-  vectorType = type.dyn_cast<VectorType>();
+// Returns vector width of the type. If the type is a scalar returns `1`.
+static int vectorWidth(Type type) {
+  auto vectorType = type.dyn_cast<VectorType>();
+  return vectorType ? vectorType.getDimSize(0) : 1;
+}
 
-  if (vectorType)
-    elementType = vectorType.getElementType().cast<FloatType>();
-  else
-    elementType = type.cast<FloatType>();
+// Returns vector element type. If the type is a scalar returns the argument.
+static Type elementType(Type type) {
+  auto vectorType = type.dyn_cast<VectorType>();
+  return vectorType ? vectorType.getElementType() : type;
 }
 
-Value FloatApproximationBuilder::constant(double value) const {
-  auto attr = rewriter.getFloatAttr(elementType, value);
-  Value scalar = rewriter.create<ConstantOp>(loc, attr);
+//----------------------------------------------------------------------------//
+// Broadcast scalar types and values into vector types and values.
+//----------------------------------------------------------------------------//
 
-  if (vectorType)
-    return rewriter.create<BroadcastOp>(loc, vectorType, scalar);
-  return scalar;
+// Broadcasts scalar type into vector type (iff width is greater then 1).
+static Type broadcast(Type type, int width) {
+  assert(!type.isa<VectorType>() && "must be scalar type");
+  return width > 1 ? VectorType::get({width}, type) : type;
 }
 
-Value FloatApproximationBuilder::abs(Value a) const {
-  return rewriter.create<AbsFOp>(loc, a);
+// Broadcasts scalar value into vector (iff width is greater then 1).
+static Value broadcast(ImplicitLocOpBuilder &builder, Value value, int width) {
+  assert(!value.getType().isa<VectorType>() && "must be scalar value");
+  auto type = broadcast(value.getType(), width);
+  return width > 1 ? builder.create<BroadcastOp>(type, value) : value;
 }
 
-Value FloatApproximationBuilder::min(Value a, Value b) const {
-  return select(cmp(CmpFPredicate::OLT, a, b), a, b);
+//----------------------------------------------------------------------------//
+// Helper functions to create constants.
+//----------------------------------------------------------------------------//
+
+static Value f32Cst(ImplicitLocOpBuilder &builder, float value) {
+  return builder.create<ConstantOp>(builder.getF32Type(),
+                                    builder.getF32FloatAttr(value));
 }
-Value FloatApproximationBuilder::max(Value a, Value b) const {
-  return select(cmp(CmpFPredicate::OGT, a, b), a, b);
+
+static Value i32Cst(ImplicitLocOpBuilder &builder, int32_t value) {
+  return builder.create<ConstantOp>(builder.getI32Type(),
+                                    builder.getI32IntegerAttr(value));
 }
-Value FloatApproximationBuilder::mul(Value a, Value b) const {
-  return rewriter.create<MulFOp>(loc, a, b);
+
+static Value f32FromBits(ImplicitLocOpBuilder &builder, uint32_t bits) {
+  Value i32Value = i32Cst(builder, static_cast<int32_t>(bits));
+  return builder.create<LLVM::BitcastOp>(builder.getF32Type(), i32Value);
 }
 
-Value FloatApproximationBuilder::div(Value a, Value b) const {
-  return rewriter.create<DivFOp>(loc, a, b);
+//----------------------------------------------------------------------------//
+// Helper functions to build math functions approximations.
+//----------------------------------------------------------------------------//
+
+static Value min(ImplicitLocOpBuilder &builder, Value a, Value b) {
+  return builder.create<SelectOp>(
+      builder.create<CmpFOp>(CmpFPredicate::OLT, a, b), a, b);
 }
 
-Value FloatApproximationBuilder::madd(Value a, Value b, Value c) const {
-  return rewriter.create<FmaFOp>(loc, a, b, c);
+static Value max(ImplicitLocOpBuilder &builder, Value a, Value b) {
+  return builder.create<SelectOp>(
+      builder.create<CmpFOp>(CmpFPredicate::OGT, a, b), a, b);
 }
 
-Value FloatApproximationBuilder::cmp(CmpFPredicate predicate, Value a,
-                                     Value b) const {
-  return rewriter.create<CmpFOp>(loc, predicate, a, b);
+static Value clamp(ImplicitLocOpBuilder &builder, Value value, Value lowerBound,
+                   Value upperBound) {
+  return max(builder, min(builder, value, upperBound), lowerBound);
 }
 
-Value FloatApproximationBuilder::select(Value predicate, Value a,
-                                        Value b) const {
-  return rewriter.create<SelectOp>(loc, predicate, a, b);
+// Decomposes given floating point value `arg` into a normalized fraction and
+// an integral power of two (see std::frexp). Returned values have float type.
+static std::pair<Value, Value> frexp(ImplicitLocOpBuilder &builder, Value arg) {
+  assert(isF32(elementType(arg.getType())) && "argument must be f32 type");
+
+  int width = vectorWidth(arg.getType());
+
+  auto bcast = [&](Value value) -> Value {
+    return broadcast(builder, value, width);
+  };
+
+  auto i32 = builder.getIntegerType(32);
+  auto i32Vec = broadcast(i32, width);
+  auto f32Vec = broadcast(builder.getF32Type(), width);
+
+  Value cst126f = f32Cst(builder, 126.0f);
+  Value cstHalf = f32Cst(builder, 0.5f);
+  Value cstInvMantMask = f32FromBits(builder, ~0x7f800000u);
+
+  // Cast to i32 for bitwise operations.
+  Value i32Half = builder.create<LLVM::BitcastOp>(i32, cstHalf);
+  Value i32InvMantMask = builder.create<LLVM::BitcastOp>(i32, cstInvMantMask);
+  Value i32Arg = builder.create<LLVM::BitcastOp>(i32Vec, arg);
+
+  // Compute normalized fraction.
+  Value tmp0 = builder.create<LLVM::AndOp>(i32Arg, bcast(i32InvMantMask));
+  Value tmp1 = builder.create<LLVM::OrOp>(tmp0, bcast(i32Half));
+  Value normalizedFraction = builder.create<LLVM::BitcastOp>(f32Vec, tmp1);
+
+  // Compute exponent.
+  Value biasedExponentBits = builder.create<UnsignedShiftRightOp>(
+      builder.create<LLVM::BitcastOp>(i32Vec, builder.create<AbsFOp>(arg)),
+      bcast(i32Cst(builder, 23)));
+  Value biasedExponent = builder.create<SIToFPOp>(f32Vec, biasedExponentBits);
+  Value exponent = builder.create<SubFOp>(biasedExponent, bcast(cst126f));
+
+  return {normalizedFraction, exponent};
 }
 
 //----------------------------------------------------------------------------//
 // TanhOp approximation.
 //----------------------------------------------------------------------------//
 
 namespace {
 struct TanhApproximation : public OpRewritePattern<math::TanhOp> {
 public:
   using OpRewritePattern::OpRewritePattern;
 
   LogicalResult matchAndRewrite(math::TanhOp op,
                                 PatternRewriter &rewriter) const final;
 };
 } // namespace
 
 LogicalResult
 TanhApproximation::matchAndRewrite(math::TanhOp op,
                                    PatternRewriter &rewriter) const {
-  if (!isValidFloatType(op.operand().getType()))
+  auto width = vectorWidth(op.operand().getType(), isF32);
+  if (!width.hasValue())
     return rewriter.notifyMatchFailure(op, "unsupported operand type");
 
-  Value operand = op.operand();
-  FloatApproximationBuilder builder(op->getLoc(), operand.getType(), rewriter);
+  ImplicitLocOpBuilder builder(op->getLoc(), rewriter);
+  auto bcast = [&](Value value) -> Value {
+    return broadcast(builder, value, *width);
+  };
 
   // Clamp operand into [plusClamp, minusClamp] range.
-  Value plusClamp = builder.constant(7.90531110763549805);
-  Value minusClamp = builder.constant(-7.9053111076354980);
-  Value x = builder.max(builder.min(operand, plusClamp), minusClamp);
+  Value minusClamp = bcast(f32Cst(builder, -7.9053111076354980f));
+  Value plusClamp = bcast(f32Cst(builder, 7.90531110763549805f));
+  Value x = clamp(builder, op.operand(), minusClamp, plusClamp);
 
   // Mask for tiny values that are approximated with `operand`.
-  Value tiny = builder.constant(0.0004f);
-  Value tinyMask = builder.cmp(CmpFPredicate::OLT, builder.abs(operand), tiny);
+  Value tiny = bcast(f32Cst(builder, 0.0004f));
+  Value tinyMask = builder.create<CmpFOp>(
+      CmpFPredicate::OLT, builder.create<AbsFOp>(op.operand()), tiny);
 
   // The monomial coefficients of the numerator polynomial (odd).
-  Value alpha1 = builder.constant(4.89352455891786e-03);
-  Value alpha3 = builder.constant(6.37261928875436e-04);
-  Value alpha5 = builder.constant(1.48572235717979e-05);
-  Value alpha7 = builder.constant(5.12229709037114e-08);
-  Value alpha9 = builder.constant(-8.60467152213735e-11);
-  Value alpha11 = builder.constant(2.00018790482477e-13);
-  Value alpha13 = builder.constant(-2.76076847742355e-16);
+  Value alpha1 = bcast(f32Cst(builder, 4.89352455891786e-03f));
+  Value alpha3 = bcast(f32Cst(builder, 6.37261928875436e-04f));
+  Value alpha5 = bcast(f32Cst(builder, 1.48572235717979e-05f));
+  Value alpha7 = bcast(f32Cst(builder, 5.12229709037114e-08f));
+  Value alpha9 = bcast(f32Cst(builder, -8.60467152213735e-11f));
+  Value alpha11 = bcast(f32Cst(builder, 2.00018790482477e-13f));
+  Value alpha13 = bcast(f32Cst(builder, -2.76076847742355e-16f));
 
   // The monomial coefficients of the denominator polynomial (even).
-  Value beta0 = builder.constant(4.89352518554385e-03);
-  Value beta2 = builder.constant(2.26843463243900e-03);
-  Value beta4 = builder.constant(1.18534705686654e-04);
-  Value beta6 = builder.constant(1.19825839466702e-06);
+  Value beta0 = bcast(f32Cst(builder, 4.89352518554385e-03f));
+  Value beta2 = bcast(f32Cst(builder, 2.26843463243900e-03f));
+  Value beta4 = bcast(f32Cst(builder, 1.18534705686654e-04f));
+  Value beta6 = bcast(f32Cst(builder, 1.19825839466702e-06f));
 
   // Since the polynomials are odd/even, we need x^2.
-  Value x2 = builder.mul(x, x);
+  Value x2 = builder.create<MulFOp>(x, x);
 
   // Evaluate the numerator polynomial p.
-  Value p = builder.madd(x2, alpha13, alpha11);
-  p = builder.madd(x2, p, alpha9);
-  p = builder.madd(x2, p, alpha7);
-  p = builder.madd(x2, p, alpha5);
-  p = builder.madd(x2, p, alpha3);
-  p = builder.madd(x2, p, alpha1);
-  p = builder.mul(x, p);
+  Value p = builder.create<FmaFOp>(x2, alpha13, alpha11);
+  p = builder.create<FmaFOp>(x2, p, alpha9);
+  p = builder.create<FmaFOp>(x2, p, alpha7);
+  p = builder.create<FmaFOp>(x2, p, alpha5);
+  p = builder.create<FmaFOp>(x2, p, alpha3);
+  p = builder.create<FmaFOp>(x2, p, alpha1);
+  p = builder.create<MulFOp>(x, p);
 
   // Evaluate the denominator polynomial q.
-  Value q = builder.madd(x2, beta6, beta4);
-  q = builder.madd(x2, q, beta2);
-  q = builder.madd(x2, q, beta0);
+  Value q = builder.create<FmaFOp>(x2, beta6, beta4);
+  q = builder.create<FmaFOp>(x2, q, beta2);
+  q = builder.create<FmaFOp>(x2, q, beta0);
 
   // Divide the numerator by the denominator.
-  Value res = builder.select(tinyMask, x, builder.div(p, q));
+  Value res =
+      builder.create<SelectOp>(tinyMask, x, builder.create<DivFOp>(p, q));
 
   rewriter.replaceOp(op, res);
 
   return success();
 }
 
 //----------------------------------------------------------------------------//
+// LogOp approximation.
+//----------------------------------------------------------------------------//
+
+namespace {
+
+// This approximations comes from the Julien Pommier's SSE math library.
+// Link: http://gruntthepeon.free.fr/ssemath
+struct LogApproximation : public OpRewritePattern<math::LogOp> {
+public:
+  using OpRewritePattern::OpRewritePattern;
+
+  LogicalResult matchAndRewrite(math::LogOp op,
+                                PatternRewriter &rewriter) const final;
+};
+} // namespace
+
+#define LN2_VALUE                                                              \
+  0.693147180559945309417232121458176568075500134360255254120680009493393621L
+
+LogicalResult
+LogApproximation::matchAndRewrite(math::LogOp op,
+                                  PatternRewriter &rewriter) const {
+  auto width = vectorWidth(op.operand().getType(), isF32);
+  if (!width.hasValue())
+    return rewriter.notifyMatchFailure(op, "unsupported operand type");
+
+  ImplicitLocOpBuilder builder(op->getLoc(), rewriter);
+  auto bcast = [&](Value value) -> Value {
+    return broadcast(builder, value, *width);
+  };
+
+  Value cstZero = bcast(f32Cst(builder, 0.0f));
+  Value cstOne = bcast(f32Cst(builder, 1.0f));
+  Value cstNegHalf = bcast(f32Cst(builder, -0.5f));
+
+  // The smallest non denormalized float number.
+  Value cstMinNormPos = bcast(f32FromBits(builder, 0x00800000u));
+  Value cstMinusInf = bcast(f32FromBits(builder, 0xff800000u));
+  Value cstPosInf = bcast(f32FromBits(builder, 0x7f800000u));
+  Value cstNan = bcast(f32FromBits(builder, 0x7fc00000));
+
+  // Polynomial coefficients.
+  Value cstCephesSQRTHF = bcast(f32Cst(builder, 0.707106781186547524f));
+  Value cstCephesLogP0 = bcast(f32Cst(builder, 7.0376836292E-2f));
+  Value cstCephesLogP1 = bcast(f32Cst(builder, -1.1514610310E-1f));
+  Value cstCephesLogP2 = bcast(f32Cst(builder, 1.1676998740E-1f));
+  Value cstCephesLogP3 = bcast(f32Cst(builder, -1.2420140846E-1f));
+  Value cstCephesLogP4 = bcast(f32Cst(builder, +1.4249322787E-1f));
+  Value cstCephesLogP5 = bcast(f32Cst(builder, -1.6668057665E-1f));
+  Value cstCephesLogP6 = bcast(f32Cst(builder, +2.0000714765E-1f));
+  Value cstCephesLogP7 = bcast(f32Cst(builder, -2.4999993993E-1f));
+  Value cstCephesLogP8 = bcast(f32Cst(builder, +3.3333331174E-1f));
+
+  Value x = op.operand();
+
+  // Truncate input values to the minimum positive normal.
+  x = max(builder, x, cstMinNormPos);
+
+  // Extract significant in the range [0.5,1) and exponent.
+  std::pair<Value, Value> pair = frexp(builder, x);
+  x = pair.first;
+  Value e = pair.second;
+
+  // Shift the inputs from the range [0.5,1) to [sqrt(1/2), sqrt(2)) and shift
+  // by -1.0. The values are then centered around 0, which improves the
+  // stability of the polynomial evaluation:
+  //
+  //   if( x < SQRTHF ) {
+  //     e -= 1;
+  //     x = x + x - 1.0;
+  //   } else { x = x - 1.0; }
+  Value mask = builder.create<CmpFOp>(CmpFPredicate::OLT, x, cstCephesSQRTHF);
+  Value tmp = builder.create<SelectOp>(mask, x, cstZero);
+
+  x = builder.create<SubFOp>(x, cstOne);
+  e = builder.create<SubFOp>(e,
+                             builder.create<SelectOp>(mask, cstOne, cstZero));
+  x = builder.create<AddFOp>(x, tmp);
+
+  Value x2 = builder.create<MulFOp>(x, x);
+  Value x3 = builder.create<MulFOp>(x2, x);
+
+  // Evaluate the polynomial approximant of degree 8 in three parts.
+  Value y0, y1, y2;
+  y0 = builder.create<FmaFOp>(cstCephesLogP0, x, cstCephesLogP1);
+  y1 = builder.create<FmaFOp>(cstCephesLogP3, x, cstCephesLogP4);
+  y2 = builder.create<FmaFOp>(cstCephesLogP6, x, cstCephesLogP7);
+  y0 = builder.create<FmaFOp>(y0, x, cstCephesLogP2);
+  y1 = builder.create<FmaFOp>(y1, x, cstCephesLogP5);
+  y2 = builder.create<FmaFOp>(y2, x, cstCephesLogP8);
+  y0 = builder.create<FmaFOp>(y0, x3, y1);
+  y0 = builder.create<FmaFOp>(y0, x3, y2);
+  y0 = builder.create<MulFOp>(y0, x3);
+
+  y0 = builder.create<FmaFOp>(cstNegHalf, x2, y0);
+  x = builder.create<AddFOp>(x, y0);
+
+  Value cstLn2 = bcast(f32Cst(builder, static_cast<float>(LN2_VALUE)));
+  x = builder.create<FmaFOp>(e, cstLn2, x);
+
+  Value invalidMask =
+      builder.create<CmpFOp>(CmpFPredicate::ULT, op.operand(), cstZero);
+  Value zeroMask =
+      builder.create<CmpFOp>(CmpFPredicate::OEQ, op.operand(), cstZero);
+  Value posInfMask =
+      builder.create<CmpFOp>(CmpFPredicate::OEQ, op.operand(), cstPosInf);
+
+  // Filter out invalid values:
+  //  • x == 0     -> -INF
+  //  • x < 0      ->  NAN
+  //  • x == +INF  -> +INF
+  Value aproximation = builder.create<SelectOp>(
+      zeroMask, cstMinusInf,
+      builder.create<SelectOp>(
+          invalidMask, cstNan,
+          builder.create<SelectOp>(posInfMask, cstPosInf, x)));
+
+  rewriter.replaceOp(op, aproximation);
+
+  return success();
+}
+
+//----------------------------------------------------------------------------//
 
 void mlir::populateMathPolynomialApproximationPatterns(
     OwningRewritePatternList &patterns, MLIRContext *ctx) {
-  patterns.insert<TanhApproximation>(ctx);
+  patterns.insert<TanhApproximation, LogApproximation>(ctx);
 }

mlir/test/Dialect/Math/polynomial-approximation.mlir

 // RUN: mlir-opt %s -test-math-polynomial-approximation | FileCheck %s
 
-// CHECK-LABEL: @tanh_scalar
-func @tanh_scalar(%arg0: f32) -> f32 {
+// Check that all math functions lowered to approximations built from
+// standard operations (add, mul, fma, shift, etc...).
+
+// CHECK-LABEL: @scalar
+func @scalar(%arg0: f32) -> f32 {
   // CHECK-NOT: tanh
   %0 = math.tanh %arg0 : f32
-  return %0 : f32
+  // CHECK-NOT: log
+  %1 = math.log %0 : f32
+  return %1 : f32
 }
 
-// CHECK-LABEL: @tanh_vector
-func @tanh_vector(%arg0: vector<8xf32>) -> vector<8xf32> {
+// CHECK-LABEL: @vector
+func @vector(%arg0: vector<8xf32>) -> vector<8xf32> {
   // CHECK-NOT: tanh
   %0 = math.tanh %arg0 : vector<8xf32>
-  return %0 : vector<8xf32>
+  // CHECK-NOT: log
+  %1 = math.log %0 : vector<8xf32>
+  return %1 : vector<8xf32>
 }

mlir/test/lib/Transforms/TestPolynomialApproximation.cpp

 //===- TestPolynomialApproximation.cpp - Test math ops approximations -----===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 //
 // This file contains test passes for expanding math operations into
 // polynomial approximations.
 //
 //===----------------------------------------------------------------------===//
 
+#include "mlir/Dialect/LLVMIR/LLVMDialect.h"
 #include "mlir/Dialect/Math/IR/Math.h"
 #include "mlir/Dialect/Math/Transforms/Passes.h"
 #include "mlir/Dialect/Vector/VectorOps.h"
 #include "mlir/Pass/Pass.h"
 #include "mlir/Transforms/GreedyPatternRewriteDriver.h"
 
 using namespace mlir;
 
 namespace {
 struct TestMathPolynomialApproximationPass
     : public PassWrapper<TestMathPolynomialApproximationPass, FunctionPass> {
   void runOnFunction() override;
   void getDependentDialects(DialectRegistry &registry) const override {
-    registry.insert<vector::VectorDialect, math::MathDialect>();
+    registry
+        .insert<vector::VectorDialect, math::MathDialect, LLVM::LLVMDialect>();
   }
 };
 } // end anonymous namespace
 
 void TestMathPolynomialApproximationPass::runOnFunction() {
   OwningRewritePatternList patterns;
   populateMathPolynomialApproximationPatterns(patterns, &getContext());
   (void)applyPatternsAndFoldGreedily(getOperation(), std::move(patterns));

mlir/test/mlir-cpu-runner/math_polynomial_approx.mlir

 // RUN:   mlir-opt %s -test-math-polynomial-approximation                      \
 // RUN:               -convert-vector-to-llvm                                  \
 // RUN:               -convert-std-to-llvm                                     \
 // RUN: | mlir-cpu-runner                                                      \
 // RUN:     -e main -entry-point-result=void -O0                               \
 // RUN:     -shared-libs=%linalg_test_lib_dir/libmlir_c_runner_utils%shlibext  \
 // RUN:     -shared-libs=%linalg_test_lib_dir/libmlir_runner_utils%shlibext    \
 // RUN: | FileCheck %s
 
-
-func @main() {
-  // ------------------------------------------------------------------------ //
-  // Tanh.
-  // ------------------------------------------------------------------------ //
-
+func @tanh() {
   // CHECK: 0.848284
   %0 = constant 1.25 : f32
   %1 = math.tanh %0 : f32
   vector.print %1 : f32
 
   // CHECK: 0.244919, 0.635149, 0.761594, 0.848284
   %2 = constant dense<[0.25, 0.75, 1.0, 1.25]> : vector<4xf32>
   %3 = math.tanh %2 : vector<4xf32>
   vector.print %3 : vector<4xf32>
 
   // CHECK: 0.099668, 0.197375, 0.291313, 0.379949, 0.462117, 0.53705, 0.604368, 0.664037
   %4 = constant dense<[0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8]> : vector<8xf32>
   %5 = math.tanh %4 : vector<8xf32>
   vector.print %5 : vector<8xf32>
 
   return
 }
+
+// ------------------------------------------------------------------------ //
+// Log.
+// ------------------------------------------------------------------------ //
+func @log() {
+  // CHECK: 2.64704
+  %0 = constant 14.112233 : f32
+  %1 = math.log %0 : f32
+  vector.print %1 : f32
+
+  // CHECK: -1.38629, -0.287682, 0, 0.223144
+  %2 = constant dense<[0.25, 0.75, 1.0, 1.25]> : vector<4xf32>
+  %3 = math.log %2 : vector<4xf32>
+  vector.print %3 : vector<4xf32>
+
+  // CHECK: -2.30259, -1.60944, -1.20397, -0.916291, -0.693147, -0.510826, -0.356675, -0.223144
+  %4 = constant dense<[0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8]> : vector<8xf32>
+  %5 = math.log %4 : vector<8xf32>
+  vector.print %5 : vector<8xf32>
+
+  // CHECK: -inf
+  %zero = constant 0.0 : f32
+  %log_zero = math.log %zero : f32
+  vector.print %log_zero : f32
+
+  // CHECK: nan
+  %neg_one = constant -1.0 : f32
+  %log_neg_one = math.log %neg_one : f32
+  vector.print %log_neg_one : f32
+
+  // CHECK: inf
+  %inf = constant 0x7f800000 : f32
+  %log_inf = math.log %inf : f32
+  vector.print %log_inf : f32
+
+  // CHECK: -inf, nan, inf, 0.693147
+  %special_vec = constant dense<[0.0, -1.0, 0x7f800000, 2.0]> : vector<4xf32>
+  %log_special_vec = math.log %special_vec : vector<4xf32>
+  vector.print %log_special_vec : vector<4xf32>
+
+  return
+}
+
+func @main() {
+  call @tanh(): () -> ()
+  call @log(): () -> ()
+  return
+}