Remove DeclareDurationOp (#87)

QUIR Durations should be declared using `quir.constant` rather than using `quir.declare_duration`. The `DeclareDurationOp` is considered to be superfluous. This PR removes the `DeclareDurationOp` and updates passes and tests to use `quir.constant #quir.duration< : !quir.duration>` instead.
openqasm · Apr 4, 2023 · 4986bfd · 4986bfd
1 parent 07fbafa
commit 4986bfd
Show file tree

Hide file tree

Showing 13 changed files with 26 additions and 53 deletions.
diff --git a/include/Dialect/QUIR/IR/QUIROps.td b/include/Dialect/QUIR/IR/QUIROps.td
@@ -103,25 +103,6 @@ def QUIR_DeclareQubitOp : QUIR_Op<"declare_qubit", [NonInterferingNonDeadSideEff
     }];
 }
 
-def QUIR_DeclareDurationOp : QUIR_Op<"declare_duration", [NoSideEffect]> {
-    let summary = "Declare a new duration.";
-    let description = [{
-        The `quir.declare_duration` operation creates a new OpenQASM3.0 duration, representing a duration of time.
-
-        Example:
-        ```mlir
-        %dur = quir.declare_duration {value = "10ns"} : !quir.duration
-        ```
-    }];
-
-    let arguments = (ins StrAttr:$value);
-    let results = (outs QUIR_DurationType:$out);
-
-    let assemblyFormat = [{
-        attr-dict `:` type($out)
-    }];
-}
-
 def QUIR_ResetQubitOp : QUIR_Op<"reset", [
             IsolatedFromAbove, CPTPOp,
             DeclareOpInterfaceMethods<QubitOpInterface, ["getOperatedQubits"]>,

diff --git a/lib/Dialect/QUIR/Transforms/BreakReset.cpp b/lib/Dialect/QUIR/Transforms/BreakReset.cpp
@@ -48,13 +48,14 @@ struct BreakResetsPattern : public OpRewritePattern<ResetQubitOp> {
 
   LogicalResult matchAndRewrite(ResetQubitOp resetOp,
                                 PatternRewriter &rewriter) const override {
-    DeclareDurationOp durationOp;
+    quir::ConstantOp constantDurationOp;
 
     if (numIterations_ > 1 && delayCycles_ > 0) {
       std::string durationString = std::to_string(delayCycles_) + "dt";
-      durationOp = rewriter.create<DeclareDurationOp>(
-          resetOp.getLoc(), rewriter.getType<DurationType>(),
-          StringRef(durationString));
+      constantDurationOp = rewriter.create<quir::ConstantOp>(
+          resetOp.getLoc(), DurationAttr::get(rewriter.getContext(),
+                                              rewriter.getType<DurationType>(),
+                                              StringRef(durationString)));
     }
 
     // result of measurement in each iteration is number of qubits * i1
@@ -64,7 +65,8 @@ struct BreakResetsPattern : public OpRewritePattern<ResetQubitOp> {
     for (uint iteration = 0; iteration < numIterations_; iteration++) {
       if (delayCycles_ > 0 && iteration > 0)
         for (auto qubit : resetOp.qubits())
-          rewriter.create<DelayOp>(resetOp.getLoc(), durationOp.out(), qubit);
+          rewriter.create<DelayOp>(resetOp.getLoc(),
+                                   constantDurationOp.result(), qubit);
 
       auto measureOp = rewriter.create<MeasureOp>(
           resetOp.getLoc(), TypeRange(typeVec), resetOp.qubits());

diff --git a/mock_target/Transforms/QubitLocalization.cpp b/mock_target/Transforms/QubitLocalization.cpp
@@ -83,8 +83,7 @@ void mock::MockQubitLocalizationPass::broadcastAndReceiveValue(
     Operation *parentOp = val.getDefiningOp();
     if (parentOp) {
       if (dyn_cast<mlir::arith::ConstantOp>(parentOp) ||
-          dyn_cast<quir::ConstantOp>(parentOp) ||
-          dyn_cast<DeclareDurationOp>(parentOp)) {
+          dyn_cast<quir::ConstantOp>(parentOp)) {
         // Just clone this op to the mocks
         for (uint id : toNodeIds)
           (*mockBuilders)[id]->clone(*parentOp, mockMapping[id]);

diff --git a/mock_target/test/static/Conversion/QUIRToStd/llvmgen.mlir b/mock_target/test/static/Conversion/QUIRToStd/llvmgen.mlir
@@ -17,7 +17,7 @@
 // CHECK: }
 module @controller attributes {quir.nodeId = 1000 : i32, quir.nodeType = "controller"}  {
   func @main() -> i32 attributes {quir.classicalOnly = false} {
-    %0 = quir.declare_duration {value = "1000dt"} : !quir.duration
+    %0 = quir.constant #quir.duration<"1000dt" : !quir.duration>
     %1 = qcs.recv {fromId = 0 : index} : i1
     qcs.broadcast %1 : i1
     scf.if %1 {

diff --git a/test/Dialect/QUIR/IR/declarations.mlir b/test/Dialect/QUIR/IR/declarations.mlir
@@ -27,8 +27,8 @@ module {
         %theta = quir.constant #quir.angle<0.1 : !quir.angle<1>>
         // CHECK: %{{.*}} = quir.constant #quir.angle<2.000000e-01  : !quir.angle>
         %mu = quir.constant #quir.angle<0.2 : !quir.angle>
-        // CHECK %{{.*}} = quir.declare_duration {value = "10ns"} : !quir.duration
-        %len1 = "quir.declare_duration"() {value = "10ns"} : () -> !quir.duration
+        // CHECK %{{.*}} = quir.constant #quir.duration<"10ns" : !quir.duration>
+        %len1 = quir.constant #quir.duration<"10ns" : !quir.duration>
         // CHECK %{{.*}} = oq3.declare_stretch : !quir.stretch
         %s1 = "oq3.declare_stretch"() : () -> !quir.stretch
         // CHECK %{{.*}} = oq3.declare_stretch : !quir.stretch

diff --git a/test/Dialect/QUIR/IR/ops-error-testing.mlir b/test/Dialect/QUIR/IR/ops-error-testing.mlir
@@ -73,12 +73,3 @@ quir.circuit @circuit6 (%q0 : !quir.qubit<1>, %omega1: !quir.angle<32>, %omega2:
 	%res0 = "quir.measure"(%q0) : (!quir.qubit<1>) -> i1
 	quir.return %res0 : i1
 }
-
-// -----
-
-quir.circuit @circuit7 (%q0 : !quir.qubit<1>, %omega1: !quir.angle<32>, %omega2: !quir.angle<32>) -> i1 {
-	// expected-error@+1 {{'quir.declare_duration' op is classical and should not be inside a circuit.}}
-	%l1 = quir.declare_duration {value = "10ns"} : !quir.duration
-	%res0 = "quir.measure"(%q0) : (!quir.qubit<1>) -> i1
-	quir.return %res0 : i1
-}
diff --git a/test/Dialect/QUIR/IR/qubit-op-interface.mlir b/test/Dialect/QUIR/IR/qubit-op-interface.mlir
@@ -47,7 +47,7 @@ func @test_qubit_op_interface (%cond : i1) -> () {
   quir.builtin_CX %q0, %q1 : !quir.qubit<1>, !quir.qubit<1>
   // CHECK: quir.builtin_CX {quir.operatedQubits = [0 : i32, 1 : i32]} {{.*}}, {{.*}} : !quir.qubit<1>, !quir.qubit<1>
 
-  %duration = quir.declare_duration {value = "20ns"} : !quir.duration
+  %duration = quir.constant #quir.duration<"20ns" : !quir.duration>
   quir.delay %duration, (%q0) : !quir.duration, (!quir.qubit<1>) -> ()
   // CHECK: quir.delay {quir.operatedQubits = [0 : i32]} {{.*}}, ({{.*}}) : !quir.duration, (!quir.qubit<1>) -> ()
 

diff --git a/test/Dialect/QUIR/IR/test.mlir b/test/Dialect/QUIR/IR/test.mlir
@@ -97,8 +97,8 @@ module {
         %ca3 = quir.call_defcal_measure @defcalMeas1(%qa1) : (!quir.qubit<1>) -> i1
         // CHECK: %{{.*}} = "oq3.cast"(%{{.*}}) : (i1) -> !quir.angle<20>
         %ang = "oq3.cast"(%ca3) : (i1) -> !quir.angle<20>
-        // CHECK: %{{.*}} = quir.declare_duration {value = "10ns"} : !quir.duration
-        %len1 = "quir.declare_duration"() {value = "10ns"} : () -> !quir.duration
+        // CHECK: %{{.*}} = quir.constant #quir.duration<"10ns" : !quir.duration>
+        %len1 = quir.constant #quir.duration<"10ns" : !quir.duration>
         // CHECK: %{{.*}} = oq3.declare_stretch : !quir.stretch
         %s1 = "oq3.declare_stretch"() : () -> !quir.stretch
         // CHECK: %{{.*}} = oq3.declare_stretch : !quir.stretch

diff --git a/test/Dialect/QUIR/Transforms/break-reset-multiqubit.mlir b/test/Dialect/QUIR/Transforms/break-reset-multiqubit.mlir
@@ -18,6 +18,7 @@ func @main() {
 // CHECK: [[QUBIT0:%.*]] = quir.declare_qubit {id = 0 : i32} : !quir.qubit<1>
 // CHECK: [[QUBIT1:%.*]] = quir.declare_qubit {id = 1 : i32} : !quir.qubit<1>
 // CHECK: [[QUBIT2:%.*]] = quir.declare_qubit {id = 2 : i32} : !quir.qubit<1>
+// DELAYITER: [[DURATION:%.*]] = quir.constant #quir.duration<"500dt" : !quir.duration>
 // DELAYITER: [[QUBIT0:%.*]] = quir.declare_qubit {id = 0 : i32} : !quir.qubit<1>
 // DELAYITER: [[QUBIT1:%.*]] = quir.declare_qubit {id = 1 : i32} : !quir.qubit<1>
 // DELAYITER: [[QUBIT2:%.*]] = quir.declare_qubit {id = 2 : i32} : !quir.qubit<1>
@@ -42,7 +43,6 @@ func @main() {
 // CHECK: }
 
 
-// DELAYITER: [[DURATION:%.*]] = quir.declare_duration {value = "500dt"} : !quir.duration
 // DELAYITER: quir.measure
 // DELAYITER-COUNT-3: scf.if
 // DELAYITER: quir.delay [[DURATION]], ([[QUBIT0]]) : !quir.duration, (!quir.qubit<1>) -> ()

diff --git a/test/Dialect/QUIR/Transforms/break-reset.mlir b/test/Dialect/QUIR/Transforms/break-reset.mlir
@@ -22,14 +22,14 @@ func @t1 (%inq : !quir.qubit<1>) {
 // CHECK:       quir.call_gate @x(%arg0) : (!quir.qubit<1>) -> ()
 // CHECK:     }
 
-// DELAY:     [[DURATION:%.*]] = quir.declare_duration {value = "500dt"} : !quir.duration
+// DELAY:     [[DURATION:%.*]] = quir.constant #quir.duration<"500dt" : !quir.duration>
 // DELAY-COUNT-2: quir.delay [[DURATION]], ({{.*}}) : !quir.duration, (!quir.qubit<1>) -> ()
 
 // ITER:       quir.call_gate @x(%arg0) : (!quir.qubit<1>) -> ()
 // ITER:       quir.call_gate @x(%arg0) : (!quir.qubit<1>) -> ()
 // ITER-NOT:   quir.call_gate @x(%arg0) : (!quir.qubit<1>) -> ()
 
-// DELAYITER:     %0 = quir.declare_duration {value = "500dt"} : !quir.duration
+// DELAYITER:     %dur = quir.constant #quir.duration<"500dt" : !quir.duration>
 // DELAYITER:       quir.call_gate @x(%arg0) : (!quir.qubit<1>) -> ()
 // DELAYITER:       quir.call_gate @x(%arg0) : (!quir.qubit<1>) -> ()
 // DELAYITER-NOT:   quir.call_gate @x(%arg0) : (!quir.qubit<1>) -> ()

diff --git a/test/Dialect/QUIR/Transforms/merge-resets.mlir b/test/Dialect/QUIR/Transforms/merge-resets.mlir
@@ -26,7 +26,7 @@ module  {
     %c1000 = arith.constant 1000 : index
     %c1 = arith.constant 1 : index
     scf.for %arg0 = %c0 to %c1000 step %c1 {
-      %0 = quir.declare_duration {value = "1ms"} : !quir.duration
+      %0 = quir.constant #quir.duration<"1ms" : !quir.duration>
       quir.delay %0, () : !quir.duration, () -> ()
 
       // qubit $0;
@@ -141,10 +141,10 @@ module  {
       quir.reset %2 : !quir.qubit<1>
       quir.call_gate @x(%2) : (!quir.qubit<1>) -> ()
 
-      // TOPO: quir.call_gate @x(%1) : (!quir.qubit<1>) -> ()
-      // TOPO: quir.reset %1, %2 : !quir.qubit<1>, !quir.qubit<1>
-      // TOPO: quir.call_gate @x(%1) : (!quir.qubit<1>) -> ()
-      // TOPO: quir.call_gate @x(%2) : (!quir.qubit<1>) -> ()
+      // TOPO: quir.call_gate @x([[QUBIT0]]) : (!quir.qubit<1>) -> ()
+      // TOPO: quir.reset [[QUBIT0]], [[QUBIT1]] : !quir.qubit<1>, !quir.qubit<1>
+      // TOPO: quir.call_gate @x([[QUBIT0]]) : (!quir.qubit<1>) -> ()
+      // TOPO: quir.call_gate @x([[QUBIT1]]) : (!quir.qubit<1>) -> ()
     }
     %c0_i32 = arith.constant 0 : i32
     return %c0_i32 : i32

diff --git a/test/Dialect/QUIR/Transforms/merge-resets2.mlir b/test/Dialect/QUIR/Transforms/merge-resets2.mlir
@@ -23,7 +23,7 @@ module  {
     %c1000 = arith.constant 1000 : index
     %c1 = arith.constant 1 : index
     scf.for %arg0 = %c0 to %c1000 step %c1 {
-      %0 = quir.declare_duration {value = "1ms"} : !quir.duration
+      %0 = quir.constant #quir.duration<"1ms" : !quir.duration>
       quir.delay %0, () : !quir.duration, () -> ()
 
       // qubit $0;

diff --git a/test/Dialect/QUIR/integration/iterative-phase-estimation.mlir b/test/Dialect/QUIR/integration/iterative-phase-estimation.mlir
@@ -136,8 +136,8 @@ module {
     "quir.call_gate"(%q1_0) {callee = @gateH} : (!quir.qubit<1>) -> ()
     "quir.call_gate"(%q0_0) {callee = @gateH} : (!quir.qubit<1>) -> ()
     // duration a, b; // should be resolved to duration by this point
-    %duration_a = quir.declare_duration {value = "10ns"} : !quir.duration
-    %duration_b = quir.declare_duration {value = "20ns"} : !quir.duration
+    %duration_a = quir.constant #quir.duration<"10ns" : !quir.duration>
+    %duration_b = quir.constant #quir.duration<"20ns" : !quir.duration>
     // delay(a) %0;
     // delay(b) %1;
     "quir.delay"(%duration_a, %q0_0) : (!quir.duration, !quir.qubit<1>) -> ()
@@ -171,7 +171,7 @@ module {
     "quir.call_gate"(%q0_0) {callee = @gateH} : (!quir.qubit<1>) -> ()
     // duration cs;
     // delay(cs) %1;
-    %duration_c = quir.declare_duration {value = "5ns"} : !quir.duration
+    %duration_c = quir.constant #quir.duration<"5ns" : !quir.duration>
     "quir.delay"(%duration_c, %q1_0) : (!quir.duration, !quir.qubit<1>) -> ()
     // cx %0, %1;
     "quir.call_gate"(%q0_0, %q1_0) {callee = @gateCX} : (!quir.qubit<1>, !quir.qubit<1>) -> ()