Skip to content

Commit 8979bdf

Browse files
author
Sam
committed
Switch to RelationSet and resolve merge conflict
2 parents 62e4431 + 429e168 commit 8979bdf

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+2411
-1353
lines changed

‎cmake/SouffleTests.cmake

+11-1
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ function(SOUFFLE_RUN_TEST_HELPER)
144144
#Usually just "facts" but can be different when running multi - tests
145145
cmake_parse_arguments(
146146
PARAM
147-
"COMPILED;FUNCTORS;NEGATIVE;MULTI_TEST;NO_PREPROCESSOR" # Options
147+
"COMPILED;COMPILED_SPLITTED;FUNCTORS;NEGATIVE;MULTI_TEST;NO_PREPROCESSOR" # Options
148148
"TEST_NAME;CATEGORY;FACTS_DIR_NAME;EXTRA_DATA" #Single valued options
149149
"INCLUDE_DIRS" # Multi-valued options
150150
${ARGV}
@@ -156,6 +156,10 @@ function(SOUFFLE_RUN_TEST_HELPER)
156156
list(APPEND EXTRA_FLAGS "-c")
157157
set(EXEC_STYLE "compiled")
158158
set(SHORT_EXEC_STYLE "_c")
159+
elseif(PARAM_COMPILED_SPLITTED)
160+
list(APPEND EXTRA_FLAGS "-C")
161+
set(EXEC_STYLE "compiled-splitted")
162+
set(SHORT_EXEC_STYLE "_C")
159163
else()
160164
set(EXEC_STYLE "interpreted")
161165
set(SHORT_EXEC_STYLE "")
@@ -323,6 +327,12 @@ endfunction()
323327
function(SOUFFLE_POSITIVE_TEST TEST_NAME CATEGORY)
324328
souffle_run_test(TEST_NAME ${TEST_NAME}
325329
CATEGORY ${CATEGORY})
330+
if (${ARGN} MATCHES "COMPILED_SPLITTED")
331+
souffle_run_test_helper(
332+
TEST_NAME ${TEST_NAME}
333+
CATEGORY ${CATEGORY}
334+
COMPILED_SPLITTED)
335+
endif()
326336
endfunction()
327337

328338
# A helper to make it easier to specify the category positionally

‎src/CMakeLists.txt

+2
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,8 @@ set(SOUFFLE_SOURCES
155155
reports/DebugReport.cpp
156156
synthesiser/Synthesiser.cpp
157157
synthesiser/Relation.cpp
158+
synthesiser/Utils.cpp
159+
synthesiser/GenDb.cpp
158160
)
159161

160162
# --------------------------------------------------

‎src/ast/analysis/IOType.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,10 @@ class IOTypeAnalysis : public Analysis {
6969
}
7070

7171
private:
72-
std::set<const Relation*> inputRelations;
73-
std::set<const Relation*> outputRelations;
74-
std::set<const Relation*> printSizeRelations;
75-
std::set<const Relation*> limitSizeRelations;
72+
RelationSet inputRelations;
73+
RelationSet outputRelations;
74+
RelationSet printSizeRelations;
75+
RelationSet limitSizeRelations;
7676
std::map<const Relation*, std::size_t> limitSize;
7777
};
7878

‎src/ast/analysis/JoinSize.cpp

+4-5
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,8 @@ const analysis::PowerSet& JoinSizeAnalysis::getSubsets(std::size_t N, std::size_
7878
return cache.at({N, K});
7979
}
8080

