From 87ac68fcf2b5fcaa02118929b820e61bbd8c10c4 Mon Sep 17 00:00:00 2001 From: gingerBill Date: Mon, 8 Jul 2024 23:39:14 +0100 Subject: [PATCH 01/12] Add `-internal-cached` --- src/build_settings.cpp | 10 +- src/cached.cpp | 213 +++++++++++++++++++++++++++++++++++ src/llvm_backend.cpp | 4 +- src/llvm_backend_general.cpp | 22 ++-- src/main.cpp | 26 ++++- src/string.cpp | 7 ++ 6 files changed, 265 insertions(+), 17 deletions(-) create mode 100644 src/cached.cpp diff --git a/src/build_settings.cpp b/src/build_settings.cpp index c8c83422f..be896f6fa 100644 --- a/src/build_settings.cpp +++ b/src/build_settings.cpp @@ -326,7 +326,12 @@ enum SanitizerFlags : u32 { SanitizerFlag_Thread = 1u<<2, }; - +struct BuildCacheData { + u64 crc; + String cache_dir; + String manifest_path; + bool copy_already_done; +}; // This stores the information for the specify architecture of this build struct BuildContext { @@ -427,6 +432,9 @@ struct BuildContext { bool use_separate_modules; bool module_per_file; + bool cached; + BuildCacheData build_cache_data; + bool no_threaded_checker; bool show_debug_messages; diff --git a/src/cached.cpp b/src/cached.cpp new file mode 100644 index 000000000..89158ccbb --- /dev/null +++ b/src/cached.cpp @@ -0,0 +1,213 @@ +gb_internal GB_COMPARE_PROC(cached_file_cmp) { + String const &x = *(String *)a; + String const &y = *(String *)b; + return string_compare(x, y); +} + + +u64 crc64_with_seed(void const *data, isize len, u64 seed) { + isize remaining; + u64 result = ~seed; + u8 const *c = cast(u8 const *)data; + for (remaining = len; remaining--; c++) { + result = (result >> 8) ^ (GB__CRC64_TABLE[(result ^ *c) & 0xff]); + } + return ~result; +} + +bool check_if_exists_file_otherwise_create(String const &str) { + char const *str_c = alloc_cstring(permanent_allocator(), str); + if (!gb_file_exists(str_c)) { + gbFile f = {}; + gb_file_create(&f, str_c); + gb_file_close(&f); + return true; + } + return false; +} + + +bool check_if_exists_directory_otherwise_create(String const &str) { +#if defined(GB_SYSTEM_WINDOWS) + String16 wstr = string_to_string16(permanent_allocator(), str); + wchar_t *wstr_c = alloc_wstring(permanent_allocator(), wstr); + return CreateDirectoryW(wstr_c, nullptr); +#else + char const *str_c = alloc_cstring(permanent_allocator(), str); + if (!gb_file_exists(str_c)) { + return false; + } + return false; +#endif +} +bool try_copy_executable_cache_internal(bool to_cache) { + String exe_name = path_to_string(heap_allocator(), build_context.build_paths[BuildPath_Output]); + defer (gb_free(heap_allocator(), exe_name.text)); + + gbString cache_name = gb_string_make(heap_allocator(), ""); + defer (gb_string_free(cache_name)); + + String cache_dir = build_context.build_cache_data.cache_dir; + + cache_name = gb_string_append_length(cache_name, cache_dir.text, cache_dir.len); + cache_name = gb_string_appendc(cache_name, "/"); + + cache_name = gb_string_appendc(cache_name, "cached-exe"); + if (selected_target_metrics) { + cache_name = gb_string_appendc(cache_name, "-"); + cache_name = gb_string_append_length(cache_name, selected_target_metrics->name.text, selected_target_metrics->name.len); + } + cache_name = gb_string_appendc(cache_name, ".bin"); + + if (to_cache) { + return gb_file_copy( + alloc_cstring(temporary_allocator(), exe_name), + cache_name, + false + ); + } else { + return gb_file_copy( + cache_name, + alloc_cstring(temporary_allocator(), exe_name), + false + ); + } +} + + + +bool try_copy_executable_to_cache(void) { + if (try_copy_executable_cache_internal(true)) { + build_context.build_cache_data.copy_already_done = true; + return true; + } + return false; +} + +bool try_copy_executable_from_cache(void) { + if (try_copy_executable_cache_internal(false)) { + build_context.build_cache_data.copy_already_done = true; + return true; + } + return false; +} + + + + +// returns false if different, true if it is the same +bool try_cached_build(Checker *c) { + Parser *p = c->parser; + + auto files = array_make(heap_allocator()); + for (AstPackage *pkg : p->packages) { + for (AstFile *f : pkg->files) { + array_add(&files, f->fullpath); + } + } + + for (auto const &entry : c->info.load_file_cache) { + auto *cache = entry.value; + if (!cache || !cache->exists) { + continue; + } + array_add(&files, cache->path); + } + + array_sort(files, cached_file_cmp); + + u64 crc = 0; + for (String const &path : files) { + crc = crc64_with_seed(path.text, path.len, crc); + } + + String base_cache_dir = build_context.build_paths[BuildPath_Output].basename; + base_cache_dir = concatenate_strings(permanent_allocator(), base_cache_dir, str_lit("/.odin-cache")); + (void)check_if_exists_directory_otherwise_create(base_cache_dir); + + gbString crc_str = gb_string_make_reserve(permanent_allocator(), 16); + crc_str = gb_string_append_fmt(crc_str, "%016llx", crc); + String cache_dir = concatenate3_strings(permanent_allocator(), base_cache_dir, str_lit("/"), make_string_c(crc_str)); + String manifest_path = concatenate3_strings(permanent_allocator(), cache_dir, str_lit("/"), str_lit("odin.manifest")); + + build_context.build_cache_data.cache_dir = cache_dir; + build_context.build_cache_data.manifest_path = manifest_path; + + if (check_if_exists_directory_otherwise_create(cache_dir)) { + goto do_write_file; + } + + if (check_if_exists_file_otherwise_create(manifest_path)) { + goto do_write_file; + } else { + // exists already + LoadedFile loaded_file = {}; + + LoadedFileError file_err = load_file_32( + alloc_cstring(temporary_allocator(), manifest_path), + &loaded_file, + false + ); + if (file_err) { + return false; + } + + String data = {cast(u8 *)loaded_file.data, loaded_file.size}; + String_Iterator it = {data, 0}; + + isize file_count = 0; + + for (; it.pos < data.len; file_count++) { + String line = string_split_iterator(&it, '\n'); + if (line.len == 0) { + break; + } + isize sep = string_index_byte(line, ' '); + if (sep < 0) { + goto do_write_file; + } + + String timestamp_str = substring(line, 0, sep); + String path_str = substring(line, sep+1, line.len); + + timestamp_str = string_trim_whitespace(timestamp_str); + path_str = string_trim_whitespace(path_str); + + if (files[file_count] != path_str) { + goto do_write_file; + } + + u64 timestamp = exact_value_to_u64(exact_value_integer_from_string(timestamp_str)); + gbFileTime last_write_time = gb_file_last_write_time(alloc_cstring(temporary_allocator(), path_str)); + if (last_write_time != timestamp) { + goto do_write_file; + } + } + + if (file_count != files.count) { + goto do_write_file; + } + + goto try_copy_executable; + } + +do_write_file:; + { + char const *manifest_path_c = alloc_cstring(temporary_allocator(), manifest_path); + gb_file_remove(manifest_path_c); + + gbFile f = {}; + defer (gb_file_close(&f)); + gb_file_open_mode(&f, gbFileMode_Write, manifest_path_c); + + for (String const &path : files) { + gbFileTime ft = gb_file_last_write_time(alloc_cstring(temporary_allocator(), path)); + gb_fprintf(&f, "%llu %.*s\n", cast(unsigned long long)ft, LIT(path)); + } + return false; + } + +try_copy_executable:; + return try_copy_executable_from_cache(); +} + diff --git a/src/llvm_backend.cpp b/src/llvm_backend.cpp index 44b6e3839..b0df17778 100644 --- a/src/llvm_backend.cpp +++ b/src/llvm_backend.cpp @@ -1397,8 +1397,8 @@ gb_internal void lb_create_global_procedures_and_types(lbGenerator *gen, Checker for (auto const &entry : gen->modules) { lbModule *m = entry.value; - gb_sort_array(m->global_types_to_create.data, m->global_types_to_create.count, llvm_global_entity_cmp); - gb_sort_array(m->global_procedures_to_create.data, m->global_procedures_to_create.count, llvm_global_entity_cmp); + array_sort(m->global_types_to_create, llvm_global_entity_cmp); + array_sort(m->global_procedures_to_create, llvm_global_entity_cmp); } if (do_threading) { diff --git a/src/llvm_backend_general.cpp b/src/llvm_backend_general.cpp index 77f78a24c..bbeff562c 100644 --- a/src/llvm_backend_general.cpp +++ b/src/llvm_backend_general.cpp @@ -126,16 +126,17 @@ gb_internal bool lb_init_generator(lbGenerator *gen, Checker *c) { m->gen = gen; map_set(&gen->modules, cast(void *)pkg, m); lb_init_module(m, c); - if (module_per_file) { - // NOTE(bill): Probably per file is not a good idea, so leave this for later - for (AstFile *file : pkg->files) { - auto m = gb_alloc_item(permanent_allocator(), lbModule); - m->file = file; - m->pkg = pkg; - m->gen = gen; - map_set(&gen->modules, cast(void *)file, m); - lb_init_module(m, c); - } + if (!module_per_file) { + continue; + } + // NOTE(bill): Probably per file is not a good idea, so leave this for later + for (AstFile *file : pkg->files) { + auto m = gb_alloc_item(permanent_allocator(), lbModule); + m->file = file; + m->pkg = pkg; + m->gen = gen; + map_set(&gen->modules, cast(void *)file, m); + lb_init_module(m, c); } } } @@ -144,7 +145,6 @@ gb_internal bool lb_init_generator(lbGenerator *gen, Checker *c) { map_set(&gen->modules, cast(void *)1, &gen->default_module); lb_init_module(&gen->default_module, c); - for (auto const &entry : gen->modules) { lbModule *m = entry.value; LLVMContextRef ctx = LLVMGetModuleContext(m->mod); diff --git a/src/main.cpp b/src/main.cpp index bbb326af3..006a7ddbc 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -71,6 +71,8 @@ gb_global Timings global_timings = {0}; #include "checker.cpp" #include "docs.cpp" +#include "cached.cpp" + #include "linker.cpp" #if defined(GB_SYSTEM_WINDOWS) && defined(ODIN_TILDE_BACKEND) @@ -391,6 +393,7 @@ enum BuildFlagKind { BuildFlag_InternalIgnoreLLVMBuild, BuildFlag_InternalIgnorePanic, BuildFlag_InternalModulePerFile, + BuildFlag_InternalCached, BuildFlag_Tilde, @@ -594,6 +597,7 @@ gb_internal bool parse_build_flags(Array args) { add_flag(&build_flags, BuildFlag_InternalIgnoreLLVMBuild, str_lit("internal-ignore-llvm-build"),BuildFlagParam_None, Command_all); add_flag(&build_flags, BuildFlag_InternalIgnorePanic, str_lit("internal-ignore-panic"), BuildFlagParam_None, Command_all); add_flag(&build_flags, BuildFlag_InternalModulePerFile, str_lit("internal-module-per-file"), BuildFlagParam_None, Command_all); + add_flag(&build_flags, BuildFlag_InternalCached, str_lit("internal-cached"), BuildFlagParam_None, Command_all); #if ALLOW_TILDE add_flag(&build_flags, BuildFlag_Tilde, str_lit("tilde"), BuildFlagParam_None, Command__does_build); @@ -1413,6 +1417,10 @@ gb_internal bool parse_build_flags(Array args) { case BuildFlag_InternalModulePerFile: build_context.module_per_file = true; break; + case BuildFlag_InternalCached: + build_context.cached = true; + build_context.use_separate_modules = true; + break; case BuildFlag_Tilde: build_context.tilde_backend = true; @@ -1921,9 +1929,6 @@ gb_internal void show_timings(Checker *c, Timings *t) { gb_internal GB_COMPARE_PROC(file_path_cmp) { AstFile *x = *(AstFile **)a; AstFile *y = *(AstFile **)b; - if (x == y) { - return 0; - } return string_compare(x->fullpath, y->fullpath); } @@ -3322,6 +3327,13 @@ int main(int arg_count, char const **arg_ptr) { return 0; } + if (build_context.cached) { + MAIN_TIME_SECTION("check cached build"); + if (try_cached_build(checker)) { + goto end_of_code_gen; + } + } + #if ALLOW_TILDE if (build_context.tilde_backend) { LinkerData linker_data = {}; @@ -3383,6 +3395,8 @@ int main(int arg_count, char const **arg_ptr) { remove_temp_files(gen); } +end_of_code_gen:; + if (build_context.show_timings) { show_timings(checker, &global_timings); } @@ -3391,6 +3405,12 @@ int main(int arg_count, char const **arg_ptr) { export_dependencies(checker); } + + if (!build_context.build_cache_data.copy_already_done && + build_context.cached) { + try_copy_executable_to_cache(); + } + if (run_output) { String exe_name = path_to_string(heap_allocator(), build_context.build_paths[BuildPath_Output]); defer (gb_free(heap_allocator(), exe_name.text)); diff --git a/src/string.cpp b/src/string.cpp index ab08e3d4a..a39d93ad9 100644 --- a/src/string.cpp +++ b/src/string.cpp @@ -88,6 +88,13 @@ gb_internal char *alloc_cstring(gbAllocator a, String s) { return c_str; } +gb_internal wchar_t *alloc_wstring(gbAllocator a, String16 s) { + wchar_t *c_str = gb_alloc_array(a, wchar_t, s.len+1); + gb_memmove(c_str, s.text, s.len*2); + c_str[s.len] = '\0'; + return c_str; +} + gb_internal gb_inline bool str_eq_ignore_case(String const &a, String const &b) { if (a.len == b.len) { From 45bf1808478ca5059dce582182cdf84582dd5a9a Mon Sep 17 00:00:00 2001 From: gingerBill Date: Mon, 8 Jul 2024 23:55:01 +0100 Subject: [PATCH 02/12] Add subtarget to cached executable --- src/cached.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/cached.cpp b/src/cached.cpp index 89158ccbb..62c7641e5 100644 --- a/src/cached.cpp +++ b/src/cached.cpp @@ -57,6 +57,11 @@ bool try_copy_executable_cache_internal(bool to_cache) { cache_name = gb_string_appendc(cache_name, "-"); cache_name = gb_string_append_length(cache_name, selected_target_metrics->name.text, selected_target_metrics->name.len); } + if (selected_subtarget) { + String st = subtarget_strings[selected_subtarget]; + cache_name = gb_string_appendc(cache_name, "-"); + cache_name = gb_string_append_length(cache_name, st.text, st.len); + } cache_name = gb_string_appendc(cache_name, ".bin"); if (to_cache) { From ccdad8b8dd3af934ef12e833b79c239c8a04895e Mon Sep 17 00:00:00 2001 From: gingerBill Date: Tue, 9 Jul 2024 13:31:54 +0100 Subject: [PATCH 03/12] Add `odin clear-cache` --- src/cached.cpp | 81 ++++++++++++++++++++++++++++++++++++++++++++++++++ src/main.cpp | 2 ++ 2 files changed, 83 insertions(+) diff --git a/src/cached.cpp b/src/cached.cpp index 62c7641e5..83950c82b 100644 --- a/src/cached.cpp +++ b/src/cached.cpp @@ -4,6 +4,87 @@ gb_internal GB_COMPARE_PROC(cached_file_cmp) { return string_compare(x, y); } +bool recursively_delete_directory(wchar_t *wpath_c) { +#if defined(GB_SYSTEM_WINDOWS) + auto const is_dots_w = [](wchar_t const *str) -> bool { + if (!str) { + return false; + } + return wcscmp(str, L".") == 0 || wcscmp(str, L"..") == 0; + }; + + TEMPORARY_ALLOCATOR_GUARD(); + + wchar_t dir_path[MAX_PATH] = {}; + wchar_t filename[MAX_PATH] = {}; + wcscpy(dir_path, wpath_c); + wcscat(dir_path, L"\\*"); + + wcscpy(filename, wpath_c); + wcscat(filename, L"\\"); + + + WIN32_FIND_DATAW find_file_data = {}; + HANDLE hfind = FindFirstFileW(dir_path, &find_file_data); + if (hfind == INVALID_HANDLE_VALUE) { + return false; + } + defer (FindClose(hfind)); + + wcscpy(dir_path, filename); + + for (;;) { + if (FindNextFileW(hfind, &find_file_data)) { + if (is_dots_w(find_file_data.cFileName)) { + continue; + } + wcscat(filename, find_file_data.cFileName); + + if (find_file_data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) { + if (!recursively_delete_directory(filename)) { + return false; + } + RemoveDirectoryW(filename); + wcscpy(filename, dir_path); + } else { + if (find_file_data.dwFileAttributes & FILE_ATTRIBUTE_READONLY) { + _wchmod(filename, _S_IWRITE); + } + if (!DeleteFileW(filename)) { + return false; + } + wcscpy(filename, dir_path); + } + } else { + if (GetLastError() == ERROR_NO_MORE_FILES) { + break; + } + return false; + } + } + + + return RemoveDirectoryW(wpath_c); +#else + return false; +#endif +} + +bool recursively_delete_directory(String const &path) { +#if defined(GB_SYSTEM_WINDOWS) + String16 wpath = string_to_string16(permanent_allocator(), path); + wchar_t *wpath_c = alloc_wstring(permanent_allocator(), wpath); + return recursively_delete_directory(wpath_c); +#else + return false; +#endif +} + +int try_clear_cache(void) { + bool ok = recursively_delete_directory(str_lit(".odin-cache")); + return ok ? 0 : 1; +} + u64 crc64_with_seed(void const *data, isize len, u64 seed) { isize remaining; diff --git a/src/main.cpp b/src/main.cpp index 006a7ddbc..49c34014b 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -3057,6 +3057,8 @@ int main(int arg_count, char const **arg_ptr) { } else if (command == "root") { gb_printf("%.*s", LIT(odin_root_dir())); return 0; + } else if (command == "clear-cache") { + return try_clear_cache(); } else { String argv1 = {}; if (args.count > 1) { From 68b70a21831b3128828357e8af366a377283fa80 Mon Sep 17 00:00:00 2001 From: gingerBill Date: Tue, 9 Jul 2024 13:35:52 +0100 Subject: [PATCH 04/12] Check for bounds check error --- src/cached.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/cached.cpp b/src/cached.cpp index 83950c82b..ab6d99848 100644 --- a/src/cached.cpp +++ b/src/cached.cpp @@ -259,6 +259,9 @@ bool try_cached_build(Checker *c) { timestamp_str = string_trim_whitespace(timestamp_str); path_str = string_trim_whitespace(path_str); + if (file_count >= files.count) { + goto do_write_file; + } if (files[file_count] != path_str) { goto do_write_file; } From 886ee66e7fcabbd09c20fd55d98051e3854dfd76 Mon Sep 17 00:00:00 2001 From: gingerBill Date: Tue, 9 Jul 2024 14:16:56 +0100 Subject: [PATCH 05/12] Cache files, env, and args --- src/build_settings.cpp | 7 +- src/cached.cpp | 170 +++++++++++++++++++++++++++++++++++------ src/main.cpp | 13 +++- src/parser.cpp | 10 +++ src/parser.hpp | 4 + 5 files changed, 175 insertions(+), 29 deletions(-) diff --git a/src/build_settings.cpp b/src/build_settings.cpp index be896f6fa..28ca0f088 100644 --- a/src/build_settings.cpp +++ b/src/build_settings.cpp @@ -329,7 +329,12 @@ enum SanitizerFlags : u32 { struct BuildCacheData { u64 crc; String cache_dir; - String manifest_path; + + // manifests + String files_path; + String args_path; + String env_path; + bool copy_already_done; }; diff --git a/src/cached.cpp b/src/cached.cpp index ab6d99848..da72e9989 100644 --- a/src/cached.cpp +++ b/src/cached.cpp @@ -1,4 +1,4 @@ -gb_internal GB_COMPARE_PROC(cached_file_cmp) { +gb_internal GB_COMPARE_PROC(string_cmp) { String const &x = *(String *)a; String const &y = *(String *)b; return string_compare(x, y); @@ -182,7 +182,9 @@ bool try_copy_executable_from_cache(void) { // returns false if different, true if it is the same -bool try_cached_build(Checker *c) { +bool try_cached_build(Checker *c, Array const &args) { + TEMPORARY_ALLOCATOR_GUARD(); + Parser *p = c->parser; auto files = array_make(heap_allocator()); @@ -200,7 +202,7 @@ bool try_cached_build(Checker *c) { array_add(&files, cache->path); } - array_sort(files, cached_file_cmp); + array_sort(files, string_cmp); u64 crc = 0; for (String const &path : files) { @@ -213,28 +215,58 @@ bool try_cached_build(Checker *c) { gbString crc_str = gb_string_make_reserve(permanent_allocator(), 16); crc_str = gb_string_append_fmt(crc_str, "%016llx", crc); - String cache_dir = concatenate3_strings(permanent_allocator(), base_cache_dir, str_lit("/"), make_string_c(crc_str)); - String manifest_path = concatenate3_strings(permanent_allocator(), cache_dir, str_lit("/"), str_lit("odin.manifest")); + String cache_dir = concatenate3_strings(permanent_allocator(), base_cache_dir, str_lit("/"), make_string_c(crc_str)); + String files_path = concatenate3_strings(permanent_allocator(), cache_dir, str_lit("/"), str_lit("files.manifest")); + String args_path = concatenate3_strings(permanent_allocator(), cache_dir, str_lit("/"), str_lit("args.manifest")); + String env_path = concatenate3_strings(permanent_allocator(), cache_dir, str_lit("/"), str_lit("env.manifest")); build_context.build_cache_data.cache_dir = cache_dir; - build_context.build_cache_data.manifest_path = manifest_path; + build_context.build_cache_data.files_path = files_path; + build_context.build_cache_data.args_path = args_path; + build_context.build_cache_data.env_path = env_path; + + auto envs = array_make(heap_allocator()); + defer (array_free(&envs)); + { + #if defined(GB_SYSTEM_WINDOWS) + wchar_t *strings = GetEnvironmentStringsW(); + defer (FreeEnvironmentStringsW(strings)); + + wchar_t *curr_string = strings; + while (curr_string && *curr_string) { + String16 wstr = make_string16_c(curr_string); + curr_string += wstr.len+1; + String str = string16_to_string(temporary_allocator(), wstr); + array_add(&envs, str); + } + #endif + } + array_sort(envs, string_cmp); if (check_if_exists_directory_otherwise_create(cache_dir)) { - goto do_write_file; + goto write_cache; } - if (check_if_exists_file_otherwise_create(manifest_path)) { - goto do_write_file; - } else { + if (check_if_exists_file_otherwise_create(files_path)) { + goto write_cache; + } + if (check_if_exists_file_otherwise_create(args_path)) { + goto write_cache; + } + if (check_if_exists_file_otherwise_create(env_path)) { + goto write_cache; + } + + { // exists already LoadedFile loaded_file = {}; LoadedFileError file_err = load_file_32( - alloc_cstring(temporary_allocator(), manifest_path), + alloc_cstring(temporary_allocator(), files_path), &loaded_file, false ); - if (file_err) { + if (file_err > LoadedFile_Empty) { return false; } @@ -250,7 +282,7 @@ bool try_cached_build(Checker *c) { } isize sep = string_index_byte(line, ' '); if (sep < 0) { - goto do_write_file; + goto write_cache; } String timestamp_str = substring(line, 0, sep); @@ -260,43 +292,131 @@ bool try_cached_build(Checker *c) { path_str = string_trim_whitespace(path_str); if (file_count >= files.count) { - goto do_write_file; + goto write_cache; } if (files[file_count] != path_str) { - goto do_write_file; + goto write_cache; } u64 timestamp = exact_value_to_u64(exact_value_integer_from_string(timestamp_str)); gbFileTime last_write_time = gb_file_last_write_time(alloc_cstring(temporary_allocator(), path_str)); if (last_write_time != timestamp) { - goto do_write_file; + goto write_cache; } } if (file_count != files.count) { - goto do_write_file; + goto write_cache; + } + } + { + LoadedFile loaded_file = {}; + + LoadedFileError file_err = load_file_32( + alloc_cstring(temporary_allocator(), args_path), + &loaded_file, + false + ); + if (file_err > LoadedFile_Empty) { + return false; } - goto try_copy_executable; + String data = {cast(u8 *)loaded_file.data, loaded_file.size}; + String_Iterator it = {data, 0}; + + isize args_count = 0; + + for (; it.pos < data.len; args_count++) { + String line = string_split_iterator(&it, '\n'); + line = string_trim_whitespace(line); + if (line.len == 0) { + break; + } + if (args_count >= args.count) { + goto write_cache; + } + + if (line != args[args_count]) { + goto write_cache; + } + } + } + { + LoadedFile loaded_file = {}; + + LoadedFileError file_err = load_file_32( + alloc_cstring(temporary_allocator(), env_path), + &loaded_file, + false + ); + if (file_err > LoadedFile_Empty) { + return false; + } + + String data = {cast(u8 *)loaded_file.data, loaded_file.size}; + String_Iterator it = {data, 0}; + + isize env_count = 0; + + for (; it.pos < data.len; env_count++) { + String line = string_split_iterator(&it, '\n'); + line = string_trim_whitespace(line); + if (line.len == 0) { + break; + } + if (env_count >= envs.count) { + goto write_cache; + } + + if (line != envs[env_count]) { + goto write_cache; + } + } } -do_write_file:; + return try_copy_executable_from_cache(); + +write_cache:; { - char const *manifest_path_c = alloc_cstring(temporary_allocator(), manifest_path); - gb_file_remove(manifest_path_c); + char const *path_c = alloc_cstring(temporary_allocator(), files_path); + gb_file_remove(path_c); gbFile f = {}; defer (gb_file_close(&f)); - gb_file_open_mode(&f, gbFileMode_Write, manifest_path_c); + gb_file_open_mode(&f, gbFileMode_Write, path_c); for (String const &path : files) { gbFileTime ft = gb_file_last_write_time(alloc_cstring(temporary_allocator(), path)); gb_fprintf(&f, "%llu %.*s\n", cast(unsigned long long)ft, LIT(path)); } - return false; + } + { + char const *path_c = alloc_cstring(temporary_allocator(), args_path); + gb_file_remove(path_c); + + gbFile f = {}; + defer (gb_file_close(&f)); + gb_file_open_mode(&f, gbFileMode_Write, path_c); + + for (String const &arg : args) { + String targ = string_trim_whitespace(arg); + gb_fprintf(&f, "%.*s\n", LIT(targ)); + } + } + { + char const *path_c = alloc_cstring(temporary_allocator(), env_path); + gb_file_remove(path_c); + + gbFile f = {}; + defer (gb_file_close(&f)); + gb_file_open_mode(&f, gbFileMode_Write, path_c); + + for (String const &env : envs) { + gb_fprintf(&f, "%.*s\n", LIT(env)); + } } -try_copy_executable:; - return try_copy_executable_from_cache(); + + return false; } diff --git a/src/main.cpp b/src/main.cpp index 49c34014b..f2312f248 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -3271,12 +3271,19 @@ int main(int arg_count, char const **arg_ptr) { print_all_errors(); } - MAIN_TIME_SECTION("type check"); checker->parser = parser; init_checker(checker); - defer (destroy_checker(checker)); + defer (destroy_checker(checker)); // this is here because of a `goto` + if (build_context.cached && parser->total_seen_load_directive_count.load() == 0) { + MAIN_TIME_SECTION("check cached build (pre-semantic check)"); + if (try_cached_build(checker, args)) { + goto end_of_code_gen; + } + } + + MAIN_TIME_SECTION("type check"); check_parsed_files(checker); check_defines(&build_context, checker); if (any_errors()) { @@ -3331,7 +3338,7 @@ int main(int arg_count, char const **arg_ptr) { if (build_context.cached) { MAIN_TIME_SECTION("check cached build"); - if (try_cached_build(checker)) { + if (try_cached_build(checker, args)) { goto end_of_code_gen; } } diff --git a/src/parser.cpp b/src/parser.cpp index 548e46cbe..eb012e980 100644 --- a/src/parser.cpp +++ b/src/parser.cpp @@ -787,6 +787,9 @@ gb_internal Ast *ast_basic_directive(AstFile *f, Token token, Token name) { Ast *result = alloc_ast_node(f, Ast_BasicDirective); result->BasicDirective.token = token; result->BasicDirective.name = name; + if (string_starts_with(name.string, str_lit("load"))) { + f->seen_load_directive_count++; + } return result; } @@ -6576,6 +6579,13 @@ gb_internal ParseFileError parse_packages(Parser *p, String init_filename) { } } } + + for (AstPackage *pkg : p->packages) { + for (AstFile *file : pkg->files) { + p->total_seen_load_directive_count += file->seen_load_directive_count; + } + } + return ParseFile_None; } diff --git a/src/parser.hpp b/src/parser.hpp index 521fd7a37..86b3393af 100644 --- a/src/parser.hpp +++ b/src/parser.hpp @@ -140,6 +140,8 @@ struct AstFile { // This is effectively a queue but does not require any multi-threading capabilities Array delayed_decls_queues[AstDelayQueue_COUNT]; + std::atomic seen_load_directive_count; + #define PARSER_MAX_FIX_COUNT 6 isize fix_count; TokenPos fix_prev_pos; @@ -210,6 +212,8 @@ struct Parser { std::atomic total_token_count; std::atomic total_line_count; + std::atomic total_seen_load_directive_count; + // TODO(bill): What should this mutex be per? // * Parser // * Package From 952fb998e6fca880aa579754da5969295ccd9344 Mon Sep 17 00:00:00 2001 From: gingerBill Date: Tue, 9 Jul 2024 14:20:55 +0100 Subject: [PATCH 06/12] Check for `CURR_DATE_TIME` --- src/cached.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/cached.cpp b/src/cached.cpp index da72e9989..4b6d82d45 100644 --- a/src/cached.cpp +++ b/src/cached.cpp @@ -237,6 +237,9 @@ bool try_cached_build(Checker *c, Array const &args) { String16 wstr = make_string16_c(curr_string); curr_string += wstr.len+1; String str = string16_to_string(temporary_allocator(), wstr); + if (string_starts_with(str, str_lit("CURR_DATE_TIME="))) { + continue; + } array_add(&envs, str); } #endif From 330d0e7a2a41201eeb0bd844057f46ef42a7e404 Mon Sep 17 00:00:00 2001 From: gingerBill Date: Tue, 9 Jul 2024 14:30:38 +0100 Subject: [PATCH 07/12] Add `debugf` calls --- src/cached.cpp | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/src/cached.cpp b/src/cached.cpp index 4b6d82d45..59c68c6ee 100644 --- a/src/cached.cpp +++ b/src/cached.cpp @@ -163,6 +163,8 @@ bool try_copy_executable_cache_internal(bool to_cache) { bool try_copy_executable_to_cache(void) { + debugf("Cache: try_copy_executable_to_cache\n"); + if (try_copy_executable_cache_internal(true)) { build_context.build_cache_data.copy_already_done = true; return true; @@ -171,6 +173,8 @@ bool try_copy_executable_to_cache(void) { } bool try_copy_executable_from_cache(void) { + debugf("Cache: try_copy_executable_from_cache\n"); + if (try_copy_executable_cache_internal(false)) { build_context.build_cache_data.copy_already_done = true; return true; @@ -220,10 +224,10 @@ bool try_cached_build(Checker *c, Array const &args) { String args_path = concatenate3_strings(permanent_allocator(), cache_dir, str_lit("/"), str_lit("args.manifest")); String env_path = concatenate3_strings(permanent_allocator(), cache_dir, str_lit("/"), str_lit("env.manifest")); - build_context.build_cache_data.cache_dir = cache_dir; + build_context.build_cache_data.cache_dir = cache_dir; build_context.build_cache_data.files_path = files_path; - build_context.build_cache_data.args_path = args_path; - build_context.build_cache_data.env_path = env_path; + build_context.build_cache_data.args_path = args_path; + build_context.build_cache_data.env_path = env_path; auto envs = array_make(heap_allocator()); defer (array_free(&envs)); @@ -384,6 +388,8 @@ write_cache:; char const *path_c = alloc_cstring(temporary_allocator(), files_path); gb_file_remove(path_c); + debugf("Cache: updating %s\n", path_c); + gbFile f = {}; defer (gb_file_close(&f)); gb_file_open_mode(&f, gbFileMode_Write, path_c); @@ -397,6 +403,8 @@ write_cache:; char const *path_c = alloc_cstring(temporary_allocator(), args_path); gb_file_remove(path_c); + debugf("Cache: updating %s\n", path_c); + gbFile f = {}; defer (gb_file_close(&f)); gb_file_open_mode(&f, gbFileMode_Write, path_c); @@ -410,6 +418,8 @@ write_cache:; char const *path_c = alloc_cstring(temporary_allocator(), env_path); gb_file_remove(path_c); + debugf("Cache: updating %s\n", path_c); + gbFile f = {}; defer (gb_file_close(&f)); gb_file_open_mode(&f, gbFileMode_Write, path_c); From 14dc3598b4ef4b32e4fd1bcbf3f6f3ce3e40a9cf Mon Sep 17 00:00:00 2001 From: gingerBill Date: Tue, 9 Jul 2024 14:33:01 +0100 Subject: [PATCH 08/12] Add `gb_internal` to procedures --- src/cached.cpp | 23 +++++++++++------------ src/main.cpp | 2 +- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/src/cached.cpp b/src/cached.cpp index 59c68c6ee..0cf9dcf5f 100644 --- a/src/cached.cpp +++ b/src/cached.cpp @@ -4,7 +4,7 @@ gb_internal GB_COMPARE_PROC(string_cmp) { return string_compare(x, y); } -bool recursively_delete_directory(wchar_t *wpath_c) { +gb_internal bool recursively_delete_directory(wchar_t *wpath_c) { #if defined(GB_SYSTEM_WINDOWS) auto const is_dots_w = [](wchar_t const *str) -> bool { if (!str) { @@ -70,7 +70,7 @@ bool recursively_delete_directory(wchar_t *wpath_c) { #endif } -bool recursively_delete_directory(String const &path) { +gb_internal bool recursively_delete_directory(String const &path) { #if defined(GB_SYSTEM_WINDOWS) String16 wpath = string_to_string16(permanent_allocator(), path); wchar_t *wpath_c = alloc_wstring(permanent_allocator(), wpath); @@ -80,13 +80,12 @@ bool recursively_delete_directory(String const &path) { #endif } -int try_clear_cache(void) { - bool ok = recursively_delete_directory(str_lit(".odin-cache")); - return ok ? 0 : 1; +gb_internal bool try_clear_cache(void) { + return recursively_delete_directory(str_lit(".odin-cache")); } -u64 crc64_with_seed(void const *data, isize len, u64 seed) { +gb_internal u64 crc64_with_seed(void const *data, isize len, u64 seed) { isize remaining; u64 result = ~seed; u8 const *c = cast(u8 const *)data; @@ -96,7 +95,7 @@ u64 crc64_with_seed(void const *data, isize len, u64 seed) { return ~result; } -bool check_if_exists_file_otherwise_create(String const &str) { +gb_internal bool check_if_exists_file_otherwise_create(String const &str) { char const *str_c = alloc_cstring(permanent_allocator(), str); if (!gb_file_exists(str_c)) { gbFile f = {}; @@ -108,7 +107,7 @@ bool check_if_exists_file_otherwise_create(String const &str) { } -bool check_if_exists_directory_otherwise_create(String const &str) { +gb_internal bool check_if_exists_directory_otherwise_create(String const &str) { #if defined(GB_SYSTEM_WINDOWS) String16 wstr = string_to_string16(permanent_allocator(), str); wchar_t *wstr_c = alloc_wstring(permanent_allocator(), wstr); @@ -121,7 +120,7 @@ bool check_if_exists_directory_otherwise_create(String const &str) { return false; #endif } -bool try_copy_executable_cache_internal(bool to_cache) { +gb_internal bool try_copy_executable_cache_internal(bool to_cache) { String exe_name = path_to_string(heap_allocator(), build_context.build_paths[BuildPath_Output]); defer (gb_free(heap_allocator(), exe_name.text)); @@ -162,7 +161,7 @@ bool try_copy_executable_cache_internal(bool to_cache) { -bool try_copy_executable_to_cache(void) { +gb_internal bool try_copy_executable_to_cache(void) { debugf("Cache: try_copy_executable_to_cache\n"); if (try_copy_executable_cache_internal(true)) { @@ -172,7 +171,7 @@ bool try_copy_executable_to_cache(void) { return false; } -bool try_copy_executable_from_cache(void) { +gb_internal bool try_copy_executable_from_cache(void) { debugf("Cache: try_copy_executable_from_cache\n"); if (try_copy_executable_cache_internal(false)) { @@ -186,7 +185,7 @@ bool try_copy_executable_from_cache(void) { // returns false if different, true if it is the same -bool try_cached_build(Checker *c, Array const &args) { +gb_internal bool try_cached_build(Checker *c, Array const &args) { TEMPORARY_ALLOCATOR_GUARD(); Parser *p = c->parser; diff --git a/src/main.cpp b/src/main.cpp index f2312f248..7763ccd23 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -3058,7 +3058,7 @@ int main(int arg_count, char const **arg_ptr) { gb_printf("%.*s", LIT(odin_root_dir())); return 0; } else if (command == "clear-cache") { - return try_clear_cache(); + return try_clear_cache() ? 0 : 1; } else { String argv1 = {}; if (args.count > 1) { From 666703f4301353a8bd435ae88fb698a350ac8e00 Mon Sep 17 00:00:00 2001 From: gingerBill Date: Tue, 9 Jul 2024 14:47:22 +0100 Subject: [PATCH 09/12] Mock out \*nix stuff for cached.cpp --- src/cached.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/cached.cpp b/src/cached.cpp index 0cf9dcf5f..553ac039f 100644 --- a/src/cached.cpp +++ b/src/cached.cpp @@ -115,7 +115,8 @@ gb_internal bool check_if_exists_directory_otherwise_create(String const &str) { #else char const *str_c = alloc_cstring(permanent_allocator(), str); if (!gb_file_exists(str_c)) { - return false; + int status = mkdir(str_c, S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH); + return status == 0; } return false; #endif @@ -245,6 +246,11 @@ gb_internal bool try_cached_build(Checker *c, Array const &args) { } array_add(&envs, str); } + #else + char **curr_env = environ; + while (curr_env && *curr_env) { + array_add(&envs, make_string_c(*curr_env++)); + } #endif } array_sort(envs, string_cmp); From 4c1754b1dc3e13b0c1bb66c3859c4f7b2012b8cd Mon Sep 17 00:00:00 2001 From: gingerBill Date: Tue, 9 Jul 2024 14:56:03 +0100 Subject: [PATCH 10/12] `environ` is only for Linux --- src/cached.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/cached.cpp b/src/cached.cpp index 553ac039f..2e5f838ef 100644 --- a/src/cached.cpp +++ b/src/cached.cpp @@ -246,11 +246,13 @@ gb_internal bool try_cached_build(Checker *c, Array const &args) { } array_add(&envs, str); } - #else + #elif defined(GB_SYSTEM_LINUX) char **curr_env = environ; while (curr_env && *curr_env) { array_add(&envs, make_string_c(*curr_env++)); } + #else + // TODO(bill): environment variables on all other platforms #endif } array_sort(envs, string_cmp); From d7016422939b3c4f0eeec4fb45796667655489cf Mon Sep 17 00:00:00 2001 From: gingerBill Date: Tue, 9 Jul 2024 15:15:23 +0100 Subject: [PATCH 11/12] Check for `PROMPT` --- src/cached.cpp | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/src/cached.cpp b/src/cached.cpp index 2e5f838ef..37eac6924 100644 --- a/src/cached.cpp +++ b/src/cached.cpp @@ -183,7 +183,9 @@ gb_internal bool try_copy_executable_from_cache(void) { } - +#if !defined(GB_SYSTEM_WINDOWS) +extern char **environ; +#endif // returns false if different, true if it is the same gb_internal bool try_cached_build(Checker *c, Array const &args) { @@ -244,15 +246,20 @@ gb_internal bool try_cached_build(Checker *c, Array const &args) { if (string_starts_with(str, str_lit("CURR_DATE_TIME="))) { continue; } + if (string_starts_with(str, str_lit("PROMPT="))) { + continue; + } array_add(&envs, str); } - #elif defined(GB_SYSTEM_LINUX) + #else char **curr_env = environ; while (curr_env && *curr_env) { - array_add(&envs, make_string_c(*curr_env++)); + String str = make_string_c(*curr_env++); + if (string_starts_with(str, str_lit("PROMPT="))) { + continue; + } + array_add(&envs, str); } - #else - // TODO(bill): environment variables on all other platforms #endif } array_sort(envs, string_cmp); From 5627af582a7882c640f0f4c5b285bafb6377fce1 Mon Sep 17 00:00:00 2001 From: gingerBill Date: Tue, 9 Jul 2024 15:18:15 +0100 Subject: [PATCH 12/12] Add `RPROMPT` to blacklist --- src/cached.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/cached.cpp b/src/cached.cpp index 37eac6924..02cb1ae96 100644 --- a/src/cached.cpp +++ b/src/cached.cpp @@ -246,9 +246,6 @@ gb_internal bool try_cached_build(Checker *c, Array const &args) { if (string_starts_with(str, str_lit("CURR_DATE_TIME="))) { continue; } - if (string_starts_with(str, str_lit("PROMPT="))) { - continue; - } array_add(&envs, str); } #else @@ -258,6 +255,9 @@ gb_internal bool try_cached_build(Checker *c, Array const &args) { if (string_starts_with(str, str_lit("PROMPT="))) { continue; } + if (string_starts_with(str, str_lit("RPROMPT="))) { + continue; + } array_add(&envs, str); } #endif