Skip to content

ANDROID: x86_64: Set default max-page-size to 16kB #87413

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

Merged
merged 5 commits into from
Apr 12, 2024
Merged

ANDROID: x86_64: Set default max-page-size to 16kB #87413

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ae55bb3
ANDROID: x86_64: Set default max-page-size to 16kB
Apr 2, 2024
bf008d6
Merge branch 'llvm:main' into x86_64-16k
Kalesh-Singh Apr 11, 2024
43d180a
Merge branch 'llvm:main' into x86_64-16k
Kalesh-Singh Apr 11, 2024
acaf36c
Add max-page-size test for x86_64/i386
Apr 11, 2024
675ad73
Refactor clang/test/Driver/android-link.cpp
Apr 12, 2024
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
3 changes: 2 additions & 1 deletion clang/lib/Driver/ToolChains/Linux.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,8 +244,9 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args)
// Android ARM uses max-page-size=4096 to reduce VMA usage.
ExtraOpts.push_back("-z");
ExtraOpts.push_back("max-page-size=4096");
} else if (Triple.isAArch64()) {
} else if (Triple.isAArch64() || Triple.getArch() == llvm::Triple::x86_64) {
// Android AArch64 uses max-page-size=16384 to support 4k/16k page sizes.
// Android emulates a 16k page size for app testing on x86_64 machines.
ExtraOpts.push_back("-z");
ExtraOpts.push_back("max-page-size=16384");
}
Expand Down
20 changes: 15 additions & 5 deletions clang/test/Driver/android-link.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Check that we add relevant linker flags for Android ARM/AArch64.
// Check that we add relevant linker flags for Android ARM/AArch64/i386/x86_64.

// RUN: %clang -### -target arm-linux-androideabi %s 2>&1 | \
// RUN: FileCheck --check-prefix=MAX-PAGE-SIZE %s
// RUN: FileCheck --check-prefix=MAX-PAGE-SIZE-4KB %s

// RUN: %clang -target aarch64-none-linux-android \
// RUN: -### -v %s 2> %t
Expand All @@ -17,10 +17,20 @@
//
// RUN: %clang -target aarch64-none-linux-android \
// RUN: -### -v %s 2> %t
// RUN: FileCheck -check-prefix=MAX-PAGE-SIZE-AARCH64 < %t %s
// RUN: FileCheck -check-prefix=MAX-PAGE-SIZE-16KB < %t %s
//
// RUN: %clang -### -target i386-none-linux-android %s 2>&1 | \
// RUN: FileCheck --check-prefix=NO-MAX-PAGE-SIZE-16KB %s
//
// RUN: %clang -### -target x86_64-none-linux-gnu %s 2>&1 | \
// RUN: FileCheck --check-prefix=NO-MAX-PAGE-SIZE-16KB %s
//
// RUN: %clang -### -target x86_64-none-linux-android %s 2>&1 | \
// RUN: FileCheck --check-prefix=MAX-PAGE-SIZE-16KB %s
//
// GENERIC-ARM: --fix-cortex-a53-843419
// CORTEX-A53: --fix-cortex-a53-843419
// CORTEX-A57-NOT: --fix-cortex-a53-843419
// MAX-PAGE-SIZE: "-z" "max-page-size=4096"
// MAX-PAGE-SIZE-AARCH64: "-z" "max-page-size=16384"
// MAX-PAGE-SIZE-4KB: "-z" "max-page-size=4096"
// MAX-PAGE-SIZE-16KB: "-z" "max-page-size=16384"
// NO-MAX-PAGE-SIZE-16KB-NOT: "-z" "max-page-size=16384"