81-
analysis::StratumJoinSize JoinSizeAnalysis::computeRuleVersionStatements(
82-
const std::set<const ast::Relation*>& scc, const ast::Clause& clause,
83-
std::optional<std::size_t> version, ast2ram::TranslationMode mode) {
81+
analysis::StratumJoinSize JoinSizeAnalysis::computeRuleVersionStatements(const RelationSet& scc,
82+
const ast::Clause& clause, std::optional<std::size_t> version, ast2ram::TranslationMode mode) {
8483
auto* prog = program;
8584
auto* poly = polyAnalysis;
8685
auto sccAtoms = filter(ast::getBodyLiterals<ast::Atom>(clause),
@@ -443,7 +442,7 @@ analysis::StratumJoinSize JoinSizeAnalysis::computeRuleVersionStatements(
443442

444443
std::vector<analysis::StratumJoinSize> JoinSizeAnalysis::computeJoinSizeStatements() {
445444
auto* prog = program;
446-
auto getSccAtoms = [prog](const ast::Clause* clause, const std::set<const ast::Relation*>& scc) {
445+
auto getSccAtoms = [prog](const ast::Clause* clause, const ast::RelationSet& scc) {
447446
const auto& sccAtoms = filter(ast::getBodyLiterals<ast::Atom>(*clause),
448447
[&](const ast::Atom* atom) { return contains(scc, prog->getRelation(*atom)); });
449448
return sccAtoms;
@@ -464,7 +463,7 @@ std::vector<analysis::StratumJoinSize> JoinSizeAnalysis::computeJoinSizeStatemen
464463
analysis::StratumJoinSize stratumNodes;
465464

466465
auto scc = sccOrdering[i];
467-
const std::set<const ast::Relation*> sccRelations = sccGraph->getInternalRelations(scc);
466+
const ast::RelationSet sccRelations = sccGraph->getInternalRelations(scc);
468467
for (auto* rel : sccRelations) {
469468
// Translate each recursive clasue
470469
for (auto&& clause : program->getClauses(*rel)) {

‎src/ast/analysis/JoinSize.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@ class JoinSizeAnalysis : public Analysis {
6969

7070
// for each stratum compute the EstimateJoinSize nodes to emit
7171
std::vector<StratumJoinSize> computeJoinSizeStatements();
72-
StratumJoinSize computeRuleVersionStatements(const std::set<const ast::Relation*>& sccRelations,
73-
const ast::Clause& clause, std::optional<std::size_t> version,
72+
StratumJoinSize computeRuleVersionStatements(const RelationSet& sccRelations, const ast::Clause& clause,
73+
std::optional<std::size_t> version,
7474
ast2ram::TranslationMode mode = ast2ram::TranslationMode::DEFAULT);
7575
const PowerSet& getSubsets(std::size_t N, std::size_t K) const;
7676
mutable std::map<std::pair<std::size_t, std::size_t>, PowerSet> cache;

‎src/ast/analysis/RecursiveClauses.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ bool RecursiveClausesAnalysis::computeIsRecursive(
5353
// we want to reach the atom of the head through the body
5454
const Relation* trg = program.getRelation(clause);
5555

56-
std::set<const Relation*> reached;
56+
RelationSet reached;
5757
std::vector<const Relation*> worklist;
5858

5959
// set up start list

‎src/ast/analysis/RedundantRelations.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ namespace souffle::ast::analysis {
3333
void RedundantRelationsAnalysis::run(const TranslationUnit& translationUnit) {
3434
precedenceGraph = &translationUnit.getAnalysis<PrecedenceGraphAnalysis>();
3535

36-
std::set<const Relation*> work;
37-
std::set<const Relation*> notRedundant;
36+
RelationSet work;
37+
RelationSet notRedundant;
3838
auto& ioType = translationUnit.getAnalysis<IOTypeAnalysis>();
3939
Program& program = translationUnit.getProgram();
4040

‎src/ast/analysis/RelationSchedule.cpp

+7-7
Original file line numberDiff line numberDiff line change
@@ -55,28 +55,27 @@ void RelationScheduleAnalysis::run(const TranslationUnit& translationUnit) {
5555
precedenceGraph = &translationUnit.getAnalysis<PrecedenceGraphAnalysis>();
5656

5757
std::size_t numSCCs = translationUnit.getAnalysis<SCCGraphAnalysis>().getNumberOfSCCs();
58-
std::vector<std::set<const Relation*>> relationExpirySchedule =
59-
computeRelationExpirySchedule(translationUnit);
58+
std::vector<RelationSet> relationExpirySchedule = computeRelationExpirySchedule(translationUnit);
6059

6160
relationSchedule.clear();
6261
for (std::size_t i = 0; i < numSCCs; i++) {
6362
auto scc = topsortSCCGraphAnalysis->order()[i];
64-
const std::set<const Relation*> computedRelations =
63+
const RelationSet computedRelations =
6564
translationUnit.getAnalysis<SCCGraphAnalysis>().getInternalRelations(scc);
6665
relationSchedule.emplace_back(computedRelations, relationExpirySchedule[i],
6766
translationUnit.getAnalysis<SCCGraphAnalysis>().isRecursive(scc));
6867
}
6968
}
7069

71-
std::vector<std::set<const Relation*>> RelationScheduleAnalysis::computeRelationExpirySchedule(
70+
std::vector<RelationSet> RelationScheduleAnalysis::computeRelationExpirySchedule(
7271
const TranslationUnit& translationUnit) {
73-
std::vector<std::set<const Relation*>> relationExpirySchedule;
72+
std::vector<RelationSet> relationExpirySchedule;
7473
/* Compute for each step in the reverse topological order
7574
of evaluating the SCC the set of alive relations. */
7675
std::size_t numSCCs = topsortSCCGraphAnalysis->order().size();
7776

7877
/* Alive set for each step */
79-
std::vector<std::set<const Relation*>> alive(numSCCs);
78+
std::vector<RelationSet> alive(numSCCs);
8079
/* Resize expired relations sets */
8180
relationExpirySchedule.resize(numSCCs);
8281
const auto& sccGraph = translationUnit.getAnalysis<SCCGraphAnalysis>();
@@ -100,7 +99,8 @@ std::vector<std::set<const Relation*>> RelationScheduleAnalysis::computeRelation
10099
std::set_difference(alive[orderedSCC].begin(), alive[orderedSCC].end(), alive[orderedSCC - 1].begin(),
101100
alive[orderedSCC - 1].end(),
102101
std::inserter(relationExpirySchedule[numSCCs - orderedSCC],
103-
relationExpirySchedule[numSCCs - orderedSCC].end()));
102+
relationExpirySchedule[numSCCs - orderedSCC].end()),
103+
NameComparison());
104104
}
105105

106106
return relationExpirySchedule;

‎src/ast/analysis/RelationSchedule.h

+7-8
Original file line numberDiff line numberDiff line change
@@ -36,16 +36,16 @@ namespace souffle::ast::analysis {
3636
*/
3737
class RelationScheduleAnalysisStep {
3838
public:
39-
RelationScheduleAnalysisStep(std::set<const Relation*> computedRelations,
40-
std::set<const Relation*> expiredRelations, const bool isRecursive)
39+
RelationScheduleAnalysisStep(
40+
RelationSet computedRelations, RelationSet expiredRelations, const bool isRecursive)
4141
: computedRelations(std::move(computedRelations)), expiredRelations(std::move(expiredRelations)),
4242
isRecursive(isRecursive) {}
4343

44-
const std::set<const Relation*>& computed() const {
44+
const RelationSet& computed() const {
4545
return computedRelations;
4646
}
4747

48-
const std::set<const Relation*>& expired() const {
48+
const RelationSet& expired() const {
4949
return expiredRelations;
5050
}
5151

@@ -62,8 +62,8 @@ class RelationScheduleAnalysisStep {
6262
}
6363

6464
private:
65-
std::set<const Relation*> computedRelations;
66-
std::set<const Relation*> expiredRelations;
65+
RelationSet computedRelations;
66+
RelationSet expiredRelations;
6767
const bool isRecursive;
6868
};
6969

@@ -92,8 +92,7 @@ class RelationScheduleAnalysis : public Analysis {
9292
/** Relations computed and expired relations at each step */
9393
std::vector<RelationScheduleAnalysisStep> relationSchedule;
9494

95-
std::vector<std::set<const Relation*>> computeRelationExpirySchedule(
96-
const TranslationUnit& translationUnit);
95+
std::vector<RelationSet> computeRelationExpirySchedule(const TranslationUnit& translationUnit);
9796
};
9897

9998
} // namespace souffle::ast::analysis

‎src/ast/analysis/SCCGraph.h

+17-18
Original file line numberDiff line numberDiff line change
@@ -94,13 +94,13 @@ class SCCGraphAnalysis : public Analysis {
9494
}
9595

9696
/** Get all internal relations of a given SCC. */
97-
const std::set<const Relation*>& getInternalRelations(const std::size_t scc) const {
97+
const RelationSet& getInternalRelations(const std::size_t scc) const {
9898
return sccToRelation.at(scc);
9999
}
100100

101101
/** Get all external output predecessor relations of a given SCC. */
102-
std::set<const Relation*> getExternalOutputPredecessorRelations(const std::size_t scc) const {
103-
std::set<const Relation*> externOutPreds;
102+
RelationSet getExternalOutputPredecessorRelations(const std::size_t scc) const {
103+
RelationSet externOutPreds;
104104
for (const auto& relation : getInternalRelations(scc)) {
105105
for (const auto& predecessor : precedenceGraph->graph().predecessors(relation)) {
106106
if (relationToScc.at(predecessor) != scc && ioType->isOutput(predecessor)) {
@@ -112,8 +112,8 @@ class SCCGraphAnalysis : public Analysis {
112112
}
113113

114114
/** Get all external non-output predecessor relations of a given SCC. */
115-
std::set<const Relation*> getExternalNonOutputPredecessorRelations(const std::size_t scc) const {
116-
std::set<const Relation*> externNonOutPreds;
115+
RelationSet getExternalNonOutputPredecessorRelations(const std::size_t scc) const {
116+
RelationSet externNonOutPreds;
117117
for (const auto& relation : getInternalRelations(scc)) {
118118
for (const auto& predecessor : precedenceGraph->graph().predecessors(relation)) {
119119
if (relationToScc.at(predecessor) != scc && !ioType->isOutput(predecessor)) {
@@ -125,8 +125,8 @@ class SCCGraphAnalysis : public Analysis {
125125
}
126126

127127
/** Get all external predecessor relations of a given SCC. */
128-
std::set<const Relation*> getExternalPredecessorRelations(const std::size_t scc) const {
129-
std::set<const Relation*> externPreds;
128+
RelationSet getExternalPredecessorRelations(const std::size_t scc) const {
129+
RelationSet externPreds;
130130
for (const auto& relation : getInternalRelations(scc)) {
131131
for (const auto& predecessor : precedenceGraph->graph().predecessors(relation)) {
132132
if (relationToScc.at(predecessor) != scc) {
@@ -138,8 +138,8 @@ class SCCGraphAnalysis : public Analysis {
138138
}
139139

140140
/** Get all internal output relations of a given SCC. */
141-
std::set<const Relation*> getInternalOutputRelations(const std::size_t scc) const {
142-
std::set<const Relation*> internOuts;
141+
RelationSet getInternalOutputRelations(const std::size_t scc) const {
142+
RelationSet internOuts;
143143
for (const auto& relation : getInternalRelations(scc)) {
144144
if (ioType->isOutput(relation)) {
145145
internOuts.insert(relation);
@@ -149,8 +149,8 @@ class SCCGraphAnalysis : public Analysis {
149149
}
150150

151151
/** Get all internal relations of a given SCC with external successors. */
152-
std::set<const Relation*> getInternalRelationsWithExternalSuccessors(const std::size_t scc) const {
153-
std::set<const Relation*> internsWithExternSuccs;
152+
RelationSet getInternalRelationsWithExternalSuccessors(const std::size_t scc) const {
153+
RelationSet internsWithExternSuccs;
154154
for (const auto& relation : getInternalRelations(scc)) {
155155
for (const auto& successor : precedenceGraph->graph().successors(relation)) {
156156
if (relationToScc.at(successor) != scc) {
@@ -163,9 +163,8 @@ class SCCGraphAnalysis : public Analysis {
163163
}
164164

165165
/** Get all internal non-output relations of a given SCC with external successors. */
166-
std::set<const Relation*> getInternalNonOutputRelationsWithExternalSuccessors(
167-
const std::size_t scc) const {
168-
std::set<const Relation*> internNonOutsWithExternSuccs;
166+
RelationSet getInternalNonOutputRelationsWithExternalSuccessors(const std::size_t scc) const {
167+
RelationSet internNonOutsWithExternSuccs;
169168
for (const auto& relation : getInternalRelations(scc)) {
170169
if (!ioType->isOutput(relation)) {
171170
for (const auto& successor : precedenceGraph->graph().successors(relation)) {
@@ -180,8 +179,8 @@ class SCCGraphAnalysis : public Analysis {
180179
}
181180

182181
/** Get all internal input relations of a given SCC. */
183-
std::set<const Relation*> getInternalInputRelations(const std::size_t scc) const {
184-
std::set<const Relation*> internIns;
182+
RelationSet getInternalInputRelations(const std::size_t scc) const {
183+
RelationSet internIns;
185184
for (const auto& relation : getInternalRelations(scc)) {
186185
if (ioType->isInput(relation)) {
187186
internIns.insert(relation);
@@ -192,7 +191,7 @@ class SCCGraphAnalysis : public Analysis {
192191

193192
/** Return if the given SCC is recursive. */
194193
bool isRecursive(const std::size_t scc) const {
195-
const std::set<const Relation*>& sccRelations = sccToRelation.at(scc);
194+
const RelationSet& sccRelations = sccToRelation.at(scc);
196195
if (sccRelations.size() == 1) {
197196
const Relation* singleRelation = *sccRelations.begin();
198197
if (precedenceGraph->graph().predecessors(singleRelation).count(singleRelation) == 0u) {
@@ -221,7 +220,7 @@ class SCCGraphAnalysis : public Analysis {
221220
std::vector<std::set<std::size_t>> predecessors;
222221

223222
/** Relations contained in a SCC */
224-
std::vector<std::set<const Relation*>> sccToRelation;
223+
std::vector<RelationSet> sccToRelation;
225224

226225
/** Recursive scR method for computing SCC */
227226
void scR(const Relation* relation, std::map<const Relation*, std::size_t>& preOrder, std::size_t& counter,

‎src/ast/transform/ExecutionPlanChecker.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ bool ExecutionPlanChecker::transform(TranslationUnit& translationUnit) {
4343

4444
Program& program = translationUnit.getProgram();
4545
for (const analysis::RelationScheduleAnalysisStep& step : relationSchedule.schedule()) {
46-
const std::set<const Relation*>& scc = step.computed();
46+
const RelationSet& scc = step.computed();
4747
for (const Relation* rel : scc) {
4848
for (auto&& clause : program.getClauses(*rel)) {
4949
if (!recursiveClauses.recursive(clause)) {

‎src/ast/transform/SemanticChecker.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ SemanticCheckerImpl::SemanticCheckerImpl(TranslationUnit& tu) : tu(tu) {
215215
if (hasNegation ||
216216
hasClauseWithAggregatedRelation(cyclicRelation, cur, &program, foundLiteral)) {
217217
auto const& relSet = sccGraph.getInternalRelations(scc);
218-
std::set<const Relation*, NameComparison> sortedRelSet(relSet.begin(), relSet.end());
218+
RelationSet sortedRelSet(relSet.begin(), relSet.end());
219219
// Negations and aggregations need to be stratified
220220
std::string relationsListStr = toString(join(sortedRelSet, ",",
221221
[](std::ostream& out, const Relation* r) { out << r->getQualifiedName(); }));

‎src/ast2ram/ClauseTranslator.h

+4-1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@
2222
namespace souffle::ast {
2323
class Clause;
2424
class Relation;
25+
struct NameComparison;
26+
using RelationSet = std::set<const Relation*, NameComparison>;
27+
2528
} // namespace souffle::ast
2629

2730
namespace souffle::ram {
@@ -73,7 +76,7 @@ class ClauseTranslator {
7376

7477
/** Translate a recursive clause */
7578
virtual Own<ram::Statement> translateRecursiveClause(
76-
const ast::Clause& clause, const std::set<const ast::Relation*>& scc, std::size_t version) = 0;
79+
const ast::Clause& clause, const ast::RelationSet& scc, std::size_t version) = 0;
7780

7881
protected:
7982
/** Translation context */

‎src/ast2ram/provenance/UnitTranslator.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ void UnitTranslator::addAuxiliaryArity(
149149
}
150150

151151
Own<ram::Statement> UnitTranslator::generateClearExpiredRelations(
152-
const std::set<const ast::Relation*>& /* expiredRelations */) const {
152+
const ast::RelationSet& /* expiredRelations */) const {
153153
// Relations should be preserved if provenance is enabled
154154
return mk<ram::Sequence>();
155155
}
@@ -304,11 +304,11 @@ Own<ram::Sequence> UnitTranslator::generateInfoClauses(const ast::Program* progr
304304
infoClause = mk<ram::DebugInfo>(std::move(infoClause), ds.str());
305305

306306
// Add the subroutine to the program
307-
std::string stratumID = "stratum_" + toString(stratumCount++);
307+
std::string stratumID = toString(stratumCount++);
308308
addRamSubroutine(stratumID, std::move(infoClause));
309309

310310
// Push up the subroutine call
311-
infoClauseCalls.push_back(mk<ram::Call>(stratumID));
311+
infoClauseCalls.push_back(mk<ram::Call>("stratum_" + stratumID));
312312
}
313313

314314
return mk<ram::Sequence>(std::move(infoClauseCalls));

‎src/ast2ram/provenance/UnitTranslator.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class UnitTranslator : public ast2ram::seminaive::UnitTranslator {
4444
protected:
4545
Own<ram::Sequence> generateProgram(const ast::TranslationUnit& translationUnit) override;
4646
Own<ram::Statement> generateClearExpiredRelations(
47-
const std::set<const ast::Relation*>& expiredRelations) const override;
47+
const ast::RelationSet& expiredRelations) const override;
4848
Own<ram::Relation> createRamRelation(
4949
const ast::Relation* baseRelation, std::string ramRelationName) const override;
5050
VecOwn<ram::Relation> createRamRelations(const std::vector<std::size_t>& sccOrdering) const override;

‎src/ast2ram/seminaive/ClauseTranslator.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ std::string ClauseTranslator::getClauseString(const ast::Clause& clause) const {
9898
}
9999

100100
Own<ram::Statement> ClauseTranslator::translateRecursiveClause(
101-
const ast::Clause& clause, const std::set<const ast::Relation*>& scc, std::size_t version) {
101+
const ast::Clause& clause, const ast::RelationSet& scc, std::size_t version) {
102102
// Update version config
103103
sccAtoms = filter(ast::getBodyLiterals<ast::Atom>(clause),
104104
[&](auto* atom) { return contains(scc, context.getProgram()->getRelation(*atom)); });

‎src/ast2ram/seminaive/ClauseTranslator.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ class ClauseTranslator : public ast2ram::ClauseTranslator {
5757
/** Entry points */
5858
Own<ram::Statement> translateNonRecursiveClause(const ast::Clause& clause);
5959
Own<ram::Statement> translateRecursiveClause(
60-
const ast::Clause& clause, const std::set<const ast::Relation*>& scc, std::size_t version);
60+
const ast::Clause& clause, const ast::RelationSet& scc, std::size_t version);
6161

6262
protected:
6363
std::size_t version{0};

0 commit comments

Comments
 (0)