[braket] Python tests

lib/Optimizer/CodeGen/Passes.cpp

@@ -14,13 +14,16 @@
 
 using namespace mlir;
 
+static SmallVector<std::string> z_disabledPatterns = {"R1ToU3"};
+
 static void addAnyonPPipeline(OpPassManager &pm) {
   using namespace cudaq::opt;
   std::string basis[] = {
       "h", "s", "t", "rx", "ry", "rz", "x", "y", "z", "z(1)",
   };
   BasisConversionPassOptions options;
   options.basis = basis;
+  options.disabledPatterns = z_disabledPatterns;
   pm.addPass(createBasisConversionPass(options));
 }
 
@@ -31,6 +34,7 @@ static void addAnyonCPipeline(OpPassManager &pm) {
   };
   BasisConversionPassOptions options;
   options.basis = basis;
+  options.disabledPatterns = z_disabledPatterns;
   pm.addPass(createBasisConversionPass(options));
 }
 
@@ -42,6 +46,7 @@ static void addOQCPipeline(OpPassManager &pm) {
   };
   BasisConversionPassOptions options;
   options.basis = basis;
+  options.disabledPatterns = z_disabledPatterns;
   pm.addPass(createBasisConversionPass(options));
 }
 
@@ -52,6 +57,7 @@ static void addQuantinuumPipeline(OpPassManager &pm) {
   };
   BasisConversionPassOptions options;
   options.basis = basis;
+  options.disabledPatterns = z_disabledPatterns;
   pm.addPass(createBasisConversionPass(options));
 }
 
@@ -63,6 +69,7 @@ static void addIQMPipeline(OpPassManager &pm) {
   };
   BasisConversionPassOptions options;
   options.basis = basis;
+  options.disabledPatterns = z_disabledPatterns;
   pm.addPass(createBasisConversionPass(options));
 }
 
@@ -74,6 +81,7 @@ static void addIonQPipeline(OpPassManager &pm) {
   };
   BasisConversionPassOptions options;
   options.basis = basis;
+  options.disabledPatterns = z_disabledPatterns;
   pm.addPass(createBasisConversionPass(options));
 }
 
@@ -84,6 +92,7 @@ static void addFermioniqPipeline(OpPassManager &pm) {
   };
   BasisConversionPassOptions options;
   options.basis = basis;
+  options.disabledPatterns = z_disabledPatterns;
   pm.addPass(createBasisConversionPass(options));
 }
 

lib/Optimizer/CodeGen/TranslateToOpenQASM.cpp

@@ -9,6 +9,7 @@
 #include "cudaq/Frontend/nvqpp/AttributeNames.h"
 #include "cudaq/Optimizer/CodeGen/Emitter.h"
 #include "cudaq/Optimizer/CodeGen/OpenQASMEmitter.h"
+#include "cudaq/Optimizer/Dialect/CC/CCOps.h"
 #include "cudaq/Optimizer/Dialect/CC/CCTypes.h"
 #include "cudaq/Optimizer/Dialect/Quake/QuakeOps.h"
 #include "llvm/ADT/PostOrderIterator.h"
@@ -22,7 +23,6 @@ using namespace cudaq;
 //===----------------------------------------------------------------------===//
 // Helper functions
 //===----------------------------------------------------------------------===//
-
 /// Translates operation names into OpenQASM gate names
 static LogicalResult translateOperatorName(quake::OperatorInterface optor,
                                            StringRef &name) {
@@ -39,7 +39,8 @@ static LogicalResult translateOperatorName(quake::OperatorInterface optor,
                .Case("rx", "crx")
                .Case("ry", "cry")
                .Case("rz", "crz")
-               .Default("");
+               .Case("swap", "cswap")
+               .Default(qkeName);
   } else if (optor.getControls().size() == 2) {
     name = StringSwitch<StringRef>(qkeName).Case("x", "ccx").Default("");
   }
@@ -345,6 +346,11 @@ static LogicalResult emitOperation(Emitter &emitter, Operation &op) {
       .Case<DeallocOp>([&](auto op) { return success(); })
       .Case<func::ReturnOp>([&](auto op) { return success(); })
       .Case<arith::ConstantOp>([&](auto op) { return success(); })
+      .Case<cudaq::cc::AllocaOp>([&](auto op) { return success(); })
+      .Case<cudaq::cc::StoreOp>([&](auto op) { return success(); })
+      .Case<cudaq::cc::CastOp>([&](auto op) { return success(); })
+      .Case<cudaq::cc::ComputePtrOp>([&](auto op) { return success(); })
+      .Case<quake::DiscriminateOp>([&](auto op) { return success(); })
       .Default([&](Operation *) -> LogicalResult {
         if (op.getName().getDialectNamespace().equals("llvm"))
           return success();

lib/Optimizer/Transforms/DecompositionPatterns.cpp

@@ -460,6 +460,25 @@ struct R1ToRz : public OpRewritePattern<quake::R1Op> {
   }
 };
 
+// Naive mapping of R1 to U3
+// This is only expected to work with full inlining and
+// quake apply specialization.
+struct R1ToU3 : public OpRewritePattern<quake::R1Op> {
+  using OpRewritePattern<quake::R1Op>::OpRewritePattern;
+
+  void initialize() { setDebugName("R1ToU3"); }
+
+  LogicalResult matchAndRewrite(quake::R1Op r1Op,
+                                PatternRewriter &rewriter) const override {
+    Location loc = r1Op->getLoc();
+    Value zero = createConstant(loc, 0.0, rewriter.getF64Type(), rewriter);
+    std::array<Value, 3> parameters = {zero, zero, r1Op.getParameters()[0]};
+    rewriter.replaceOpWithNewOp<quake::U3Op>(
+        r1Op, r1Op.isAdj(), parameters, r1Op.getControls(), r1Op.getTargets());
+    return success();
+  }
+};
+
 // quake.swap a, b
 // ───────────────────────────────────
 // quake.cnot b, a;
@@ -1554,6 +1573,7 @@ void cudaq::populateWithAllDecompositionPatterns(RewritePatternSet &patterns) {
     CR1ToCX,
     R1ToPhasedRx,
     R1ToRz,
+    R1ToU3,
     // RxOp patterns
     CRxToCX,
     RxToPhasedRx,

python/runtime/utils/PyRemoteRESTQPU.cpp

@@ -89,7 +89,6 @@ class PyRemoteRESTQPU : public cudaq::BaseRemoteRESTQPU {
     pm.addPass(mlir::createCanonicalizerPass());
     pm.addPass(cudaq::opt::createApplyOpSpecializationPass());
     pm.addPass(createInlinerPass());
-    pm.addPass(cudaq::opt::createExpandMeasurementsPass());
     pm.addPass(createCanonicalizerPass());
     pm.addPass(createCSEPass());
     if (failed(pm.run(cloned)))

python/tests/backends/test_QuEra.py

@@ -40,7 +40,7 @@ def startUpMockServer():
     p.terminate()
 
 
-@pytest.mark.skip(reason="Braket credentials required")
+@pytest.mark.skip(reason="Amazon Braket credentials required")
 def test_JSON_payload():
     '''
     Test based on https://docs.aws.amazon.com/braket/latest/developerguide/braket-quera-submitting-analog-program-aquila.html