Skip to content

Enable ICF and LTO (#720) #33560

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
neildhar wants to merge 3 commits into from
Closed

Enable ICF and LTO (#720) #33560

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
55a2fae
Directly invoke CMake when compiling Hermes
neildhar Apr 3, 2022
0b16ae7
Always enable debugger by default
neildhar Apr 3, 2022
aaf8274
Enable ICF and LTO (#720)
neildhar Apr 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -922,7 +922,7 @@ jobs:
command: |
HERMESC_LINUX_DIR="$HERMES_WS_DIR/hermesc/linux"
cd "$HERMES_WS_DIR"
hermes/utils/build/configure.py --static-link --distribute --cmake-flags="-DCMAKE_CXX_FLAGS=-s"
cmake -S hermes -B build_release -G Ninja -DHERMES_STATIC_LINK=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS=-s -DCMAKE_C_FLAGS=-s
cd build_release
ninja github-cli-release
mkdir -p "$HERMESC_LINUX_DIR"
Expand Down Expand Up @@ -953,7 +953,7 @@ jobs:
command: |
HERMESC_MACOS_DIR="$HERMES_WS_DIR/hermesc/macos"
cd "$HERMES_WS_DIR"
hermes/utils/build/configure.py ./build_host_hermesc
cmake -S hermes -B build_host_hermesc -G Ninja -DCMAKE_BUILD_TYPE=Release
cmake --build ./build_host_hermesc --target hermesc
mkdir -p "$HERMESC_MACOS_DIR"
mv $HERMES_WS_DIR/build_host_hermesc/* "$HERMESC_MACOS_DIR"
Expand Down Expand Up @@ -1015,7 +1015,7 @@ jobs:
$Env:PATH += ";$Env:CMAKE_DIR;$Env:MSBUILD_DIR"
$Env:ICU_ROOT = "$Env:HERMES_WS_DIR\icu"
cd $Env:HERMES_WS_DIR
hermes\utils\build\configure.py --build-system='Visual Studio 16 2019' --cmake-flags="-DHERMES_ENABLE_WIN10_ICU_FALLBACK=OFF -DHERMES_GITHUB_RESOURCE_DIR=$Env:HERMES_WS_DIR\deps" --distribute
cmake -S hermes -B build_release -G 'Visual Studio 16 2019' -DCMAKE_BUILD_TYPE=Release -DHERMES_ENABLE_WIN10_ICU_FALLBACK=OFF -DHERMES_GITHUB_RESOURCE_DIR=$Env:HERMES_WS_DIR\deps
if (-not $?) { throw "Failed to configure Hermes" }
cd build_release
cmake --build . --target github-cli-release --config Release
Expand Down
15 changes: 5 additions & 10 deletions ReactAndroid/hermes-engine/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,18 +66,12 @@ task unzipHermes(dependsOn: downloadHermes, type: Copy) {

task configureNinjaForHermes(type: Exec) {
workingDir(hermesDir)
commandLine(windowsAwareCommandLine(
"python3",
"utils/build/configure.py",
"--jsidir",
jsiDir.absolutePath,
"./ninja_build"
))
commandLine(windowsAwareCommandLine("cmake", "-S", ".", "-B", "./build", "-DJSI_DIR=" + jsiDir.absolutePath))
}

task buildNinjaForHermes(dependsOn: configureNinjaForHermes, type: Exec) {
workingDir(hermesDir)
commandLine(windowsAwareCommandLine("cmake", "--build", "./ninja_build", "--target", "hermesc", "-j", ndkBuildJobs))
commandLine(windowsAwareCommandLine("cmake", "--build", "./build", "--target", "hermesc", "-j", ndkBuildJobs))
}

task prepareHeadersForPrefab(type: Copy) {
Expand Down Expand Up @@ -120,7 +114,8 @@ android {
arguments "-DHERMES_IS_ANDROID=True"
arguments "-DANDROID_STL=c++_shared"
arguments "-DANDROID_PIE=True"
arguments "-DIMPORT_HERMESC=${new File(hermesDir, "ninja_build/ImportHermesc.cmake").toString()}"
arguments "-DANDROID_LD=lld"
arguments "-DIMPORT_HERMESC=${new File(hermesDir, "build/ImportHermesc.cmake").toString()}"
arguments "-DJSI_DIR=${jsiDir}"
arguments "-DHERMES_SLOW_DEBUG=False"
arguments "-DHERMES_BUILD_SHARED_JSI=True"
Expand All @@ -146,7 +141,6 @@ android {
debug {
externalNativeBuild {
cmake {
arguments "-DHERMES_ENABLE_DEBUGGER=True"
// JS developers aren't VM developers.
// Therefore we're passing as build type Release, to provide a faster build.
// This has the (unlucky) side effect of letting AGP call the build
Expand All @@ -158,6 +152,7 @@ android {
release {
externalNativeBuild {
cmake {
arguments "-DHERMES_ENABLE_DEBUGGER=False"
arguments "-DCMAKE_BUILD_TYPE=MinSizeRel"
}
}
Expand Down