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
26 changes: 4 additions & 22 deletions mlir/lib/Conversion/SPIRVToLLVM/SPIRVToLLVM.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1520,20 +1520,12 @@ class TanPattern : public SPIRVToLLVMConversion<spirv::GLTanOp> {
if (!dstType)
return rewriter.notifyMatchFailure(tanOp, "type conversion failed");

Location loc = tanOp.getLoc();
Value sin = LLVM::SinOp::create(rewriter, loc, dstType, tanOp.getOperand());
Value cos = LLVM::CosOp::create(rewriter, loc, dstType, tanOp.getOperand());
rewriter.replaceOpWithNewOp<LLVM::FDivOp>(tanOp, dstType, sin, cos);
rewriter.replaceOpWithNewOp<LLVM::TanOp>(tanOp, dstType,
adaptor.getOperands());
return success();
}
};

/// Convert `spirv.Tanh` to
///
/// exp(2x) - 1
/// -----------
/// exp(2x) + 1
///
class TanhPattern : public SPIRVToLLVMConversion<spirv::GLTanhOp> {
public:
using SPIRVToLLVMConversion<spirv::GLTanhOp>::SPIRVToLLVMConversion;
Expand All @@ -1546,18 +1538,8 @@ class TanhPattern : public SPIRVToLLVMConversion<spirv::GLTanhOp> {
if (!dstType)
return rewriter.notifyMatchFailure(tanhOp, "type conversion failed");

Location loc = tanhOp.getLoc();
Value two = createFPConstant(loc, srcType, dstType, rewriter, 2.0);
Value multiplied =
LLVM::FMulOp::create(rewriter, loc, dstType, two, tanhOp.getOperand());
Value exponential = LLVM::ExpOp::create(rewriter, loc, dstType, multiplied);
Value one = createFPConstant(loc, srcType, dstType, rewriter, 1.0);
Value numerator =
LLVM::FSubOp::create(rewriter, loc, dstType, exponential, one);
Value denominator =
LLVM::FAddOp::create(rewriter, loc, dstType, exponential, one);
rewriter.replaceOpWithNewOp<LLVM::FDivOp>(tanhOp, dstType, numerator,
denominator);
rewriter.replaceOpWithNewOp<LLVM::TanhOp>(tanhOp, dstType,
adaptor.getOperands());
return success();
}
};
Expand Down
12 changes: 2 additions & 10 deletions mlir/test/Conversion/SPIRVToLLVM/gl-ops-to-llvm.mlir
Original file line number Diff line number Diff line change
Expand Up @@ -162,9 +162,7 @@ spirv.func @sqrt(%arg0: f32, %arg1: vector<3xf16>) "None" {

// CHECK-LABEL: @tan
spirv.func @tan(%arg0: f32) "None" {
// CHECK: %[[SIN:.*]] = llvm.intr.sin(%{{.*}}) : (f32) -> f32
// CHECK: %[[COS:.*]] = llvm.intr.cos(%{{.*}}) : (f32) -> f32
// CHECK: llvm.fdiv %[[SIN]], %[[COS]] : f32
// CHECK: llvm.intr.tan(%{{.*}}) : (f32) -> f32
%0 = spirv.GL.Tan %arg0 : f32
spirv.Return
}
Expand All @@ -175,13 +173,7 @@ spirv.func @tan(%arg0: f32) "None" {

// CHECK-LABEL: @tanh
spirv.func @tanh(%arg0: f32) "None" {
// CHECK: %[[TWO:.*]] = llvm.mlir.constant(2.000000e+00 : f32) : f32
// CHECK: %[[X2:.*]] = llvm.fmul %[[TWO]], %{{.*}} : f32
// CHECK: %[[EXP:.*]] = llvm.intr.exp(%[[X2]]) : (f32) -> f32
// CHECK: %[[ONE:.*]] = llvm.mlir.constant(1.000000e+00 : f32) : f32
// CHECK: %[[T0:.*]] = llvm.fsub %[[EXP]], %[[ONE]] : f32
// CHECK: %[[T1:.*]] = llvm.fadd %[[EXP]], %[[ONE]] : f32
// CHECK: llvm.fdiv %[[T0]], %[[T1]] : f32
// CHECK: llvm.intr.tanh(%{{.*}}) : (f32) -> f32
%0 = spirv.GL.Tanh %arg0 : f32
spirv.Return
}
Expand Down
Loading