diff --git a/args.gn b/args.gn index 175e749c..db8d18de 100644 --- a/args.gn +++ b/args.gn @@ -89,4 +89,4 @@ enable_rust = true enable_all_rust_features = true init_stack_vars_zero = true chrome_pgo_phase = 2 -pgo_data_path = "/home/alex/chromium/src/chrome/build/pgo_profiles/chrome-linux-5938-1694538110-0c18cf4b1d955dedaa35a61d3e46b14386cd9e41.profdata" +pgo_data_path = "/home/alex/chromium/src/chrome/build/pgo_profiles/chrome-linux-6045-1698773863-4971413bb000a6c36ce91149e324af631a09cee8.profdata" diff --git a/arm/android/android_ARM32_args.gn b/arm/android/android_ARM32_args.gn index 601b1a35..b3b7b086 100644 --- a/arm/android/android_ARM32_args.gn +++ b/arm/android/android_ARM32_args.gn @@ -98,4 +98,5 @@ enable_platform_dts_audio = true enable_mse_mpeg2ts_stream_parser = true use_thin_lto = true thin_lto_enable_optimizations = true -chrome_pgo_phase = 0 +chrome_pgo_phase = 2 +pgo_data_path = "/home/alex/chromium/src/chrome/build/pgo_profiles/chrome-android32-main-1696269474-d9cc430a376fd26e31c2c2b532aa055bbc985f6f.profdata" diff --git a/arm/android/android_ARM64_args.gn b/arm/android/android_ARM64_args.gn index 1fe57429..feba3b5c 100644 --- a/arm/android/android_ARM64_args.gn +++ b/arm/android/android_ARM64_args.gn @@ -98,4 +98,5 @@ enable_platform_dts_audio = true enable_mse_mpeg2ts_stream_parser = true use_thin_lto = true thin_lto_enable_optimizations = true -chrome_pgo_phase = 0 +chrome_pgo_phase = 2 +pgo_data_path = "/home/alex/chromium/src/chrome/build/pgo_profiles/chrome-android64-main-1696269474-c48c320c9092df29383f4fdbb89349e9e30169fe.profdata" diff --git a/arm/raspi/raspi_args.gn b/arm/raspi/raspi_args.gn index d8079535..60739628 100644 --- a/arm/raspi/raspi_args.gn +++ b/arm/raspi/raspi_args.gn @@ -94,4 +94,4 @@ use_thin_lto = true thin_lto_enable_optimizations = true enable_rust = true chrome_pgo_phase = 0 -#pgo_data_path = "/home/alex/chromium/src/chrome/build/pgo_profiles/chrome-linux-5938-1694538110-0c18cf4b1d955dedaa35a61d3e46b14386cd9e41.profdata" +#pgo_data_path = "/home/alex/chromium/src/chrome/build/pgo_profiles/chrome-linux-6045-1698773863-4971413bb000a6c36ce91149e324af631a09cee8.profdata" diff --git a/arm/win_ARM_args.gn b/arm/win_ARM_args.gn index c90bcbc1..0b6e25c7 100644 --- a/arm/win_ARM_args.gn +++ b/arm/win_ARM_args.gn @@ -83,4 +83,5 @@ enable_mse_mpeg2ts_stream_parser = true use_text_section_splitting = true use_thin_lto = true thin_lto_enable_optimizations = true -chrome_pgo_phase = 0 +chrome_pgo_phase = 2 +pgo_data_path = "/home/alex/chromium/src/chrome/build/pgo_profiles/chrome-win-arm64-main-1696247976-9992948f6edc579f186906d21f9ff3940ff99fbe.profdata" diff --git a/docs/REBASING.md b/docs/REBASING.md index 505446c3..c0c391ff 100644 --- a/docs/REBASING.md +++ b/docs/REBASING.md @@ -1,4 +1,15 @@ # Rebasing Thorium My primary job as the founder and main dev of Thorium is rebasing Thorium to match newer upstream Chromium versions. -This is note a trivial task +This is not a trivial task. This document describes my personal workflow for how I rebase the repo. If anyone +notices something I could do better or faster, make a PR and edit this file along with an explanation of what should be done differently. + +Rebasing would be even more of a chore if it wasn't thanks to the [Chromium source code search](https://source.chromium.org/). +We have a [bookmarks file](https://github.com/Alex313031/thorium/blob/main/infra/THORIUM_DEV_BOOKMARKS.html) located in __//infra__ +which has a (not super well organized) bookmark list of all the files thorium uses. + +The bookmarks file can be imported at chrome://bookmarks. Each file will be at the current Thorium revision, and it will also show +git history. If only one or two small commits were made to a file since the last version, I usually just look at the diff and manually +edit files as needed. +For more in depth rebasing, I find [Meld](https://meldmerge.org/) invaluable. The IDE I use is [Geany](https://www.geany.org/). +Both are available for Linux, Windows, and MacOS. diff --git a/other/AVX2/linux_AVX2_args.gn b/other/AVX2/linux_AVX2_args.gn new file mode 100644 index 00000000..db8d18de --- /dev/null +++ b/other/AVX2/linux_AVX2_args.gn @@ -0,0 +1,92 @@ +google_api_key = "" +google_default_client_id = "" +google_default_client_secret = "" +# is_chancie_wancie_build = true +# clang_base_path = "/usr/lib/llvm-17" +# clang_version = "17" +# use_polly = true +target_os = "linux" +target_cpu = "x64" +enable_linux_installer = true +enable_distro_version_check = false +is_official_build = true +is_debug = false +enable_stripping = true +dcheck_always_on = false +exclude_unwind_tables = true +# enable_debugallocation = false +enable_iterator_debugging = false +disable_fieldtrial_testing_config = true +enable_reporting = false +enable_resource_allowlist_generation = false +enable_profiling = false +is_component_build = false +symbol_level = 0 +enable_nacl = false +optimize_webui = true +enable_webui_tab_strip = true +is_clang = true +treat_warnings_as_errors = false +# llvm_force_head_revision = true +use_lld = true +use_icf = true +is_cfi = true +v8_symbol_level = 0 +v8_enable_fast_torque = true +v8_enable_builtins_optimization = true +v8_enable_maglev = true +v8_enable_turbofan = true +v8_enable_wasm_simd256_revec = true +use_v8_context_snapshot = true +blink_symbol_level = 0 +enable_precompiled_headers = false +media_use_ffmpeg = true +media_use_libvpx = true +# enable_hls_sample_aes = true +enable_hls_demuxer = true +enable_ink = false +enable_discovery = true +enable_cros_media_app = false +proprietary_codecs = true +ffmpeg_branding = "Chrome" +# Set to false for Polly build +clang_use_chrome_plugins = true +enable_ffmpeg_video_decoders = true +is_component_ffmpeg = true +use_webaudio_ffmpeg = false +use_webaudio_pffft = true +# enable_av1_decoder = true +# enable_dav1d_decoder = true +use_vaapi = true +enable_library_cdms = true +enable_widevine = true +bundle_widevine_cdm = false +# enable_widevine_cdm_component = true +enable_cdm_host_verification = false +ignore_missing_widevine_signing_cert = true +enable_media_drm_storage = true +# enable_media_overlay = true +enable_hangout_services_extension = true +rtc_use_h264 = true +rtc_include_ilbc = true +# rtc_build_with_neon = true +rtc_build_examples = false +rtc_enable_avx2 = true +enable_vr = true +# use_vr_assets_component = true +enable_platform_hevc = true +enable_hevc_parser_and_hw_decoder = true +enable_platform_ac3_eac3_audio = true +enable_platform_dolby_vision = true +enable_platform_encrypted_dolby_vision = true +enable_platform_mpeg_h_audio = true +enable_platform_dts_audio = true +enable_mse_mpeg2ts_stream_parser = true +use_text_section_splitting = true +use_thin_lto = true +thin_lto_enable_optimizations = true +enable_rust = true +enable_all_rust_features = true +init_stack_vars_zero = true +chrome_pgo_phase = 2 +pgo_data_path = "/home/alex/chromium/src/chrome/build/pgo_profiles/chrome-linux-6045-1698773863-4971413bb000a6c36ce91149e324af631a09cee8.profdata" diff --git a/other/AVX2/win_AVX2_args.gn b/other/AVX2/win_AVX2_args.gn index d8ce834a..e631facb 100644 --- a/other/AVX2/win_AVX2_args.gn +++ b/other/AVX2/win_AVX2_args.gn @@ -87,4 +87,4 @@ use_thin_lto = true thin_lto_enable_optimizations = true enable_rust = true chrome_pgo_phase = 2 -pgo_data_path = "/home/alex/chromium/src/chrome/build/pgo_profiles/chrome-win64-5938-1694538110-800e283176041fc5005eddef3c7b87862da7319f.profdata" +pgo_data_path = "/home/alex/chromium/src/chrome/build/pgo_profiles/chrome-win64-6045-1698773863-4fe6c3c95e5c03790332099ad83029869e492dda.profdata" diff --git a/other/Mac/mac_ARM_args.gn b/other/Mac/mac_ARM_args.gn index c8ce8703..17f8c977 100644 --- a/other/Mac/mac_ARM_args.gn +++ b/other/Mac/mac_ARM_args.gn @@ -87,4 +87,4 @@ use_text_section_splitting = true use_thin_lto = true thin_lto_enable_optimizations = true chrome_pgo_phase = 2 -pgo_data_path = "/Users/midzer/chromium/src/chrome/build/pgo_profiles/chrome-mac-arm-main-1687283862-4a8e9e81d303429f3e96b1c992807345a075441d.profdata" +pgo_data_path = "/Users/midzer/chromium/src/chrome/build/pgo_profiles/chrome-mac-arm-main-1696262306-aa817679d137e2e66b22994f417ba32dc413dc8a.profdata" diff --git a/other/Mac/mac_args.gn b/other/Mac/mac_args.gn index 49d5ad62..11fac3c4 100644 --- a/other/Mac/mac_args.gn +++ b/other/Mac/mac_args.gn @@ -80,4 +80,4 @@ use_text_section_splitting = true use_thin_lto = true thin_lto_enable_optimizations = true chrome_pgo_phase = 2 -pgo_data_path = "/Users/midzer/chromium/src/chrome/build/pgo_profiles/chrome-mac-5845-1692121706-bfe7ddfabb5d789a18a8cee5847d4c02e8a1804b.profdata" +pgo_data_path = "/Users/midzer/chromium/src/chrome/build/pgo_profiles/chrome-mac-6045-1698773863-0800b37557311f53edc195a329eb269d9975f857.profdata" diff --git a/other/SSE3/args_SSE3.gn b/other/SSE3/args_SSE3.gn index 07db86a6..2a04e287 100644 --- a/other/SSE3/args_SSE3.gn +++ b/other/SSE3/args_SSE3.gn @@ -88,4 +88,4 @@ enable_rust = true enable_all_rust_features = true init_stack_vars_zero = true chrome_pgo_phase = 2 -pgo_data_path = "/home/alex/chromium/src/chrome/build/pgo_profiles/chrome-linux-5938-1694538110-0c18cf4b1d955dedaa35a61d3e46b14386cd9e41.profdata" +pgo_data_path = "/home/alex/chromium/src/chrome/build/pgo_profiles/chrome-linux-6045-1698773863-4971413bb000a6c36ce91149e324af631a09cee8.profdata" diff --git a/other/SSE3/win_SSE3_args.gn b/other/SSE3/win_SSE3_args.gn index 2488b3bc..75accbd0 100644 --- a/other/SSE3/win_SSE3_args.gn +++ b/other/SSE3/win_SSE3_args.gn @@ -87,4 +87,4 @@ use_thin_lto = true thin_lto_enable_optimizations = true enable_rust = true chrome_pgo_phase = 2 -pgo_data_path = "/home/alex/chromium/src/chrome/build/pgo_profiles/chrome-win64-5938-1694538110-800e283176041fc5005eddef3c7b87862da7319f.profdata" +pgo_data_path = "/home/alex/chromium/src/chrome/build/pgo_profiles/chrome-win64-6045-1698773863-4fe6c3c95e5c03790332099ad83029869e492dda.profdata" diff --git a/win_args.gn b/win_args.gn index 650be387..c9d54e25 100644 --- a/win_args.gn +++ b/win_args.gn @@ -87,4 +87,4 @@ use_thin_lto = true thin_lto_enable_optimizations = true enable_rust = true chrome_pgo_phase = 2 -pgo_data_path = "/home/alex/chromium/src/chrome/build/pgo_profiles/chrome-win64-5938-1694538110-800e283176041fc5005eddef3c7b87862da7319f.profdata" +pgo_data_path = "/home/alex/chromium/src/chrome/build/pgo_profiles/chrome-win64-6045-1698773863-4fe6c3c95e5c03790332099ad83029869e492dda.profdata"