Fully adapting solution for synthesizing base operation of an annotated gates from add_control, but with the twist that some other high-level gate names are also supported; fixing failing tests that are synthesized differently (and actually better) using the new flow

Author: alexanderivrii

qiskit/transpiler/passes/synthesis/annotated_synthesis.py

@@ -81,17 +81,32 @@ def run(self, high_level_object, coupling_map=None, target=None, qubits=None, **
         # (including annotated operations) as the HighLevelSynthesis transpiler pass will
         # recursively re-synthesize this circuit, However, we should always guarantee that some
         # progress is made.
-        device_ops = data.get_device_insts().copy()
-        additional_ops = {"annotated", "mcx", "cz", "qft"}
-        device_ops = device_ops.union(additional_ops)
+        basis = {
+            "p",
+            "u",
+            "x",
+            "z",
+            "y",
+            "h",
+            "sx",
+            "sxdg",
+            "rx",
+            "ry",
+            "rz",
+            "cx",
+            "cz",
+            "annotated",
+            "mcx",
+            "qft",
+        }
         base_synthesis_data = HighLevelSynthesisData(
             hls_config=data.get_hls_config(),
             hls_plugin_manager=data.get_hls_plugin_manager(),
             coupling_map=None,
             target=None,
             equivalence_library=data.get_equivalence_library(),
             hls_op_names=data.get_hls_op_names(),
-            device_insts=device_ops,
+            device_insts=basis,
             use_qubit_indices=data.get_use_qubit_indices(),
             min_qubits=0,
             unroll_definitions=data.get_unroll_definitions(),

test/python/transpiler/test_high_level_synthesis.py

@@ -792,9 +792,17 @@ def test_controlled_qft_adder(self):
         gate = HalfAdderGate(3).control(2, annotated=True)
         qc = QuantumCircuit(gate.num_qubits)
         qc.append(gate, qc.qubits)
-        qct = HighLevelSynthesis(basis_gates=["cx", "u"], qubits_initially_zero=True)(qc)
+        qct = HighLevelSynthesis(basis_gates=["cx", "u"], qubits_initially_zero=False)(qc)
         self.assertLessEqual(qct.count_ops()["cx"], 450)
 
+    def test_controlled_qft(self):
+        """Test controlled QFT-gate."""
+        gate = QFTGate(3).control(2, annotated=True)
+        qc = QuantumCircuit(gate.num_qubits)
+        qc.append(gate, qc.qubits)
+        qct = HighLevelSynthesis(basis_gates=["cx", "u"], qubits_initially_zero=False)(qc)
+        self.assertLessEqual(qct.count_ops()["cx"], 198)
+
 
 class TestPMHSynthesisLinearFunctionPlugin(QiskitTestCase):
     """Tests for the PMHSynthesisLinearFunction plugin for synthesizing linear functions."""
@@ -1267,7 +1275,7 @@ def test_multiple_controls(self):
         circuit.append(lazy_gate1, [0, 1, 2, 3, 4])
         transpiled_circuit = HighLevelSynthesis()(circuit)
         expected_circuit = QuantumCircuit(5)
-        expected_circuit.append(SwapGate().control(2).control(1), [0, 1, 2, 3, 4])
+        expected_circuit.append(SwapGate().control(3), [0, 1, 2, 3, 4])
         self.assertEqual(transpiled_circuit, expected_circuit)
 
     def test_nested_controls(self):
@@ -1278,7 +1286,7 @@ def test_nested_controls(self):
         circuit.append(lazy_gate2, [0, 1, 2, 3, 4])
         transpiled_circuit = HighLevelSynthesis()(circuit)
         expected_circuit = QuantumCircuit(5)
-        expected_circuit.append(SwapGate().control(2).control(1), [0, 1, 2, 3, 4])
+        expected_circuit.append(SwapGate().control(3), [0, 1, 2, 3, 4])
         self.assertEqual(transpiled_circuit, expected_circuit)
 
     def test_nested_controls_permutation(self):