Revert "Reapply "Reapply "[mlir] Add FP software implementation lowering pass: arith-to-apfloat (#166618)" (#167431)""

mlir/include/mlir/Conversion/Passes.h

@@ -12,7 +12,6 @@
 #include "mlir/Conversion/AMDGPUToROCDL/AMDGPUToROCDL.h"
 #include "mlir/Conversion/AffineToStandard/AffineToStandard.h"
 #include "mlir/Conversion/ArithToAMDGPU/ArithToAMDGPU.h"
-#include "mlir/Conversion/ArithToAPFloat/ArithToAPFloat.h"
 #include "mlir/Conversion/ArithToArmSME/ArithToArmSME.h"
 #include "mlir/Conversion/ArithToEmitC/ArithToEmitCPass.h"
 #include "mlir/Conversion/ArithToLLVM/ArithToLLVM.h"

mlir/include/mlir/Conversion/Passes.td

@@ -186,21 +186,6 @@ def ArithToLLVMConversionPass : Pass<"convert-arith-to-llvm"> {
   ];
 }
 
-//===----------------------------------------------------------------------===//
-// ArithToAPFloat
-//===----------------------------------------------------------------------===//
-
-def ArithToAPFloatConversionPass
-    : Pass<"convert-arith-to-apfloat", "ModuleOp"> {
-  let summary = "Convert Arith ops to APFloat runtime library calls";
-  let description = [{
-    This pass converts supported Arith ops to APFloat-based runtime library
-    calls (APFloatWrappers.cpp). APFloat is a software implementation of
-    floating-point arithmetic operations.
-  }];
-  let dependentDialects = ["func::FuncDialect"];
-}
-
 //===----------------------------------------------------------------------===//
 // ArithToSPIRV
 //===----------------------------------------------------------------------===//

mlir/include/mlir/Dialect/Func/Utils/Utils.h

@@ -60,13 +60,6 @@ mlir::FailureOr<std::pair<mlir::func::FuncOp, mlir::func::CallOp>>
 deduplicateArgsOfFuncOp(mlir::RewriterBase &rewriter, mlir::func::FuncOp funcOp,
                         mlir::ModuleOp moduleOp);
 
-/// Look up a FuncOp with signature `resultTypes`(`paramTypes`)` and name
-/// `name`. Return a failure if the FuncOp is found but with a different
-/// signature.
-FailureOr<FuncOp> lookupFnDecl(SymbolOpInterface symTable, StringRef name,
-                               FunctionType funcT,
-                               SymbolTableCollection *symbolTables = nullptr);
-
 } // namespace func
 } // namespace mlir
 

mlir/include/mlir/Dialect/LLVMIR/FunctionCallUtils.h

@@ -52,10 +52,6 @@ lookupOrCreatePrintF32Fn(OpBuilder &b, Operation *moduleOp,
 FailureOr<LLVM::LLVMFuncOp>
 lookupOrCreatePrintF64Fn(OpBuilder &b, Operation *moduleOp,
                          SymbolTableCollection *symbolTables = nullptr);
-FailureOr<LLVM::LLVMFuncOp>
-lookupOrCreateApFloatPrintFn(OpBuilder &b, Operation *moduleOp,
-                             SymbolTableCollection *symbolTables = nullptr);
-
 /// Declares a function to print a C-string.
 /// If a custom runtime function is defined via `runtimeFunctionName`, it must
 /// have the signature void(char const*). The default function is `printString`.

mlir/lib/Conversion/ArithToLLVM/ArithToLLVM.cpp

@@ -14,7 +14,6 @@
 #include "mlir/Conversion/LLVMCommon/VectorPattern.h"
 #include "mlir/Dialect/Arith/IR/Arith.h"
 #include "mlir/Dialect/Arith/Transforms/Passes.h"
-#include "mlir/Dialect/LLVMIR/FunctionCallUtils.h"
 #include "mlir/Dialect/LLVMIR/LLVMAttrs.h"
 #include "mlir/Dialect/LLVMIR/LLVMDialect.h"
 #include "mlir/IR/TypeUtilities.h"

mlir/lib/Conversion/CMakeLists.txt

@@ -2,7 +2,6 @@ add_subdirectory(AffineToStandard)
 add_subdirectory(AMDGPUToROCDL)
 add_subdirectory(ArithCommon)
 add_subdirectory(ArithToAMDGPU)
-add_subdirectory(ArithToAPFloat)
 add_subdirectory(ArithToArmSME)
 add_subdirectory(ArithToEmitC)
 add_subdirectory(ArithToLLVM)

mlir/lib/Conversion/VectorToLLVM/ConvertVectorToLLVM.cpp

@@ -1654,20 +1654,6 @@ class VectorPrintOpConversion : public ConvertOpToLLVMPattern<vector::PrintOp> {
           return failure();
         }
       }
