[clang] [llvm] Reapply "[sanitizer][NFCI] Add Options parameter to LowerAllowCheckPass" (#122833) (PR #122994)

2025-01-22 Thread Thurston Dang via cfe-commits 

https://github.com/thurstond closed 
https://github.com/llvm/llvm-project/pull/122994
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[clang] [llvm] Reapply "[sanitizer][NFCI] Add Options parameter to LowerAllowCheckPass" (#122833) (PR #122994)

2025-01-22 Thread Thurston Dang via cfe-commits 

https://github.com/thurstond updated 
https://github.com/llvm/llvm-project/pull/122994

>From afc18adfbc4671cd39356abd0945eae057b6ad28 Mon Sep 17 00:00:00 2001
From: Thurston Dang 
Date: Tue, 14 Jan 2025 19:13:51 +
Subject: [PATCH 1/3] Reapply "[sanitizer][NFCI] Add Options parameter to
 LowerAllowCheckPass" (#122833)

This reverts commit 1515caf7a59dc20cb932b724b2ef5c1d1a593427
(https://github.com/llvm/llvm-project/pull/122833) i.e.,
relands 7d8b4eb0ead277f41ff69525ed807f9f6e227f37
(https://github.com/llvm/llvm-project/pull/122765), with the addition of
std::move to fix a stack use-after-scope error.
---
 clang/lib/CodeGen/BackendUtil.cpp | 10 ++
 .../Instrumentation/LowerAllowCheckPass.h |  9 +
 llvm/lib/Passes/PassBuilder.cpp   | 15 +++
 llvm/lib/Passes/PassRegistry.def  |  5 -
 4 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/clang/lib/CodeGen/BackendUtil.cpp 
b/clang/lib/CodeGen/BackendUtil.cpp
index 3951ad01497ccac..337c4b4d7a06157 100644
--- a/clang/lib/CodeGen/BackendUtil.cpp
+++ b/clang/lib/CodeGen/BackendUtil.cpp
@@ -795,11 +795,13 @@ static void addSanitizers(const Triple &TargetTriple,
   }
 
   if (LowerAllowCheckPass::IsRequested()) {
+LowerAllowCheckPass::Options Opts;
 // We want to call it after inline, which is about 
OptimizerEarlyEPCallback.
-PB.registerOptimizerEarlyEPCallback([](ModulePassManager &MPM,
-   OptimizationLevel Level,
-   ThinOrFullLTOPhase Phase) {
-  MPM.addPass(createModuleToFunctionPassAdaptor(LowerAllowCheckPass()));
+PB.registerOptimizerEarlyEPCallback([Opts = 
std::move(Opts)](ModulePassManager &MPM,
+   OptimizationLevel Level,
+   ThinOrFullLTOPhase Phase) {
+  MPM.addPass(createModuleToFunctionPassAdaptor(
+  LowerAllowCheckPass(Opts)));
 });
   }
 }
diff --git a/llvm/include/llvm/Transforms/Instrumentation/LowerAllowCheckPass.h 
b/llvm/include/llvm/Transforms/Instrumentation/LowerAllowCheckPass.h
index af974818fec5f31..3ee907606e12b83 100644
--- a/llvm/include/llvm/Transforms/Instrumentation/LowerAllowCheckPass.h
+++ b/llvm/include/llvm/Transforms/Instrumentation/LowerAllowCheckPass.h
@@ -24,9 +24,18 @@ namespace llvm {
 // from the hot code.
 class LowerAllowCheckPass : public PassInfoMixin {
 public:
+  struct Options {
+std::vector placeholder; // TODO: cutoffs
+  };
+
+  explicit LowerAllowCheckPass(LowerAllowCheckPass::Options Opts)
+  : Opts(std::move(Opts)) {};
   PreservedAnalyses run(Function &F, FunctionAnalysisManager &AM);
 
   static bool IsRequested();
+
+private:
+  LowerAllowCheckPass::Options Opts;
 };
 
 } // namespace llvm
diff --git a/llvm/lib/Passes/PassBuilder.cpp b/llvm/lib/Passes/PassBuilder.cpp
index f698a3df08ef78f..1e97cef22045d4f 100644
--- a/llvm/lib/Passes/PassBuilder.cpp
+++ b/llvm/lib/Passes/PassBuilder.cpp
@@ -821,6 +821,21 @@ Expected 
parseEmbedBitcodePassOptions(StringRef Params) {
   return Result;
 }
 
+Expected
+parseLowerAllowCheckPassOptions(StringRef Params) {
+  LowerAllowCheckPass::Options Result;
+  while (!Params.empty()) {
+StringRef ParamName;
+std::tie(ParamName, Params) = Params.split(';');
+
+return make_error(
+formatv("invalid LowerAllowCheck pass parameter '{0}' ", ParamName)
+.str(),
+inconvertibleErrorCode());
+  }
+  return Result;
+}
+
 Expected parseMSanPassOptions(StringRef Params) {
   MemorySanitizerOptions Result;
   while (!Params.empty()) {
diff --git a/llvm/lib/Passes/PassRegistry.def b/llvm/lib/Passes/PassRegistry.def
index a93a995655a1476..0eb050c8adb047f 100644
--- a/llvm/lib/Passes/PassRegistry.def
+++ b/llvm/lib/Passes/PassRegistry.def
@@ -402,7 +402,6 @@ FUNCTION_PASS("loop-load-elim", LoopLoadEliminationPass())
 FUNCTION_PASS("loop-simplify", LoopSimplifyPass())
 FUNCTION_PASS("loop-sink", LoopSinkPass())
 FUNCTION_PASS("loop-versioning", LoopVersioningPass())
-FUNCTION_PASS("lower-allow-check", LowerAllowCheckPass())
 FUNCTION_PASS("lower-atomic", LowerAtomicPass())
 FUNCTION_PASS("lower-constant-intrinsics", LowerConstantIntrinsicsPass())
 FUNCTION_PASS("lower-expect", LowerExpectIntrinsicPass())
@@ -553,6 +552,10 @@ FUNCTION_PASS_WITH_PARAMS(
 parseLoopVectorizeOptions,
 
"no-interleave-forced-only;interleave-forced-only;no-vectorize-forced-only;"
 "vectorize-forced-only")
+FUNCTION_PASS_WITH_PARAMS(
+"lower-allow-check", "LowerAllowCheckPass",
+[](LowerAllowCheckPass::Options Opts) { return LowerAllowCheckPass(Opts); 
},
+parseLowerAllowCheckPassOptions, "")
 FUNCTION_PASS_WITH_PARAMS(
 "lower-matrix-intrinsics", "LowerMatrixIntrinsicsPass",
 [](bool Minimal) { return LowerMatrixIntrinsicsPass(Minimal); },

>From 3bc2d41e372c9c10168cab3cca353a1218136951 Mon Sep 17 00:00:00 2001
From: Vitaly Buka 
Date

[clang] [llvm] Reapply "[sanitizer][NFCI] Add Options parameter to LowerAllowCheckPass" (#122833) (PR #122994)

2025-01-15 Thread Vitaly Buka via cfe-commits 

https://github.com/vitalybuka approved this pull request.


https://github.com/llvm/llvm-project/pull/122994
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[clang] [llvm] Reapply "[sanitizer][NFCI] Add Options parameter to LowerAllowCheckPass" (#122833) (PR #122994)

2025-01-15 Thread Vitaly Buka via cfe-commits 

https://github.com/vitalybuka updated 
https://github.com/llvm/llvm-project/pull/122994

>From 02c3d9ef1eb15b0d7ebe7511f200b7c00d52d6c9 Mon Sep 17 00:00:00 2001
From: Thurston Dang 
Date: Tue, 14 Jan 2025 19:13:51 +
Subject: [PATCH 1/3] Reapply "[sanitizer][NFCI] Add Options parameter to
 LowerAllowCheckPass" (#122833)

This reverts commit 1515caf7a59dc20cb932b724b2ef5c1d1a593427
(https://github.com/llvm/llvm-project/pull/122833) i.e.,
relands 7d8b4eb0ead277f41ff69525ed807f9f6e227f37
(https://github.com/llvm/llvm-project/pull/122765), with the addition of
std::move to fix a stack use-after-scope error.
---
 clang/lib/CodeGen/BackendUtil.cpp | 10 ++
 .../Instrumentation/LowerAllowCheckPass.h |  9 +
 llvm/lib/Passes/PassBuilder.cpp   | 15 +++
 llvm/lib/Passes/PassRegistry.def  |  5 -
 4 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/clang/lib/CodeGen/BackendUtil.cpp 
b/clang/lib/CodeGen/BackendUtil.cpp
index 79e6bf3d24dffb..ffe640fd4b9287 100644
--- a/clang/lib/CodeGen/BackendUtil.cpp
+++ b/clang/lib/CodeGen/BackendUtil.cpp
@@ -795,11 +795,13 @@ static void addSanitizers(const Triple &TargetTriple,
   }
 
   if (LowerAllowCheckPass::IsRequested()) {
+LowerAllowCheckPass::Options Opts;
 // We want to call it after inline, which is about 
OptimizerEarlyEPCallback.
-PB.registerOptimizerEarlyEPCallback([](ModulePassManager &MPM,
-   OptimizationLevel Level,
-   ThinOrFullLTOPhase Phase) {
-  MPM.addPass(createModuleToFunctionPassAdaptor(LowerAllowCheckPass()));
+PB.registerOptimizerEarlyEPCallback([Opts = 
std::move(Opts)](ModulePassManager &MPM,
+   OptimizationLevel Level,
+   ThinOrFullLTOPhase Phase) {
+  MPM.addPass(createModuleToFunctionPassAdaptor(
+  LowerAllowCheckPass(Opts)));
 });
   }
 }
diff --git a/llvm/include/llvm/Transforms/Instrumentation/LowerAllowCheckPass.h 
b/llvm/include/llvm/Transforms/Instrumentation/LowerAllowCheckPass.h
index af974818fec5f3..3ee907606e12b8 100644
--- a/llvm/include/llvm/Transforms/Instrumentation/LowerAllowCheckPass.h
+++ b/llvm/include/llvm/Transforms/Instrumentation/LowerAllowCheckPass.h
@@ -24,9 +24,18 @@ namespace llvm {
 // from the hot code.
 class LowerAllowCheckPass : public PassInfoMixin {
 public:
+  struct Options {
+std::vector placeholder; // TODO: cutoffs
+  };
+
+  explicit LowerAllowCheckPass(LowerAllowCheckPass::Options Opts)
+  : Opts(std::move(Opts)) {};
   PreservedAnalyses run(Function &F, FunctionAnalysisManager &AM);
 
   static bool IsRequested();
+
+private:
+  LowerAllowCheckPass::Options Opts;
 };
 
 } // namespace llvm
diff --git a/llvm/lib/Passes/PassBuilder.cpp b/llvm/lib/Passes/PassBuilder.cpp
index 94782547325ed1..1e9f825dc3dc4c 100644
--- a/llvm/lib/Passes/PassBuilder.cpp
+++ b/llvm/lib/Passes/PassBuilder.cpp
@@ -821,6 +821,21 @@ Expected 
parseEmbedBitcodePassOptions(StringRef Params) {
   return Result;
 }
 
+Expected
+parseLowerAllowCheckPassOptions(StringRef Params) {
+  LowerAllowCheckPass::Options Result;
+  while (!Params.empty()) {
+StringRef ParamName;
+std::tie(ParamName, Params) = Params.split(';');
+
+return make_error(
+formatv("invalid LowerAllowCheck pass parameter '{0}' ", ParamName)
+.str(),
+inconvertibleErrorCode());
+  }
+  return Result;
+}
+
 Expected parseMSanPassOptions(StringRef Params) {
   MemorySanitizerOptions Result;
   while (!Params.empty()) {
diff --git a/llvm/lib/Passes/PassRegistry.def b/llvm/lib/Passes/PassRegistry.def
index a93a995655a147..0eb050c8adb047 100644
--- a/llvm/lib/Passes/PassRegistry.def
+++ b/llvm/lib/Passes/PassRegistry.def
@@ -402,7 +402,6 @@ FUNCTION_PASS("loop-load-elim", LoopLoadEliminationPass())
 FUNCTION_PASS("loop-simplify", LoopSimplifyPass())
 FUNCTION_PASS("loop-sink", LoopSinkPass())
 FUNCTION_PASS("loop-versioning", LoopVersioningPass())
-FUNCTION_PASS("lower-allow-check", LowerAllowCheckPass())
 FUNCTION_PASS("lower-atomic", LowerAtomicPass())
 FUNCTION_PASS("lower-constant-intrinsics", LowerConstantIntrinsicsPass())
 FUNCTION_PASS("lower-expect", LowerExpectIntrinsicPass())
@@ -553,6 +552,10 @@ FUNCTION_PASS_WITH_PARAMS(
 parseLoopVectorizeOptions,
 
"no-interleave-forced-only;interleave-forced-only;no-vectorize-forced-only;"
 "vectorize-forced-only")
+FUNCTION_PASS_WITH_PARAMS(
+"lower-allow-check", "LowerAllowCheckPass",
+[](LowerAllowCheckPass::Options Opts) { return LowerAllowCheckPass(Opts); 
},
+parseLowerAllowCheckPassOptions, "")
 FUNCTION_PASS_WITH_PARAMS(
 "lower-matrix-intrinsics", "LowerMatrixIntrinsicsPass",
 [](bool Minimal) { return LowerMatrixIntrinsicsPass(Minimal); },

>From bb12caeefd0cd37a928c802f5137d290b197ac67 Mon Sep 17 00:00:00 2001
From: Vitaly Buka 
Date: Wed,

[clang] [llvm] Reapply "[sanitizer][NFCI] Add Options parameter to LowerAllowCheckPass" (#122833) (PR #122994)

2025-01-15 Thread Vitaly Buka via cfe-commits 

https://github.com/vitalybuka updated 
https://github.com/llvm/llvm-project/pull/122994

>From 02c3d9ef1eb15b0d7ebe7511f200b7c00d52d6c9 Mon Sep 17 00:00:00 2001
From: Thurston Dang 
Date: Tue, 14 Jan 2025 19:13:51 +
Subject: [PATCH 1/2] Reapply "[sanitizer][NFCI] Add Options parameter to
 LowerAllowCheckPass" (#122833)

This reverts commit 1515caf7a59dc20cb932b724b2ef5c1d1a593427
(https://github.com/llvm/llvm-project/pull/122833) i.e.,
relands 7d8b4eb0ead277f41ff69525ed807f9f6e227f37
(https://github.com/llvm/llvm-project/pull/122765), with the addition of
std::move to fix a stack use-after-scope error.
---
 clang/lib/CodeGen/BackendUtil.cpp | 10 ++
 .../Instrumentation/LowerAllowCheckPass.h |  9 +
 llvm/lib/Passes/PassBuilder.cpp   | 15 +++
 llvm/lib/Passes/PassRegistry.def  |  5 -
 4 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/clang/lib/CodeGen/BackendUtil.cpp 
b/clang/lib/CodeGen/BackendUtil.cpp
index 79e6bf3d24dffb..ffe640fd4b9287 100644
--- a/clang/lib/CodeGen/BackendUtil.cpp
+++ b/clang/lib/CodeGen/BackendUtil.cpp
@@ -795,11 +795,13 @@ static void addSanitizers(const Triple &TargetTriple,
   }
 
   if (LowerAllowCheckPass::IsRequested()) {
+LowerAllowCheckPass::Options Opts;
 // We want to call it after inline, which is about 
OptimizerEarlyEPCallback.
-PB.registerOptimizerEarlyEPCallback([](ModulePassManager &MPM,
-   OptimizationLevel Level,
-   ThinOrFullLTOPhase Phase) {
-  MPM.addPass(createModuleToFunctionPassAdaptor(LowerAllowCheckPass()));
+PB.registerOptimizerEarlyEPCallback([Opts = 
std::move(Opts)](ModulePassManager &MPM,
+   OptimizationLevel Level,
+   ThinOrFullLTOPhase Phase) {
+  MPM.addPass(createModuleToFunctionPassAdaptor(
+  LowerAllowCheckPass(Opts)));
 });
   }
 }
diff --git a/llvm/include/llvm/Transforms/Instrumentation/LowerAllowCheckPass.h 
b/llvm/include/llvm/Transforms/Instrumentation/LowerAllowCheckPass.h
index af974818fec5f3..3ee907606e12b8 100644
--- a/llvm/include/llvm/Transforms/Instrumentation/LowerAllowCheckPass.h
+++ b/llvm/include/llvm/Transforms/Instrumentation/LowerAllowCheckPass.h
@@ -24,9 +24,18 @@ namespace llvm {
 // from the hot code.
 class LowerAllowCheckPass : public PassInfoMixin {
 public:
+  struct Options {
+std::vector placeholder; // TODO: cutoffs
+  };
+
+  explicit LowerAllowCheckPass(LowerAllowCheckPass::Options Opts)
+  : Opts(std::move(Opts)) {};
   PreservedAnalyses run(Function &F, FunctionAnalysisManager &AM);
 
   static bool IsRequested();
+
+private:
+  LowerAllowCheckPass::Options Opts;
 };
 
 } // namespace llvm
diff --git a/llvm/lib/Passes/PassBuilder.cpp b/llvm/lib/Passes/PassBuilder.cpp
index 94782547325ed1..1e9f825dc3dc4c 100644
--- a/llvm/lib/Passes/PassBuilder.cpp
+++ b/llvm/lib/Passes/PassBuilder.cpp
@@ -821,6 +821,21 @@ Expected 
parseEmbedBitcodePassOptions(StringRef Params) {
   return Result;
 }
 
+Expected
+parseLowerAllowCheckPassOptions(StringRef Params) {
+  LowerAllowCheckPass::Options Result;
+  while (!Params.empty()) {
+StringRef ParamName;
+std::tie(ParamName, Params) = Params.split(';');
+
+return make_error(
+formatv("invalid LowerAllowCheck pass parameter '{0}' ", ParamName)
+.str(),
+inconvertibleErrorCode());
+  }
+  return Result;
+}
+
 Expected parseMSanPassOptions(StringRef Params) {
   MemorySanitizerOptions Result;
   while (!Params.empty()) {
diff --git a/llvm/lib/Passes/PassRegistry.def b/llvm/lib/Passes/PassRegistry.def
index a93a995655a147..0eb050c8adb047 100644
--- a/llvm/lib/Passes/PassRegistry.def
+++ b/llvm/lib/Passes/PassRegistry.def
@@ -402,7 +402,6 @@ FUNCTION_PASS("loop-load-elim", LoopLoadEliminationPass())
 FUNCTION_PASS("loop-simplify", LoopSimplifyPass())
 FUNCTION_PASS("loop-sink", LoopSinkPass())
 FUNCTION_PASS("loop-versioning", LoopVersioningPass())
-FUNCTION_PASS("lower-allow-check", LowerAllowCheckPass())
 FUNCTION_PASS("lower-atomic", LowerAtomicPass())
 FUNCTION_PASS("lower-constant-intrinsics", LowerConstantIntrinsicsPass())
 FUNCTION_PASS("lower-expect", LowerExpectIntrinsicPass())
@@ -553,6 +552,10 @@ FUNCTION_PASS_WITH_PARAMS(
 parseLoopVectorizeOptions,
 
"no-interleave-forced-only;interleave-forced-only;no-vectorize-forced-only;"
 "vectorize-forced-only")
+FUNCTION_PASS_WITH_PARAMS(
+"lower-allow-check", "LowerAllowCheckPass",
+[](LowerAllowCheckPass::Options Opts) { return LowerAllowCheckPass(Opts); 
},
+parseLowerAllowCheckPassOptions, "")
 FUNCTION_PASS_WITH_PARAMS(
 "lower-matrix-intrinsics", "LowerMatrixIntrinsicsPass",
 [](bool Minimal) { return LowerMatrixIntrinsicsPass(Minimal); },

>From bb12caeefd0cd37a928c802f5137d290b197ac67 Mon Sep 17 00:00:00 2001
From: Vitaly Buka 
Date: Wed,

[clang] [llvm] Reapply "[sanitizer][NFCI] Add Options parameter to LowerAllowCheckPass" (#122833) (PR #122994)

2025-01-14 Thread via cfe-commits 

llvmbot wrote:




@llvm/pr-subscribers-clang

Author: Thurston Dang (thurstond)


Changes

This reverts commit 1515caf7a59dc20cb932b724b2ef5c1d1a593427 
(https://github.com/llvm/llvm-project/pull/122833) i.e., relands 
7d8b4eb0ead277f41ff69525ed807f9f6e227f37
(https://github.com/llvm/llvm-project/pull/122765), with the addition of 
std::move to fix a stack use-after-scope error.

---
Full diff: https://github.com/llvm/llvm-project/pull/122994.diff


4 Files Affected:

- (modified) clang/lib/CodeGen/BackendUtil.cpp (+6-4) 
- (modified) llvm/include/llvm/Transforms/Instrumentation/LowerAllowCheckPass.h 
(+9) 
- (modified) llvm/lib/Passes/PassBuilder.cpp (+15) 
- (modified) llvm/lib/Passes/PassRegistry.def (+4-1) 


``diff
diff --git a/clang/lib/CodeGen/BackendUtil.cpp 
b/clang/lib/CodeGen/BackendUtil.cpp
index 79e6bf3d24dffb..ffe640fd4b9287 100644
--- a/clang/lib/CodeGen/BackendUtil.cpp
+++ b/clang/lib/CodeGen/BackendUtil.cpp
@@ -795,11 +795,13 @@ static void addSanitizers(const Triple &TargetTriple,
   }
 
   if (LowerAllowCheckPass::IsRequested()) {
+LowerAllowCheckPass::Options Opts;
 // We want to call it after inline, which is about 
OptimizerEarlyEPCallback.
-PB.registerOptimizerEarlyEPCallback([](ModulePassManager &MPM,
-   OptimizationLevel Level,
-   ThinOrFullLTOPhase Phase) {
-  MPM.addPass(createModuleToFunctionPassAdaptor(LowerAllowCheckPass()));
+PB.registerOptimizerEarlyEPCallback([Opts = 
std::move(Opts)](ModulePassManager &MPM,
+   OptimizationLevel Level,
+   ThinOrFullLTOPhase Phase) {
+  MPM.addPass(createModuleToFunctionPassAdaptor(
+  LowerAllowCheckPass(Opts)));
 });
   }
 }
diff --git a/llvm/include/llvm/Transforms/Instrumentation/LowerAllowCheckPass.h 
b/llvm/include/llvm/Transforms/Instrumentation/LowerAllowCheckPass.h
index af974818fec5f3..3ee907606e12b8 100644
--- a/llvm/include/llvm/Transforms/Instrumentation/LowerAllowCheckPass.h
+++ b/llvm/include/llvm/Transforms/Instrumentation/LowerAllowCheckPass.h
@@ -24,9 +24,18 @@ namespace llvm {
 // from the hot code.
 class LowerAllowCheckPass : public PassInfoMixin {
 public:
+  struct Options {
+std::vector placeholder; // TODO: cutoffs
+  };
+
+  explicit LowerAllowCheckPass(LowerAllowCheckPass::Options Opts)
+  : Opts(std::move(Opts)) {};
   PreservedAnalyses run(Function &F, FunctionAnalysisManager &AM);
 
   static bool IsRequested();
+
+private:
+  LowerAllowCheckPass::Options Opts;
 };
 
 } // namespace llvm
diff --git a/llvm/lib/Passes/PassBuilder.cpp b/llvm/lib/Passes/PassBuilder.cpp
index 94782547325ed1..1e9f825dc3dc4c 100644
--- a/llvm/lib/Passes/PassBuilder.cpp
+++ b/llvm/lib/Passes/PassBuilder.cpp
@@ -821,6 +821,21 @@ Expected 
parseEmbedBitcodePassOptions(StringRef Params) {
   return Result;
 }
 
+Expected
+parseLowerAllowCheckPassOptions(StringRef Params) {
+  LowerAllowCheckPass::Options Result;
+  while (!Params.empty()) {
+StringRef ParamName;
+std::tie(ParamName, Params) = Params.split(';');
+
+return make_error(
+formatv("invalid LowerAllowCheck pass parameter '{0}' ", ParamName)
+.str(),
+inconvertibleErrorCode());
+  }
+  return Result;
+}
+
 Expected parseMSanPassOptions(StringRef Params) {
   MemorySanitizerOptions Result;
   while (!Params.empty()) {
diff --git a/llvm/lib/Passes/PassRegistry.def b/llvm/lib/Passes/PassRegistry.def
index a93a995655a147..0eb050c8adb047 100644
--- a/llvm/lib/Passes/PassRegistry.def
+++ b/llvm/lib/Passes/PassRegistry.def
@@ -402,7 +402,6 @@ FUNCTION_PASS("loop-load-elim", LoopLoadEliminationPass())
 FUNCTION_PASS("loop-simplify", LoopSimplifyPass())
 FUNCTION_PASS("loop-sink", LoopSinkPass())
 FUNCTION_PASS("loop-versioning", LoopVersioningPass())
-FUNCTION_PASS("lower-allow-check", LowerAllowCheckPass())
 FUNCTION_PASS("lower-atomic", LowerAtomicPass())
 FUNCTION_PASS("lower-constant-intrinsics", LowerConstantIntrinsicsPass())
 FUNCTION_PASS("lower-expect", LowerExpectIntrinsicPass())
@@ -553,6 +552,10 @@ FUNCTION_PASS_WITH_PARAMS(
 parseLoopVectorizeOptions,
 
"no-interleave-forced-only;interleave-forced-only;no-vectorize-forced-only;"
 "vectorize-forced-only")
+FUNCTION_PASS_WITH_PARAMS(
+"lower-allow-check", "LowerAllowCheckPass",
+[](LowerAllowCheckPass::Options Opts) { return LowerAllowCheckPass(Opts); 
},
+parseLowerAllowCheckPassOptions, "")
 FUNCTION_PASS_WITH_PARAMS(
 "lower-matrix-intrinsics", "LowerMatrixIntrinsicsPass",
 [](bool Minimal) { return LowerMatrixIntrinsicsPass(Minimal); },

``




https://github.com/llvm/llvm-project/pull/122994
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[clang] [llvm] Reapply "[sanitizer][NFCI] Add Options parameter to LowerAllowCheckPass" (#122833) (PR #122994)

2025-01-14 Thread via cfe-commits 

github-actions[bot] wrote:




:warning: C/C++ code formatter, clang-format found issues in your code. 
:warning:



You can test this locally with the following command:


``bash
git-clang-format --diff 6e14f9b40e15600ae7832826b47a7f0c0503a1d7 
02c3d9ef1eb15b0d7ebe7511f200b7c00d52d6c9 --extensions h,cpp -- 
clang/lib/CodeGen/BackendUtil.cpp 
llvm/include/llvm/Transforms/Instrumentation/LowerAllowCheckPass.h 
llvm/lib/Passes/PassBuilder.cpp
``





View the diff from clang-format here.


``diff
diff --git a/clang/lib/CodeGen/BackendUtil.cpp 
b/clang/lib/CodeGen/BackendUtil.cpp
index ffe640fd4b..66ee195abb 100644
--- a/clang/lib/CodeGen/BackendUtil.cpp
+++ b/clang/lib/CodeGen/BackendUtil.cpp
@@ -797,11 +797,11 @@ static void addSanitizers(const Triple &TargetTriple,
   if (LowerAllowCheckPass::IsRequested()) {
 LowerAllowCheckPass::Options Opts;
 // We want to call it after inline, which is about 
OptimizerEarlyEPCallback.
-PB.registerOptimizerEarlyEPCallback([Opts = 
std::move(Opts)](ModulePassManager &MPM,
-   OptimizationLevel Level,
-   ThinOrFullLTOPhase Phase) {
-  MPM.addPass(createModuleToFunctionPassAdaptor(
-  LowerAllowCheckPass(Opts)));
+PB.registerOptimizerEarlyEPCallback([Opts = std::move(Opts)](
+ModulePassManager &MPM,
+OptimizationLevel Level,
+ThinOrFullLTOPhase Phase) {
+  
MPM.addPass(createModuleToFunctionPassAdaptor(LowerAllowCheckPass(Opts)));
 });
   }
 }

``




https://github.com/llvm/llvm-project/pull/122994
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[clang] [llvm] Reapply "[sanitizer][NFCI] Add Options parameter to LowerAllowCheckPass" (#122833) (PR #122994)

2025-01-14 Thread Thurston Dang via cfe-commits 

https://github.com/thurstond created 
https://github.com/llvm/llvm-project/pull/122994

This reverts commit 1515caf7a59dc20cb932b724b2ef5c1d1a593427 
(https://github.com/llvm/llvm-project/pull/122833) i.e., relands 
7d8b4eb0ead277f41ff69525ed807f9f6e227f37
(https://github.com/llvm/llvm-project/pull/122765), with the addition of 
std::move to fix a stack use-after-scope error.

>From 02c3d9ef1eb15b0d7ebe7511f200b7c00d52d6c9 Mon Sep 17 00:00:00 2001
From: Thurston Dang 
Date: Tue, 14 Jan 2025 19:13:51 +
Subject: [PATCH] Reapply "[sanitizer][NFCI] Add Options parameter to
 LowerAllowCheckPass" (#122833)

This reverts commit 1515caf7a59dc20cb932b724b2ef5c1d1a593427
(https://github.com/llvm/llvm-project/pull/122833) i.e.,
relands 7d8b4eb0ead277f41ff69525ed807f9f6e227f37
(https://github.com/llvm/llvm-project/pull/122765), with the addition of
std::move to fix a stack use-after-scope error.
---
 clang/lib/CodeGen/BackendUtil.cpp | 10 ++
 .../Instrumentation/LowerAllowCheckPass.h |  9 +
 llvm/lib/Passes/PassBuilder.cpp   | 15 +++
 llvm/lib/Passes/PassRegistry.def  |  5 -
 4 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/clang/lib/CodeGen/BackendUtil.cpp 
b/clang/lib/CodeGen/BackendUtil.cpp
index 79e6bf3d24dffb..ffe640fd4b9287 100644
--- a/clang/lib/CodeGen/BackendUtil.cpp
+++ b/clang/lib/CodeGen/BackendUtil.cpp
@@ -795,11 +795,13 @@ static void addSanitizers(const Triple &TargetTriple,
   }
 
   if (LowerAllowCheckPass::IsRequested()) {
+LowerAllowCheckPass::Options Opts;
 // We want to call it after inline, which is about 
OptimizerEarlyEPCallback.
-PB.registerOptimizerEarlyEPCallback([](ModulePassManager &MPM,
-   OptimizationLevel Level,
-   ThinOrFullLTOPhase Phase) {
-  MPM.addPass(createModuleToFunctionPassAdaptor(LowerAllowCheckPass()));
+PB.registerOptimizerEarlyEPCallback([Opts = 
std::move(Opts)](ModulePassManager &MPM,
+   OptimizationLevel Level,
+   ThinOrFullLTOPhase Phase) {
+  MPM.addPass(createModuleToFunctionPassAdaptor(
+  LowerAllowCheckPass(Opts)));
 });
   }
 }
diff --git a/llvm/include/llvm/Transforms/Instrumentation/LowerAllowCheckPass.h 
b/llvm/include/llvm/Transforms/Instrumentation/LowerAllowCheckPass.h
index af974818fec5f3..3ee907606e12b8 100644
--- a/llvm/include/llvm/Transforms/Instrumentation/LowerAllowCheckPass.h
+++ b/llvm/include/llvm/Transforms/Instrumentation/LowerAllowCheckPass.h
@@ -24,9 +24,18 @@ namespace llvm {
 // from the hot code.
 class LowerAllowCheckPass : public PassInfoMixin {
 public:
+  struct Options {
+std::vector placeholder; // TODO: cutoffs
+  };
+
+  explicit LowerAllowCheckPass(LowerAllowCheckPass::Options Opts)
+  : Opts(std::move(Opts)) {};
   PreservedAnalyses run(Function &F, FunctionAnalysisManager &AM);
 
   static bool IsRequested();
+
+private:
+  LowerAllowCheckPass::Options Opts;
 };
 
 } // namespace llvm
diff --git a/llvm/lib/Passes/PassBuilder.cpp b/llvm/lib/Passes/PassBuilder.cpp
index 94782547325ed1..1e9f825dc3dc4c 100644
--- a/llvm/lib/Passes/PassBuilder.cpp
+++ b/llvm/lib/Passes/PassBuilder.cpp
@@ -821,6 +821,21 @@ Expected 
parseEmbedBitcodePassOptions(StringRef Params) {
   return Result;
 }
 
+Expected
+parseLowerAllowCheckPassOptions(StringRef Params) {
+  LowerAllowCheckPass::Options Result;
+  while (!Params.empty()) {
+StringRef ParamName;
+std::tie(ParamName, Params) = Params.split(';');
+
+return make_error(
+formatv("invalid LowerAllowCheck pass parameter '{0}' ", ParamName)
+.str(),
+inconvertibleErrorCode());
+  }
+  return Result;
+}
+
 Expected parseMSanPassOptions(StringRef Params) {
   MemorySanitizerOptions Result;
   while (!Params.empty()) {
diff --git a/llvm/lib/Passes/PassRegistry.def b/llvm/lib/Passes/PassRegistry.def
index a93a995655a147..0eb050c8adb047 100644
--- a/llvm/lib/Passes/PassRegistry.def
+++ b/llvm/lib/Passes/PassRegistry.def
@@ -402,7 +402,6 @@ FUNCTION_PASS("loop-load-elim", LoopLoadEliminationPass())
 FUNCTION_PASS("loop-simplify", LoopSimplifyPass())
 FUNCTION_PASS("loop-sink", LoopSinkPass())
 FUNCTION_PASS("loop-versioning", LoopVersioningPass())
-FUNCTION_PASS("lower-allow-check", LowerAllowCheckPass())
 FUNCTION_PASS("lower-atomic", LowerAtomicPass())
 FUNCTION_PASS("lower-constant-intrinsics", LowerConstantIntrinsicsPass())
 FUNCTION_PASS("lower-expect", LowerExpectIntrinsicPass())
@@ -553,6 +552,10 @@ FUNCTION_PASS_WITH_PARAMS(
 parseLoopVectorizeOptions,
 
"no-interleave-forced-only;interleave-forced-only;no-vectorize-forced-only;"
 "vectorize-forced-only")
+FUNCTION_PASS_WITH_PARAMS(
+"lower-allow-check", "LowerAllowCheckPass",
+[](LowerAllowCheckPass::Options Opts) { return LowerAllowCheckPass(Opts); 
},
+parseLowerAl