diff --git a/mozconfigs/mozconfig b/mozconfigs/mozconfig index 5d6437c..1c8ade2 100644 --- a/mozconfigs/mozconfig +++ b/mozconfigs/mozconfig @@ -22,11 +22,13 @@ ac_add_options --enable-strip ac_add_options --enable-install-strip ac_add_options --enable-clang-plugin ac_add_options --enable-lto=cross +ac_add_options --enable-profile-use=cross ac_add_options --enable-wasm-avx ac_add_options --enable-optimize="-O3 -msse3 -mssse3 -msse4.1 -msse4.2 -mavx -maes" ac_add_options --enable-rust-simd ac_add_options --enable-hardening #ac_add_options --disable-trace-logging +export MOZILLA_OFFICIAL=1 mk_add_options MOZ_OPTIMIZE=1 MOZ_OPTIMIZE=1 export MOZ_OPTIMIZE=1 @@ -63,6 +65,7 @@ MOZ_REQUIRE_SIGNING= export MOZ_CRASHREPORTER=0 export MOZ_DATA_REPORTING=0 export MOZ_REQUIRE_SIGNING= +export MOZ_TELEMETRY_REPORTING= # Branding ac_add_options --with-app-name=mercury @@ -92,6 +95,12 @@ ac_add_options MOZ_LTO=cross export MOZ_PGO=1 ac_add_options MOZ_PGO=1 +if test "$GEN_PGO"; then + ac_add_options --enable-profile-generate +elif test "$USE_PGO"; then + ac_add_options --enable-profile-use +fi + # Compiler, Linker, and Rust flags export CFLAGS="-O3 -msse3 -mssse3 -msse4.1 -msse4.2 -mavx -maes" export CPPFLAGS="-O3 -msse3 -mssse3 -msse4.1 -msse4.2 -mavx -maes" diff --git a/mozconfigs/mozconfig-arm64 b/mozconfigs/mozconfig-arm64 index ea6c64f..7f3f59f 100644 --- a/mozconfigs/mozconfig-arm64 +++ b/mozconfigs/mozconfig-arm64 @@ -22,10 +22,12 @@ ac_add_options --enable-strip ac_add_options --enable-install-strip ac_add_options --enable-clang-plugin ac_add_options --enable-lto=cross +ac_add_options --enable-profile-use=cross ac_add_options --enable-optimize="-O3 -march=armv8-a+simd -mtune=cortex-a72" ac_add_options --enable-rust-simd ac_add_options --enable-hardening #ac_add_options --disable-trace-logging +export MOZILLA_OFFICIAL=1 mk_add_options MOZ_OPTIMIZE=1 MOZ_OPTIMIZE=1 export MOZ_OPTIMIZE=1 @@ -61,6 +63,7 @@ MOZ_REQUIRE_SIGNING= export MOZ_CRASHREPORTER=0 export MOZ_DATA_REPORTING=0 export MOZ_REQUIRE_SIGNING= +export MOZ_TELEMETRY_REPORTING= # Branding ac_add_options --with-app-name=mercury diff --git a/mozconfigs/mozconfig-avx2 b/mozconfigs/mozconfig-avx2 index 062ddef..553b092 100644 --- a/mozconfigs/mozconfig-avx2 +++ b/mozconfigs/mozconfig-avx2 @@ -22,12 +22,14 @@ ac_add_options --enable-strip ac_add_options --enable-install-strip ac_add_options --enable-clang-plugin ac_add_options --enable-lto=cross +ac_add_options --enable-profile-use=cross ac_add_options --enable-wasm-avx #ac_add_options --enable-avx2 ac_add_options --enable-optimize="-O3 -march=x86-64-v3" ac_add_options --enable-rust-simd ac_add_options --enable-hardening #ac_add_options --disable-trace-logging +export MOZILLA_OFFICIAL=1 mk_add_options MOZ_OPTIMIZE=1 MOZ_OPTIMIZE=1 export MOZ_OPTIMIZE=1 @@ -64,6 +66,7 @@ MOZ_REQUIRE_SIGNING= export MOZ_CRASHREPORTER=0 export MOZ_DATA_REPORTING=0 export MOZ_REQUIRE_SIGNING= +export MOZ_TELEMETRY_REPORTING= # Branding ac_add_options --with-app-name=mercury diff --git a/mozconfigs/mozconfig-debug b/mozconfigs/mozconfig-debug index ffbdead..9698e9c 100644 --- a/mozconfigs/mozconfig-debug +++ b/mozconfigs/mozconfig-debug @@ -51,6 +51,7 @@ MOZ_REQUIRE_SIGNING= export MOZ_CRASHREPORTER=0 export MOZ_DATA_REPORTING=0 export MOZ_REQUIRE_SIGNING= +export MOZ_TELEMETRY_REPORTING= # Branding ac_add_options --with-app-name=mercury diff --git a/mozconfigs/mozconfig-macos-arm64 b/mozconfigs/mozconfig-macos-arm64 index 616ebaf..d7adb66 100644 --- a/mozconfigs/mozconfig-macos-arm64 +++ b/mozconfigs/mozconfig-macos-arm64 @@ -25,6 +25,7 @@ ac_add_options --enable-optimize="-O3 -march=armv8.3-a+simd" ac_add_options --enable-rust-simd ac_add_options --enable-hardening #ac_add_options --disable-trace-logging +export MOZILLA_OFFICIAL=1 mk_add_options MOZ_OPTIMIZE=1 MOZ_OPTIMIZE=1 export MOZ_OPTIMIZE=1 @@ -58,6 +59,7 @@ MOZ_REQUIRE_SIGNING= export MOZ_CRASHREPORTER=0 export MOZ_DATA_REPORTING=0 export MOZ_REQUIRE_SIGNING= +export MOZ_TELEMETRY_REPORTING= # Branding ac_add_options --with-app-name=mercury diff --git a/mozconfigs/mozconfig-macos-arm64-cross b/mozconfigs/mozconfig-macos-arm64-cross index 06563fa..717bbd0 100644 --- a/mozconfigs/mozconfig-macos-arm64-cross +++ b/mozconfigs/mozconfig-macos-arm64-cross @@ -27,6 +27,7 @@ ac_add_options --enable-optimize="-O3 -march=armv8.3-a+simd" ac_add_options --enable-rust-simd ac_add_options --enable-hardening #ac_add_options --disable-trace-logging +export MOZILLA_OFFICIAL=1 mk_add_options MOZ_OPTIMIZE=1 MOZ_OPTIMIZE=1 export MOZ_OPTIMIZE=1 @@ -60,6 +61,7 @@ MOZ_REQUIRE_SIGNING= export MOZ_CRASHREPORTER=0 export MOZ_DATA_REPORTING=0 export MOZ_REQUIRE_SIGNING= +export MOZ_TELEMETRY_REPORTING= # Branding ac_add_options --with-app-name=mercury diff --git a/mozconfigs/mozconfig-macos-x64 b/mozconfigs/mozconfig-macos-x64 index 1805a65..a0ec70c 100644 --- a/mozconfigs/mozconfig-macos-x64 +++ b/mozconfigs/mozconfig-macos-x64 @@ -27,6 +27,7 @@ ac_add_options --enable-optimize="-O3 -march=x86-64-v3" ac_add_options --enable-rust-simd ac_add_options --enable-hardening #ac_add_options --disable-trace-logging +export MOZILLA_OFFICIAL=1 mk_add_options MOZ_OPTIMIZE=1 MOZ_OPTIMIZE=1 export MOZ_OPTIMIZE=1 @@ -60,6 +61,7 @@ MOZ_REQUIRE_SIGNING= export MOZ_CRASHREPORTER=0 export MOZ_DATA_REPORTING=0 export MOZ_REQUIRE_SIGNING= +export MOZ_TELEMETRY_REPORTING= # Branding ac_add_options --with-app-name=mercury diff --git a/mozconfigs/mozconfig-macos-x64-cross b/mozconfigs/mozconfig-macos-x64-cross index c8ff7d4..fa5116a 100644 --- a/mozconfigs/mozconfig-macos-x64-cross +++ b/mozconfigs/mozconfig-macos-x64-cross @@ -29,6 +29,7 @@ ac_add_options --enable-optimize="-O3 -march=x86-64-v3" ac_add_options --enable-rust-simd ac_add_options --enable-hardening #ac_add_options --disable-trace-logging +export MOZILLA_OFFICIAL=1 mk_add_options MOZ_OPTIMIZE=1 MOZ_OPTIMIZE=1 export MOZ_OPTIMIZE=1 @@ -62,6 +63,7 @@ MOZ_REQUIRE_SIGNING= export MOZ_CRASHREPORTER=0 export MOZ_DATA_REPORTING=0 export MOZ_REQUIRE_SIGNING= +export MOZ_TELEMETRY_REPORTING= # Branding ac_add_options --with-app-name=mercury diff --git a/mozconfigs/mozconfig-sse3 b/mozconfigs/mozconfig-sse3 index 951ce1b..122f586 100644 --- a/mozconfigs/mozconfig-sse3 +++ b/mozconfigs/mozconfig-sse3 @@ -22,11 +22,13 @@ ac_add_options --enable-strip ac_add_options --enable-install-strip ac_add_options --enable-clang-plugin ac_add_options --enable-lto=cross +ac_add_options --enable-profile-use=cross #ac_add_options --enable-wasm-avx ac_add_options --enable-optimize="-O3 -msse3" ac_add_options --enable-rust-simd ac_add_options --enable-hardening #ac_add_options --disable-trace-logging +export MOZILLA_OFFICIAL=1 mk_add_options MOZ_OPTIMIZE=1 MOZ_OPTIMIZE=1 export MOZ_OPTIMIZE=1 @@ -63,6 +65,7 @@ MOZ_REQUIRE_SIGNING= export MOZ_CRASHREPORTER=0 export MOZ_DATA_REPORTING=0 export MOZ_REQUIRE_SIGNING= +export MOZ_TELEMETRY_REPORTING= # Branding ac_add_options --with-app-name=mercury diff --git a/mozconfigs/mozconfig-sse4 b/mozconfigs/mozconfig-sse4 index 7e38fad..95a7e5e 100644 --- a/mozconfigs/mozconfig-sse4 +++ b/mozconfigs/mozconfig-sse4 @@ -22,11 +22,13 @@ ac_add_options --enable-strip ac_add_options --enable-install-strip ac_add_options --enable-clang-plugin ac_add_options --enable-lto=cross +ac_add_options --enable-profile-use=cross #ac_add_options --enable-wasm-avx ac_add_options --enable-optimize="-O3 -msse3 -mssse3 -msse4.1" ac_add_options --enable-rust-simd ac_add_options --enable-hardening #ac_add_options --disable-trace-logging +export MOZILLA_OFFICIAL=1 mk_add_options MOZ_OPTIMIZE=1 MOZ_OPTIMIZE=1 export MOZ_OPTIMIZE=1 @@ -63,6 +65,7 @@ MOZ_REQUIRE_SIGNING= export MOZ_CRASHREPORTER=0 export MOZ_DATA_REPORTING=0 export MOZ_REQUIRE_SIGNING= +export MOZ_TELEMETRY_REPORTING= # Branding ac_add_options --with-app-name=mercury diff --git a/mozconfigs/mozconfig-win b/mozconfigs/mozconfig-win index c28f999..6a16499 100644 --- a/mozconfigs/mozconfig-win +++ b/mozconfigs/mozconfig-win @@ -26,11 +26,13 @@ ac_add_options --enable-strip ac_add_options --enable-install-strip ac_add_options --enable-clang-plugin ac_add_options --enable-lto=cross +ac_add_options --enable-profile-use=cross ac_add_options --enable-wasm-avx ac_add_options --enable-optimize="-O2 -O3 -msse3 -mssse3 -msse4.1 -msse4.2 -mavx -maes -Xclang -O3" ac_add_options --enable-rust-simd ac_add_options --enable-hardening #ac_add_options --disable-trace-logging +export MOZILLA_OFFICIAL=1 mk_add_options MOZ_OPTIMIZE=1 MOZ_OPTIMIZE=1 export MOZ_OPTIMIZE=1 @@ -67,6 +69,7 @@ MOZ_REQUIRE_SIGNING= export MOZ_CRASHREPORTER=0 export MOZ_DATA_REPORTING=0 export MOZ_REQUIRE_SIGNING= +export MOZ_TELEMETRY_REPORTING= # Installer export WIN32_REDIST_DIR="/c/Program Files/Microsoft Visual Studio/2022/Community/VC/Redist/MSVC/14.38.33130/x64/Microsoft.VC143.CRT" @@ -104,6 +107,6 @@ export CFLAGS="-O3 -msse3 -mssse3 -msse4.1 -msse4.2 -mavx -maes /clang:-O3 /arch export CPPFLAGS="-O3 -msse3 -mssse3 -msse4.1 -msse4.2 -mavx -maes /clang:-O3 /arch:AVX" export CXXFLAGS="-O3 -msse3 -mssse3 -msse4.1 -msse4.2 -mavx -maes /clang:-O3 /arch:AVX" export LDFLAGS="-Wl,-O3 -msse3 -mssse3 -msse4.1 -msse4.2 -mavx -maes" -#export MOZ_LTO_LDFLAGS="-mllvm:-polly" +POLLY="-mllvm -polly -mllvm -polly-2nd-level-tiling -mllvm -polly-loopfusion-greedy -mllvm -polly-pattern-matching-based-opts -mllvm -polly-position=before-vectorizer -mllvm -polly-vectorizer=stripmine" export RUSTFLAGS="-C target-feature=+avx" export VERBOSE=1 diff --git a/mozconfigs/mozconfig-win-avx2 b/mozconfigs/mozconfig-win-avx2 index 75b6358..a6fdece 100644 --- a/mozconfigs/mozconfig-win-avx2 +++ b/mozconfigs/mozconfig-win-avx2 @@ -26,11 +26,13 @@ ac_add_options --enable-strip ac_add_options --enable-install-strip ac_add_options --enable-clang-plugin ac_add_options --enable-lto=cross +ac_add_options --enable-profile-use=cross ac_add_options --enable-wasm-avx ac_add_options --enable-optimize="-O2 -O3 -march=x86-64-v3 -Xclang -O3" ac_add_options --enable-rust-simd ac_add_options --enable-hardening #ac_add_options --disable-trace-logging +export MOZILLA_OFFICIAL=1 mk_add_options MOZ_OPTIMIZE=1 MOZ_OPTIMIZE=1 export MOZ_OPTIMIZE=1 @@ -67,6 +69,7 @@ MOZ_REQUIRE_SIGNING= export MOZ_CRASHREPORTER=0 export MOZ_DATA_REPORTING=0 export MOZ_REQUIRE_SIGNING= +export MOZ_TELEMETRY_REPORTING= # Installer export WIN32_REDIST_DIR="/c/Program Files/Microsoft Visual Studio/2022/Community/VC/Redist/MSVC/14.38.33130/x64/Microsoft.VC143.CRT" @@ -104,6 +107,6 @@ export CFLAGS="-O3 -march=x86-64-v3 /clang:-O3 /clang:-ffp-contract=fast /arch:A export CPPFLAGS="-O3 -march=x86-64-v3 /clang:-O3 /clang:-ffp-contract=fast /arch:AVX2" export CXXFLAGS="-O3 -march=x86-64-v3 /clang:-O3 /clang:-ffp-contract=fast /arch:AVX2" export LDFLAGS="-Wl,-O3 -march=x86-64-v3" -#export MOZ_LTO_LDFLAGS="-mllvm:-polly" +POLLY="-mllvm -polly -mllvm -polly-2nd-level-tiling -mllvm -polly-loopfusion-greedy -mllvm -polly-pattern-matching-based-opts -mllvm -polly-position=before-vectorizer -mllvm -polly-vectorizer=stripmine" export RUSTFLAGS="-C target-feature=+avx2" export VERBOSE=1 diff --git a/mozconfigs/mozconfig-win-avx2-cross b/mozconfigs/mozconfig-win-avx2-cross index 0751016..8a21649 100644 --- a/mozconfigs/mozconfig-win-avx2-cross +++ b/mozconfigs/mozconfig-win-avx2-cross @@ -38,6 +38,7 @@ ac_add_options --enable-optimize="/O2 /clang:-O3 -march=x86-64-v3" ac_add_options --enable-rust-simd ac_add_options --enable-hardening #ac_add_options --disable-trace-logging +export MOZILLA_OFFICIAL=1 mk_add_options MOZ_OPTIMIZE=1 MOZ_OPTIMIZE=1 export MOZ_OPTIMIZE=1 @@ -74,6 +75,7 @@ MOZ_REQUIRE_SIGNING= export MOZ_CRASHREPORTER=0 export MOZ_DATA_REPORTING=0 export MOZ_REQUIRE_SIGNING= +export MOZ_TELEMETRY_REPORTING= # Branding ac_add_options --with-app-name=mercury diff --git a/mozconfigs/mozconfig-win-cross b/mozconfigs/mozconfig-win-cross index 99bb504..f125104 100644 --- a/mozconfigs/mozconfig-win-cross +++ b/mozconfigs/mozconfig-win-cross @@ -38,6 +38,7 @@ ac_add_options --enable-optimize="-mavx -maes /O2 /clang:-O3 /arch:AVX" ac_add_options --enable-rust-simd ac_add_options --enable-hardening #ac_add_options --disable-trace-logging +export MOZILLA_OFFICIAL=1 mk_add_options MOZ_OPTIMIZE=1 MOZ_OPTIMIZE=1 export MOZ_OPTIMIZE=1 @@ -74,6 +75,7 @@ MOZ_REQUIRE_SIGNING= export MOZ_CRASHREPORTER=0 export MOZ_DATA_REPORTING=0 export MOZ_REQUIRE_SIGNING= +export MOZ_TELEMETRY_REPORTING= # Branding ac_add_options --with-app-name=mercury diff --git a/mozconfigs/mozconfig-win-debug b/mozconfigs/mozconfig-win-debug index 47d7ff8..09be66e 100644 --- a/mozconfigs/mozconfig-win-debug +++ b/mozconfigs/mozconfig-win-debug @@ -56,6 +56,7 @@ MOZ_REQUIRE_SIGNING= export MOZ_CRASHREPORTER=0 export MOZ_DATA_REPORTING=0 export MOZ_REQUIRE_SIGNING= +export MOZ_TELEMETRY_REPORTING= # Installer export WIN32_REDIST_DIR="/c/Program Files/Microsoft Visual Studio/2022/Community/VC/Redist/MSVC/14.38.33130/x64/Microsoft.VC143.CRT" diff --git a/mozconfigs/mozconfig-win-sse3 b/mozconfigs/mozconfig-win-sse3 index 6f4b00c..810caeb 100644 --- a/mozconfigs/mozconfig-win-sse3 +++ b/mozconfigs/mozconfig-win-sse3 @@ -26,11 +26,13 @@ ac_add_options --enable-strip ac_add_options --enable-install-strip ac_add_options --enable-clang-plugin ac_add_options --enable-lto=cross +ac_add_options --enable-profile-use=cross #ac_add_options --enable-wasm-avx ac_add_options --enable-optimize="-O2 -O3 -msse3 -Xclang -O3" ac_add_options --enable-rust-simd ac_add_options --enable-hardening #ac_add_options --disable-trace-logging +export MOZILLA_OFFICIAL=1 mk_add_options MOZ_OPTIMIZE=1 MOZ_OPTIMIZE=1 export MOZ_OPTIMIZE=1 @@ -67,6 +69,7 @@ MOZ_REQUIRE_SIGNING= export MOZ_CRASHREPORTER=0 export MOZ_DATA_REPORTING=0 export MOZ_REQUIRE_SIGNING= +export MOZ_TELEMETRY_REPORTING= # Installer export WIN32_REDIST_DIR="/c/Program Files/Microsoft Visual Studio/2022/Community/VC/Redist/MSVC/14.38.33130/x64/Microsoft.VC143.CRT" @@ -104,6 +107,6 @@ export CFLAGS="-O3 -msse3 /clang:-O3" export CPPFLAGS="-O3 -msse3 /clang:-O3" export CXXFLAGS="-O3 -msse3 /clang:-O3" export LDFLAGS="-Wl,-O3 -msse3" -#export MOZ_LTO_LDFLAGS="-mllvm:-polly" +POLLY="-mllvm -polly -mllvm -polly-2nd-level-tiling -mllvm -polly-loopfusion-greedy -mllvm -polly-pattern-matching-based-opts -mllvm -polly-position=before-vectorizer -mllvm -polly-vectorizer=stripmine" export RUSTFLAGS="-C target-feature=+sse3" export VERBOSE=1 diff --git a/mozconfigs/mozconfig-win-sse4 b/mozconfigs/mozconfig-win-sse4 index 8e68b92..17a51cd 100644 --- a/mozconfigs/mozconfig-win-sse4 +++ b/mozconfigs/mozconfig-win-sse4 @@ -26,11 +26,13 @@ ac_add_options --enable-strip ac_add_options --enable-install-strip ac_add_options --enable-clang-plugin ac_add_options --enable-lto=cross +ac_add_options --enable-profile-use=cross #ac_add_options --enable-wasm-avx ac_add_options --enable-optimize="-O2 -O3 -msse3 -mssse3 -msse4.1 -Xclang -O3" ac_add_options --enable-rust-simd ac_add_options --enable-hardening #ac_add_options --disable-trace-logging +export MOZILLA_OFFICIAL=1 mk_add_options MOZ_OPTIMIZE=1 MOZ_OPTIMIZE=1 export MOZ_OPTIMIZE=1 @@ -67,6 +69,7 @@ MOZ_REQUIRE_SIGNING= export MOZ_CRASHREPORTER=0 export MOZ_DATA_REPORTING=0 export MOZ_REQUIRE_SIGNING= +export MOZ_TELEMETRY_REPORTING= # Installer export WIN32_REDIST_DIR="/c/Program Files/Microsoft Visual Studio/2022/Community/VC/Redist/MSVC/14.38.33130/x64/Microsoft.VC143.CRT" @@ -104,6 +107,6 @@ export CFLAGS="-O3 -msse3 -mssse3 -msse4.1 /clang:-O3" export CPPFLAGS="-O3 -msse3 -mssse3 -msse4.1 /clang:-O3" export CXXFLAGS="-O3 -msse3 -mssse3 -msse4.1 /clang:-O3" export LDFLAGS="-Wl,-O3 -msse3 -mssse3 -msse4.1" -#export MOZ_LTO_LDFLAGS="-mllvm:-polly" +POLLY="-mllvm -polly -mllvm -polly-2nd-level-tiling -mllvm -polly-loopfusion-greedy -mllvm -polly-pattern-matching-based-opts -mllvm -polly-position=before-vectorizer -mllvm -polly-vectorizer=stripmine" export RUSTFLAGS="-C target-feature=+sse4.1" export VERBOSE=1