Skip to content

Fix handling of output permutation and initial layout #509

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

Merged
merged 1 commit into from
Dec 25, 2023
Merged

Fix handling of output permutation and initial layout #509

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
31 changes: 21 additions & 10 deletions src/parsers/QASM3Parser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@ class OpenQasm3Parser final : public InstVisitor {

bool openQASM2CompatMode{false};

qc::Permutation initialLayout{};
qc::Permutation outputPermutation{};

[[noreturn]] static void error(const std::string& message,
const std::shared_ptr<DebugInfo>& debugInfo) {
throw CompilerError(message, debugInfo);
Expand Down Expand Up @@ -162,6 +165,15 @@ class OpenQasm3Parser final : public InstVisitor {
throw;
}
}

// Finally, if we have a initial layout and output permutation specified,
// apply them.
if (!initialLayout.empty()) {
qc->initialLayout = initialLayout;
}
if (!outputPermutation.empty()) {
qc->outputPermutation = outputPermutation;
}
}

void visitVersionDeclaration(
Expand Down Expand Up @@ -249,22 +261,21 @@ class OpenQasm3Parser final : public InstVisitor {
assignmentStatement->debugInfo);
}

void visitInitialLayout(
const std::shared_ptr<InitialLayout> initialLayout) override {
if (!qc->initialLayout.empty()) {
error("Multiple initial layout specifications found.",
initialLayout->debugInfo);
void
visitInitialLayout(const std::shared_ptr<InitialLayout> layout) override {
if (!initialLayout.empty()) {
error("Multiple initial layout specifications found.", layout->debugInfo);
}
qc->initialLayout = initialLayout->permutation;
initialLayout = layout->permutation;
}

void visitOutputPermutation(
const std::shared_ptr<OutputPermutation> outputPermutation) override {
if (!qc->outputPermutation.empty()) {
const std::shared_ptr<OutputPermutation> permutation) override {
if (!outputPermutation.empty()) {
error("Multiple output permutation specifications found.",
outputPermutation->debugInfo);
permutation->debugInfo);
}
qc->outputPermutation = outputPermutation->permutation;
outputPermutation = permutation->permutation;
}

void visitGateStatement(
Expand Down
41 changes: 41 additions & 0 deletions test/unittests/test_qasm3_parser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -466,6 +466,47 @@ TEST_F(Qasm3ParserTest, ImportQasm3EmptyIfElse) {
EXPECT_EQ(out.str(), expected);
}

TEST_F(Qasm3ParserTest, ImportQasm3OutputPerm) {
std::stringstream ss{};
const std::string testfile = "// i 0 2 1 3\n"
"// o 3 0\n"
"qubit[4] q;\n";

ss << testfile;
auto qc = QuantumComputation();
qc.import(ss, Format::OpenQASM3);

std::stringstream out{};
QuantumComputation::printPermutation(qc.outputPermutation, out);

const std::string expected = "\t0: 1\n"
"\t3: 0\n"
"";

EXPECT_EQ(out.str(), expected);
}

TEST_F(Qasm3ParserTest, ImportQasm3OutputPermDefault) {
std::stringstream ss{};
const std::string testfile = "// i 0 2 1 3\n"
"qubit[4] q;\n";

ss << testfile;
auto qc = QuantumComputation();
qc.import(ss, Format::OpenQASM3);

std::stringstream out{};
QuantumComputation::printPermutation(qc.outputPermutation, out);

const std::string expected = "\t0: 0\n"
"\t1: 1\n"
"\t2: 2\n"
"\t3: 3\n"
"";

EXPECT_EQ(out.str(), expected);
}

TEST_F(Qasm3ParserTest, ImportQasm3IfElseNoBlock) {
std::stringstream ss{};
const std::string testfile = "OPENQASM 3.0;\n"
Expand Down