From 200d4c4a6c28db52fe6e037642bee4917795fd5f Mon Sep 17 00:00:00 2001 From: Levon Gevorgyan Date: Sun, 21 Dec 2025 11:26:05 -0600 Subject: [PATCH] don't really care about pgo for rust --- lib/build.sh | 20 ++++++++++++-------- lib/pgo.sh | 3 ++- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/lib/build.sh b/lib/build.sh index 54c22c6..8c07682 100644 --- a/lib/build.sh +++ b/lib/build.sh @@ -26,6 +26,7 @@ set_compile_opts() { FFMPEG_EXTRA_FLAGS CARGO_CINSTALL_FLAGS LTO_FLAG + PGO_FLAG LIB_SUFF BUILD_TYPE ) @@ -169,13 +170,13 @@ exec \"${realT}\" ${addFlag} \"\$@\"" >"${compilerDir}/${genericT}" # second run will be to use generated profdata if [[ ${PGO} == 'ON' ]]; then if [[ ${PGO_RUN} == 'generate' ]]; then - local pgoFlag="-fprofile-generate" - CFLAGS_ARR+=("${pgoFlag}") - LDFLAGS_ARR+=("${pgoFlag}") + PGO_FLAG="-fprofile-generate" + CFLAGS_ARR+=("${PGO_FLAG}") + LDFLAGS_ARR+=("${PGO_FLAG}") else - local pgoFlag="-fprofile-use=${PGO_PROFDATA}" - CFLAGS_ARR+=("${pgoFlag}") - LDFLAGS_ARR+=("${pgoFlag}") + PGO_FLAG="-fprofile-use=${PGO_PROFDATA}" + CFLAGS_ARR+=("${PGO_FLAG}") + LDFLAGS_ARR+=("${PGO_FLAG}") fi fi @@ -661,8 +662,11 @@ del_pkgconfig_gcc_s() { ### RUST ### meta_cargoc_build() { local destdir="${PWD}/fb-local-install" - # let rust handle its own lto - CFLAGS="${CFLAGS//${LTO_FLAG}/}" cargo cinstall \ + # let rust handle its own lto/pgo + local newCflags="${CFLAGS//${LTO_FLAG}/}" + newCflags="${newCflags//${PGO_FLAG}/}" + + CFLAGS="${newCflags}" cargo cinstall \ --destdir "${destdir}" \ "${CARGO_CINSTALL_FLAGS[@]}" || return 1 # cargo cinstall destdir prepends with entire prefix diff --git a/lib/pgo.sh b/lib/pgo.sh index 1c6212f..45c8bae 100644 --- a/lib/pgo.sh +++ b/lib/pgo.sh @@ -13,8 +13,9 @@ gen_profdata() { # make fhd preset 2 line_contains "${vid}" 'fhd' && args+=(-P 2) + echo_info "encoding pgo vid: ${vid}" LLVM_PROFILE_FILE="${PGO_DIR}/default_%p.profraw" \ - encode -i "${vid}" "${args[@]}" "encoded-${vid}" || return 1 + echo_if_fail encode -i "${vid}" "${args[@]}" "encoded-${vid}" || return 1 done # merge profraw into profdata