ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-04 22:58:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

enum-ifiy function pass managers for lbModule

Browse Source
This commit is contained in:
gingerBill
2023-01-05 15:56:45 +00:00
parent 029cb6581b
commit 5eee8077dd
3 changed files with 75 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/llvm_backend.cpp
+54 -48
View File
@@ -1420,89 +1420,89 @@ gb_internal WORKER_TASK_PROC(lb_llvm_emit_worker_proc) {
return 0; return 0;
} }
gb_internal WORKER_TASK_PROC(lb_llvm_function_pass_worker_proc) {
GB_ASSERT(MULTITHREAD_OBJECT_GENERATION);
auto m = cast(lbModule *)data; gb_internal void lb_llvm_function_pass_per_function_internal(lbModule *module, lbProcedure *p, lbFunctionPassManagerKind pass_manager_kind = lbFunctionPassManager_default) {
LLVMPassManagerRef pass_manager = module->function_pass_managers[pass_manager_kind];
lb_run_function_pass_manager(pass_manager, p);
}
LLVMPassManagerRef default_function_pass_manager = LLVMCreateFunctionPassManagerForModule(m->mod); gb_internal void lb_llvm_function_pass_per_module(lbModule *m) {
LLVMPassManagerRef function_pass_manager_minimal = LLVMCreateFunctionPassManagerForModule(m->mod); {
LLVMPassManagerRef function_pass_manager_size = LLVMCreateFunctionPassManagerForModule(m->mod); GB_ASSERT(m->function_pass_managers[lbFunctionPassManager_default] == nullptr);
LLVMPassManagerRef function_pass_manager_speed = LLVMCreateFunctionPassManagerForModule(m->mod);
LLVMInitializeFunctionPassManager(default_function_pass_manager); m->function_pass_managers[lbFunctionPassManager_default] = LLVMCreateFunctionPassManagerForModule(m->mod);
LLVMInitializeFunctionPassManager(function_pass_manager_minimal); m->function_pass_managers[lbFunctionPassManager_default_without_memcpy] = LLVMCreateFunctionPassManagerForModule(m->mod);
LLVMInitializeFunctionPassManager(function_pass_manager_size); m->function_pass_managers[lbFunctionPassManager_minimal] = LLVMCreateFunctionPassManagerForModule(m->mod);
LLVMInitializeFunctionPassManager(function_pass_manager_speed); m->function_pass_managers[lbFunctionPassManager_size] = LLVMCreateFunctionPassManagerForModule(m->mod);
m->function_pass_managers[lbFunctionPassManager_speed] = LLVMCreateFunctionPassManagerForModule(m->mod);
lb_populate_function_pass_manager(m, default_function_pass_manager, false, build_context.optimization_level); LLVMInitializeFunctionPassManager(m->function_pass_managers[lbFunctionPassManager_default]);
lb_populate_function_pass_manager_specific(m, function_pass_manager_minimal, 0); LLVMInitializeFunctionPassManager(m->function_pass_managers[lbFunctionPassManager_default_without_memcpy]);
lb_populate_function_pass_manager_specific(m, function_pass_manager_size, 1); LLVMInitializeFunctionPassManager(m->function_pass_managers[lbFunctionPassManager_minimal]);
lb_populate_function_pass_manager_specific(m, function_pass_manager_speed, 2); LLVMInitializeFunctionPassManager(m->function_pass_managers[lbFunctionPassManager_size]);
LLVMInitializeFunctionPassManager(m->function_pass_managers[lbFunctionPassManager_speed]);
LLVMFinalizeFunctionPassManager(default_function_pass_manager); lb_populate_function_pass_manager(m, m->function_pass_managers[lbFunctionPassManager_default], false, build_context.optimization_level);
LLVMFinalizeFunctionPassManager(function_pass_manager_minimal); lb_populate_function_pass_manager(m, m->function_pass_managers[lbFunctionPassManager_default_without_memcpy], true, build_context.optimization_level);
LLVMFinalizeFunctionPassManager(function_pass_manager_size); lb_populate_function_pass_manager_specific(m, m->function_pass_managers[lbFunctionPassManager_minimal], 0);
LLVMFinalizeFunctionPassManager(function_pass_manager_speed); lb_populate_function_pass_manager_specific(m, m->function_pass_managers[lbFunctionPassManager_size], 1);
lb_populate_function_pass_manager_specific(m, m->function_pass_managers[lbFunctionPassManager_speed], 2);
if (m == &m->gen->default_module) { LLVMFinalizeFunctionPassManager(m->function_pass_managers[lbFunctionPassManager_default]);
lb_run_function_pass_manager(default_function_pass_manager, m->gen->startup_type_info); LLVMFinalizeFunctionPassManager(m->function_pass_managers[lbFunctionPassManager_default_without_memcpy]);
lb_run_function_pass_manager(default_function_pass_manager, m->gen->startup_runtime); LLVMFinalizeFunctionPassManager(m->function_pass_managers[lbFunctionPassManager_minimal]);
lb_finalize_objc_names(m->gen->objc_names); LLVMFinalizeFunctionPassManager(m->function_pass_managers[lbFunctionPassManager_size]);
LLVMFinalizeFunctionPassManager(m->function_pass_managers[lbFunctionPassManager_speed]);
} }
if (m == &m->gen->default_module) {
LLVMPassManagerRef default_function_pass_manager_without_memcpy = LLVMCreateFunctionPassManagerForModule(m->mod); lb_llvm_function_pass_per_function_internal(m, m->gen->startup_type_info);
LLVMInitializeFunctionPassManager(default_function_pass_manager_without_memcpy); lb_llvm_function_pass_per_function_internal(m, m->gen->startup_runtime);
lb_populate_function_pass_manager(m, default_function_pass_manager_without_memcpy, true, build_context.optimization_level); lb_llvm_function_pass_per_function_internal(m, m->gen->objc_names);
LLVMFinalizeFunctionPassManager(default_function_pass_manager_without_memcpy); }
for (lbProcedure *p : m->procedures_to_generate) { for (lbProcedure *p : m->procedures_to_generate) {
if (p->body != nullptr) { // Build Procedure if (p->body != nullptr) { // Build Procedure
lbFunctionPassManagerKind pass_manager_kind = lbFunctionPassManager_default;
if (p->flags & lbProcedureFlag_WithoutMemcpyPass) { if (p->flags & lbProcedureFlag_WithoutMemcpyPass) {
lb_run_function_pass_manager(default_function_pass_manager_without_memcpy, p); pass_manager_kind = lbFunctionPassManager_default_without_memcpy;
} else { } else {
if (p->entity && p->entity->kind == Entity_Procedure) { if (p->entity && p->entity->kind == Entity_Procedure) {
switch (p->entity->Procedure.optimization_mode) { switch (p->entity->Procedure.optimization_mode) {
case ProcedureOptimizationMode_None: case ProcedureOptimizationMode_None:
case ProcedureOptimizationMode_Minimal: case ProcedureOptimizationMode_Minimal:
lb_run_function_pass_manager(function_pass_manager_minimal, p); pass_manager_kind = lbFunctionPassManager_minimal;
break; break;
case ProcedureOptimizationMode_Size: case ProcedureOptimizationMode_Size:
lb_run_function_pass_manager(function_pass_manager_size, p); pass_manager_kind = lbFunctionPassManager_size;
break; break;
case ProcedureOptimizationMode_Speed: case ProcedureOptimizationMode_Speed:
lb_run_function_pass_manager(function_pass_manager_speed, p); pass_manager_kind = lbFunctionPassManager_speed;
break;
default:
lb_run_function_pass_manager(default_function_pass_manager, p);
break; break;
} }
} else {
lb_run_function_pass_manager(default_function_pass_manager, p);
} }
} }
lb_llvm_function_pass_per_function_internal(m, p, pass_manager_kind);
} }
} }
for (auto const &entry : m->equal_procs) { for (auto const &entry : m->equal_procs) {
lbProcedure *p = entry.value; lbProcedure *p = entry.value;
lb_run_function_pass_manager(default_function_pass_manager, p); lb_llvm_function_pass_per_function_internal(m, p);
} }
for (auto const &entry : m->hasher_procs) { for (auto const &entry : m->hasher_procs) {
lbProcedure *p = entry.value; lbProcedure *p = entry.value;
lb_run_function_pass_manager(default_function_pass_manager, p); lb_llvm_function_pass_per_function_internal(m, p);
} }
for (auto const &entry : m->map_get_procs) { for (auto const &entry : m->map_get_procs) {
lbProcedure *p = entry.value; lbProcedure *p = entry.value;
lb_run_function_pass_manager(default_function_pass_manager, p); lb_llvm_function_pass_per_function_internal(m, p);
} }
for (auto const &entry : m->map_set_procs) { for (auto const &entry : m->map_set_procs) {
lbProcedure *p = entry.value; lbProcedure *p = entry.value;
lb_run_function_pass_manager(default_function_pass_manager, p); lb_llvm_function_pass_per_function_internal(m, p);
} }
return 0;
} }
@@ -2125,6 +2125,10 @@ gb_internal bool lb_generate_code(lbGenerator *gen) {
} }
} }
if (gen->modules.entries.count <= 1) {
do_threading = false;
}
TIME_SECTION("LLVM Procedure Generation"); TIME_SECTION("LLVM Procedure Generation");
for (auto const &entry : gen->modules) { for (auto const &entry : gen->modules) {
lbModule *m = entry.value; lbModule *m = entry.value;
@@ -2142,6 +2146,7 @@ gb_internal bool lb_generate_code(lbGenerator *gen) {
lb_create_main_procedure(default_module, gen->startup_runtime); lb_create_main_procedure(default_module, gen->startup_runtime);
} }
TIME_SECTION("LLVM Procedure Generation (missing)");
for (auto const &entry : gen->modules) { for (auto const &entry : gen->modules) {
lbModule *m = entry.value; lbModule *m = entry.value;
// NOTE(bill): procedures may be added during generation // NOTE(bill): procedures may be added during generation
@@ -2154,6 +2159,11 @@ gb_internal bool lb_generate_code(lbGenerator *gen) {
thread_pool_wait(); thread_pool_wait();
if (gen->objc_names) {
TIME_SECTION("Finalize objc names");
lb_finalize_objc_names(gen->objc_names);
}
if (build_context.ODIN_DEBUG) { if (build_context.ODIN_DEBUG) {
TIME_SECTION("LLVM Debug Info Complete Types and Finalize"); TIME_SECTION("LLVM Debug Info Complete Types and Finalize");
for (auto const &entry : gen->modules) { for (auto const &entry : gen->modules) {
@@ -2180,11 +2190,7 @@ gb_internal bool lb_generate_code(lbGenerator *gen) {
TIME_SECTION("LLVM Function Pass"); TIME_SECTION("LLVM Function Pass");
for (auto const &entry : gen->modules) { for (auto const &entry : gen->modules) {
lbModule *m = entry.value; lbModule *m = entry.value;
// if (do_threading) { lb_llvm_function_pass_per_module(m);
// thread_pool_add_task(lb_llvm_function_pass_worker_proc, m);
// } else {
lb_llvm_function_pass_worker_proc(m);
// }
} }
thread_pool_wait(); thread_pool_wait();
src/llvm_backend.hpp
+14
View File
@@ -117,6 +117,16 @@ struct lbIncompleteDebugType {
typedef Slice<i32> lbStructFieldRemapping; typedef Slice<i32> lbStructFieldRemapping;
enum lbFunctionPassManagerKind {
lbFunctionPassManager_default,
lbFunctionPassManager_default_without_memcpy,
lbFunctionPassManager_minimal,
lbFunctionPassManager_size,
lbFunctionPassManager_speed,
lbFunctionPassManager_COUNT
};
struct lbModule { struct lbModule {
LLVMModuleRef mod; LLVMModuleRef mod;
LLVMContextRef ctx; LLVMContextRef ctx;
@@ -158,6 +168,8 @@ struct lbModule {
LLVMDIBuilderRef debug_builder; LLVMDIBuilderRef debug_builder;
LLVMMetadataRef debug_compile_unit; LLVMMetadataRef debug_compile_unit;
RecursiveMutex debug_values_mutex;
PtrMap<void *, LLVMMetadataRef> debug_values; PtrMap<void *, LLVMMetadataRef> debug_values;
Array<lbIncompleteDebugType> debug_incomplete_types; Array<lbIncompleteDebugType> debug_incomplete_types;
@@ -167,6 +179,8 @@ struct lbModule {
PtrMap<Type *, lbAddr> map_cell_info_map; // address of runtime.Map_Info PtrMap<Type *, lbAddr> map_cell_info_map; // address of runtime.Map_Info
PtrMap<Type *, lbAddr> map_info_map; // address of runtime.Map_Cell_Info PtrMap<Type *, lbAddr> map_info_map; // address of runtime.Map_Cell_Info
LLVMPassManagerRef function_pass_managers[lbFunctionPassManager_COUNT];
}; };
struct lbGenerator { struct lbGenerator {
src/llvm_backend_debug.cpp
+7
View File
@@ -2,7 +2,9 @@ gb_internal LLVMMetadataRef lb_get_llvm_metadata(lbModule *m, void *key) {
if (key == nullptr) { if (key == nullptr) {
return nullptr; return nullptr;
} }
mutex_lock(&m->debug_values_mutex);
auto found = map_get(&m->debug_values, key); auto found = map_get(&m->debug_values, key);
mutex_unlock(&m->debug_values_mutex);
if (found) { if (found) {
return *found; return *found;
} }
@@ -10,7 +12,9 @@ gb_internal LLVMMetadataRef lb_get_llvm_metadata(lbModule *m, void *key) {
} }
gb_internal void lb_set_llvm_metadata(lbModule *m, void *key, LLVMMetadataRef value) { gb_internal void lb_set_llvm_metadata(lbModule *m, void *key, LLVMMetadataRef value) {
if (key != nullptr) { if (key != nullptr) {
mutex_lock(&m->debug_values_mutex);
map_set(&m->debug_values, key, value); map_set(&m->debug_values, key, value);
mutex_unlock(&m->debug_values_mutex);
} }
} }
@@ -491,6 +495,9 @@ gb_internal LLVMMetadataRef lb_get_base_scope_metadata(lbModule *m, Scope *scope
} }
gb_internal LLVMMetadataRef lb_debug_type(lbModule *m, Type *type) { gb_internal LLVMMetadataRef lb_debug_type(lbModule *m, Type *type) {
mutex_lock(&m->debug_values_mutex);
defer (mutex_unlock(&m->debug_values_mutex));
GB_ASSERT(type != nullptr); GB_ASSERT(type != nullptr);
LLVMMetadataRef found = lb_get_llvm_metadata(m, type); LLVMMetadataRef found = lb_get_llvm_metadata(m, type);
if (found != nullptr) { if (found != nullptr) {