Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions mlir/include/mlir/Dialect/Math/Transforms/Passes.td
Original file line number Diff line number Diff line change
Expand Up @@ -64,4 +64,12 @@ def MathExpandOpsPass : Pass<"math-expand-ops"> {
];
}

def MathSincosFusionPass : Pass<"math-sincos-fusion"> {
let summary = "Fuse sin and cos operations.";
let description = [{
Fuse sin and cos operations into a sincos operation.
}];
let dependentDialects = ["math::MathDialect"];
}

#endif // MLIR_DIALECT_MATH_TRANSFORMS_PASSES
1 change: 1 addition & 0 deletions mlir/lib/Dialect/Math/Transforms/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ add_mlir_dialect_library(MLIRMathTransforms
ExpandOps.cpp
ExtendToSupportedTypes.cpp
PolynomialApproximation.cpp
SincosFusion.cpp
UpliftToFMA.cpp

ADDITIONAL_HEADER_DIRS
Expand Down
80 changes: 80 additions & 0 deletions mlir/lib/Dialect/Math/Transforms/SincosFusion.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
//===- SincosFusion.cpp - Fuse sin/cos into sincos -----------------------===//
//
// 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
//
//===----------------------------------------------------------------------===//

#include "mlir/Dialect/Math/IR/Math.h"
#include "mlir/Dialect/Math/Transforms/Passes.h"
#include "mlir/IR/PatternMatch.h"
#include "mlir/Transforms/GreedyPatternRewriteDriver.h"

using namespace mlir;
using namespace mlir::math;

namespace {

/// Fuse a math.sin and math.cos in the same block that use the same operand and
/// have identical fastmath flags into a single math.sincos.
struct SincosFusionPattern : OpRewritePattern<math::SinOp> {
using Base::Base;

LogicalResult matchAndRewrite(math::SinOp sinOp,
PatternRewriter &rewriter) const override {
Value operand = sinOp.getOperand();
mlir::arith::FastMathFlags sinFastMathFlags = sinOp.getFastmath();

math::CosOp cosOp = nullptr;
sinOp->getBlock()->walk([&](math::CosOp op) {
if (op.getOperand() == operand && op.getFastmath() == sinFastMathFlags) {
cosOp = op;
return WalkResult::interrupt();
}
return WalkResult::advance();
});

if (!cosOp)
return failure();

Operation *firstOp = sinOp->isBeforeInBlock(cosOp) ? sinOp.getOperation()
: cosOp.getOperation();
rewriter.setInsertionPoint(firstOp);

Type elemType = sinOp.getType();
auto sincos = math::SincosOp::create(rewriter, firstOp->getLoc(),
TypeRange{elemType, elemType}, operand,
sinOp.getFastmathAttr());

rewriter.replaceOp(sinOp, sincos.getSin());
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please try an example where cos precedes sin, and there is a use of cos before sin.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The insertion point should be the dominating operation. Thanks for pointing that out!

rewriter.replaceOp(cosOp, sincos.getCos());
return success();
}
};

} // namespace

namespace mlir::math {
#define GEN_PASS_DEF_MATHSINCOSFUSIONPASS
#include "mlir/Dialect/Math/Transforms/Passes.h.inc"
} // namespace mlir::math

namespace {

struct MathSincosFusionPass final
: math::impl::MathSincosFusionPassBase<MathSincosFusionPass> {
using MathSincosFusionPassBase::MathSincosFusionPassBase;

void runOnOperation() override {
RewritePatternSet patterns(&getContext());
patterns.add<SincosFusionPattern>(&getContext());

GreedyRewriteConfig config;
if (failed(
applyPatternsGreedily(getOperation(), std::move(patterns), config)))
return signalPassFailure();
}
};

} // namespace
86 changes: 86 additions & 0 deletions mlir/test/Dialect/Math/sincos-fusion.mlir
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
// RUN: mlir-opt -math-sincos-fusion %s | FileCheck %s

// CHECK-LABEL: func.func @sincos_fusion(
// CHECK-SAME: %[[ARG0:.*]]: f32,
// CHECK-SAME: %[[ARG1:.*]]: f32) -> (f32, f32, f32, f32) {
// CHECK: %[[VAL_0:.*]], %[[VAL_1:.*]] = math.sincos %[[ARG0]] : f32
// CHECK: %[[VAL_2:.*]], %[[VAL_3:.*]] = math.sincos %[[ARG1]] : f32
// CHECK: return %[[VAL_0]], %[[VAL_1]], %[[VAL_3]], %[[VAL_2]] : f32, f32, f32, f32
// CHECK: }
func.func @sincos_fusion(%arg0 : f32, %arg1 : f32) -> (f32, f32, f32, f32) {
%0 = math.sin %arg0 : f32
%1 = math.cos %arg0 : f32

%2 = math.cos %arg1 : f32
%3 = math.sin %arg1 : f32

func.return %0, %1, %2, %3 : f32, f32, f32, f32
}

func.func private @sink(%arg0 : f32)

// CHECK: func.func private @sink(f32)
// CHECK-LABEL: func.func @sincos_ensure_ssa_dominance(
// CHECK-SAME: %[[ARG0:.*]]: f32,
// CHECK-SAME: %[[ARG1:.*]]: f32) -> (f32, f32, f32, f32) {
// CHECK: %[[VAL_0:.*]], %[[VAL_1:.*]] = math.sincos %[[ARG0]] : f32
// CHECK: call @sink(%[[VAL_0]]) : (f32) -> ()
// CHECK: %[[VAL_2:.*]], %[[VAL_3:.*]] = math.sincos %[[ARG1]] : f32
// CHECK: call @sink(%[[VAL_3]]) : (f32) -> ()
// CHECK: return %[[VAL_0]], %[[VAL_1]], %[[VAL_3]], %[[VAL_2]] : f32, f32, f32, f32
// CHECK: }
func.func @sincos_ensure_ssa_dominance(%arg0 : f32, %arg1 : f32) -> (f32, f32, f32, f32) {
%0 = math.sin %arg0 : f32
func.call @sink(%0) : (f32) -> ()
%1 = math.cos %arg0 : f32
%2 = math.cos %arg1 : f32
func.call @sink(%2) : (f32) -> ()
%3 = math.sin %arg1 : f32
func.return %0, %1, %2, %3 : f32, f32, f32, f32
}

// CHECK-LABEL: func.func @sincos_fusion_no_match_fmf(
// CHECK-SAME: %[[ARG0:.*]]: f32) -> (f32, f32) {
// CHECK: %[[VAL_0:.*]] = math.sin %[[ARG0]] fastmath<contract> : f32
// CHECK: %[[VAL_1:.*]] = math.cos %[[ARG0]] : f32
// CHECK: return %[[VAL_0]], %[[VAL_1]] : f32, f32
// CHECK: }
func.func @sincos_fusion_no_match_fmf(%arg0 : f32) -> (f32, f32) {
%0 = math.sin %arg0 fastmath<contract> : f32
%1 = math.cos %arg0 : f32
func.return %0, %1 : f32, f32
}

// CHECK-LABEL: func.func @sincos_no_fusion_different_block(
// CHECK-SAME: %[[ARG0:.*]]: f32,
// CHECK-SAME: %[[ARG1:.*]]: i1) -> f32 {
// CHECK: %[[VAL_0:.*]] = scf.if %[[ARG1]] -> (f32) {
// CHECK: %[[VAL_1:.*]] = math.sin %[[ARG0]] : f32
// CHECK: scf.yield %[[VAL_1]] : f32
// CHECK: } else {
// CHECK: %[[VAL_2:.*]] = math.cos %[[ARG0]] : f32
// CHECK: scf.yield %[[VAL_2]] : f32
// CHECK: }
// CHECK: return %[[VAL_0]] : f32
// CHECK: }
func.func @sincos_no_fusion_different_block(%arg0 : f32, %flag : i1) -> f32 {
%0 = scf.if %flag -> f32 {
%s = math.sin %arg0 : f32
scf.yield %s : f32
} else {
%c = math.cos %arg0 : f32
scf.yield %c : f32
}
func.return %0 : f32
}

// CHECK-LABEL: func.func @sincos_fusion_preserve_fastmath(
// CHECK-SAME: %[[ARG0:.*]]: f32) -> (f32, f32) {
// CHECK: %[[VAL_0:.*]], %[[VAL_1:.*]] = math.sincos %[[ARG0]] fastmath<contract> : f32
// CHECK: return %[[VAL_0]], %[[VAL_1]] : f32, f32
// CHECK: }
func.func @sincos_fusion_preserve_fastmath(%arg0 : f32) -> (f32, f32) {
%0 = math.sin %arg0 fastmath<contract> : f32
%1 = math.cos %arg0 fastmath<contract> : f32
func.return %0, %1 : f32, f32
}