Skip to content

Commit

Permalink
translate[] -> get[] renamed where appr. in ast2ram.
Browse files Browse the repository at this point in the history
  • Loading branch information
@azreika
azreika committed Oct 16, 2020
1 parent c333612 commit e54d3d6
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 20 deletions.
31 changes: 15 additions & 16 deletions src/ast2ram/AstToRamTranslator.cpp
View file
Expand Up @@ -210,11 +210,11 @@ std::string AstToRamTranslator::getConcreteRelationName(
return relationNamePrefix + getRelationName(rel->getQualifiedName());
}

std::string AstToRamTranslator::translateDeltaRelation(const ast::Relation* rel) {
std::string AstToRamTranslator::getDeltaRelationName(const ast::Relation* rel) {
return getConcreteRelationName(rel, "@delta_");
}

std::string AstToRamTranslator::translateNewRelation(const ast::Relation* rel) {
std::string AstToRamTranslator::getNewRelationName(const ast::Relation* rel) {
return getConcreteRelationName(rel, "@new_");
}

Expand Down Expand Up @@ -559,25 +559,25 @@ Own<ram::Statement> AstToRamTranslator::translateRecursiveRelation(const std::se
for (const ast::Relation* rel : scc) {
/* create update statements for fixpoint (even iteration) */
Own<ram::Statement> updateRelTable =
mk<ram::Sequence>(genMerge(rel, getConcreteRelationName(rel), translateNewRelation(rel)),
mk<ram::Swap>(translateDeltaRelation(rel), translateNewRelation(rel)),
mk<ram::Clear>(translateNewRelation(rel)));
mk<ram::Sequence>(genMerge(rel, getConcreteRelationName(rel), getNewRelationName(rel)),
mk<ram::Swap>(getDeltaRelationName(rel), getNewRelationName(rel)),
mk<ram::Clear>(getNewRelationName(rel)));

/* measure update time for each relation */
if (Global::config().has("profile")) {
updateRelTable = mk<ram::LogRelationTimer>(std::move(updateRelTable),
LogStatement::cRecursiveRelation(toString(rel->getQualifiedName()), rel->getSrcLoc()),
translateNewRelation(rel));
getNewRelationName(rel));
}

/* drop temporary tables after recursion */
appendStmt(postamble, mk<ram::Clear>(translateDeltaRelation(rel)));
appendStmt(postamble, mk<ram::Clear>(translateNewRelation(rel)));
appendStmt(postamble, mk<ram::Clear>(getDeltaRelationName(rel)));
appendStmt(postamble, mk<ram::Clear>(getNewRelationName(rel)));

/* Generate code for non-recursive part of relation */
/* Generate merge operation for temp tables */
appendStmt(preamble, translateNonRecursiveRelation(*rel, recursiveClauses));
appendStmt(preamble, genMerge(rel, translateDeltaRelation(rel), getConcreteRelationName(rel)));
appendStmt(preamble, genMerge(rel, getDeltaRelationName(rel), getConcreteRelationName(rel)));

/* Add update operations of relations to parallel statements */
appendStmt(updateTable, std::move(updateRelTable));
Expand Down Expand Up @@ -617,9 +617,8 @@ Own<ram::Statement> AstToRamTranslator::translateRecursiveRelation(const std::se

// modify the processed rule to use delta relation and write to new relation
Own<ast::Clause> r1(cl->clone());
r1->getHead()->setQualifiedName(translateNewRelation(rel));
ast::getBodyLiterals<ast::Atom>(*r1)[j]->setQualifiedName(
translateDeltaRelation(atomRelation));
r1->getHead()->setQualifiedName(getNewRelationName(rel));
ast::getBodyLiterals<ast::Atom>(*r1)[j]->setQualifiedName(getDeltaRelationName(atomRelation));
if (Global::config().has("provenance")) {
r1->addToBody(mk<ast::ProvenanceNegation>(souffle::clone(cl->getHead())));
} else {
Expand All @@ -636,7 +635,7 @@ Own<ram::Statement> AstToRamTranslator::translateRecursiveRelation(const std::se
for (size_t k = j + 1; k < atoms.size(); k++) {
if (isInSameSCC(getAtomRelation(atoms[k], program))) {
auto cur = souffle::clone(ast::getBodyLiterals<ast::Atom>(*r1)[k]);
cur->setQualifiedName(translateDeltaRelation(getAtomRelation(atoms[k], program)));
cur->setQualifiedName(getDeltaRelationName(getAtomRelation(atoms[k], program)));
r1->addToBody(mk<ast::Negation>(std::move(cur)));
}
}
Expand All @@ -653,7 +652,7 @@ Own<ram::Statement> AstToRamTranslator::translateRecursiveRelation(const std::se
const std::string logSizeStatement =
LogStatement::nRecursiveRule(relationName, version, srcLocation, clauseText);
rule = mk<ram::LogRelationTimer>(
std::move(rule), logTimerStatement, translateNewRelation(rel));
std::move(rule), logTimerStatement, getNewRelationName(rel));
}

// add debug info
Expand Down Expand Up @@ -691,7 +690,7 @@ Own<ram::Statement> AstToRamTranslator::translateRecursiveRelation(const std::se
const std::string logTimerStatement = LogStatement::tRecursiveRelation(relationName, srcLocation);
const std::string logSizeStatement = LogStatement::nRecursiveRelation(relationName, srcLocation);
auto newStmt = mk<ram::LogRelationTimer>(
mk<ram::Sequence>(std::move(loopRelSeq)), logTimerStatement, translateNewRelation(rel));
mk<ram::Sequence>(std::move(loopRelSeq)), logTimerStatement, getNewRelationName(rel));
loopRelSeq.clear();
appendStmt(loopRelSeq, std::move(newStmt));
}
Expand All @@ -709,7 +708,7 @@ Own<ram::Statement> AstToRamTranslator::translateRecursiveRelation(const std::se
Own<ram::Condition> exitCond;
VecOwn<ram::Statement> exitStmts;
for (const ast::Relation* rel : scc) {
addCondition(exitCond, mk<ram::EmptinessCheck>(translateNewRelation(rel)));
addCondition(exitCond, mk<ram::EmptinessCheck>(getNewRelationName(rel)));
if (ioType->isLimitSize(rel)) {
Own<ram::Condition> limit = mk<ram::Constraint>(BinaryConstraintOp::GE,
mk<ram::RelationSize>(getConcreteRelationName(rel)),
Expand Down
8 changes: 4 additions & 4 deletions src/ast2ram/AstToRamTranslator.h
View file
Expand Up @@ -164,11 +164,11 @@ class AstToRamTranslator {
// TODO (b-scholz): revisit / refactor so that only one directive is translated
std::vector<std::map<std::string, std::string>> getOutputDirectives(const ast::Relation* rel);

/** translate a temporary `delta` relation to a RAM relation for semi-naive evaluation */
std::string translateDeltaRelation(const ast::Relation* rel);
/** Get the corresponding RAM delta relation name for the relation */
std::string getDeltaRelationName(const ast::Relation* rel);

/** translate a temporary `new` relation to a RAM relation for semi-naive evaluation */
std::string translateNewRelation(const ast::Relation* rel);
/** Get the corresponding RAM 'new' relation name for the relation */
std::string getNewRelationName(const ast::Relation* rel);

/** Return a symbol table **/
SymbolTable& getSymbolTable();
Expand Down

0 comments on commit e54d3d6

Please sign in to comment.