From 2160484b62ebde52ba6f486ad652f1a72cfe9143 Mon Sep 17 00:00:00 2001 From: gingerBill Date: Thu, 21 Sep 2023 09:40:33 +0100 Subject: Support `-sanitize:` for `address`, `memory`, `thread` for LLVM 17 --- src/build_settings.cpp | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'src/build_settings.cpp') diff --git a/src/build_settings.cpp b/src/build_settings.cpp index 79f6e8a2c..57dac0ca3 100644 --- a/src/build_settings.cpp +++ b/src/build_settings.cpp @@ -264,6 +264,14 @@ u64 get_vet_flag_from_name(String const &name) { } +enum SanitizerFlags : u32 { + SanitizerFlag_NONE = 0, + SanitizerFlag_Address = 1u<<0, + SanitizerFlag_Memory = 1u<<1, + SanitizerFlag_Thread = 1u<<2, +}; + + // This stores the information for the specify architecture of this build struct BuildContext { @@ -305,6 +313,7 @@ struct BuildContext { String pdb_filepath; u64 vet_flags; + u32 sanitizer_flags; bool has_resource; String link_flags; @@ -1738,6 +1747,13 @@ gb_internal bool init_build_paths(String init_filename) { return false; } + if (build_context.sanitizer_flags & SanitizerFlag_Memory) { + if (build_context.metrics.os != TargetOs_linux) { + gb_printf_err("-sanitize:memory is only supported on linux\n"); + return false; + } + } + if (bc->target_features_string.len != 0) { enable_target_feature({}, bc->target_features_string); -- cgit v1.2.3 From e82b0ea4cd1b8c750b517eee806ea4ae1e2b21a6 Mon Sep 17 00:00:00 2001 From: gingerBill Date: Thu, 21 Sep 2023 09:48:53 +0100 Subject: Add `-o:aggressive` for LLVM 17 --- src/build_settings.cpp | 2 +- src/llvm_backend.cpp | 29 +++++++++++++++++++---------- src/llvm_backend.hpp | 1 + src/llvm_backend_opt.cpp | 3 +-- src/main.cpp | 22 +++++++++++++++++++++- 5 files changed, 43 insertions(+), 14 deletions(-) (limited to 'src/build_settings.cpp') diff --git a/src/build_settings.cpp b/src/build_settings.cpp index 57dac0ca3..08e591a3a 100644 --- a/src/build_settings.cpp +++ b/src/build_settings.cpp @@ -1390,7 +1390,7 @@ gb_internal void init_build_context(TargetMetrics *cross_target, Subtarget subta bc->optimization_level = -1; // -o:none } - bc->optimization_level = gb_clamp(bc->optimization_level, -1, 2); + bc->optimization_level = gb_clamp(bc->optimization_level, -1, 3); // ENFORCE DYNAMIC MAP CALLS bc->dynamic_map_calls = true; diff --git a/src/llvm_backend.cpp b/src/llvm_backend.cpp index 68223d8c9..a09cd8b4f 100644 --- a/src/llvm_backend.cpp +++ b/src/llvm_backend.cpp @@ -1358,6 +1358,7 @@ gb_internal WORKER_TASK_PROC(lb_llvm_function_pass_per_module) { m->function_pass_managers[lbFunctionPassManager_minimal] = LLVMCreateFunctionPassManagerForModule(m->mod); m->function_pass_managers[lbFunctionPassManager_size] = LLVMCreateFunctionPassManagerForModule(m->mod); m->function_pass_managers[lbFunctionPassManager_speed] = LLVMCreateFunctionPassManagerForModule(m->mod); + m->function_pass_managers[lbFunctionPassManager_aggressive] = LLVMCreateFunctionPassManagerForModule(m->mod); LLVMInitializeFunctionPassManager(m->function_pass_managers[lbFunctionPassManager_default]); LLVMInitializeFunctionPassManager(m->function_pass_managers[lbFunctionPassManager_default_without_memcpy]); @@ -1368,10 +1369,11 @@ gb_internal WORKER_TASK_PROC(lb_llvm_function_pass_per_module) { lb_populate_function_pass_manager(m, m->function_pass_managers[lbFunctionPassManager_default], false, build_context.optimization_level); lb_populate_function_pass_manager(m, m->function_pass_managers[lbFunctionPassManager_default_without_memcpy], true, build_context.optimization_level); - lb_populate_function_pass_manager_specific(m, m->function_pass_managers[lbFunctionPassManager_none], -1); - lb_populate_function_pass_manager_specific(m, m->function_pass_managers[lbFunctionPassManager_minimal], 0); - 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); + lb_populate_function_pass_manager_specific(m, m->function_pass_managers[lbFunctionPassManager_none], -1); + lb_populate_function_pass_manager_specific(m, m->function_pass_managers[lbFunctionPassManager_minimal], 0); + 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); + lb_populate_function_pass_manager_specific(m, m->function_pass_managers[lbFunctionPassManager_aggressive], 3); LLVMFinalizeFunctionPassManager(m->function_pass_managers[lbFunctionPassManager_default]); LLVMFinalizeFunctionPassManager(m->function_pass_managers[lbFunctionPassManager_default_without_memcpy]); @@ -1379,6 +1381,7 @@ gb_internal WORKER_TASK_PROC(lb_llvm_function_pass_per_module) { LLVMFinalizeFunctionPassManager(m->function_pass_managers[lbFunctionPassManager_minimal]); LLVMFinalizeFunctionPassManager(m->function_pass_managers[lbFunctionPassManager_size]); LLVMFinalizeFunctionPassManager(m->function_pass_managers[lbFunctionPassManager_speed]); + LLVMFinalizeFunctionPassManager(m->function_pass_managers[lbFunctionPassManager_aggressive]); } if (m == &m->gen->default_module) { @@ -1464,7 +1467,7 @@ gb_internal WORKER_TASK_PROC(lb_llvm_module_pass_worker_proc) { int inline_threshold = 0; LLVMPassBuilderOptionsSetInlinerThreshold(pb_options, inline_threshold); - if (build_context.optimization_level == 2) { + if (build_context.optimization_level >= 2) { LLVMPassBuilderOptionsSetLoopVectorization(pb_options, true); LLVMPassBuilderOptionsSetLoopUnrolling (pb_options, true); LLVMPassBuilderOptionsSetMergeFunctions (pb_options, true); @@ -1483,6 +1486,9 @@ gb_internal WORKER_TASK_PROC(lb_llvm_module_pass_worker_proc) { case 2: passes = gb_string_appendc(passes, "default"); break; + case 3: + passes = gb_string_appendc(passes, "default"); + break; } // asan - Linux, Darwin, Windows @@ -2105,12 +2111,15 @@ gb_internal bool lb_generate_code(lbGenerator *gen) { // GB_ASSERT_MSG(LLVMTargetHasAsmBackend(target)); LLVMCodeGenOptLevel code_gen_level = LLVMCodeGenLevelNone; + if (!LB_USE_NEW_PASS_SYSTEM) { + build_context.optimization_level = gb_clamp(build_context.optimization_level, -1, 2); + } switch (build_context.optimization_level) { - case 0: code_gen_level = LLVMCodeGenLevelNone; break; - case 1: code_gen_level = LLVMCodeGenLevelLess; break; - case 2: code_gen_level = LLVMCodeGenLevelDefault; break; - case 3: code_gen_level = LLVMCodeGenLevelDefault; break; // NOTE(bill): force -opt:3 to be the same as -opt:2 - // case 3: code_gen_level = LLVMCodeGenLevelAggressive; break; + default:/*fallthrough*/ + case 0: code_gen_level = LLVMCodeGenLevelNone; break; + case 1: code_gen_level = LLVMCodeGenLevelLess; break; + case 2: code_gen_level = LLVMCodeGenLevelDefault; break; + case 3: code_gen_level = LLVMCodeGenLevelAggressive; break; } // NOTE(bill): Target Machine Creation diff --git a/src/llvm_backend.hpp b/src/llvm_backend.hpp index 9386ed63e..d4da1f18a 100644 --- a/src/llvm_backend.hpp +++ b/src/llvm_backend.hpp @@ -117,6 +117,7 @@ enum lbFunctionPassManagerKind { lbFunctionPassManager_minimal, lbFunctionPassManager_size, lbFunctionPassManager_speed, + lbFunctionPassManager_aggressive, lbFunctionPassManager_COUNT }; diff --git a/src/llvm_backend_opt.cpp b/src/llvm_backend_opt.cpp index b7fdc60bf..2f0dc24fd 100644 --- a/src/llvm_backend_opt.cpp +++ b/src/llvm_backend_opt.cpp @@ -66,8 +66,7 @@ gb_internal void lb_populate_function_pass_manager_specific(lbModule *m, LLVMPas #endif gb_internal bool lb_opt_ignore(i32 optimization_level) { - optimization_level = gb_clamp(optimization_level, -1, 2); - return optimization_level == -1; + return optimization_level < 0; } gb_internal void lb_basic_populate_function_pass_manager(LLVMPassManagerRef fpm, i32 optimization_level) { diff --git a/src/main.cpp b/src/main.cpp index 3d2dd3c44..706bbab87 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -664,12 +664,18 @@ gb_internal bool parse_build_flags(Array args) { } else if (value.value_string == "speed") { build_context.custom_optimization_level = true; build_context.optimization_level = 2; + } else if (value.value_string == "aggressive" && LB_USE_NEW_PASS_SYSTEM) { + build_context.custom_optimization_level = true; + build_context.optimization_level = 3; } else { gb_printf_err("Invalid optimization mode for -o:, got %.*s\n", LIT(value.value_string)); gb_printf_err("Valid optimization modes:\n"); gb_printf_err("\tminimal\n"); gb_printf_err("\tsize\n"); gb_printf_err("\tspeed\n"); + if (LB_USE_NEW_PASS_SYSTEM) { + gb_printf_err("\taggressive\n"); + } gb_printf_err("\tnone (useful for -debug builds)\n"); bad_flags = true; } @@ -1668,8 +1674,13 @@ gb_internal void print_show_help(String const arg0, String const &command) { print_usage_line(1, "-o:"); print_usage_line(2, "Set the optimization mode for compilation"); - print_usage_line(2, "Accepted values: minimal, size, speed, none"); + if (LB_USE_NEW_PASS_SYSTEM) { + print_usage_line(2, "Accepted values: none, minimal, size, speed, aggressive"); + } else { + print_usage_line(2, "Accepted values: none, minimal, size, speed"); + } print_usage_line(2, "Example: -o:speed"); + print_usage_line(2, "The default is -o:minimal"); print_usage_line(0, ""); } @@ -1948,6 +1959,15 @@ gb_internal void print_show_help(String const arg0, String const &command) { } + if (run_or_build) { + print_usage_line(1, "-sanitize:"); + print_usage_line(1, "Enables sanitization analysis"); + print_usage_line(1, "Options are 'address', 'memory', and 'thread'"); + print_usage_line(1, "NOTE: This flag can be used multiple times"); + print_usage_line(0, ""); + + } + if (run_or_build) { #if defined(GB_SYSTEM_WINDOWS) print_usage_line(1, "-ignore-vs-search"); -- cgit v1.2.3 From 4aa9d34b3d8495404d91c18743438671be1a6168 Mon Sep 17 00:00:00 2001 From: gingerBill Date: Thu, 21 Sep 2023 11:20:13 +0100 Subject: Add attributes for sanitize_memory and sanitize_thread --- src/build_settings.cpp | 31 ++++++++++++++++++++++++++++++- src/llvm_backend_proc.cpp | 6 ++++++ 2 files changed, 36 insertions(+), 1 deletion(-) (limited to 'src/build_settings.cpp') diff --git a/src/build_settings.cpp b/src/build_settings.cpp index 08e591a3a..8f495e3c4 100644 --- a/src/build_settings.cpp +++ b/src/build_settings.cpp @@ -1747,11 +1747,40 @@ gb_internal bool init_build_paths(String init_filename) { return false; } + if (build_context.sanitizer_flags & SanitizerFlag_Address) { + switch (build_context.metrics.os) { + case TargetOs_windows: + case TargetOs_linux: + case TargetOs_darwin: + break; + default: + gb_printf_err("-sanitize:memory is only supported on windows, linux, and darwin\n"); + return false; + } + } + if (build_context.sanitizer_flags & SanitizerFlag_Memory) { - if (build_context.metrics.os != TargetOs_linux) { + switch (build_context.metrics.os) { + case TargetOs_linux: + break; + default: gb_printf_err("-sanitize:memory is only supported on linux\n"); return false; } + if (build_context.metrics.os != TargetOs_linux) { + return false; + } + } + + if (build_context.sanitizer_flags & SanitizerFlag_Thread) { + switch (build_context.metrics.os) { + case TargetOs_linux: + case TargetOs_darwin: + break; + default: + gb_printf_err("-sanitize:thread is only supported on linux and darwin\n"); + return false; + } } diff --git a/src/llvm_backend_proc.cpp b/src/llvm_backend_proc.cpp index f86e008a9..4be0ebf9b 100644 --- a/src/llvm_backend_proc.cpp +++ b/src/llvm_backend_proc.cpp @@ -321,6 +321,12 @@ gb_internal lbProcedure *lb_create_procedure(lbModule *m, Entity *entity, bool i if (build_context.sanitizer_flags & SanitizerFlag_Address) { lb_add_attribute_to_proc(m, p->value, "sanitize_address"); } + if (build_context.sanitizer_flags & SanitizerFlag_Memory) { + lb_add_attribute_to_proc(m, p->value, "sanitize_memory"); + } + if (build_context.sanitizer_flags & SanitizerFlag_Thread) { + lb_add_attribute_to_proc(m, p->value, "sanitize_thread"); + } } lbValue proc_value = {p->value, p->type}; -- cgit v1.2.3 From 70aff9fbb20d90d31d7d7b0fff8754ad072e3a8f Mon Sep 17 00:00:00 2001 From: gingerBill Date: Wed, 27 Sep 2023 14:01:45 +0100 Subject: Update src/build_settings.cpp Co-authored-by: Laytan Laats --- src/build_settings.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/build_settings.cpp') diff --git a/src/build_settings.cpp b/src/build_settings.cpp index 8f495e3c4..42ea538af 100644 --- a/src/build_settings.cpp +++ b/src/build_settings.cpp @@ -1754,7 +1754,7 @@ gb_internal bool init_build_paths(String init_filename) { case TargetOs_darwin: break; default: - gb_printf_err("-sanitize:memory is only supported on windows, linux, and darwin\n"); + gb_printf_err("-sanitize:address is only supported on windows, linux, and darwin\n"); return false; } } -- cgit v1.2.3