feat!: Add ReplaceBoolPass

tket2-exts/src/tket2_exts/data/tket2/bool.json

@@ -50,14 +50,21 @@
       },
       "binary": false
     },
-    "bool_to_sum": {
+    "eq": {
       "extension": "tket2.bool",
-      "name": "bool_to_sum",
-      "description": "Convert a tket2.bool into a Hugr unit sum.",
+      "name": "eq",
+      "description": "Equality between two tket2.bools.",
       "signature": {
         "params": [],
         "body": {
           "input": [
+            {
+              "t": "Opaque",
+              "extension": "tket2.bool",
+              "id": "bool",
+              "args": [],
+              "bound": "C"
+            },
             {
               "t": "Opaque",
               "extension": "tket2.bool",
@@ -68,36 +75,29 @@
           ],
           "output": [
             {
-              "t": "Sum",
-              "s": "Unit",
-              "size": 2
+              "t": "Opaque",
+              "extension": "tket2.bool",
+              "id": "bool",
+              "args": [],
+              "bound": "C"
             }
           ]
         }
       },
       "binary": false
     },
-    "eq": {
+    "make_opaque": {
       "extension": "tket2.bool",
-      "name": "eq",
-      "description": "Equality between two tket2.bools.",
+      "name": "make_opaque",
+      "description": "Convert a Hugr bool_t (a unit sum) into an tket2.bool.",
       "signature": {
         "params": [],
         "body": {
           "input": [
             {
-              "t": "Opaque",
-              "extension": "tket2.bool",
-              "id": "bool",
-              "args": [],
-              "bound": "C"
-            },
-            {
-              "t": "Opaque",
-              "extension": "tket2.bool",
-              "id": "bool",
-              "args": [],
-              "bound": "C"
+              "t": "Sum",
+              "s": "Unit",
+              "size": 2
             }
           ],
           "output": [
@@ -178,28 +178,28 @@
       },
       "binary": false
     },
-    "sum_to_bool": {
+    "read": {
       "extension": "tket2.bool",
-      "name": "sum_to_bool",
-      "description": "Convert a Hugr unit sum into an tket2.bool.",
+      "name": "read",
+      "description": "Convert a tket2.bool into a Hugr bool_t (a unit sum).",
       "signature": {
         "params": [],
         "body": {
           "input": [
-            {
-              "t": "Sum",
-              "s": "Unit",
-              "size": 2
-            }
-          ],
-          "output": [
             {
               "t": "Opaque",
               "extension": "tket2.bool",
               "id": "bool",
               "args": [],
               "bound": "C"
             }
+          ],
+          "output": [
+            {
+              "t": "Sum",
+              "s": "Unit",
+              "size": 2
+            }
           ]
         }
       },

tket2-exts/src/tket2_exts/data/tket2/qsystem.json

@@ -88,9 +88,11 @@
           ],
           "output": [
             {
-              "t": "Sum",
-              "s": "Unit",
-              "size": 2
+              "t": "Opaque",
+              "extension": "tket2.bool",
+              "id": "bool",
+              "args": [],
+              "bound": "C"
             }
           ]
         }
@@ -114,9 +116,11 @@
               "t": "Q"
             },
             {
-              "t": "Sum",
-              "s": "Unit",
-              "size": 2
+              "t": "Opaque",
+              "extension": "tket2.bool",
+              "id": "bool",
+              "args": [],
+              "bound": "C"
             }
           ]
         }

tket2-exts/src/tket2_exts/data/tket2/quantum.json

@@ -223,9 +223,11 @@
           ],
           "output": [
             {
-              "t": "Sum",
-              "s": "Unit",
-              "size": 2
+              "t": "Opaque",
+              "extension": "tket2.bool",
+              "id": "bool",
+              "args": [],
+              "bound": "C"
             }
           ]
         }

tket2-hseries/src/extension/qsystem.rs

@@ -33,6 +33,7 @@ use crate::extension::futures;
 use derive_more::Display;
 use lazy_static::lazy_static;
 use strum::{EnumIter, EnumString, IntoStaticStr};
+use tket2::extension::bool::{bool_type, BoolOp};
 
 use super::futures::future_type;
 
@@ -110,12 +111,12 @@ impl MakeOpDef for QSystemOp {
             LazyMeasureReset => Signature::new(qb_t(), vec![qb_t(), future_type(bool_t())]),
             Reset => Signature::new(one_qb_row.clone(), one_qb_row),
             ZZPhase => Signature::new(vec![qb_t(), qb_t(), float64_type()], two_qb_row),
-            Measure => Signature::new(one_qb_row, bool_t()),
+            Measure => Signature::new(one_qb_row, bool_type()),
             Rz => Signature::new(vec![qb_t(), float64_type()], one_qb_row),
             PhasedX => Signature::new(vec![qb_t(), float64_type(), float64_type()], one_qb_row),
             TryQAlloc => Signature::new(type_row![], Type::from(option_type(one_qb_row))),
             QFree => Signature::new(one_qb_row, type_row![]),
-            MeasureReset => Signature::new(one_qb_row.clone(), vec![qb_t(), bool_t()]),
+            MeasureReset => Signature::new(one_qb_row.clone(), vec![qb_t(), bool_type()]),
         }
         .into()
     }
@@ -452,8 +453,9 @@ pub trait QSystemOpBuilder: Dataflow + UnwrapBuilder + ArrayOpBuilder {
     /// Build a projective measurement with a conditional flip.
     fn build_measure_flip(&mut self, qb: Wire) -> Result<[Wire; 2], BuildError> {
         let [qb, b] = self.add_measure_reset(qb)?;
+        let sum_b = self.add_dataflow_op(BoolOp::read, [b])?.out_wire(0);
         let mut conditional = self.conditional_builder(
-            ([type_row![], type_row![]], b),
+            ([type_row![], type_row![]], sum_b),
             [(qb_t(), qb)],
             vec![qb_t()].into(),
         )?;
@@ -470,7 +472,7 @@ pub trait QSystemOpBuilder: Dataflow + UnwrapBuilder + ArrayOpBuilder {
         case1.finish_with_outputs([qb])?;
 
         let [qb] = conditional.finish_sub_container()?.outputs_arr();
-        Ok([qb, b])
+        Ok([qb, sum_b])
     }
 
     /// Build a qalloc operation that panics on failure.
@@ -591,7 +593,7 @@ mod test {
         let hugr = {
             let mut func_builder = FunctionBuilder::new(
                 "all_ops",
-                Signature::new(vec![qb_t(), float64_type()], vec![bool_t()]),
+                Signature::new(vec![qb_t(), float64_type()], vec![bool_type()]),
             )
             .unwrap();
             let [q0, angle] = func_builder.input_wires_arr();

tket2-hseries/src/extension/qsystem/lower.rs

@@ -378,9 +378,9 @@ mod test {
         assert_eq!(lowered.len(), 6);
         // dfg, input, output, alloc + (10 for unwrap), phasedx, rz, toturns, fmul, phasedx, free +
         // 5x(float + load), measure_reset, conditional, case(input, output) * 2, flip
-        // (phasedx + 2*(float + load))
+        // (phasedx + 2*(float + load)), tket2.read
         // + 19 for the barrier array wrapping, popping and option unwrapping
-        assert_eq!(h.descendants(h.module_root()).count(), 82);
+        assert_eq!(h.descendants(h.module_root()).count(), 83);
         assert_eq!(check_lowered(&h), Ok(()));
         if let Err(e) = h.validate() {
             panic!("{}", e);