Skip to content

[NFC] [hwasan] factor out some opt handling #84414

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 2 commits into from
Mar 13, 2024
Merged

[NFC] [hwasan] factor out some opt handling #84414

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cca5994
[𝘀𝗽𝗿] initial version
fmayer Mar 8, 2024
962d3a2
fmt
fmayer Mar 8, 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
47 changes: 18 additions & 29 deletions llvm/lib/Transforms/Instrumentation/HWAddressSanitizer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,6 +260,10 @@ static cl::opt<bool> ClUsePageAliases("hwasan-experimental-use-page-aliases",

namespace {

template <typename T> T optOr(cl::opt<T> &Opt, T Other) {
return Opt.getNumOccurrences() ? Opt : Other;
}

bool shouldUsePageAliases(const Triple &TargetTriple) {
return ClUsePageAliases && TargetTriple.getArch() == Triple::x86_64;
}
Expand All @@ -269,14 +273,11 @@ bool shouldInstrumentStack(const Triple &TargetTriple) {
}

bool shouldInstrumentWithCalls(const Triple &TargetTriple) {
return ClInstrumentWithCalls.getNumOccurrences()
? ClInstrumentWithCalls
: TargetTriple.getArch() == Triple::x86_64;
return optOr(ClInstrumentWithCalls, TargetTriple.getArch() == Triple::x86_64);
}

bool mightUseStackSafetyAnalysis(bool DisableOptimization) {
return ClUseStackSafety.getNumOccurrences() ? ClUseStackSafety
: !DisableOptimization;
return optOr(ClUseStackSafety, !DisableOptimization);
}

bool shouldUseStackSafetyAnalysis(const Triple &TargetTriple,
Expand All @@ -296,10 +297,8 @@ class HWAddressSanitizer {
HWAddressSanitizer(Module &M, bool CompileKernel, bool Recover,
const StackSafetyGlobalInfo *SSI)
: M(M), SSI(SSI) {
this->Recover = ClRecover.getNumOccurrences() > 0 ? ClRecover : Recover;
this->CompileKernel = ClEnableKhwasan.getNumOccurrences() > 0
? ClEnableKhwasan
: CompileKernel;
this->Recover = optOr(ClRecover, Recover);
this->CompileKernel = optOr(ClEnableKhwasan, CompileKernel);
this->Rng =
RandomSkipRate.getNumOccurrences() ? M.createRNG("hwasan") : nullptr;

Expand Down Expand Up @@ -624,19 +623,14 @@ void HWAddressSanitizer::initializeModule() {
bool NewRuntime =
!TargetTriple.isAndroid() || !TargetTriple.isAndroidVersionLT(30);

UseShortGranules =
ClUseShortGranules.getNumOccurrences() ? ClUseShortGranules : NewRuntime;
OutlinedChecks =
(TargetTriple.isAArch64() || TargetTriple.isRISCV64()) &&
TargetTriple.isOSBinFormatELF() &&
(ClInlineAllChecks.getNumOccurrences() ? !ClInlineAllChecks : !Recover);
UseShortGranules = optOr(ClUseShortGranules, NewRuntime);
OutlinedChecks = (TargetTriple.isAArch64() || TargetTriple.isRISCV64()) &&
TargetTriple.isOSBinFormatELF() &&
!optOr(ClInlineAllChecks, Recover);

InlineFastPath =
(ClInlineFastPathChecks.getNumOccurrences()
? ClInlineFastPathChecks
: !(TargetTriple.isAndroid() ||
TargetTriple.isOSFuchsia())); // These platforms may prefer less
// inlining to reduce binary size.
// These platforms may prefer less inlining to reduce binary size.
InlineFastPath = optOr(ClInlineFastPathChecks, !(TargetTriple.isAndroid() ||
TargetTriple.isOSFuchsia()));

if (ClMatchAllTag.getNumOccurrences()) {
if (ClMatchAllTag != -1) {
Expand All @@ -648,22 +642,17 @@ void HWAddressSanitizer::initializeModule() {
UseMatchAllCallback = !CompileKernel && MatchAllTag.has_value();

// If we don't have personality function support, fall back to landing pads.
InstrumentLandingPads = ClInstrumentLandingPads.getNumOccurrences()
? ClInstrumentLandingPads
: !NewRuntime;
InstrumentLandingPads = optOr(ClInstrumentLandingPads, !NewRuntime);

if (!CompileKernel) {
createHwasanCtorComdat();
bool InstrumentGlobals =
ClGlobals.getNumOccurrences() ? ClGlobals : NewRuntime;
bool InstrumentGlobals = optOr(ClGlobals, NewRuntime);

if (InstrumentGlobals && !UsePageAliases)
instrumentGlobals();

bool InstrumentPersonalityFunctions =
ClInstrumentPersonalityFunctions.getNumOccurrences()
? ClInstrumentPersonalityFunctions
: NewRuntime;
optOr(ClInstrumentPersonalityFunctions, NewRuntime);
if (InstrumentPersonalityFunctions)
instrumentPersonalityFunctions();
}
Expand Down