-    } else if (auto floatTy = dyn_cast<FloatType>(printType)) {
-      // Print other floating-point types using the APFloat runtime library.
-      int32_t sem =
-          llvm::APFloatBase::SemanticsToEnum(floatTy.getFloatSemantics());
-      Value semValue = LLVM::ConstantOp::create(
-          rewriter, loc, rewriter.getI32Type(),
-          rewriter.getIntegerAttr(rewriter.getI32Type(), sem));
-      Value floatBits =
-          LLVM::ZExtOp::create(rewriter, loc, rewriter.getI64Type(), value);
-      printer =
-          LLVM::lookupOrCreateApFloatPrintFn(rewriter, parent, symbolTables);
-      emitCall(rewriter, loc, printer.value(),
-               ValueRange({semValue, floatBits}));
-      return success();
     } else {
       return failure();
     }

mlir/lib/Dialect/Func/Utils/Utils.cpp

@@ -254,28 +254,3 @@ func::deduplicateArgsOfFuncOp(RewriterBase &rewriter, func::FuncOp funcOp,
 
   return std::make_pair(*newFuncOpOrFailure, newCallOp);
 }
-
-FailureOr<func::FuncOp>
-func::lookupFnDecl(SymbolOpInterface symTable, StringRef name,
-                   FunctionType funcT, SymbolTableCollection *symbolTables) {
-  FuncOp func;
-  if (symbolTables) {
-    func = symbolTables->lookupSymbolIn<FuncOp>(
-        symTable, StringAttr::get(symTable->getContext(), name));
-  } else {
-    func = llvm::dyn_cast_or_null<FuncOp>(
-        SymbolTable::lookupSymbolIn(symTable, name));
-  }
-
-  if (!func)
-    return func;
-
-  mlir::FunctionType foundFuncT = func.getFunctionType();
-  // Assert the signature of the found function is same as expected
-  if (funcT != foundFuncT) {
-    return func.emitError("matched function '")
-           << name << "' but with different type: " << foundFuncT
-           << " (expected " << funcT << ")";
-  }
-  return func;
-}

mlir/lib/Dialect/LLVMIR/IR/FunctionCallUtils.cpp

@@ -30,7 +30,6 @@ static constexpr llvm::StringRef kPrintF16 = "printF16";
 static constexpr llvm::StringRef kPrintBF16 = "printBF16";
 static constexpr llvm::StringRef kPrintF32 = "printF32";
 static constexpr llvm::StringRef kPrintF64 = "printF64";
-static constexpr llvm::StringRef kPrintApFloat = "printApFloat";
 static constexpr llvm::StringRef kPrintString = "printString";
 static constexpr llvm::StringRef kPrintOpen = "printOpen";
 static constexpr llvm::StringRef kPrintClose = "printClose";
@@ -161,16 +160,6 @@ mlir::LLVM::lookupOrCreatePrintF64Fn(OpBuilder &b, Operation *moduleOp,
       LLVM::LLVMVoidType::get(moduleOp->getContext()), symbolTables);
 }
 
-FailureOr<LLVM::LLVMFuncOp>
-mlir::LLVM::lookupOrCreateApFloatPrintFn(OpBuilder &b, Operation *moduleOp,
-                                         SymbolTableCollection *symbolTables) {
-  return lookupOrCreateReservedFn(
-      b, moduleOp, kPrintApFloat,
-      {IntegerType::get(moduleOp->getContext(), 32),
-       IntegerType::get(moduleOp->getContext(), 64)},
-      LLVM::LLVMVoidType::get(moduleOp->getContext()), symbolTables);
-}
-
 static LLVM::LLVMPointerType getCharPtr(MLIRContext *context) {
   return LLVM::LLVMPointerType::get(context);
 }