try it without profiling

This commit is contained in:
ohfp 2020-03-29 15:37:35 +02:00
parent 1784ded7dd
commit 50e1776af1

View file

@ -55,50 +55,50 @@ rm -f mozconfig
# Do 3-tier PGO # Do 3-tier PGO
echo "Building instrumented browser..." echo "Building instrumented browser..."
if [[ $CARCH == 'aarch64' ]]; then # if [[ $CARCH == 'aarch64' ]]; then
#
# cat >.mozconfig ${CI_PROJECT_DIR}/mozconfig - <<END
# ac_add_options --enable-profile-generate
# END
#
# else
#
# cat >.mozconfig ${CI_PROJECT_DIR}/mozconfig - <<END
# # -fno-plt with cross-LTO causes obscure LLVM errors
# # LLVM ERROR: Function Import: link error
# # CFLAGS="${CFLAGS/-fno-plt/}"
# # CXXFLAGS="${CXXFLAGS/-fno-plt/}"
#
# ac_add_options --enable-profile-generate
# END
cat >.mozconfig ${CI_PROJECT_DIR}/mozconfig - <<END # fi
ac_add_options --enable-profile-generate
END
else
cat >.mozconfig ${CI_PROJECT_DIR}/mozconfig - <<END
# -fno-plt with cross-LTO causes obscure LLVM errors
# LLVM ERROR: Function Import: link error
# CFLAGS="${CFLAGS/-fno-plt/}"
# CXXFLAGS="${CXXFLAGS/-fno-plt/}"
ac_add_options --enable-profile-generate
END
fi
# Executes the actual build # Executes the actual build
printf "\nBuilding LibreWolf\n"; printf "\nBuilding LibreWolf\n";
./mach build; ./mach build;
echo "Profiling instrumented browser..." # echo "Profiling instrumented browser..."
./mach package # ./mach package
LLVM_PROFDATA=llvm-profdata \ # LLVM_PROFDATA=llvm-profdata \
JARLOG_FILE="$PWD/jarlog" \ # JARLOG_FILE="$PWD/jarlog" \
xvfb-run -s "-screen 0 1920x1080x24 -nolisten local" \ # xvfb-run -s "-screen 0 1920x1080x24 -nolisten local" \
./mach python build/pgo/profileserver.py # ./mach python build/pgo/profileserver.py
#
if [[ ! -s merged.profdata ]]; then # if [[ ! -s merged.profdata ]]; then
echo "No profile data produced." # echo "No profile data produced."
exit 1 # exit 1
fi # fi
#
if [[ ! -s jarlog ]]; then # if [[ ! -s jarlog ]]; then
echo "No jar log produced." # echo "No jar log produced."
exit 1 # exit 1
fi # fi
#
echo "Removing instrumented browser..." # echo "Removing instrumented browser..."
./mach clobber # ./mach clobber
#
echo "Building optimized browser..." # echo "Building optimized browser..."
if [[ $CARCH == 'aarch64' ]]; then if [[ $CARCH == 'aarch64' ]]; then
@ -114,10 +114,10 @@ END
else else
cat >.mozconfig ${CI_PROJECT_DIR}/mozconfig - <<END cat >.mozconfig ${CI_PROJECT_DIR}/mozconfig - <<END
ac_add_options --enable-lto # ac_add_options --enable-lto
ac_add_options --enable-profile-use # ac_add_options --enable-profile-use
ac_add_options --with-pgo-profile-path=${PWD@Q}/merged.profdata # ac_add_options --with-pgo-profile-path=${PWD@Q}/merged.profdata
ac_add_options --with-pgo-jarlog=${PWD@Q}/jarlog # ac_add_options --with-pgo-jarlog=${PWD@Q}/jarlog
ac_add_options --enable-linker=gold ac_add_options --enable-linker=gold
END END