Continue to flail at mystery CI failures.

Signed-off-by: Eric Schweitz <[email protected]>

Author: schweitzpgi

include/cudaq/Optimizer/CodeGen/Passes.h

@@ -108,6 +108,14 @@ void addPipelineTranslateToOpenQASM(mlir::PassManager &pm);
 /// Pipeline builder to convert Quake to IQM `Json`.
 void addPipelineTranslateToIQMJson(mlir::PassManager &pm);
 
+//===----------------------------------------------------------------------===//
+
+void commonPipelineConvertToQIR(mlir::PassManager &pm,
+                                mlir::StringRef codeGenFor = "qir:0.1",
+                                mlir::StringRef passConfigAs = "qir:0.1");
+void addPipelineConvertToQIR(mlir::PassManager &pm, mlir::StringRef convertTo);
+
+
 // declarative passes
 #define GEN_PASS_DECL
 #define GEN_PASS_REGISTRATION

lib/Optimizer/CodeGen/Pipelines.cpp

@@ -148,3 +148,67 @@ void cudaq::opt::addPipelineTranslateToIQMJson(PassManager &pm) {
   pm.addNestedPass<func::FuncOp>(createCanonicalizerPass());
   pm.addPass(createSymbolDCEPass());
 }
+
+void cudaq::opt::commonPipelineConvertToQIR(PassManager &pm,
+                                            StringRef codeGenFor,
+                                            StringRef passConfigAs) {
+  auto codeGenFields = codeGenFor.split(':');
+  auto passConfigFields = passConfigAs.split(':');
+
+  pm.addNestedPass<func::FuncOp>(createApplyControlNegations());
+  addAggressiveInlining(pm);
+  pm.addNestedPass<func::FuncOp>(createCanonicalizerPass());
+  pm.addNestedPass<func::FuncOp>(createUnwindLowering());
+  pm.addNestedPass<func::FuncOp>(createCanonicalizerPass());
+  pm.addNestedPass<func::FuncOp>(createExpandMeasurementsPass());
+  pm.addNestedPass<func::FuncOp>(createClassicalMemToReg());
+  pm.addNestedPass<func::FuncOp>(createCanonicalizerPass());
+  pm.addNestedPass<func::FuncOp>(createCSEPass());
+  pm.addNestedPass<func::FuncOp>(createQuakeAddDeallocs());
+  pm.addNestedPass<func::FuncOp>(createQuakeAddMetadata());
+  pm.addPass(createQuakePropagateMetadata());
+  pm.addNestedPass<func::FuncOp>(createLoopNormalize());
+  LoopUnrollOptions luo;
+  luo.allowBreak = passConfigAs == "qir-adaptive";
+  pm.addNestedPass<func::FuncOp>(createLoopUnroll(luo));
+  pm.addNestedPass<func::FuncOp>(createCanonicalizerPass());
+  pm.addNestedPass<func::FuncOp>(createCSEPass());
+  // A final round of apply specialization after loop unrolling. This should
+  // eliminate any residual control structures so the kernel specializations can
+  // succeed.
+  pm.addPass(createApplySpecialization());
+  // If there was any specialization, we want another round in inlining to
+  // inline the apply calls properly.
+  addAggressiveInlining(pm);
+  addLowerToCFG(pm);
+  pm.addNestedPass<func::FuncOp>(createCombineQuantumAllocations());
+  pm.addNestedPass<func::FuncOp>(createCanonicalizerPass());
+  pm.addNestedPass<func::FuncOp>(createCSEPass());
+
+  if (passConfigFields.first == "qir-base")
+    pm.addNestedPass<func::FuncOp>(createDelayMeasurementsPass());
+
+  if (codeGenFields.first == "qir" || codeGenFields.first == "qir-full")
+    cudaq::opt::addConvertToQIRAPIPipeline(pm, "full:" +
+                                                   codeGenFields.second.str());
+  else if (codeGenFields.first == "qir-base")
+    cudaq::opt::addConvertToQIRAPIPipeline(pm, "base-profile:" +
+                                                   codeGenFields.second.str());
+  else if (codeGenFields.first == "qir-adaptive")
+    cudaq::opt::addConvertToQIRAPIPipeline(pm, "adaptive-profile:" +
+                                                   codeGenFields.second.str());
+  else
+    emitError(UnknownLoc::get(pm.getContext()),
+              "convert to QIR must be given a valid specification to use.");
+  pm.addPass(createReturnToOutputLog());
+  pm.addPass(createConvertMathToFuncs());
+  pm.addPass(createSymbolDCEPass());
+  pm.addPass(createCCToLLVM());
+}
+
+void cudaq::opt::addPipelineConvertToQIR(PassManager &pm, StringRef convertTo) {
+  commonPipelineConvertToQIR(pm, convertTo, convertTo);
+  auto targetPair = convertTo.split(':');
+  if (targetPair.first != "qir" && targetPair.first != "qir-full")
+    addQIRProfileVerify(pm, convertTo);
+}

python/runtime/cudaq/platform/py_alt_launch_kernel.cpp

@@ -169,7 +169,7 @@ ExecutionEngine *jitKernel(const std::string &name, MlirModule module,
       else
         tl = "qir:" + tlPair.second.str();
     }
-    cudaq::opt::addAOTPipelineConvertToQIR(pm, tl);
+    cudaq::opt::addPipelineConvertToQIR(pm, tl);
     pm.addPass(createSymbolDCEPass());
 
     auto enablePrintMLIREachPass =
@@ -850,7 +850,7 @@ std::string getQIR(const std::string &name, MlirModule module,
   std::string profile{profile_};
   if (profile.empty())
     profile = "qir:0.1";
-  cudaq::opt::addAOTPipelineConvertToQIR(pm, profile);
+  cudaq::opt::addPipelineConvertToQIR(pm, profile);
   DefaultTimingManager tm;
   tm.setEnabled(cudaq::isTimingTagEnabled(cudaq::TIMING_JIT_PASSES));
   auto timingScope = tm.getRootScope(); // starts the timer