Remove t_complexity from comparison bloqs (#996)

* Remove t_complexity from comparison bloqs

- These bloqs already had call graphs.
- Also fix them to pick up the number of cliffords from the other
bloqs.

Author: dstrain115

qualtran/bloqs/arithmetic/comparison.py

@@ -51,7 +51,7 @@
 from qualtran.bloqs.mcmt.and_bloq import And, MultiAnd
 from qualtran.bloqs.mcmt.multi_control_multi_target_pauli import MultiControlX
 from qualtran.cirq_interop.bit_tools import iter_bits
-from qualtran.cirq_interop.t_complexity_protocol import t_complexity, TComplexity
+from qualtran.cirq_interop.t_complexity_protocol import TComplexity
 from qualtran.drawing import WireSymbol
 from qualtran.drawing.musical_score import Text, TextBox
 
@@ -628,12 +628,6 @@ def signature(self):
             a=QUInt(self.a_bitsize), b=QUInt(self.b_bitsize), target=QBit()
         )
 
-    def _t_complexity_(self) -> 'TComplexity':
-        # TODO Determine precise clifford count and/or ignore.
-        # See: https://github.com/quantumlib/Qualtran/issues/219
-        # See: https://github.com/quantumlib/Qualtran/issues/217
-        return t_complexity(LessThanEqual(self.a_bitsize, self.b_bitsize))
-
     def wire_symbol(self, reg: Optional[Register], idx: Tuple[int, ...] = tuple()) -> WireSymbol:
         if reg is None:
             return Text("a>b")
@@ -646,11 +640,7 @@ def wire_symbol(self, reg: Optional[Register], idx: Tuple[int, ...] = tuple()) -
         raise ValueError(f'Unknown register name {reg.name}')
 
     def build_call_graph(self, ssa: 'SympySymbolAllocator') -> Set['BloqCountT']:
-        # TODO Determine precise clifford count and/or ignore.
-        # See: https://github.com/quantumlib/Qualtran/issues/219
-        # See: https://github.com/quantumlib/Qualtran/issues/217
-        tc = t_complexity(LessThanEqual(self.a_bitsize, self.b_bitsize))
-        return {(TGate(), tc.t)}
+        return {(LessThanEqual(self.a_bitsize, self.b_bitsize), 1)}
 
 
 @bloq_example
@@ -868,12 +858,6 @@ class GreaterThanConstant(Bloq):
     def signature(self) -> Signature:
         return Signature.build_from_dtypes(x=QUInt(self.bitsize), target=QBit())
 
-    def _t_complexity_(self) -> TComplexity:
-        # TODO Determine precise clifford count and/or ignore.
-        # See: https://github.com/quantumlib/Qualtran/issues/219
-        # See: https://github.com/quantumlib/Qualtran/issues/217
-        return t_complexity(LessThanConstant(self.bitsize, less_than_val=self.val))
-
     def wire_symbol(self, reg: Optional[Register], idx: Tuple[int, ...] = tuple()) -> WireSymbol:
         if reg is None:
             return Text("")
@@ -884,11 +868,7 @@ def wire_symbol(self, reg: Optional[Register], idx: Tuple[int, ...] = tuple()) -
         raise ValueError(f'Unknown register symbol {reg.name}')
 
     def build_call_graph(self, ssa: 'SympySymbolAllocator') -> Set['BloqCountT']:
-        # TODO Determine precise clifford count and/or ignore.
-        # See: https://github.com/quantumlib/Qualtran/issues/219
-        # See: https://github.com/quantumlib/Qualtran/issues/217
-        tc = t_complexity(LessThanConstant(self.bitsize, less_than_val=self.val))
-        return {(TGate(), tc.t)}
+        return {(LessThanConstant(self.bitsize, less_than_val=self.val), 1)}
 
 
 @bloq_example
@@ -923,9 +903,6 @@ class EqualsAConstant(Bloq):
     def signature(self) -> Signature:
         return Signature.build_from_dtypes(x=QUInt(self.bitsize), target=QBit())
 
-    def _t_complexity_(self) -> 'TComplexity':
-        return TComplexity(t=4 * (self.bitsize - 1))
-
     def wire_symbol(self, reg: Optional[Register], idx: Tuple[int, ...] = tuple()) -> WireSymbol:
         if reg is None:
             return Text("")

qualtran/bloqs/arithmetic/comparison_test.py

@@ -32,6 +32,7 @@
     LinearDepthGreaterThan,
 )
 from qualtran.cirq_interop.bit_tools import iter_bits
+from qualtran.cirq_interop.t_complexity_protocol import t_complexity, TComplexity
 from qualtran.cirq_interop.testing import (
     assert_circuit_inp_out_cirqsim,
     assert_decompose_is_consistent_with_t_complexity,
@@ -179,10 +180,10 @@ def test_greater_than_manual():
     anc = bb.add_register('result', 1)
     q0, q1, anc = bb.add(GreaterThan(bitsize, bitsize), a=q0, b=q1, target=anc)
     cbloq = bb.finalize(a=q0, b=q1, result=anc)
-    cbloq.t_complexity()
     qlt_testing.assert_wire_symbols_match_expected(
         GreaterThanConstant(bitsize, 17), ['In(x)', '⨁(x > 17)']
     )
+    assert cbloq.t_complexity() == t_complexity(LessThanEqual(bitsize, bitsize))
 
 
 @pytest.mark.parametrize('bitsize', [1, 2, 5])
@@ -229,10 +230,12 @@ def test_greater_than_constant():
     anc = bb.add_register('result', 1)
     q0, anc = bb.add(GreaterThanConstant(bitsize, 17), x=q0, target=anc)
     cbloq = bb.finalize(x=q0, result=anc)
-    cbloq.t_complexity()
     qlt_testing.assert_wire_symbols_match_expected(
         GreaterThanConstant(bitsize, 17), ['In(x)', '⨁(x > 17)']
     )
+    assert t_complexity(GreaterThanConstant(bitsize, 17)) == t_complexity(
+        LessThanConstant(bitsize, 17)
+    )
 
 
 def test_equals_a_constant():
@@ -246,6 +249,7 @@ def test_equals_a_constant():
     qlt_testing.assert_wire_symbols_match_expected(
         EqualsAConstant(bitsize, 17), ['In(x)', '⨁(x = 17)']
     )
+    assert t_complexity(EqualsAConstant(bitsize, 17)) == TComplexity(t=4 * (bitsize - 1))
 
 
 @pytest.mark.notebook