Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Multi-target gate circuit art improvement #2185

Open
wants to merge 8 commits into
base: main
Choose a base branch
from
+252 −115
Open

Multi-target gate circuit art improvement #2185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a400655
How this code should have looked in the first place
Morcifer Feb 1, 2025
c141799
This actually is nicer
Morcifer Feb 1, 2025
4012ee8
Minor simplification with new and default
Morcifer Feb 2, 2025
99910c5
Inefficient in terms of complexity, but works as expected
Morcifer Feb 9, 2025
cfa7382
Both efficient and correct (probably)
Morcifer Feb 9, 2025
aa6ae78
Rework, non-argumentative part
Morcifer Feb 19, 2025
1d1e039
Rework part 2 - 1.5 comments, one stone.
Morcifer Feb 19, 2025
fc96b10
ColumnRenderer -> Column rename
Morcifer Feb 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
118 changes: 116 additions & 2 deletions compiler/qsc/src/interpret/circuit_tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -490,18 +490,25 @@ fn custom_intrinsic_mixed_args() {
.circuit(CircuitEntryPoint::EntryPoint, false)
.expect("circuit generation should succeed");

// This is one gate that spans ten target wires, even though the
// text visualization doesn't convey that clearly.
expect![[r"
q_0 ─ AccountForEstimatesInternal([(0, 1), (1, 2), (2, 3), (3, 4), (4, 5), (5, 6)], 1) ──
┆
q_1 ─ AccountForEstimatesInternal([(0, 1), (1, 2), (2, 3), (3, 4), (4, 5), (5, 6)], 1) ──
┆
q_2 ─ AccountForEstimatesInternal([(0, 1), (1, 2), (2, 3), (3, 4), (4, 5), (5, 6)], 1) ──
┆
q_3 ─ AccountForEstimatesInternal([(0, 1), (1, 2), (2, 3), (3, 4), (4, 5), (5, 6)], 1) ──
┆
q_4 ─ AccountForEstimatesInternal([(0, 1), (1, 2), (2, 3), (3, 4), (4, 5), (5, 6)], 1) ──
┆
q_5 ─ AccountForEstimatesInternal([(0, 1), (1, 2), (2, 3), (3, 4), (4, 5), (5, 6)], 1) ──
┆
q_6 ─ AccountForEstimatesInternal([(0, 1), (1, 2), (2, 3), (3, 4), (4, 5), (5, 6)], 1) ──
┆
q_7 ─ AccountForEstimatesInternal([(0, 1), (1, 2), (2, 3), (3, 4), (4, 5), (5, 6)], 1) ──
┆
q_8 ─ AccountForEstimatesInternal([(0, 1), (1, 2), (2, 3), (3, 4), (4, 5), (5, 6)], 1) ──
┆
q_9 ─ AccountForEstimatesInternal([(0, 1), (1, 2), (2, 3), (3, 4), (4, 5), (5, 6)], 1) ──
"]]
.assert_eq(&circ.to_string());
Expand Down Expand Up @@ -887,6 +894,113 @@ fn operation_with_long_gates_properly_aligned() {
.assert_eq(&circ.to_string());
}

#[test]
fn operation_with_subsequent_qubits_gets_horizontal_lines() {
let mut interpreter = interpreter(
r"
namespace Test {
import Std.Measurement.*;

@EntryPoint()
operation Main() : Unit {
use q0 = Qubit();
use q1 = Qubit();
Rxx(1.0, q0, q1);

use q2 = Qubit();
use q3 = Qubit();
Rxx(1.0, q2, q3);
}
}
",
Profile::Unrestricted,
);

let circ = interpreter
.circuit(CircuitEntryPoint::EntryPoint, false)
.expect("circuit generation should succeed");

expect![[r#"
q_0 ─ rxx(1.0000) ─
┆
q_1 ─ rxx(1.0000) ─
q_2 ─ rxx(1.0000) ─
┆
q_3 ─ rxx(1.0000) ─
"#]]
.assert_eq(&circ.to_string());
}

#[test]
fn operation_with_subsequent_qubits_no_double_rows() {
let mut interpreter = interpreter(
r"
namespace Test {
import Std.Measurement.*;

@EntryPoint()
operation Main() : Unit {
use q0 = Qubit();
use q1 = Qubit();
Rxx(1.0, q0, q1);
Rxx(1.0, q0, q1);
}
}
",
Profile::Unrestricted,
);

let circ = interpreter
.circuit(CircuitEntryPoint::EntryPoint, false)
.expect("circuit generation should succeed");

expect![[r#"
q_0 ─ rxx(1.0000) ── rxx(1.0000) ─
┆ ┆
q_1 ─ rxx(1.0000) ── rxx(1.0000) ─
"#]]
.assert_eq(&circ.to_string());
}

#[test]
fn operation_with_subsequent_qubits_no_added_rows() {
let mut interpreter = interpreter(
r"
namespace Test {
import Std.Measurement.*;

@EntryPoint()
operation Main() : Result[] {
use q0 = Qubit();
use q1 = Qubit();
Rxx(1.0, q0, q1);

use q2 = Qubit();
use q3 = Qubit();
Rxx(1.0, q2, q3);

[M(q0), M(q2)]
}
}
",
Profile::Unrestricted,
);

let circ = interpreter
.circuit(CircuitEntryPoint::EntryPoint, false)
.expect("circuit generation should succeed");

expect![[r#"
q_0 ─ rxx(1.0000) ─── M ──
┆ ╘═══
q_1 ─ rxx(1.0000) ────────
q_2 ─ rxx(1.0000) ─── M ──
┆ ╘═══
q_3 ─ rxx(1.0000) ────────
"#]]
.assert_eq(&circ.to_string());
}

/// Tests that invoke circuit generation throught the debugger.
mod debugger_stepping {
use super::Debugger;
Expand Down
Loading