Change ConverComplexPow from func to module pass.

Author: TIFitis

flang/include/flang/Optimizer/Transforms/Passes.td

@@ -551,7 +551,7 @@ def SimplifyFIROperations : Pass<"simplify-fir-operations", "mlir::ModuleOp"> {
       "Prefer expanding without using Fortran runtime calls.">];
 }
 
-def ConvertComplexPow : Pass<"convert-complex-pow", "mlir::func::FuncOp"> {
+def ConvertComplexPow : Pass<"convert-complex-pow", "mlir::ModuleOp"> {
   let summary = "Convert complex.pow operations to library calls";
   let description = [{
     Replace `complex.pow` operations with calls to the appropriate

flang/lib/Optimizer/Transforms/ConvertComplexPow.cpp

@@ -55,14 +55,13 @@ static bool isZero(Value v) {
 }
 
 void ConvertComplexPowPass::runOnOperation() {
-  auto func = getOperation();
-  auto mod = func->getParentOfType<ModuleOp>();
+  ModuleOp mod = getOperation();
   if (fir::getTargetTriple(mod).isAMDGCN())
     return;
 
-  fir::FirOpBuilder builder(func, fir::getKindMapping(mod));
+  fir::FirOpBuilder builder(mod, fir::getKindMapping(mod));
 
-  func.walk([&](complex::PowOp op) {
+  mod.walk([&](complex::PowOp op) {
     builder.setInsertionPoint(op);
     Location loc = op.getLoc();
     auto complexTy = cast<ComplexType>(op.getType());

flang/test/Driver/bbc-mlir-pass-pipeline.f90

@@ -69,8 +69,7 @@
 ! CHECK-NEXT: SCFToControlFlow
 ! CHECK-NEXT: Canonicalizer
 ! CHECK-NEXT: SimplifyRegionLite
-! CHECK-NEXT: 'func.func' Pipeline
-! CHECK-NEXT:   ConvertComplexPow
+! CHECK-NEXT: ConvertComplexPow
 ! CHECK-NEXT: CSE
 ! CHECK-NEXT:   (S) 0 num-cse'd - Number of operations CSE'd
 ! CHECK-NEXT:   (S) 0 num-dce'd - Number of operations DCE'd

flang/test/Driver/mlir-debug-pass-pipeline.f90

@@ -96,8 +96,7 @@
 ! ALL-NEXT: SCFToControlFlow
 ! ALL-NEXT: Canonicalizer
 ! ALL-NEXT: SimplifyRegionLite
-! ALL-NEXT: 'func.func' Pipeline
-! ALL-NEXT:   ConvertComplexPow
+! ALL-NEXT: ConvertComplexPow
 ! ALL-NEXT: CSE
 ! ALL-NEXT:   (S) 0 num-cse'd - Number of operations CSE'd
 ! ALL-NEXT:   (S) 0 num-dce'd - Number of operations DCE'd

flang/test/Driver/mlir-pass-pipeline.f90

@@ -127,8 +127,7 @@
 ! ALL-NEXT: SCFToControlFlow
 ! ALL-NEXT: Canonicalizer
 ! ALL-NEXT: SimplifyRegionLite
-! ALL-NEXT: 'func.func' Pipeline
-! ALL-NEXT:   ConvertComplexPow
+! ALL-NEXT: ConvertComplexPow
 ! ALL-NEXT: CSE
 ! ALL-NEXT:   (S) 0 num-cse'd - Number of operations CSE'd
 ! ALL-NEXT:   (S) 0 num-dce'd - Number of operations DCE'd

flang/test/Fir/basic-program.fir

@@ -125,8 +125,7 @@ func.func @_QQmain() {
 // PASSES-NEXT: SCFToControlFlow
 // PASSES-NEXT: Canonicalizer
 // PASSES-NEXT: SimplifyRegionLite
-// PASSES-NEXT: 'func.func' Pipeline
-// PASSES-NEXT:   ConvertComplexPow
+// PASSES-NEXT: ConvertComplexPow
 // PASSES-NEXT: CSE
 // PASSES-NEXT:   (S) 0 num-cse'd - Number of operations CSE'd
 // PASSES-NEXT:   (S) 0 num-dce'd - Number of operations DCE'd