diff options
| author | atkurtul <atilkurtulmus@gmail.com> | 2021-03-19 10:26:10 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-19 10:26:10 +0300 |
| commit | 6de0b689288dfebc7c68acbe299526e8310c5bf2 (patch) | |
| tree | 6e3670e3e6ed17c8e694cccc98cc7c8ca3181e3e | |
| parent | bb6e6fb4efff7cec6066e702e5bc0783c42ce686 (diff) | |
| parent | 88b8052532eb8ccdf673226e8b4862bfe8b56e12 (diff) | |
Merge pull request #2 from atkurtul/main
early memcpyopt
| -rw-r--r-- | src/build_settings.cpp | 2 | ||||
| -rw-r--r-- | src/main.cpp | 24 |
2 files changed, 20 insertions, 6 deletions
diff --git a/src/build_settings.cpp b/src/build_settings.cpp index e1192eea5..f55bc631e 100644 --- a/src/build_settings.cpp +++ b/src/build_settings.cpp @@ -873,7 +873,7 @@ void init_build_context(TargetMetrics *cross_target) { // -memcpyopt: MemCpy optimization } if (bc->ODIN_DEBUG == false) { - opt_flags = gb_string_appendc(opt_flags, "-mem2reg -memcpyopt -die "); + opt_flags = gb_string_appendc(opt_flags, "-mem2reg -die "); } diff --git a/src/main.cpp b/src/main.cpp index 0f6208134..2496c87ae 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1477,7 +1477,7 @@ void show_timings(Checker *c, Timings *t) { void remove_temp_files(String output_base) { if (build_context.keep_temp_files) return; - auto data = array_make<u8>(heap_allocator(), output_base.len + 10); + auto data = array_make<u8>(heap_allocator(), output_base.len + 30); defer (array_free(&data)); isize n = output_base.len; @@ -1488,6 +1488,7 @@ void remove_temp_files(String output_base) { } while (0) EXT_REMOVE(".ll"); EXT_REMOVE(".bc"); + EXT_REMOVE("_memcpy_pass.bc"); if (build_context.build_mode != BuildMode_Object && !build_context.keep_object_files) { #if defined(GB_SYSTEM_WINDOWS) EXT_REMOVE(".obj"); @@ -1506,8 +1507,15 @@ void remove_temp_files(String output_base) { i32 exec_llvm_opt(String output_base) { #if defined(GB_SYSTEM_WINDOWS) // For more passes arguments: http://llvm.org/docs/Passes.html - return system_exec_command_line_app("llvm-opt", - "\"%.*sbin/opt\" \"%.*s.ll\" -o \"%.*s.bc\" %.*s " + + return system_exec_command_line_app("llvm-opt", + "\"%.*sbin/opt\" \"%.*s.ll\" -o \"%.*s_memcpy_pass.bc\" -memcpyopt" + "", + LIT(build_context.ODIN_ROOT), + LIT(output_base), LIT(output_base)) + + || system_exec_command_line_app("llvm-opt", + "\"%.*sbin/opt\" \"%.*s_memcpy_pass.bc\" -o \"%.*s.bc\" %.*s " "", LIT(build_context.ODIN_ROOT), LIT(output_base), LIT(output_base), @@ -1515,8 +1523,14 @@ i32 exec_llvm_opt(String output_base) { #else // NOTE(zangent): This is separate because it seems that LLVM tools are packaged // with the Windows version, while they will be system-provided on MacOS and GNU/Linux - return system_exec_command_line_app("llvm-opt", - "opt \"%.*s.ll\" -o \"%.*s.bc\" %.*s " + + return system_exec_command_line_app("llvm-opt", + "opt \"%.*s.ll\" -o \"%.*s_memcpy_pass.bc\" -memcpyopt" + "", + LIT(output_base), LIT(output_base)) + + || system_exec_command_line_app("llvm-opt", + "opt \"%.*s_memcpy_pass.bc\" -o \"%.*s.bc\" %.*s " "", LIT(output_base), LIT(output_base), LIT(build_context.opt_flags)); |