Skip to content

Performance improvements typechecker #2849

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

Draft
sungshik wants to merge 14 commits into
base: main
Choose a base branch
from
+108 −70
Draft

Performance improvements typechecker #2849

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
7cb47fe
Prepare separate main branch for performance improvements
sungshik Jul 31, 2026
95c668e
Remove `-ea` from "Launch `RascalShell`" configuration (to be reverted)
sungshik Aug 3, 2026
ed8f781
Add flame graph generator (to be reverted)
sungshik Aug 3, 2026
9ed9f11
Update flame graph generator to write data to disk asap
sungshik Aug 4, 2026
b723a5d
Update `doSaveModule` to use map lookups instead of linear searches
sungshik Jul 31, 2026
498ef0a
Update `doSaveModule` to reduce the number of field lookups
sungshik Aug 4, 2026
b628e7c
Replace ternary conditional with binary conjunction
sungshik Aug 17, 2026
470a092
Remove commented code
sungshik Aug 19, 2026
d1c7dc7
Add `rascalFilterUnused` as a faster alternative to `rascalReportUnused`
sungshik Aug 18, 2026
d2ce976
Add pre-conversion of `facts` and `defines` to a more efficient repre…
sungshik Aug 4, 2026
6e95fee
Add cache to `importedModulesResolved`
sungshik Aug 18, 2026
b963bcb
Simplify `getImportedModulesResolved`
sungshik Aug 18, 2026
f857c16
Faster `importedModulesResolved` (#2858)
sungshik Aug 19, 2026
8dc8544
Remove performance improvements scaffolding
sungshik Aug 19, 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
32 changes: 20 additions & 12 deletions src/org/rascalmpl/compiler/lang/rascalcore/check/Checker.rsc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,6 +299,14 @@ ModuleStatus rascalTModelForLocs(
// }

<tm, ms> = rascalTModelComponent(component, ms);

// Convert `tm.facts` and `tm.defines` to a more efficient
// representation for later use
map[loc, AType] facts = tm.facts;
rel[str, AType] factsByPath = {<l.path, facts[l]> | loc l <- facts};
Defines defines = tm.defines;
rel[str, Define] definesByPath = {<d.defined.path, d> | Define d <- defines};

// moduleScopes += getModuleScopes(tm);
map[str,TModel] tmodels_for_component = ();
map[MODID,set[MODID]] m_imports = ();
Expand Down Expand Up @@ -328,13 +336,13 @@ ModuleStatus rascalTModelForLocs(
imsgs += error("Rascal TPL version error for `<iname>`, no source found", imod.src);
}
if(inameId notin usedModules){
if(iname == "ParseTree" && implicitlyUsesParseTree(ms.moduleLocs[m].path, tm)){
if(iname == "ParseTree" && implicitlyUsesParseTree(ms.moduleLocs[m].path, factsByPath)){
continue check_imports;
}
if(ms.moduleLocs[inameId]? && ms.moduleLocs[m]? && implicitlyUsesLayoutOrLexical(ms.moduleLocs[m].path, ms.moduleLocs[inameId].path, tm)){
if(ms.moduleLocs[inameId]? && ms.moduleLocs[m]? && implicitlyUsesLayoutOrLexical(ms.moduleLocs[m].path, ms.moduleLocs[inameId].path, factsByPath)){
continue check_imports;
}
if(ms.moduleLocs[inameId]? && ms.moduleLocs[m]? && usesOrExtendsADT(ms.moduleLocs[m].path, ms.moduleLocs[inameId].path, tm)){
if(ms.moduleLocs[inameId]? && ms.moduleLocs[m]? && usesOrExtendsADT(ms.moduleLocs[m].path, ms.moduleLocs[inameId].path, factsByPath, definesByPath)){
continue check_imports;
}
if((inameId in component || hasProperty(inameId, ms, checked())) && hasNotProperty(inameId, ms, rsc_not_found())){
Expand Down Expand Up @@ -401,20 +409,20 @@ ModuleStatus rascalTModelForLocs(
return clearTModelCache(ms);
}

bool implicitlyUsesParseTree(str modulePath, TModel tm){
return any(loc l <- tm.facts, l.path == modulePath, areified(_) <- tm.facts[l]);
bool implicitlyUsesParseTree(str modulePath, rel[str, AType] factsByPath){
return any(areified(_) <- factsByPath[modulePath]);
}

bool implicitlyUsesLayoutOrLexical(str modulePath, str importPath, TModel tm){
return any(loc l <- tm.facts, l.path == importPath, aadt(_,_,sr) := tm.facts[l], sr in {layoutSyntax(), lexicalSyntax()})
&& any(loc l <- tm.facts, l.path == modulePath, aadt(_,_,contextFreeSyntax()) := tm.facts[l]);
bool implicitlyUsesLayoutOrLexical(str modulePath, str importPath, rel[str, AType] factsByPath){
return any(aadt(_,_,sr) <- factsByPath[importPath], sr in {layoutSyntax(), lexicalSyntax()})
&& any(aadt(_,_,contextFreeSyntax()) <- factsByPath[modulePath]);
}

bool usesOrExtendsADT(str modulePath, str importPath, TModel tm){
usedADTs = { unset(tm.facts[l], "alabel") | loc l <- tm.facts, l.path == modulePath, aadt(_,_,_) := tm.facts[l] };
definedADTs = { unset(the_adt, "alabel") | Define d <- tm.defines, d.defined.path == modulePath, defType(the_adt:aadt(_,_,_)) := d.defInfo };
bool usesOrExtendsADT(str modulePath, str importPath, rel[str, AType] factsByPath, rel[str, Define] definesByPath){
usedADTs = { unset(the_adt, "alabel") | the_adt:aadt(_,_,_) <- factsByPath[modulePath] };
definedADTs = { unset(the_adt, "alabel") | Define d <- definesByPath[modulePath], defType(the_adt:aadt(_,_,_)) := d.defInfo };
usedOrDefinedADTs = usedADTs + definedADTs;
res = any(loc l <- tm.facts, l.path == importPath, the_adt:aadt(_,_,_) := tm.facts[l], unset(the_adt, "alabel") in usedOrDefinedADTs);
res = any(the_adt:aadt(_,_,_) <- factsByPath[importPath], unset(the_adt, "alabel") in usedOrDefinedADTs);
return res;
}

Expand Down
55 changes: 31 additions & 24 deletions src/org/rascalmpl/compiler/lang/rascalcore/check/Import.rsc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -420,17 +420,20 @@ ModuleStatus doSaveModule(set[MODID] component, map[MODID,set[MODID]] m_imports,
component = { m | m <- component, hasNotProperty(m, ms, ModuleProperty::ignored()) };
if(isEmpty(component)) return ms;

//println("doSaveModule: <component>, <m_imports>, <m_extends>, <moduleScopes>");
component_scopes = component; //{ getModuleScope(mid, moduleScopes, pcfg) | MODID mid <- component };
set[MODID] componentScopes = component;
map[str, MODID] componentScopesByUri = ();
set[MODID] filteredModuleScopes = {};
map[str, MODID] filteredModuleScopesByUri = ();
loc2moduleName = invertUnique(ms.moduleLocs);

bool isContainedInComponentScopes(loc inner, map[loc,loc] m){
return any(cs <- component_scopes, isContainedIn(inner, cs, m));
inner = m[inner] ? inner;
return inner.uri in componentScopesByUri && isContainedIn(inner, componentScopesByUri[inner.uri]);
};

bool isContainedInFilteredModuleScopes(loc inner, map[loc,loc] m){
return any(cs <- filteredModuleScopes, isContainedIn(inner, cs, m));
inner = m[inner] ? inner;
return inner.uri in filteredModuleScopesByUri && isContainedIn(inner, filteredModuleScopesByUri[inner.uri]);
};

for(currentModule <- component){
Expand All @@ -443,32 +446,36 @@ ModuleStatus doSaveModule(set[MODID] component, map[MODID,set[MODID]] m_imports,

bom = makeBom(currentModule, ms);

// Lookup fields only once to save interpreter time (significant)
paths = tm.paths;
facts = tm.facts;
specializedFacts = tm.specializedFacts;
useDef = tm.useDef;
logical2physical = tm.logical2physical;
definitions = tm.definitions;

componentScopesByUri = (s.uri: s | loc s <- componentScopes, loc s := logical2physical[s] ? s);

extendedModuleScopes = {m | MODID m <- extends, hasProperty(m, ms, checked())};
extendedModuleScopes += {*tm.paths[ems,importPath()] | MODID ems <- extendedModuleScopes}; // add imports of extended modules
extendedModuleScopes += {*paths[ems,importPath()] | MODID ems <- extendedModuleScopes}; // add imports of extended modules
filteredModuleScopes = {m | MODID m <- (currentModule + imports), hasProperty(m, ms, checked())} + extendedModuleScopes;
filteredModuleScopesByUri = (m.uri: m | loc m <- filteredModuleScopes, loc m := logical2physical[m] ? m);

TModel m1 = tmodel();
m1.version = getCurrentTplVersion();
m1.rascalTplVersion = compilerConfig.rascalTplVersion;
m1.modelName = moduleId2moduleName(currentModule);
m1.moduleLocs = (m1.modelName : currentModule);

m1.facts = (key : tm.facts[key] | key <- tm.facts, isContainedInFilteredModuleScopes(key, tm.logical2physical));
m1.facts = (key : facts[key] | key <- facts, isContainedInFilteredModuleScopes(key, logical2physical));

m1.specializedFacts = (key : tm.specializedFacts[key] | key <- tm.specializedFacts, isContainedInComponentScopes(key, tm.logical2physical), any(fms <- filteredModuleScopes, isContainedIn(key, fms)));
m1.specializedFacts = (key : specializedFacts[key] | key <- specializedFacts, isContainedInComponentScopes(key, logical2physical), isContainedInFilteredModuleScopes(key, logical2physical));
m1.facts += m1.specializedFacts;

m1.messages = [msg | msg <- tm.messages, isContainedIn(msg.at, currentModule, tm.logical2physical)];
m1.messages = [msg | msg <- tm.messages, isContainedIn(msg.at, currentModule, logical2physical)];
ms.messages[currentModule] = toSet(m1.messages);

filteredModuleScopePaths = {ml.path |loc ml <- filteredModuleScopes};
m1.scopes = tm.scopes;
// m1.scopes
// = ( inner : tm.scopes[inner]
// | loc inner <- tm.scopes,
// inner.path in filteredModuleScopePaths,
// (tm.scopes[inner] == |global-scope:///| || isContainedInComponentScopes(inner, tm.logical2physical))
// );

m1.store
= (key_bom : bom);
Expand All @@ -480,23 +487,23 @@ ModuleStatus doSaveModule(set[MODID] component, map[MODID,set[MODID]] m_imports,
m1.store[key_common_keyword_fields]
= tm.store[key_common_keyword_fields] ? [];

m1.paths = { tup | tuple[MODID from, PathRole pathRole, MODID to] tup <- tm.paths, tup.from == currentModule || tup.from in filteredModuleScopes /*|| tup.from in filteredModuleScopePaths*/ };
m1.paths = { tup | tuple[MODID from, PathRole pathRole, MODID to] tup <- paths, tup.from == currentModule || tup.from in filteredModuleScopes };

keepRoles = variableRoles + keepInTModelRoles;
m1.useDef = { <u, d>
| <u, d> <- tm.useDef,
isContainedIn(u, currentModule, tm.logical2physical)
|| (tm.definitions[d]? && tm.definitions[d].idRole in keepRoles)
| <u, d> <- useDef,
isContainedIn(u, currentModule, logical2physical)
|| (definitions[d]? && definitions[d].idRole in keepRoles)
};

// Filter model for current module and replace functions in defType by their defined type

defs = for(tup:<loc _scope, str _id, str _orgId, IdRole idRole, loc defined, DefInfo _defInfo> <- tm.defines){
if( ( idRole in variableRoles ? ( isContainedInComponentScopes(defined, tm.logical2physical)
if( ( idRole in variableRoles ? ( isContainedInComponentScopes(defined, logical2physical)
)
: ( idRole in keepInTModelRoles
&& ( isContainedInComponentScopes(defined, tm.logical2physical)
|| isContainedInFilteredModuleScopes(defined, tm.logical2physical)
&& ( isContainedInComponentScopes(defined, logical2physical)
|| isContainedInFilteredModuleScopes(defined, logical2physical)
)
)
)
Expand All @@ -511,14 +518,14 @@ ModuleStatus doSaveModule(set[MODID] component, map[MODID,set[MODID]] m_imports,
m1.define2id = tm.define2id;

// Remove default expressions and fragments
// (Relatively expensive: can take >50% of the execution time of this function)
m1 = visit(m1) {
case kwField(AType atype, str fieldName, str definingModule, Expression _defaultExp) => kwField(atype, fieldName, definingModule)
case loc l : if(!isEmpty(l.fragment)) insert l[fragment=""];
};
m1.logical2physical = tm.logical2physical;
m1.logical2physical = logical2physical;
ms = deleteProperty(currentModule, ms, tpl_saved());
ms = addTModel(currentModule, m1, ms);
// println("TModel for <currentModule>:"); iprintln(m1);
}
return ms;
}
47 changes: 33 additions & 14 deletions src/org/rascalmpl/compiler/lang/rascalcore/check/RascalConfig.rsc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,32 +323,34 @@ bool isOverloadedFunction(loc fun, map[loc,Define] definitions, map[loc, AType]
}

bool rascalReportUnused(loc def, TModel tm){
return rascalFilterUnused([def], tm) == [def];
}

list[loc] rascalFilterUnused(list[loc] defs, TModel tm) {
config = tm.config;
if(!config.warnUnused) return false;
if(!config.warnUnused) return [];

// Lookup fields only once to save interpreter time (significant)
warnUnusedFormals = config.warnUnusedFormals;
moduleLocs = tm.moduleLocs;
modelName = tm.modelName;
logical2physical = tm.logical2physical;
definitions = tm.definitions;

if(!definitions[def]? || !tm.moduleLocs[tm.modelName]?) return false;

if(!isContainedIn(definitions[def].defined, tm.moduleLocs[tm.modelName], tm.logical2physical)){
return false;
}

scopes = tm.scopes;
facts = tm.facts;

bool reportFormal(Define define){
if(!config.warnUnusedFormals || isWildCard(define.id[0])) return false;
container = tm.definitions[findContainer(def, definitions, scopes)];
if(!warnUnusedFormals || isWildCard(define.id[0])) return false;
container = definitions[findContainer(define.defined, definitions, scopes)];
if(container.idRole == functionId()){
if(isOverloadedFunction(container.defined, definitions, facts)) return false;
return "java" notin container.defInfo.modifiers;
}
return false;
}

define = definitions[def];
try {
bool filterFormal(loc def) {
define = definitions[def];
switch(define.idRole){
case moduleId(): return false;
case dataId(): return false;
Expand Down Expand Up @@ -383,9 +385,25 @@ bool rascalReportUnused(loc def, TModel tm){
case layoutId(): return false;
case keywordId(): return false;
}
} catch NoSuchKey(_): return false;
return true;
}

bool tryFilterFormal(loc def) {
try {
return filterFormal(def);
} catch NoSuchKey(_): {
return false;
}
}

return true;
if (modelName in moduleLocs) {
moduleLoc = moduleLocs[modelName];
moduleLoc = logical2physical[moduleLoc] ? moduleLoc;
// Assumption: `logical2physical` has already been applied to each `def`
return [def | loc def <- defs, isContainedIn(def, moduleLoc), tryFilterFormal(def)];
} else {
return [];
}
}

// Extend the path relation by
Expand Down Expand Up @@ -663,6 +681,7 @@ RascalCompilerConfig rascalCompilerConfig(PathConfig pcfg,
preSolver = rascalPreSolver,
postSolver = rascalPostSolver,
reportUnused = rascalReportUnused,
filterUnused = rascalFilterUnused,
createLogicalLoc = rascalCreateLogicalLoc,
similarNames = rascalSimilarNames
);
Loading
Loading