Skip to content
GitLab
Commit f511bd37 authored by Mccaskey, Alex's avatar Mccaskey, Alex
Browse files

Updates for qcor - added Compiler::canParse, updated xasm and staq to support it 



Signed-off-by: Mccaskey, Alex's avatarAlex McCaskey <mccaskeyaj@ornl.gov>
parent f4a9e04a
Hide whitespace changes
Inline Side-by-side
quantum/plugins/staq/CMakeLists.txt
View file @ f511bd37
......@@ -14,6 +14,8 @@ set(LIBRARY_NAME xacc-staq-compiler)
file(GLOB SRC
compiler/*.cpp *.cpp transformations/*.cpp utils/*.cpp)
message(STATUS "${BoldGreen}Building Staq Compiler.${ColorReset}")
usfunctiongetresourcesource(TARGET ${LIBRARY_NAME} OUT SRC)
usfunctiongeneratebundleinit(TARGET ${LIBRARY_NAME} OUT SRC)
......
quantum/plugins/staq/compiler/staq_compiler.cpp
View file @ f511bd37
......@@ -27,12 +27,106 @@
#include "output/cirq.hpp"
#include <streambuf>
using namespace staq::ast;
namespace xacc {
StaqCompiler::StaqCompiler() {}
bool StaqCompiler::canParse(const std::string &src) {
std::string _src = src;
bool isXaccKernel = false;
std::string prototype;
auto xasm = xacc::getCompiler("xasm");
/** staq prints to cerr, override this **/
class buffer_override {
std::ostream &os;
std::streambuf *buf;
public:
buffer_override(std::ostream &os) : os(os), buf(os.rdbuf()) {}
~buffer_override() { os.rdbuf(buf); }
};
buffer_override b(std::cerr);
std::stringstream xx;
std::cerr.rdbuf(xx.rdbuf());
/** --------------------------------- **/
if (src.find("__qpu__") != std::string::npos) {
prototype = _src.substr(0, _src.find_first_of("{")) + "{}";
auto bufferNames = xasm->getKernelBufferNames(prototype);
isXaccKernel = true;
std::string tmp = "";
auto first = _src.find_first_of("{");
auto last = _src.find_last_of("}");
auto sub = _src.substr(first + 1, last - first - 1);
auto lines = xacc::split(sub, '\n');
bool addedNames = false;
for (auto &l : lines) {
xacc::trim(l);
if (l.find("measure") != std::string::npos) {
// don't add measures
continue;
}
tmp += l + "\n";
if (l.find("include") != std::string::npos) {
for (auto &b : bufferNames) {
auto size = std::numeric_limits<int>::max();
tmp += "qreg " + b + "[" + std::to_string(size) + "];\n";
}
addedNames = true;
}
}
_src = tmp;
if (!addedNames) {
for (auto &b : bufferNames) {
auto size = std::numeric_limits<int>::max();
_src = "qreg " + b + "[" + std::to_string(size) + "];\n" + _src;
}
}
}
// we allow users to leave out OPENQASM 2.0 and include qelib.inc
// If they did we need to add it for them
std::string tmp = "";
auto lines = xacc::split(_src, '\n');
bool foundOpenQasm = false, foundInclude = false;
for (auto &l : lines) {
if (l.find("OPENQASM") != std::string::npos) {
foundOpenQasm = true;
}
if (l.find("include") != std::string::npos) {
foundInclude = true;
}
}
if (!foundInclude) {
_src = "include \"qelib1.inc\";\n" + _src;
}
if (!foundOpenQasm) {
_src = "OPENQASM 2.0;\n" + _src;
}
// std::cout << " HELLO:\n" << _src << "\n";
using namespace staq;
try {
auto prog = parser::parse_string(_src);
return true;
} catch (std::exception &e) {
return false;
}
}
std::shared_ptr<IR> StaqCompiler::compile(const std::string &src,
std::shared_ptr<Accelerator> acc) {
// IF src contains typical xacc quantum kernel prototype, then take
......
quantum/plugins/staq/compiler/staq_compiler.hpp
View file @ f511bd37
......@@ -26,6 +26,7 @@ public:
std::shared_ptr<Accelerator> acc) override;
std::shared_ptr<xacc::IR> compile(const std::string &src) override;
bool canParse(const std::string& src) override;
const std::string
translate(std::shared_ptr<CompositeInstruction> function) override;
......
quantum/plugins/staq/compiler/tests/StaqCompilerTester.in.cpp
View file @ f511bd37
......@@ -26,7 +26,6 @@ TEST(StaqCompilerTester, checkSimple) {
measure q -> c;
)");
auto hello = IR->getComposites()[0];
std::cout << "HELLO:\n" << hello->toString() << "\n";
......@@ -48,6 +47,40 @@ TEST(StaqCompilerTester, checkSimple) {
std::cout << "HELLO:\n" << hello->toString() << "\n";
}
TEST(StaqCompilerTester, checkCanParse) {
auto a = xacc::qalloc(2);
a->setName("q");
xacc::storeBuffer(a);
auto compiler = xacc::getCompiler("staq");
EXPECT_FALSE(compiler->canParse(
R"(__qpu__ void bell_test_can_parse(qbit q, double t0) {
H(q[0]);
CX(q[0], q[1]);
Ry(q[0], t0);
Measure(q[0]);
Measure(q[1]);
})"));
EXPECT_FALSE(compiler->canParse(
R"(__qpu__ void bell_test_can_parse(qbit q, double t0) {
H(q[0]);
CX(q[0], [1]);
Ry(q[0], t0);
Measure(q[0]);
Measure(q[1]);
})"));
EXPECT_TRUE(compiler->canParse(R"(
qreg q[2];
creg c[2];
U(0,0,0) q[0];
CX q[0],q[1];
rx(3.3) q[0];
measure q -> c;
)"));
}
TEST(StaqCompilerTester, checkTranslate) {
auto compiler = xacc::getCompiler("staq");
......@@ -61,27 +94,26 @@ TEST(StaqCompilerTester, checkTranslate) {
measure q -> c;
)");
auto hello = IR->getComposites()[0];
std::cout << "HELLO:\n" << hello->toString() << "\n";
std::cout << "TRANSLATED: " << compiler->translate(hello) << "\n";
// auto q = xacc::qalloc(2);
// q->setName("q");
// xacc::storeBuffer(q);
// IR = compiler->compile(R"(__qpu__ void f(qreg q) {
// OPENQASM 2.0;
// include "qelib1.inc";
// creg c[2];
// U(0,0,0) q[0];
// CX q[0],q[1];
// rx(3.3) q[0];
// measure q -> c;
// })");
// hello = IR->getComposites()[0];
// std::cout << "HELLO:\n" << hello->toString() << "\n";
// auto q = xacc::qalloc(2);
// q->setName("q");
// xacc::storeBuffer(q);
// IR = compiler->compile(R"(__qpu__ void f(qreg q) {
// OPENQASM 2.0;
// include "qelib1.inc";
// creg c[2];
// U(0,0,0) q[0];
// CX q[0],q[1];
// rx(3.3) q[0];
// measure q -> c;
// })");
// hello = IR->getComposites()[0];
// std::cout << "HELLO:\n" << hello->toString() << "\n";
}
TEST(StaqCompilerTester, checkOracle) {
......@@ -144,13 +176,12 @@ adder a[0],a[1],a[2],a[3],b[0],b[1],b[2],b[3],c[0],c[1],c[2],c[3];
// measure
measure c -> result;
)";
// IR = compiler->compile(src2);
// IR = compiler->compile(src2);
// hello = IR->getComposites()[0];
// std::cout << hello->toString() << "\n";
// hello = IR->getComposites()[0];
// std::cout << hello->toString() << "\n";
}
TEST(StaqCompilerTester, checkCirq) {
auto compiler = xacc::getCompiler("staq");
auto IR = compiler->compile(R"(
......
quantum/plugins/xasm/tests/XASMCompilerTester.cpp
View file @ f511bd37
......@@ -32,6 +32,37 @@ TEST(XASMCompilerTester, checkTranslate) {
std::cout << "HELLO:\n" << translated << "\n";
}
TEST(XASMCompilerTester, checkCanParse) {
auto compiler = xacc::getCompiler("xasm");
EXPECT_TRUE(compiler->canParse(
R"(__qpu__ void bell_test_can_parse(qbit q, double t0) {
H(q[0]);
CX(q[0], q[1]);
Ry(q[0], t0);
Measure(q[0]);
Measure(q[1]);
})"));
EXPECT_FALSE(compiler->canParse(
R"(__qpu__ void bell_test_can_parse(qbit q, double t0) {
H(q[0]);
CX(q[0], [1]);
Ry(q[0], t0);
Measure(q[0]);
Measure(q[1]);
})"));
EXPECT_FALSE(compiler->canParse(R"(
qreg q[2];
creg c[2];
U(0,0,0) q[0];
CX q[0],q[1];
rx(3.3) q[0];
measure q -> c;
)"));
}
TEST(XASMCompilerTester, checkSimple) {
auto compiler = xacc::getCompiler("xasm");
......@@ -195,14 +226,12 @@ TEST(XASMCompilerTester, checkIfStmt) {
q->reset_single_measurements();
IR->getComposites()[0]->getInstruction(2)->disable();
std::cout << "KERNEL\n" << IR->getComposites()[0]->toString() << "\n";
std::cout << "KERNEL\n" << IR->getComposites()[0]->toString() << "\n";
q->measure(0, 1);
IR->getComposites()[0]->expand({});
std::cout << "KERNEL\n" << IR->getComposites()[0]->toString() << "\n";
}
TEST(XASMCompilerTester, checkApplyAll) {
......@@ -245,20 +274,18 @@ TEST(XASMCompilerTester, checkGateOnAll) {
xacc::storeBuffer(q);
auto compiler = xacc::getCompiler("xasm");
auto IR =
compiler->compile(R"(__qpu__ void on_all(qbit qqq) {
auto IR = compiler->compile(R"(__qpu__ void on_all(qbit qqq) {
H(qqq);
Measure(qqq);
})");
auto f = IR->getComposite("on_all");
std::cout << "F:\n" << f->toString() << "\n";
auto f = IR->getComposite("on_all");
std::cout << "F:\n" << f->toString() << "\n";
}
TEST(XASMCompilerTester, checkBugBug) {
auto a = xacc::qalloc(4);
auto a = xacc::qalloc(4);
a->setName("a");
xacc::storeBuffer(a);
......@@ -270,12 +297,12 @@ auto a = xacc::qalloc(4);
c->setName("c");
xacc::storeBuffer(c);
auto anc = xacc::qalloc(4);
auto anc = xacc::qalloc(4);
anc->setName("anc");
xacc::storeBuffer(anc);
auto compiler = xacc::getCompiler("xasm");
auto IR =
compiler->compile(R"(__qpu__ void bugbug(qbit a, qbit b, qbit c, qbit anc) {
auto compiler = xacc::getCompiler("xasm");
auto IR = compiler->compile(
R"(__qpu__ void bugbug(qbit a, qbit b, qbit c, qbit anc) {
X(a[0]);
X(a[1]);
X(b[0]);
......@@ -287,15 +314,15 @@ CX(b[0], anc[0]);
Tdg(anc[0]);
})");
std::cout << IR->getComposites()[0]->toString() << "\n";
std::cout << IR->getComposites()[0]->getInstruction(4)->toString() << "\n";
for (auto& b :IR->getComposites()[0]->getInstruction(4)->getBufferNames()) {std::cout << b << "\n";}
std::cout << IR->getComposites()[0]->toString() << "\n";
std::cout << IR->getComposites()[0]->getInstruction(4)->toString() << "\n";
for (auto &b : IR->getComposites()[0]->getInstruction(4)->getBufferNames()) {
std::cout << b << "\n";
}
}
TEST(XASMCompilerTester, checkCallingPreviousKernel) {
auto compiler = xacc::getCompiler("xasm");
auto IR =
compiler->compile(R"(__qpu__ void bell_call(qbit q) {
auto compiler = xacc::getCompiler("xasm");
auto IR = compiler->compile(R"(__qpu__ void bell_call(qbit q) {
H(q[0]);
CX(q[0], q[1]);
Measure(q[0]);
......
quantum/plugins/xasm/xasm_compiler.cpp
View file @ f511bd37
......@@ -29,6 +29,32 @@ namespace xacc {
XASMCompiler::XASMCompiler() = default;
bool XASMCompiler::canParse(const std::string &src) {
class XASMThrowExceptionErrorListener : public BaseErrorListener {
public:
void syntaxError(Recognizer *recognizer, Token *offendingSymbol,
size_t line, size_t charPositionInLine,
const std::string &msg, std::exception_ptr e) override {
throw std::runtime_error("Cannot parse this XASM source string.");
}
};
ANTLRInputStream input(src);
xasmLexer lexer(&input);
CommonTokenStream tokens(&lexer);
xasmParser parser(&tokens);
parser.removeErrorListeners();
parser.addErrorListener(new XASMThrowExceptionErrorListener());
try {
tree::ParseTree *tree = parser.xaccsrc();
return true;
} catch (std::exception &e) {
return false;
}
}
std::shared_ptr<IR> XASMCompiler::compile(const std::string &src,
std::shared_ptr<Accelerator> acc) {
ANTLRInputStream input(src);
......@@ -60,7 +86,8 @@ std::shared_ptr<IR> XASMCompiler::compile(const std::string &src) {
return compile(src, nullptr);
}
std::vector<std::string> XASMCompiler::getKernelBufferNames(const std::string& src) {
std::vector<std::string>
XASMCompiler::getKernelBufferNames(const std::string &src) {
ANTLRInputStream input(src);
xasmLexer lexer(&input);
CommonTokenStream tokens(&lexer);
......
quantum/plugins/xasm/xasm_compiler.hpp
View file @ f511bd37
......@@ -26,7 +26,8 @@ public:
std::shared_ptr<Accelerator> acc) override;
std::shared_ptr<xacc::IR> compile(const std::string &src) override;
bool canParse(const std::string& src) override;
const std::string translate(std::shared_ptr<CompositeInstruction> function) override;
std::vector<std::string> getKernelBufferNames(const std::string& src) override;
......
xacc/compiler/Compiler.hpp
View file @ f511bd37
......@@ -27,6 +27,13 @@ public:
virtual std::shared_ptr<IR> compile(const std::string &src,
std::shared_ptr<Accelerator> acc) = 0;
virtual std::shared_ptr<IR> compile(const std::string &src) = 0;
// By default, we assume this compiler can not parse a given
// source string. Subtypes implement this to indicate if
// they can or not
virtual bool canParse(const std::string& src) {
return false;
}
virtual const std::string
translate(std::shared_ptr<CompositeInstruction> program) = 0;
......
xacc/compiler/qalloc.cpp
View file @ f511bd37
......@@ -16,6 +16,7 @@ std::map<std::string, int> qreg::counts() {
double qreg::exp_val_z() { return buffer->getExpectationValueZ(); }
void qreg::reset() { buffer->resetBuffer(); }
void qreg::setName(const char *name) { buffer->setName(name); }
void qreg::setNameAndStore(const char *name) { setName(name); store(); }
void qreg::store() {
auto buffer_as_shared = std::shared_ptr<AcceleratorBuffer>(
buffer, empty_delete<AcceleratorBuffer>());
......
xacc/compiler/qalloc.hpp
View file @ f511bd37
......@@ -32,6 +32,7 @@ public:
double exp_val_z();
void reset();
void setName(const char *name);
void setNameAndStore(const char *name);
void store();
};
......@@ -42,4 +43,6 @@ xacc::internal_compiler::qreg qalloc(const int n) {
return xacc::internal_compiler::qreg(n);
}
#define __qpu__ [[clang::syntax(qcor)]]
#endif
\ No newline at end of file
xacc/compiler/xacc_internal_compiler.cpp
View file @ f511bd37
......@@ -6,19 +6,24 @@
namespace xacc {
namespace internal_compiler {
Accelerator *qpu = nullptr;
CompositeInstruction* lastCompiled = nullptr;
CompositeInstruction *lastCompiled = nullptr;
bool __execute = true;
void __set_verbose(bool v) {
xacc::set_verbose(v);
}
void __set_verbose(bool v) { xacc::set_verbose(v); }
void compiler_InitializeXACC(const char *qpu_backend) {
if (!xacc::isInitialized())
xacc::Initialize();
xacc::external::load_external_language_plugins();
setAccelerator(qpu_backend);
}
void compiler_InitializeXACC(const char *qpu_backend, const int shots) {
if (!xacc::isInitialized())
xacc::Initialize();
xacc::external::load_external_language_plugins();
setAccelerator(qpu_backend, shots);
}
void setAccelerator(const char *qpu_backend) {
......@@ -31,18 +36,21 @@ void setAccelerator(const char *qpu_backend) {
}
}
void setAccelerator(const char * qpu_backend, const int shots) {
setAccelerator(qpu_backend);
qpu->updateConfiguration({std::make_pair("shots", shots)});
void setAccelerator(const char *qpu_backend, const int shots) {
if (qpu) {
if (qpu_backend != qpu->name()) {
qpu = xacc::getAccelerator(qpu_backend, {std::make_pair("shots", shots)})
.get();
}
} else {
qpu = xacc::getAccelerator(qpu_backend, {std::make_pair("shots", shots)})
.get();
}
}
Accelerator* get_qpu() {
return qpu;
}
Accelerator *get_qpu() { return qpu; }
CompositeInstruction* getLastCompiled() {
return lastCompiled;
}
CompositeInstruction *getLastCompiled() { return lastCompiled; }
// Map kernel source string representing a single
// kernel function to a single CompositeInstruction (src to IR)
......@@ -65,7 +73,8 @@ CompositeInstruction *getCompiled(const char *kernel_name) {
// Run quantum compilation routines on IR
void optimize(CompositeInstruction *program, const OptLevel opt) {
xacc::info("[InternalCompiler] Pre-optimization, circuit has " + std::to_string(program->nInstructions()) + " instructions.");
xacc::info("[InternalCompiler] Pre-optimization, circuit has " +
std::to_string(program->nInstructions()) + " instructions.");
// We don't own this ptr, so create shared_ptr with empty deleter
auto as_shared = std::shared_ptr<CompositeInstruction>(
......@@ -80,8 +89,8 @@ void optimize(CompositeInstruction *program, const OptLevel opt) {
xacc::error("Other Optimization Levels not yet supported.");
}
xacc::info("[InternalCompiler] Post-optimization, circuit has " + std::to_string(program->nInstructions()) + " instructions.");
xacc::info("[InternalCompiler] Post-optimization, circuit has " +
std::to_string(program->nInstructions()) + " instructions.");
}
// Execute on the specified QPU, persisting results to
......@@ -148,10 +157,11 @@ void execute(AcceleratorBuffer **buffers, const int nBuffers,
sizes.insert(bit);
}
}
auto size = *std::max_element(sizes.begin(),sizes.end());
auto size = *std::max_element(sizes.begin(), sizes.end());
auto extra = qalloc(size);
extra->setName(possible_buffer);
xacc::debug("[xacc_internal_compiler] Adding extra buffer " + possible_buffer + " of size " + std::to_string(size));
xacc::debug("[xacc_internal_compiler] Adding extra buffer " +
possible_buffer + " of size " + std::to_string(size));
bvec.push_back(extra.get());
}
......@@ -203,10 +213,10 @@ void execute(AcceleratorBuffer **buffers, const int nBuffers,
std::vector<std::size_t> measure_idxs;
InstructionIterator iter2(program_as_shared);
while (iter2.hasNext()) {
auto &next = *iter2.next();
if (next.name() == "Measure") {
measure_idxs.push_back(next.bits()[0]);
}
auto &next = *iter2.next();
if (next.name() == "Measure") {
measure_idxs.push_back(next.bits()[0]);
}
}
optimize(program);
......@@ -221,14 +231,15 @@ void execute(AcceleratorBuffer **buffers, const int nBuffers,
// Some backends return bitstring of size = number of measures
// instead of size = global_reg_size, adjust if so
if (bitstring.size() == measure_idxs.size()) {
std::string tmps = "";
for (int j = 0; j < global_reg_size; j++) tmps+="0";
std::string tmps = "";
for (int j = 0; j < global_reg_size; j++)
tmps += "0";
for (int j = 0; j < measure_idxs.size(); j++) {
tmps[measure_idxs[j]] = bitstring[j];
}
for (int j = 0; j < measure_idxs.size(); j++) {
tmps[measure_idxs[j]] = bitstring[j];
}
bitstring = tmps;
bitstring = tmps;
}
// The following processing the bit string assuming LSB
......@@ -258,10 +269,10 @@ void execute(AcceleratorBuffer **buffers, const int nBuffers,
for (auto &b : bvec) {
b->setMeasurements(buf_counts[b->name()]);
b->addExtraInfo("endianness", qpu->getBitOrder() == Accelerator::BitOrder::LSB ? "lsb" : "msb" );
b->addExtraInfo("endianness",
qpu->getBitOrder() == Accelerator::BitOrder::LSB ? "lsb"
: "msb");
}
}
} // namespace internal_compiler
......
xacc/compiler/xacc_internal_compiler.hpp
View file @ f511bd37
......@@ -26,6 +26,8 @@ extern bool __execute;
enum OptLevel { DEFAULT, LEVEL1, LEVEL2, LEVEL3 };
void compiler_InitializeXACC(const char *qpu_backend = "local-ibm");
void compiler_InitializeXACC(const char *qpu_backend, const int shots);
void setAccelerator(const char * qpu_backend);
void setAccelerator(const char * qpu_backend, const int shots);
Accelerator* get_qpu();
......