Skip to content

Faster doSaveModule #2833

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

Merged
sungshik merged 4 commits into from
Aug 19, 2026
Merged

Faster doSaveModule #2833

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4b86f90
Update `doSaveModule` to use map lookups instead of linear searches
sungshik Jul 31, 2026
c06368f
Update `doSaveModule` to reduce the number of field lookups
sungshik Aug 4, 2026
af37e3b
Replace ternary conditional with binary conjunction
sungshik Aug 17, 2026
7139fa4
Remove commented code
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
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 @@ -509,14 +516,14 @@ ModuleStatus doSaveModule(set[MODID] component, map[MODID,set[MODID]] m_imports,

m1.definitions = ( def.defined : def | Define def <- m1.defines); // TODO this is derived info, can we derive it later?
// Remove default expressions and fragments
// (Relatively expensive: can take >50% of the execution time of this function)
Comment thread
sungshik marked this conversation as resolved.
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;
}
Loading