[llvm] [NFC] [hwasan] factor out selective instrumentation logic (PR #84408)
via llvm-commits
llvm-commits at lists.llvm.org
Thu Mar 7 16:18:27 PST 2024
llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT-->
@llvm/pr-subscribers-llvm-transforms
Author: Florian Mayer (fmayer)
<details>
<summary>Changes</summary>
sanitizeFunction is long enough already.
---
Full diff: https://github.com/llvm/llvm-project/pull/84408.diff
1 Files Affected:
- (modified) llvm/lib/Transforms/Instrumentation/HWAddressSanitizer.cpp (+31-22)
``````````diff
diff --git a/llvm/lib/Transforms/Instrumentation/HWAddressSanitizer.cpp b/llvm/lib/Transforms/Instrumentation/HWAddressSanitizer.cpp
index 289183ecf0f286..f50044dd7450af 100644
--- a/llvm/lib/Transforms/Instrumentation/HWAddressSanitizer.cpp
+++ b/llvm/lib/Transforms/Instrumentation/HWAddressSanitizer.cpp
@@ -47,6 +47,7 @@
#include "llvm/IR/LLVMContext.h"
#include "llvm/IR/MDBuilder.h"
#include "llvm/IR/Module.h"
+#include "llvm/IR/PassManager.h"
#include "llvm/IR/Type.h"
#include "llvm/IR/Value.h"
#include "llvm/Support/Casting.h"
@@ -318,6 +319,8 @@ class HWAddressSanitizer {
};
void setSSI(const StackSafetyGlobalInfo *S) { SSI = S; }
+ bool selectiveInstrumentationShouldSkip(Function &F,
+ FunctionAnalysisManager &FAM);
void initializeModule();
void createHwasanCtorComdat();
@@ -1524,6 +1527,30 @@ bool HWAddressSanitizer::instrumentStack(memtag::StackInfo &SInfo,
return true;
}
+bool HWAddressSanitizer::selectiveInstrumentationShouldSkip(
+ Function &F, FunctionAnalysisManager &FAM) {
+ if (RandomSkipRate.getNumOccurrences()) {
+ std::bernoulli_distribution D(RandomSkipRate);
+ if (D(*Rng))
+ return true;
+ } else {
+ auto &MAMProxy = FAM.getResult<ModuleAnalysisManagerFunctionProxy>(F);
+ ProfileSummaryInfo *PSI =
+ MAMProxy.getCachedResult<ProfileSummaryAnalysis>(*F.getParent());
+ if (PSI && PSI->hasProfileSummary()) {
+ auto &BFI = FAM.getResult<BlockFrequencyAnalysis>(F);
+ if ((HotPercentileCutoff.getNumOccurrences() && HotPercentileCutoff >= 0)
+ ? PSI->isFunctionHotInCallGraphNthPercentile(HotPercentileCutoff,
+ &F, BFI)
+ : PSI->isFunctionHotInCallGraph(&F, BFI))
+ return true;
+ } else {
+ ++NumNoProfileSummaryFuncs;
+ }
+ }
+ return false;
+}
+
void HWAddressSanitizer::sanitizeFunction(Function &F,
FunctionAnalysisManager &FAM) {
if (&F == HwasanCtorFunction)
@@ -1536,28 +1563,10 @@ void HWAddressSanitizer::sanitizeFunction(Function &F,
return;
NumTotalFuncs++;
- if (CSelectiveInstrumentation) {
- if (RandomSkipRate.getNumOccurrences()) {
- std::bernoulli_distribution D(RandomSkipRate);
- if (D(*Rng))
- return;
- } else {
- auto &MAMProxy = FAM.getResult<ModuleAnalysisManagerFunctionProxy>(F);
- ProfileSummaryInfo *PSI =
- MAMProxy.getCachedResult<ProfileSummaryAnalysis>(*F.getParent());
- if (PSI && PSI->hasProfileSummary()) {
- auto &BFI = FAM.getResult<BlockFrequencyAnalysis>(F);
- if ((HotPercentileCutoff.getNumOccurrences() &&
- HotPercentileCutoff >= 0)
- ? PSI->isFunctionHotInCallGraphNthPercentile(
- HotPercentileCutoff, &F, BFI)
- : PSI->isFunctionHotInCallGraph(&F, BFI))
- return;
- } else {
- ++NumNoProfileSummaryFuncs;
- }
- }
- }
+
+ if (CSelectiveInstrumentation && selectiveInstrumentationShouldSkip(F, FAM))
+ return;
+
NumInstrumentedFuncs++;
LLVM_DEBUG(dbgs() << "Function: " << F.getName() << "\n");
``````````
</details>
https://github.com/llvm/llvm-project/pull/84408
More information about the llvm-commits
mailing list