Improve error messages in Target-based GateDirection pass

qiskit/transpiler/passes/utils/gate_direction.py

@@ -19,7 +19,7 @@
 
 from qiskit.converters import dag_to_circuit, circuit_to_dag
 from qiskit.circuit import QuantumRegister, ControlFlowOp
-from qiskit.dagcircuit import DAGCircuit
+from qiskit.dagcircuit import DAGCircuit, DAGOpNode
 from qiskit.circuit.library.standard_gates import (
     RYGate,
     HGate,
@@ -34,6 +34,10 @@
 )
 
 
+def _swap_node_qargs(node):
+    return DAGOpNode(node.op, node.qargs[::-1], node.cargs)
+
+
 class GateDirection(TransformationPass):
     """Modify asymmetric gates to match the hardware coupling direction.
 
@@ -58,6 +62,8 @@ class GateDirection(TransformationPass):
              └──────┘          └───┘└──────┘└───┘
     """
 
+    _KNOWN_REPLACEMENTS = frozenset(["cx", "cz", "ecr", "swap", "rzx", "rxx", "ryy", "rzz"])
+
     def __init__(self, coupling_map, target=None):
         """GateDirection pass.
 
@@ -99,6 +105,8 @@ def __init__(self, coupling_map, target=None):
         self._swap_dag.add_qreg(qr)
         self._swap_dag.apply_operation_back(SwapGate(), [qr[1], qr[0]], [])
 
+        # If adding more replacements (either static or dynamic), also update the class variable
+        # `_KNOWN_REPLACMENTS` to include them in the error messages.
         self._static_replacements = {
             "cx": self._cx_dag,
             "cz": self._cz_dag,
@@ -186,7 +194,7 @@ def _run_coupling_map(self, dag, wire_map, edges=None):
                 else:
                     raise TranspilerError(
                         f"Flipping of gate direction is only supported "
-                        f"for {list(self._static_replacements)} at this time, not '{node.name}'."
+                        f"for {list(self._KNOWN_REPLACEMENTS)} at this time, not '{node.name}'."
                     )
         return dag
 
@@ -277,11 +285,21 @@ def _run_target(self, dag, wire_map):
                         f"The circuit requires a connection between physical qubits {qargs}"
                         f" for {node.name}"
                     )
-            else:
+            elif self.target.instruction_supported(node.name, qargs):
+                continue
+            elif self.target.instruction_supported(node.name, swapped) or dag.has_calibration_for(
+                _swap_node_qargs(node)
+            ):
                 raise TranspilerError(
                     f"Flipping of gate direction is only supported "
-                    f"for {list(self._static_replacements)} at this time, not '{node.name}'."
+                    f"for {list(self._KNOWN_REPLACEMENTS)} at this time, not '{node.name}'."
                 )
+            else:
+                raise TranspilerError(
+                    f"'{node.name}' with parameters '{node.op.params}' is not supported on qubits"
+                    f" '{qargs}' in either direction."
+                )
+
         return dag
 
     def run(self, dag):

test/python/transpiler/test_gate_direction.py

@@ -17,8 +17,8 @@
 
 import ddt
 
-from qiskit import ClassicalRegister, QuantumRegister, QuantumCircuit
-from qiskit.circuit import Parameter
+from qiskit import ClassicalRegister, QuantumRegister, QuantumCircuit, pulse
+from qiskit.circuit import Parameter, Gate
 from qiskit.circuit.library import (
     CXGate,
     CZGate,
@@ -439,6 +439,49 @@ def test_target_control_flow(self):
         pass_ = GateDirection(None, target)
         self.assertEqual(pass_(circuit), expected)
 
+    def test_target_cannot_flip_message(self):
+        """A suitable error message should be emitted if the gate would be supported if it were
+        flipped."""
+        gate = Gate("my_2q_gate", 2, [])
+        target = Target(num_qubits=2)
+        target.add_instruction(gate, properties={(0, 1): None})
+
+        circuit = QuantumCircuit(2)
+        circuit.append(gate, (1, 0))
+
+        pass_ = GateDirection(None, target)
+        with self.assertRaisesRegex(TranspilerError, "Flipping of gate direction.*"):
+            pass_(circuit)
+
+    def test_target_cannot_flip_message_calibrated(self):
+        """A suitable error message should be emitted if the gate would be supported if it were
+        flipped."""
+        target = Target(num_qubits=2)
+        target.add_instruction(CXGate(), properties={(0, 1): None})
+
+        gate = Gate("my_2q_gate", 2, [])
+        circuit = QuantumCircuit(2)
+        circuit.append(gate, (1, 0))
+        circuit.add_calibration(gate, (0, 1), pulse.ScheduleBlock())
+
+        pass_ = GateDirection(None, target)
+        with self.assertRaisesRegex(TranspilerError, "Flipping of gate direction.*"):
+            pass_(circuit)
+
+    def test_target_unknown_gate_message(self):
+        """A suitable error message should be emitted if the gate isn't valid in either direction on
+        the target."""
+        gate = Gate("my_2q_gate", 2, [])
+        target = Target(num_qubits=2)
+        target.add_instruction(CXGate(), properties={(0, 1): None})
+
+        circuit = QuantumCircuit(2)
+        circuit.append(gate, (0, 1))
+
+        pass_ = GateDirection(None, target)
+        with self.assertRaisesRegex(TranspilerError, "'my_2q_gate'.*not supported on qubits .*"):
+            pass_(circuit)
+
 
 if __name__ == "__main__":
     unittest.main()