mirrors/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2025-09-14 15:02:33 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

cbuilder: store split up C files in vtmp

Browse source
This commit is contained in:
Alexander Medvednikov 2024-12-17 13:07:00 +03:00
parent a8484387cb
commit 597d4e2239
2 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cmd/tools/vself.v
View file

@ -25,7 +25,7 @@ fn main() {
os.chdir(vroot)! os.chdir(vroot)!
os.setenv('VCOLORS', 'always', true) os.setenv('VCOLORS', 'always', true)
mut args := os.args[1..].filter(it != 'self') mut args := os.args[1..].filter(it != 'self')
if args.len == 0 || ('-cc' !in args && '-prod' !in args) { if args.len == 0 || ('-cc' !in args && '-prod' !in args && '-parallel-cc' !in args) {
// compiling by default, i.e. `v self`: // compiling by default, i.e. `v self`:
uos := os.user_os() uos := os.user_os()
uname := os.uname() uname := os.uname()

13
vlib/v/builder/cbuilder/parallel_cc.v
View file

@ -14,6 +14,7 @@ const cc_cflags = os.getenv_opt('CFLAGS') or { '' }
const cc_cflags_opt = os.getenv_opt('CFLAGS_OPT') or { '' } // '-O3' } const cc_cflags_opt = os.getenv_opt('CFLAGS_OPT') or { '' } // '-O3' }
fn parallel_cc(mut b builder.Builder, result c.GenOutput) { fn parallel_cc(mut b builder.Builder, result c.GenOutput) {
tmp_dir := os.vtmp_dir()
sw_total := time.new_stopwatch() sw_total := time.new_stopwatch()
defer { defer {
eprint_time(sw_total, @METHOD) eprint_time(sw_total, @METHOD)
@ -25,16 +26,16 @@ fn parallel_cc(mut b builder.Builder, result c.GenOutput) {
// like the `int main()` to "out_0.c" and "out_x.c" // like the `int main()` to "out_0.c" and "out_x.c"
// out.h // out.h
os.write_file('out.h', result.header) or { panic(err) } os.write_file('${tmp_dir}/out.h', result.header) or { panic(err) }
// out_0.c // out_0.c
out0 := '//out0\n' + result.out_str[..result.out_fn_start_pos[0]] out0 := '//out0\n' + result.out_str[..result.out_fn_start_pos[0]]
os.write_file('out_0.c', '#include "out.h"\n' + out0 + '\n//X:\n' + result.out0_str) or { os.write_file('${tmp_dir}/out_0.c', '#include "out.h"\n' + out0 + '\n//X:\n' + result.out0_str) or {
panic(err) panic(err)
} }
// out_x.c // out_x.c
os.write_file('out_x.c', '#include "out.h"\n\n' + result.extern_str + '\n' + os.write_file('${tmp_dir}/out_x.c', '#include "out.h"\n\n' + result.extern_str + '\n' +
result.out_str[result.out_fn_start_pos.last()..]) or { panic(err) } result.out_str[result.out_fn_start_pos.last()..]) or { panic(err) }
mut prev_fn_pos := 0 mut prev_fn_pos := 0
@ -42,7 +43,7 @@ fn parallel_cc(mut b builder.Builder, result c.GenOutput) {
mut fnames := []string{} mut fnames := []string{}
for i in 0 .. c_files { for i in 0 .. c_files {
fname := 'out_${i + 1}.c' fname := '${tmp_dir}/out_${i + 1}.c'
fnames << fname fnames << fname
out_files[i] = os.create(fname) or { panic(err) } out_files[i] = os.create(fname) or { panic(err) }
@ -77,7 +78,7 @@ fn parallel_cc(mut b builder.Builder, result c.GenOutput) {
} }
str_args := b.str_args.replace('-flto', '') // remove link time optimization, slows down linking 10x str_args := b.str_args.replace('-flto', '') // remove link time optimization, slows down linking 10x
for postfix in o_postfixes { for postfix in o_postfixes {
cmds << '${cc} ${cc_cflags} ${cc_cflags_opt} ${str_args} -c -w -o out_${postfix}.o out_${postfix}.c' cmds << '${cc} ${cc_cflags} ${cc_cflags_opt} ${str_args} -c -w -o ${tmp_dir}/out_${postfix}.o ${tmp_dir}/out_${postfix}.c'
} }
sw := time.new_stopwatch() sw := time.new_stopwatch()
mut pp := pool.new_pool_processor(callback: build_parallel_o_cb) mut pp := pool.new_pool_processor(callback: build_parallel_o_cb)
@ -87,7 +88,7 @@ fn parallel_cc(mut b builder.Builder, result c.GenOutput) {
gc_flag := if b.pref.gc_mode != .no_gc { '-lgc ' } else { '' } gc_flag := if b.pref.gc_mode != .no_gc { '-lgc ' } else { '' }
obj_files := fnames.map(it.replace('.c', '.o')).join(' ') obj_files := fnames.map(it.replace('.c', '.o')).join(' ')
ld_flags := '${gc_flag}${cc_ldflags}' ld_flags := '${gc_flag}${cc_ldflags}'
link_cmd := '${cc} -o ${os.quoted_path(b.pref.out_name)} out_0.o ${obj_files} out_x.o -lpthread ${ld_flags}' link_cmd := '${cc} -o ${os.quoted_path(b.pref.out_name)} ${tmp_dir}/out_0.o ${obj_files} ${tmp_dir}/out_x.o -lpthread ${ld_flags}'
sw_link := time.new_stopwatch() sw_link := time.new_stopwatch()
link_res := os.execute(link_cmd) link_res := os.execute(link_cmd)
eprint_result_time(sw_link, 'link_cmd', link_cmd, link_res) eprint_result_time(sw_link, 'link_cmd', link_cmd, link_res)