mirror/jak-project
1
0
Fork 0
mirror of https://github.com/open-goal/jak-project synced 2026-09-02 18:12:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

[goalc] speed up jak3 compilation (#3454)

Browse Source 
I noticed that jak 3's compilation was spending a lot of time accessing
the `unordered_map`s we use to store constants and symbol types.

 
I repurposed the `EnvironmentMap` originally made for GOOS for this. It
turns out that we were copying the entire constant map whenever we
encountered a `deftype`, and fixed that too.

This speeds up jak3 compiles from ~16 to 11 seconds for me.
This commit is contained in:
water111
2024-04-06 16:01:17 -04:00
committed by GitHub
parent 376194a3e7
commit cc8801a27b
18 changed files with 192 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files
goalc/compiler/compilation/CompilerControl.cpp
+9 -8
View File
@@ -362,7 +362,7 @@ std::string Compiler::make_symbol_info_description(const symbol_info::SymbolInfo
switch (info->m_kind) {
case symbol_info::Kind::GLOBAL_VAR:
return fmt::format("[Global Variable] Type: {} Defined: {}",
m_symbol_types.at(m_goos.intern_ptr(info->m_name)).print(),
m_symbol_types.lookup(m_goos.intern_ptr(info->m_name))->print(),
m_goos.reader.db.get_info_for(info->m_def_form));
case symbol_info::Kind::LANGUAGE_BUILTIN:
return fmt::format("[Built-in Form] {}\n", info->m_name);
@@ -379,7 +379,8 @@ std::string Compiler::make_symbol_info_description(const symbol_info::SymbolInfo
case symbol_info::Kind::CONSTANT:
return fmt::format(
"[Constant] Name: {} Value: {} Defined: {}", info->m_name,
m_global_constants.at(m_goos.reader.symbolTable.intern(info->m_name.c_str())).print(),
m_global_constants.lookup(m_goos.reader.symbolTable.intern(info->m_name.c_str()))
->print(),
m_goos.reader.db.get_info_for(info->m_def_form));
case symbol_info::Kind::FUNCTION:
return fmt::format("[Function] Name: {} Defined: {}", info->m_name,
@@ -615,9 +616,9 @@ std::vector<symbol_info::SymbolInfo*> Compiler::lookup_exact_name_info(
}
std::optional<TypeSpec> Compiler::lookup_typespec(const std::string& symbol_name) {
const auto& it = m_symbol_types.find(m_goos.intern_ptr(symbol_name));
if (it != m_symbol_types.end()) {
return it->second;
const auto it = m_symbol_types.lookup(m_goos.intern_ptr(symbol_name));
if (it) {
return *it;
}
return {};
}
@@ -686,7 +687,7 @@ Compiler::generate_per_file_symbol_info() {
if (sym_info->m_kind == symbol_info::Kind::CONSTANT) {
var.type = "unknown"; // Unfortunately, constants are not properly typed
} else {
var.type = m_symbol_types.at(m_goos.intern_ptr(var.name)).base_type();
var.type = m_symbol_types.lookup(m_goos.intern_ptr(var.name))->base_type();
}
var.def_location = def_loc;
if (sym_info->m_kind == symbol_info::Kind::GLOBAL_VAR) {
@@ -701,8 +702,8 @@ Compiler::generate_per_file_symbol_info() {
func.def_location = def_loc;
func.args = Docs::get_args_from_docstring(sym_info->m_args, func.description);
// The last arg in the typespec is the return type
const auto& func_type = m_symbol_types.at(m_goos.intern_ptr(func.name));
func.return_type = func_type.last_arg().base_type();
const auto func_type = m_symbol_types.lookup(m_goos.intern_ptr(func.name));
func.return_type = func_type->last_arg().base_type();
file_doc.functions.push_back(func);
} else if (sym_info->m_kind == symbol_info::Kind::TYPE) {
Docs::TypeDocumentation type;