Rename to ComplexToROCDLLibraryCalls

Author: TIFitis

flang/lib/Optimizer/CodeGen/CMakeLists.txt

@@ -34,7 +34,7 @@ add_flang_library(FIRCodeGen
 
   MLIR_LIBS
   MLIRComplexToLLVM
-  MLIRComplexToROCDL
+  MLIRComplexToROCDLLibraryCalls
   MLIRComplexToStandard
   MLIRGPUDialect
   MLIRMathToFuncs

flang/lib/Optimizer/CodeGen/CodeGen.cpp

@@ -33,7 +33,7 @@
 #include "mlir/Conversion/ArithCommon/AttrToLLVMConverter.h"
 #include "mlir/Conversion/ArithToLLVM/ArithToLLVM.h"
 #include "mlir/Conversion/ComplexToLLVM/ComplexToLLVM.h"
-#include "mlir/Conversion/ComplexToROCDL/ComplexToROCDL.h"
+#include "mlir/Conversion/ComplexToROCDLLibraryCalls/ComplexToROCDLLibraryCalls.h"
 #include "mlir/Conversion/ComplexToStandard/ComplexToStandard.h"
 #include "mlir/Conversion/ControlFlowToLLVM/ControlFlowToLLVM.h"
 #include "mlir/Conversion/FuncToLLVM/ConvertFuncToLLVM.h"
@@ -4155,7 +4155,7 @@ class FIRToLLVMLowering
     // not needed since all math operations are handled this way.
     if (isAMDGCN) {
       mathConversionPM.addPass(mlir::createConvertMathToROCDL());
-      mathConversionPM.addPass(mlir::createConvertComplexToROCDL());
+      mathConversionPM.addPass(mlir::createConvertComplexToROCDLLibraryCalls());
     }
 
     // Convert math::FPowI operations to inline implementation

mlir/include/mlir/Conversion/ComplexToROCDL/ComplexToROCDL.h renamed to mlir/include/mlir/Conversion/ComplexToROCDLLibraryCalls/ComplexToROCDLLibraryCalls.h

@@ -1,26 +1,26 @@
-//===-- ComplexToROCDL.h - conversion from Complex to ROCDL calls ---------===//
+//===- ComplexToROCDLLibraryCalls.h - convert from Complex to ROCDL calls -===//
 //
 // 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
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef MLIR_CONVERSION_COMPLEXTOROCDL_COMPLEXTOROCDL_H_
-#define MLIR_CONVERSION_COMPLEXTOROCDL_COMPLEXTOROCDL_H_
+#ifndef MLIR_CONVERSION_COMPLEXTOROCDLLIBRARYCALLS_COMPLEXTOROCDLLIBRARYCALLS_H_
+#define MLIR_CONVERSION_COMPLEXTOROCDLLIBRARYCALLS_COMPLEXTOROCDLLIBRARYCALLS_H_
 
 #include "mlir/IR/PatternMatch.h"
-#include "mlir/Pass/Pass.h"
 
 namespace mlir {
 class RewritePatternSet;
 
-#define GEN_PASS_DECL_CONVERTCOMPLEXTOROCDL
+#define GEN_PASS_DECL_CONVERTCOMPLEXTOROCDLLIBRARYCALLS
 #include "mlir/Conversion/Passes.h.inc"
 
 /// Populate the given list with patterns that convert from Complex to ROCDL
 /// calls.
-void populateComplexToROCDLConversionPatterns(RewritePatternSet &patterns);
+void populateComplexToROCDLLibraryCallsConversionPatterns(
+    RewritePatternSet &patterns);
 } // namespace mlir
 
-#endif // MLIR_CONVERSION_COMPLEXTOROCDL_COMPLEXTOROCDL_H_
+#endif // MLIR_CONVERSION_COMPLEXTOROCDLLIBRARYCALLS_COMPLEXTOROCDLLIBRARYCALLS_H_

mlir/include/mlir/Conversion/Passes.h

@@ -23,7 +23,7 @@
 #include "mlir/Conversion/BufferizationToMemRef/BufferizationToMemRef.h"
 #include "mlir/Conversion/ComplexToLLVM/ComplexToLLVM.h"
 #include "mlir/Conversion/ComplexToLibm/ComplexToLibm.h"
-#include "mlir/Conversion/ComplexToROCDL/ComplexToROCDL.h"
+#include "mlir/Conversion/ComplexToROCDLLibraryCalls/ComplexToROCDLLibraryCalls.h"
 #include "mlir/Conversion/ComplexToSPIRV/ComplexToSPIRVPass.h"
 #include "mlir/Conversion/ComplexToStandard/ComplexToStandard.h"
 #include "mlir/Conversion/ControlFlowToLLVM/ControlFlowToLLVM.h"

mlir/include/mlir/Conversion/Passes.td

@@ -313,11 +313,11 @@ def ConvertComplexToLibm : Pass<"convert-complex-to-libm", "ModuleOp"> {
 }
 
 //===----------------------------------------------------------------------===//
-// ComplexToROCDL
+// ComplexToROCDLLibraryCalls
 //===----------------------------------------------------------------------===//
 
-def ConvertComplexToROCDL : Pass<"convert-complex-to-rocdl", "ModuleOp"> {
-  let summary = "Convert Complex dialect to ROCDL calls";
+def ConvertComplexToROCDLLibraryCalls : Pass<"convert-complex-to-rocdl-library-calls", "ModuleOp"> {
+  let summary = "Convert Complex dialect to ROCDL library calls";
   let description = [{
     This pass converts supported Complex ops to calls to the AMD device library.
   }];

mlir/lib/Conversion/CMakeLists.txt

@@ -13,7 +13,7 @@ add_subdirectory(AsyncToLLVM)
 add_subdirectory(BufferizationToMemRef)
 add_subdirectory(ComplexCommon)
 add_subdirectory(ComplexToLibm)
-add_subdirectory(ComplexToROCDL)
+add_subdirectory(ComplexToROCDLLibraryCalls)
 add_subdirectory(ComplexToLLVM)
 add_subdirectory(ComplexToSPIRV)
 add_subdirectory(ComplexToStandard)

mlir/lib/Conversion/ComplexToROCDL/CMakeLists.txt

@@ -0,0 +1,18 @@
+add_mlir_conversion_library(MLIRComplexToROCDLLibraryCalls
+  ComplexToROCDLLibraryCalls.cpp
+
+  ADDITIONAL_HEADER_DIRS
+  ${MLIR_MAIN_INCLUDE_DIR}/mlir/Conversion/ComplexToROCDLLibraryCalls
+
+  DEPENDS
+  MLIRConversionPassIncGen
+
+  LINK_COMPONENTS
+  Core
+
+  LINK_LIBS PUBLIC
+  MLIRComplexDialect
+  MLIRFuncDialect
+  MLIRPass
+  MLIRTransformUtils
+  )

mlir/lib/Conversion/ComplexToROCDLLibraryCalls/CMakeLists.txt

@@ -1,40 +1,40 @@
-//===-- ComplexToROCDL.cpp - conversion from Complex to ROCDL calls -------===//
+//=== ComplexToROCDLLibraryCalls.cpp - convert from Complex to ROCDL calls ===//
 //
 // 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/Conversion/ComplexToROCDL/ComplexToROCDL.h"
+#include "mlir/Conversion/ComplexToROCDLLibraryCalls/ComplexToROCDLLibraryCalls.h"
 #include "mlir/Dialect/Complex/IR/Complex.h"
 #include "mlir/Dialect/Func/IR/FuncOps.h"
 #include "mlir/IR/PatternMatch.h"
 #include "mlir/Transforms/DialectConversion.h"
 
 namespace mlir {
-#define GEN_PASS_DEF_CONVERTCOMPLEXTOROCDL
+#define GEN_PASS_DEF_CONVERTCOMPLEXTOROCDLLIBRARYCALLS
 #include "mlir/Conversion/Passes.h.inc"
 } // namespace mlir
 
 using namespace mlir;
 
 namespace {
 
-template <typename Op, typename Ty>
+template <typename Op, typename FloatTy>
 // Pattern to convert Complex ops to ROCDL function calls.
-struct ComplexOpToROCDLCall : public OpRewritePattern<Op> {
+struct ComplexOpToROCDLLibraryCalls : public OpRewritePattern<Op> {
   using OpRewritePattern<Op>::OpRewritePattern;
-  ComplexOpToROCDLCall(MLIRContext *context, StringRef funcName,
-                       PatternBenefit benefit = 1)
+  ComplexOpToROCDLLibraryCalls(MLIRContext *context, StringRef funcName,
+                               PatternBenefit benefit = 1)
       : OpRewritePattern<Op>(context, benefit), funcName(funcName) {}
 
   LogicalResult matchAndRewrite(Op op, PatternRewriter &rewriter) const final {
     Operation *symTable = SymbolTable::getNearestSymbolTable(op);
     Type resType = op.getType();
     if (auto complexType = dyn_cast<ComplexType>(resType))
       resType = complexType.getElementType();
-    if (!isa<Ty>(resType))
+    if (!isa<FloatTy>(resType))
       return failure();
 
     auto opFunc = dyn_cast_or_null<SymbolOpInterface>(
@@ -58,30 +58,31 @@ struct ComplexOpToROCDLCall : public OpRewritePattern<Op> {
 };
 } // namespace
 
-void mlir::populateComplexToROCDLConversionPatterns(
+void mlir::populateComplexToROCDLLibraryCallsConversionPatterns(
     RewritePatternSet &patterns) {
-  patterns.add<ComplexOpToROCDLCall<complex::AbsOp, Float32Type>>(
+  patterns.add<ComplexOpToROCDLLibraryCalls<complex::AbsOp, Float32Type>>(
       patterns.getContext(), "__ocml_cabs_f32");
-  patterns.add<ComplexOpToROCDLCall<complex::AbsOp, Float64Type>>(
+  patterns.add<ComplexOpToROCDLLibraryCalls<complex::AbsOp, Float64Type>>(
       patterns.getContext(), "__ocml_cabs_f64");
-  patterns.add<ComplexOpToROCDLCall<complex::ExpOp, Float32Type>>(
+  patterns.add<ComplexOpToROCDLLibraryCalls<complex::ExpOp, Float32Type>>(
       patterns.getContext(), "__ocml_cexp_f32");
-  patterns.add<ComplexOpToROCDLCall<complex::ExpOp, Float64Type>>(
+  patterns.add<ComplexOpToROCDLLibraryCalls<complex::ExpOp, Float64Type>>(
       patterns.getContext(), "__ocml_cexp_f64");
 }
 
 namespace {
-struct ConvertComplexToROCDLPass
-    : public impl::ConvertComplexToROCDLBase<ConvertComplexToROCDLPass> {
+struct ConvertComplexToROCDLLibraryCallsPass
+    : public impl::ConvertComplexToROCDLLibraryCallsBase<
+          ConvertComplexToROCDLLibraryCallsPass> {
   void runOnOperation() override;
 };
 } // namespace
 
-void ConvertComplexToROCDLPass::runOnOperation() {
+void ConvertComplexToROCDLLibraryCallsPass::runOnOperation() {
   Operation *op = getOperation();
 
   RewritePatternSet patterns(&getContext());
-  populateComplexToROCDLConversionPatterns(patterns);
+  populateComplexToROCDLLibraryCallsConversionPatterns(patterns);
 
   ConversionTarget target(getContext());
   target.addLegalDialect<func::FuncDialect>();

mlir/lib/Conversion/ComplexToROCDL/ComplexToROCDL.cpp renamed to mlir/lib/Conversion/ComplexToROCDLLibraryCalls/ComplexToROCDLLibraryCalls.cpp

@@ -1,4 +1,4 @@
-// RUN: mlir-opt %s -convert-complex-to-rocdl | FileCheck %s
+// RUN: mlir-opt %s -convert-complex-to-rocdl-library-calls | FileCheck %s
 
 // CHECK-DAG: @__ocml_cabs_f32(complex<f32>) -> f32
 // CHECK-DAG: @__ocml_cabs_f64(complex<f64>) -> f64