Merge branch 'main' into bd-terminate-on-synchronize

openqasm · Mar 27, 2024 · 5396bc7 · 5396bc7
2 parents cddda9c + d09f48c
commit 5396bc7
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 17 deletions.
diff --git a/conan/qasm/conandata.yml b/conan/qasm/conandata.yml
@@ -1,5 +1,5 @@
 sources:
-  hash: "d59248cbb4cf8840c9720462f2569907b9506323"
+  hash: "a9cf9fa3599b2045941d154dc91aba5a45beabb7"
 requirements:
   - "gmp/6.2.1"
   - "mpfr/4.1.0"

diff --git a/conan/qasm/conanfile.py b/conan/qasm/conanfile.py
@@ -17,7 +17,7 @@
 
 class QasmConan(ConanFile):
     name = "qasm"
-    version = "0.3.0"
+    version = "0.3.1"
     url = "https://github.com/openqasm/qe-qasm.git"
     settings = "os", "compiler", "build_type", "arch"
     options = {"shared": [True, False], "examples": [True, False]}

diff --git a/conandata.yml b/conandata.yml
@@ -7,4 +7,4 @@ requirements:
   - pybind11/2.11.1
   - clang-tools-extra/17.0.5-0@
   - llvm/17.0.5-0@
-  - qasm/0.3.0@qss/stable
+  - qasm/0.3.1@qss/stable
diff --git a/include/Dialect/Pulse/Utils/Utils.h b/include/Dialect/Pulse/Utils/Utils.h
@@ -41,9 +41,8 @@ Waveform_CreateOp getWaveformOp(PlayOp pulsePlayOp,
 
 Waveform_CreateOp getWaveformOp(PlayOp pulsePlayOp,
                                 CallSequenceStack_t &callSequenceOpStack);
-
-double getPhaseValue(ShiftPhaseOp shiftPhaseOp,
-                     CallSequenceStack_t &callSequenceOpStack);
+mlir::Value getPhaseValue(ShiftPhaseOp shiftPhaseOp,
+                          CallSequenceStack_t &callSequenceOpStack);
 
 /// this function goes over all the blocks of the input pulse sequence, and for
 /// each block, it sorts the pulse ops within the block according to their

diff --git a/lib/Dialect/Pulse/Utils/Utils.cpp b/lib/Dialect/Pulse/Utils/Utils.cpp
@@ -64,25 +64,20 @@ Waveform_CreateOp getWaveformOp(PlayOp pulsePlayOp,
   return waveformOp;
 }
 
-double getPhaseValue(ShiftPhaseOp shiftPhaseOp,
-                     CallSequenceStack_t &callSequenceOpStack) {
+mlir::Value getPhaseValue(ShiftPhaseOp shiftPhaseOp,
+                          CallSequenceStack_t &callSequenceOpStack) {
   auto phaseOffsetIndex = 0;
   mlir::Value phaseOffset = shiftPhaseOp.getPhaseOffset();
 
   for (auto it = callSequenceOpStack.rbegin(); it != callSequenceOpStack.rend();
        ++it) {
-    if (phaseOffset.isa<BlockArgument>()) {
-      phaseOffsetIndex = phaseOffset.dyn_cast<BlockArgument>().getArgNumber();
-      phaseOffset = it->getOperand(phaseOffsetIndex);
-    } else
+    if (auto blockArg = dyn_cast<BlockArgument>(phaseOffset))
+      phaseOffset = it->getOperand(blockArg.getArgNumber());
+    else
       break;
   }
 
-  auto phaseOffsetOp =
-      dyn_cast<mlir::arith::ConstantFloatOp>(phaseOffset.getDefiningOp());
-  if (!phaseOffsetOp)
-    phaseOffsetOp->emitError() << "Phase offset is not a ConstantFloatOp.";
-  return phaseOffsetOp.value().convertToDouble();
+  return phaseOffset;
 }
 
 void sortOpsByTimepoint(SequenceOp &sequenceOp) {

diff --git a/lib/Frontend/OpenQASM3/QUIRGenQASM3Visitor.cpp b/lib/Frontend/OpenQASM3/QUIRGenQASM3Visitor.cpp
@@ -1847,6 +1847,7 @@ ExpressionValueType QUIRGenQASM3Visitor::visit_(const ASTUnaryOpNode *node) {
   }
 
   switch (node->GetOpType()) {
+  case ASTOpTypeBitNot:
   case ASTOpTypeLogicalNot: {
     const auto boolType = builder.getI1Type();
 

diff --git a/releasenotes/notes/add-bitnot-support-7ad288e5a87b7302.yaml b/releasenotes/notes/add-bitnot-support-7ad288e5a87b7302.yaml
@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    Fixes failure to parse expressions with bitnot operation. Refer to
+    `#278 <https://github.com/openqasm/qe-compiler/issues/278>` for more
+    details.
diff --git a/test/Frontend/OpenQASM3/bitops.qasm b/test/Frontend/OpenQASM3/bitops.qasm
@@ -107,3 +107,11 @@ f = e | d;
 // MLIR: [[NOT_CBIT:%.*]] = "oq3.cast"([[NOT]]) : (i1) -> !quir.cbit<1>
 // MLIR: oq3.variable_assign @f : !quir.cbit<1> = [[NOT_CBIT]]
 f = !f;
+
+// MLIR: [[F:%.*]] = oq3.variable_load @f : !quir.cbit<1>
+// MLIR: [[BOOL_F:%.*]] = "oq3.cast"([[F]]) : (!quir.cbit<1>) -> i1
+// MLIR: [[TRUE:%.*]] = arith.constant true
+// MLIR: [[NOT:%.*]] = arith.cmpi ne, [[BOOL_F]], [[TRUE]] : i1
+// MLIR: [[NOT_CBIT:%.*]] = "oq3.cast"([[NOT]]) : (i1) -> !quir.cbit<1>
+// MLIR: oq3.variable_assign @f : !quir.cbit<1> = [[NOT_CBIT]]
+f = ~f;