Skip to content

Commit

Permalink
🐛 properly handle timing literals in QASM parser (#724)
Browse files Browse the repository at this point in the history
## Description

This PR fixes a bug in the QASM parser that would treat timing literal
suffixes as individual tokens, which can lead to strange errors with
gate declarations whose name matches a timing literal suffix, e.g.,
`ms`.
Timing literals are now properly treated and do not lead to clashes.

In the process, it was noticed that the Python import of long QASM
strings would fail due to pathlib throwing an `OSError` for too long
paths.
This is now fixed by short circuiting if the path is too long.

Fixes #723

## Checklist:

<!---
This checklist serves as a reminder of a couple of things that ensure
your pull request will be merged swiftly.
-->

- [x] The pull request only contains commits that are related to it.
- [x] I have added appropriate tests and documentation.
- [x] I have made sure that all CI jobs on GitHub pass.
- [x] The pull request introduces no new warnings and follows the
project's style guidelines.

---------

Signed-off-by: burgholzer <[email protected]>
  • Loading branch information
burgholzer authored Oct 11, 2024
1 parent 11a7d49 commit 008ad6a
Show file tree
Hide file tree
Showing 6 changed files with 151 additions and 58 deletions.
2 changes: 2 additions & 0 deletions include/mqt-core/ir/parsers/qasm3_parser/Scanner.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ class Scanner {
return isNum(c) || (c >= 'a' && c <= 'f') || (c >= 'A' && c <= 'F');
}

[[nodiscard]] static bool hasTimingSuffix(char first, char second);

static char readUtf8Codepoint(std::istream* in);

void nextCh();
Expand Down
26 changes: 6 additions & 20 deletions include/mqt-core/ir/parsers/qasm3_parser/Token.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -142,14 +142,6 @@ struct Token {

Underscore,

TimeUnitDt,
TimeUnitNs,
TimeUnitUs,
TimeUnitMys,
TimeUnitMs,
// might be either TimeUnitS or the `s` gate
S,

DoubleQuote,
SingleQuote,
BackSlash,
Expand All @@ -160,6 +152,7 @@ struct Token {
StringLiteral,
IntegerLiteral,
FloatLiteral,
TimingLiteral,

Sin,
Cos,
Expand Down Expand Up @@ -401,18 +394,6 @@ struct Token {
return "imag";
case Kind::Underscore:
return "underscore";
case Kind::TimeUnitDt:
return "dt";
case Kind::TimeUnitNs:
return "ns";
case Kind::TimeUnitUs:
return "us";
case Kind::TimeUnitMys:
return "mys";
case Kind::TimeUnitMs:
return "ms";
case Kind::S:
return "s";
case Kind::DoubleQuote:
return "\"";
case Kind::SingleQuote:
Expand All @@ -429,6 +410,8 @@ struct Token {
return "IntegerLiteral";
case Kind::FloatLiteral:
return "FloatLiteral";
case Kind::TimingLiteral:
return "TimingLiteral";
case Kind::Sin:
return "sin";
case Kind::Cos:
Expand Down Expand Up @@ -473,6 +456,9 @@ struct Token {
case Kind::FloatLiteral:
ss << " (" << valReal << ")";
break;
case Kind::TimingLiteral:
ss << " (" << valReal << " [s])";
break;
default:
break;
}
Expand Down
6 changes: 1 addition & 5 deletions src/ir/parsers/qasm3_parser/Parser.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -153,8 +153,7 @@ std::shared_ptr<QuantumStatement> Parser::parseQuantumStatement() {
current().kind == Token::Kind::Ctrl ||
current().kind == Token::Kind::NegCtrl ||
current().kind == Token::Kind::Identifier ||
current().kind == Token::Kind::Gphase ||
current().kind == Token::Kind::S) {
current().kind == Token::Kind::Gphase) {
// TODO: since we do not support classical function calls yet, we can assume
// that this is a gate statement
return parseGateCallStatement();
Expand Down Expand Up @@ -385,9 +384,6 @@ std::shared_ptr<GateCallStatement> Parser::parseGateCallStatement() {
scan();
identifier = "gphase";
operandsOptional = true;
} else if (current().kind == Token::Kind::S) {
scan();
identifier = "s";
} else {
identifier = expect(Token::Kind::Identifier).str;
}
Expand Down
62 changes: 48 additions & 14 deletions src/ir/parsers/qasm3_parser/Scanner.cpp
Original file line number Diff line number Diff line change
@@ -1,14 +1,18 @@
#include "ir/parsers/qasm3_parser/Scanner.hpp"

#include "Definitions.hpp"
#include "ir/parsers/qasm3_parser/Token.hpp"

#include <algorithm>
#include <cstdint>
#include <istream>
#include <optional>
#include <regex>
#include <sstream>
#include <stdexcept>
#include <string>
#include <utility>
#include <vector>

namespace qasm3 {
char Scanner::readUtf8Codepoint(std::istream* in) {
Expand Down Expand Up @@ -225,16 +229,40 @@ Token Scanner::consumeNumberLiteral() {
if (negative) {
t.valReal *= -1;
}

return t;
} else {
t.val = static_cast<int64_t>(
parseIntegerLiteral(valBeforeDecimalSeparator, base));
t.kind = Token::Kind::IntegerLiteral;
if (negative) {
t.val *= -1;
t.isSigned = true;
}
}

t.val = static_cast<int64_t>(
parseIntegerLiteral(valBeforeDecimalSeparator, base));
t.kind = Token::Kind::IntegerLiteral;
if (negative) {
t.val *= -1;
t.isSigned = true;
const auto suffix1 = ch;
const auto suffix2 = peek();
if (hasTimingSuffix(suffix1, suffix2)) {
double factor = 1.0;
nextCh();
if (suffix1 != 's' && (suffix1 != 'd' || suffix2 != 't')) {
nextCh();
const auto suffix = std::string{suffix1, suffix2};
if (suffix == "ms") {
factor = 1e-3;
} else if (suffix == "us") {
factor = 1e-6;
} else if (suffix == "ns") {
factor = 1e-9;
} else if (suffix == "ps") {
factor = 1e-12;
}
}
if (t.kind == Token::Kind::FloatLiteral) {
t.valReal *= factor;
} else {
t.valReal = static_cast<qc::fp>(t.val) * factor;
}
t.kind = Token::Kind::TimingLiteral;
}

t.endCol = col;
Expand Down Expand Up @@ -345,12 +373,6 @@ Scanner::Scanner(std::istream* in) : is(in) {
keywords["true"] = Token::Kind::True;
keywords["false"] = Token::Kind::False;
keywords["im"] = Token::Kind::Imag;
keywords["dt"] = Token::Kind::TimeUnitDt;
keywords["ns"] = Token::Kind::TimeUnitNs;
keywords["us"] = Token::Kind::TimeUnitUs;
keywords["mys"] = Token::Kind::TimeUnitMys;
keywords["ms"] = Token::Kind::TimeUnitMs;
keywords["s"] = Token::Kind::S;
keywords["sin"] = Token::Kind::Sin;
keywords["cos"] = Token::Kind::Cos;
keywords["tan"] = Token::Kind::Tan;
Expand Down Expand Up @@ -603,4 +625,16 @@ Token Scanner::next() {
t.endLine = line;
return t;
}

bool Scanner::hasTimingSuffix(const char first, const char second) {
if (first == 's') {
return true;
}
const auto suffixes = std::vector<std::pair<char, char>>{
{'m', 's'}, {'u', 's'}, {'n', 's'}, {'p', 's'}, {'d', 't'}};
return std::any_of(suffixes.begin(), suffixes.end(),
[first, second](const auto& suffix) {
return suffix.first == first && suffix.second == second;
});
}
} // namespace qasm3
16 changes: 9 additions & 7 deletions src/mqt/core/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

from __future__ import annotations

from os import PathLike
import os
from pathlib import Path
from typing import TYPE_CHECKING, Union

Expand All @@ -14,7 +14,7 @@
from qiskit.circuit import QuantumCircuit

"""The type of input that can be used to load a quantum circuit."""
CircuitInputType = Union[QuantumComputation, str, PathLike[str], QuantumCircuit]
CircuitInputType = Union[QuantumComputation, str, os.PathLike[str], QuantumCircuit]


def load(input_circuit: CircuitInputType) -> QuantumComputation:
Expand All @@ -33,15 +33,17 @@ def load(input_circuit: CircuitInputType) -> QuantumComputation:
if isinstance(input_circuit, QuantumComputation):
return input_circuit

if isinstance(input_circuit, (str, PathLike)):
if not Path(input_circuit).is_file():
if isinstance(input_circuit, PathLike) or "OPENQASM" not in input_circuit:
if isinstance(input_circuit, (str, os.PathLike)):
input_str = str(input_circuit)
max_filename_length = 255 if os.name == "nt" else os.pathconf("/", "PC_NAME_MAX")
if len(input_str) > max_filename_length or not Path(input_circuit).is_file():
if isinstance(input_circuit, os.PathLike) or "OPENQASM" not in input_circuit:
msg = f"File {input_circuit} does not exist."
raise FileNotFoundError(msg)
# otherwise, we assume that this is a QASM string
return QuantumComputation.from_qasm(str(input_circuit))
return QuantumComputation.from_qasm(input_str)

return QuantumComputation(str(input_circuit))
return QuantumComputation(input_str)

try:
from .plugins.qiskit import qiskit_to_mqt
Expand Down
97 changes: 85 additions & 12 deletions test/ir/test_qasm3_parser.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -754,6 +754,34 @@ TEST_F(Qasm3ParserTest, ImportMQTBenchCircuit) {
EXPECT_EQ(out, expected);
}

TEST_F(Qasm3ParserTest, ImportMSGate) {
const std::string testfile = "OPENQASM 3.0;"
"qubit[3] q;"
"bit[3] c;"
"gate ms(p0) q0, q1, q2 {"
" rxx(p0) q0, q1;"
" rxx(p0) q0, q2;"
" rxx(p0) q1, q2;"
"}"
"ms(0.844396) q[0], q[1], q[2];"
"c = measure q;";

auto qc = QuantumComputation::fromQASM(testfile);

const std::string out = qc.toQASM();
const std::string expected = "// i 0 1 2\n"
"// o 0 1 2\n"
"OPENQASM 3.0;\n"
"include \"stdgates.inc\";\n"
"qubit[3] q;\n"
"bit[3] c;\n"
"rxx(0.844396) q[0], q[1];\n"
"rxx(0.844396) q[0], q[2];\n"
"rxx(0.844396) q[1], q[2];\n"
"c = measure q;\n";
EXPECT_EQ(out, expected);
}

TEST_F(Qasm3ParserTest, ImportQasm2CPrefixInvalidGate) {
const std::string testfile = "OPENQASM 2.0;\n"
"qubit[5] q;\n"
Expand Down Expand Up @@ -1644,12 +1672,6 @@ TEST_F(Qasm3ParserTest, TestPrintTokens) {
qasm3::Token(qasm3::Token::Kind::RightShift, 0, 0),
qasm3::Token(qasm3::Token::Kind::Imag, 0, 0),
qasm3::Token(qasm3::Token::Kind::Underscore, 0, 0),
qasm3::Token(qasm3::Token::Kind::TimeUnitDt, 0, 0),
qasm3::Token(qasm3::Token::Kind::TimeUnitNs, 0, 0),
qasm3::Token(qasm3::Token::Kind::TimeUnitUs, 0, 0),
qasm3::Token(qasm3::Token::Kind::TimeUnitMys, 0, 0),
qasm3::Token(qasm3::Token::Kind::TimeUnitMs, 0, 0),
qasm3::Token(qasm3::Token::Kind::S, 0, 0),
qasm3::Token(qasm3::Token::Kind::DoubleQuote, 0, 0),
qasm3::Token(qasm3::Token::Kind::SingleQuote, 0, 0),
qasm3::Token(qasm3::Token::Kind::BackSlash, 0, 0),
Expand All @@ -1658,6 +1680,7 @@ TEST_F(Qasm3ParserTest, TestPrintTokens) {
qasm3::Token(qasm3::Token::Kind::StringLiteral, 0, 0, "hello, world"),
qasm3::Token(qasm3::Token::Kind::IntegerLiteral, 0, 0),
qasm3::Token(qasm3::Token::Kind::FloatLiteral, 0, 0),
qasm3::Token(qasm3::Token::Kind::TimingLiteral, 0, 0),
qasm3::Token(qasm3::Token::Kind::Sin, 0, 0),
qasm3::Token(qasm3::Token::Kind::Cos, 0, 0),
qasm3::Token(qasm3::Token::Kind::Tan, 0, 0),
Expand Down Expand Up @@ -1781,12 +1804,6 @@ TEST_F(Qasm3ParserTest, TestPrintTokens) {
">>\n"
"imag\n"
"underscore\n"
"dt\n"
"ns\n"
"us\n"
"mys\n"
"ms\n"
"s\n"
"\"\n"
"'\n"
"\\\n"
Expand All @@ -1796,6 +1813,7 @@ TEST_F(Qasm3ParserTest, TestPrintTokens) {
"StringLiteral (\"hello, world\")\n"
"IntegerLiteral (0)\n"
"FloatLiteral (0)\n"
"TimingLiteral (0 [s])\n"
"sin\n"
"cos\n"
"tan\n"
Expand Down Expand Up @@ -2168,3 +2186,58 @@ TEST_F(Qasm3ParserTest, TestConstEval) {
EXPECT_EQ(result, expected);
}
}

TEST_F(Qasm3ParserTest, TokenKindTimingLiteralSeconds) {
qasm3::Scanner scanner(new std::istringstream("1.0s"));
const auto token = scanner.next();
EXPECT_EQ(token.kind, qasm3::Token::Kind::TimingLiteral);
EXPECT_DOUBLE_EQ(token.valReal, 1.0);
}

TEST_F(Qasm3ParserTest, TokenKindTimingLiteralMilliseconds) {
qasm3::Scanner scanner(new std::istringstream("1.0ms"));
const auto token = scanner.next();
EXPECT_EQ(token.kind, qasm3::Token::Kind::TimingLiteral);
EXPECT_DOUBLE_EQ(token.valReal, 1.0e-3);
}

TEST_F(Qasm3ParserTest, TokenKindTimingLiteralMicroseconds) {
qasm3::Scanner scanner(new std::istringstream("1.0us"));
const auto token = scanner.next();
EXPECT_EQ(token.kind, qasm3::Token::Kind::TimingLiteral);
EXPECT_DOUBLE_EQ(token.valReal, 1.0e-6);
}

TEST_F(Qasm3ParserTest, TokenKindTimingLiteralNanoseconds) {
qasm3::Scanner scanner(new std::istringstream("1.0ns"));
const auto token = scanner.next();
EXPECT_EQ(token.kind, qasm3::Token::Kind::TimingLiteral);
EXPECT_DOUBLE_EQ(token.valReal, 1.0e-9);
}

TEST_F(Qasm3ParserTest, TokenKindTimingLiteralPicoseconds) {
qasm3::Scanner scanner(new std::istringstream("1.0ps"));
const auto token = scanner.next();
EXPECT_EQ(token.kind, qasm3::Token::Kind::TimingLiteral);
EXPECT_DOUBLE_EQ(token.valReal, 1.0e-12);
}

TEST_F(Qasm3ParserTest, TokenKindTimingLiteralDoubleSuffix) {
qasm3::Scanner scanner(new std::istringstream("1.0dt"));
const auto token = scanner.next();
EXPECT_EQ(token.kind, qasm3::Token::Kind::TimingLiteral);
EXPECT_DOUBLE_EQ(token.valReal, 1.0);
}

TEST_F(Qasm3ParserTest, TokenKindTimingLiteralInvalidSuffix) {
qasm3::Scanner scanner(new std::istringstream("1.0xs"));
const auto token = scanner.next();
EXPECT_NE(token.kind, qasm3::Token::Kind::TimingLiteral);
}

TEST_F(Qasm3ParserTest, TokenKindTimingLiteralMicrosecondsInteger) {
qasm3::Scanner scanner(new std::istringstream("1us"));
const auto token = scanner.next();
EXPECT_EQ(token.kind, qasm3::Token::Kind::TimingLiteral);
EXPECT_DOUBLE_EQ(token.valReal, 1.0e-6);
}

0 comments on commit 008ad6a

Please sign in to comment.