Skip to content

Faster defInfo #61

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

Closed
sungshik wants to merge 2 commits into from
Closed

Faster defInfo #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b221486
Prepare separate main branch for performance improvements
sungshik Jul 29, 2026
97568cb
Add `newDefInfo` function to make creation of `defInfo` values faster…
sungshik Aug 10, 2026
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
1 change: 1 addition & 0 deletions .github/workflows/build.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ on:
pull_request:
branches:
- main
- performance-improvements-main

env:
MAVEN_OPTS: "-Xmx6G -Dhttps.protocols=TLSv1.2 -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=WARN -Dorg.slf4j.simpleLogger.showDateTime=true -Djava.awt.headless=true"
Expand Down
38 changes: 28 additions & 10 deletions src/analysis/typepal/Solver.rsc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1645,14 +1645,29 @@ Solver newSolver(map[str,Tree] namedTrees, TModel tm){

/****************** end of main solve loop *****************************/

// Creating new `defType` values using the `defType` constructor takes
// significant interpreter time. To make it faster, the following map
// stores "prototypes" from which new `defType` values can be created.
map[AType, DefInfo] defInfoPrototypes = ();

DefInfo newDefInfo(AType t, map[str, value] keywordParameters) {
DefInfo proto;
if (t in defInfoPrototypes) {
proto = defInfoPrototypes[t];
} else {
proto = defType(t);
defInfoPrototypes[t] = proto;
}
return setKeywordParameters(proto, keywordParameters); // Create new value (i.e., leave `proto` unchanged)
}

// Eliminate all defTypeCalls before handing control to the postSolver
for(loc l <- definitions){
Define def = definitions[l];
if(defTypeCall(_, AType(Solver s) getAType) := def.defInfo){
kwparams = getKeywordParameters(def.defInfo);
try {
di = defType(getAType(thisSolver));
def.defInfo = setKeywordParameters(di, kwparams);
def.defInfo = newDefInfo(getAType(thisSolver), kwparams);
definitions[l] = def;
} catch _: { // Guard against type incorrect defines, but record for now
; //println("Skipping (type-incorrect) def: <def>\n");
Expand All @@ -1663,11 +1678,16 @@ Solver newSolver(map[str,Tree] namedTrees, TModel tm){

newDefines =
for(def <- defines){
// All `defTypeCall` values have already been eliminated from
// `definitions`, so this is a fast(er) way out.
if (def.defined in definitions) {
append definitions[def.defined];
continue;
}
if(defTypeCall(_, AType(Solver s) getAType) := def.defInfo){
kwparams = getKeywordParameters(def.defInfo);
try {
di = defType(getAType(thisSolver));
def.defInfo = setKeywordParameters(di, kwparams);
def.defInfo = newDefInfo(getAType(thisSolver), kwparams);
} catch _: { // Guard against type incorrect defines, but record for now
; //println("Skipping (type-incorrect) def: <def>\n");
}
Expand Down Expand Up @@ -1805,16 +1825,14 @@ Solver newSolver(map[str,Tree] namedTrees, TModel tm){
ldefines = for(tup: <loc _, str _, str _, IdRole _, loc defined, DefInfo defInfo> <- tm.defines){
if(defInfo has tree){
l = getLogicalLoc(defInfo.tree);
if(l in tm.facts){
dt = defType(tm.facts[l]);
tup.defInfo = setKeywordParameters(dt, getKeywordParameters(defInfo));
if(l in facts){
tup.defInfo = newDefInfo(facts[l], getKeywordParameters(defInfo));
} else {
continue;
}
} else {
if(defined in tm.facts){
dt = defType(tm.facts[defined]);
tup.defInfo = setKeywordParameters(dt, getKeywordParameters(defInfo));
if(defined in facts){
tup.defInfo = newDefInfo(facts[defined], getKeywordParameters(defInfo));
} else {
continue;
}
Expand Down
Loading