[llvm-reduce]: print short form, actionable names in the log #132813
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Thank you for submitting a Pull Request (PR) to the LLVM Project! This PR will be automatically labeled and the relevant teams will be notified. If you wish to, you can add reviewers by using the "Reviewers" section on this page. If this is not working for you, it is probably because you do not have write permissions for the repository. In which case you can instead tag reviewers by name in a comment by using If you have received no comments on your PR for a week, you can request a review by "ping"ing the PR by adding a comment “Ping”. The common courtesy "ping" rate is once a week. Please remember that you are asking for valuable time from other developers. If you have further questions, they may be answered by the LLVM GitHub User Guide. You can also ask questions in a comment on this PR, on the LLVM Discord or on the forums. |
MacDue
reviewed
Mar 24, 2025
Comment on lines
47
to
49
| void llvm::reduceAliasesDeltaPass(TestRunner &Test) { | ||
| runDeltaPass(Test, extractAliasesFromModule, "Reducing Aliases"); | ||
| runDeltaPass(Test, extractAliasesFromModule, "Reducing Aliases (aliases)"); | ||
| } |
There was a problem hiding this comment.
Maybe this could be done in a way that does not hardcode the pass names (which may get out of sync)?
One option could be to add the message to the DELTA_PASS macro:
DELTA_PASS("aliases", reduceAliasesDeltaPass, "Reducing Aliases") \And update these functions to take the message as a StringRef:
void llvm::reduceAliasesDeltaPass(TestRunner &Test, StringRef PassMessage) {
runDeltaPass(Test, extractAliasesFromModule, PassMessage);
}And the macro could just combine the strings to make the message:
#define DELTA_PASS(NAME, FUNC) \
if (PassName == NAME) { \
FUNC(Tester, MESSAGE "(" NAME ")"); \
return; \
}
/// ...
There was a problem hiding this comment.
I was hoping to define some kind of struct, and define the reductions in a .def file similar to how we do passes
There was a problem hiding this comment.
According to your hints, I should use a struct to represent the DeltaPass, and also add a new field to represent the relevant description and pass it to the appropriate reduceXXXDeltaPass after concatenating it with the command line option. Separate all the reductions into a single .def file.
You can test this locally with the following command:git-clang-format --diff 39e7efe1e4304544289d8d1b45f4d04d11b4a791 dbe560a42f64752a3980f4793f4377e6f12f484e --extensions cpp,h -- llvm/tools/llvm-reduce/DeltaPass.h clang/lib/Frontend/ASTUnit.cpp clang/lib/Lex/ModuleMap.cpp clang/lib/Serialization/ASTReader.cpp flang/lib/Evaluate/fold-logical.cpp libcxx/test/std/utilities/utility/forward/forward_like.verify.cpp llvm/tools/llvm-reduce/DeltaManager.cpp llvm/tools/llvm-reduce/deltas/Delta.h llvm/tools/llvm-reduce/deltas/ReduceAliases.cpp llvm/tools/llvm-reduce/deltas/ReduceAliases.h llvm/tools/llvm-reduce/deltas/ReduceArguments.cpp llvm/tools/llvm-reduce/deltas/ReduceArguments.h llvm/tools/llvm-reduce/deltas/ReduceAttributes.cpp llvm/tools/llvm-reduce/deltas/ReduceAttributes.h llvm/tools/llvm-reduce/deltas/ReduceBasicBlocks.cpp llvm/tools/llvm-reduce/deltas/ReduceBasicBlocks.h llvm/tools/llvm-reduce/deltas/ReduceDIMetadata.cpp llvm/tools/llvm-reduce/deltas/ReduceDIMetadata.h llvm/tools/llvm-reduce/deltas/ReduceDbgRecords.cpp llvm/tools/llvm-reduce/deltas/ReduceDbgRecords.h llvm/tools/llvm-reduce/deltas/ReduceDistinctMetadata.cpp llvm/tools/llvm-reduce/deltas/ReduceDistinctMetadata.h llvm/tools/llvm-reduce/deltas/ReduceFunctionBodies.cpp llvm/tools/llvm-reduce/deltas/ReduceFunctionBodies.h llvm/tools/llvm-reduce/deltas/ReduceFunctions.cpp llvm/tools/llvm-reduce/deltas/ReduceFunctions.h llvm/tools/llvm-reduce/deltas/ReduceGlobalObjects.cpp llvm/tools/llvm-reduce/deltas/ReduceGlobalObjects.h llvm/tools/llvm-reduce/deltas/ReduceGlobalValues.cpp llvm/tools/llvm-reduce/deltas/ReduceGlobalValues.h llvm/tools/llvm-reduce/deltas/ReduceGlobalVarInitializers.cpp llvm/tools/llvm-reduce/deltas/ReduceGlobalVarInitializers.h llvm/tools/llvm-reduce/deltas/ReduceGlobalVars.cpp llvm/tools/llvm-reduce/deltas/ReduceGlobalVars.h llvm/tools/llvm-reduce/deltas/ReduceIRReferences.cpp llvm/tools/llvm-reduce/deltas/ReduceIRReferences.h llvm/tools/llvm-reduce/deltas/ReduceInstructionFlags.cpp llvm/tools/llvm-reduce/deltas/ReduceInstructionFlags.h llvm/tools/llvm-reduce/deltas/ReduceInstructionFlagsMIR.cpp llvm/tools/llvm-reduce/deltas/ReduceInstructionFlagsMIR.h llvm/tools/llvm-reduce/deltas/ReduceInstructions.cpp llvm/tools/llvm-reduce/deltas/ReduceInstructions.h llvm/tools/llvm-reduce/deltas/ReduceInstructionsMIR.cpp llvm/tools/llvm-reduce/deltas/ReduceInstructionsMIR.h llvm/tools/llvm-reduce/deltas/ReduceInvokes.cpp llvm/tools/llvm-reduce/deltas/ReduceInvokes.h llvm/tools/llvm-reduce/deltas/ReduceMemoryOperations.cpp llvm/tools/llvm-reduce/deltas/ReduceMemoryOperations.h llvm/tools/llvm-reduce/deltas/ReduceMetadata.cpp llvm/tools/llvm-reduce/deltas/ReduceMetadata.h llvm/tools/llvm-reduce/deltas/ReduceModuleData.cpp llvm/tools/llvm-reduce/deltas/ReduceModuleData.h llvm/tools/llvm-reduce/deltas/ReduceOpcodes.cpp llvm/tools/llvm-reduce/deltas/ReduceOpcodes.h llvm/tools/llvm-reduce/deltas/ReduceOperandBundles.cpp llvm/tools/llvm-reduce/deltas/ReduceOperandBundles.h llvm/tools/llvm-reduce/deltas/ReduceOperands.cpp llvm/tools/llvm-reduce/deltas/ReduceOperands.h llvm/tools/llvm-reduce/deltas/ReduceOperandsSkip.cpp llvm/tools/llvm-reduce/deltas/ReduceOperandsSkip.h llvm/tools/llvm-reduce/deltas/ReduceOperandsToArgs.cpp llvm/tools/llvm-reduce/deltas/ReduceOperandsToArgs.h llvm/tools/llvm-reduce/deltas/ReduceRegisterDefs.cpp llvm/tools/llvm-reduce/deltas/ReduceRegisterDefs.h llvm/tools/llvm-reduce/deltas/ReduceRegisterMasks.cpp llvm/tools/llvm-reduce/deltas/ReduceRegisterMasks.h llvm/tools/llvm-reduce/deltas/ReduceRegisterUses.cpp llvm/tools/llvm-reduce/deltas/ReduceRegisterUses.h llvm/tools/llvm-reduce/deltas/ReduceSpecialGlobals.cpp llvm/tools/llvm-reduce/deltas/ReduceSpecialGlobals.h llvm/tools/llvm-reduce/deltas/ReduceUsingSimplifyCFG.cpp llvm/tools/llvm-reduce/deltas/ReduceUsingSimplifyCFG.h llvm/tools/llvm-reduce/deltas/ReduceVirtualRegisters.cpp llvm/tools/llvm-reduce/deltas/ReduceVirtualRegisters.h llvm/tools/llvm-reduce/deltas/RunIRPasses.cpp llvm/tools/llvm-reduce/deltas/RunIRPasses.h llvm/tools/llvm-reduce/deltas/SimplifyInstructions.cpp llvm/tools/llvm-reduce/deltas/SimplifyInstructions.h llvm/tools/llvm-reduce/deltas/StripDebugInfo.cpp llvm/tools/llvm-reduce/deltas/StripDebugInfo.hView the diff from clang-format here.diff --git a/flang/lib/Evaluate/fold-logical.cpp b/flang/lib/Evaluate/fold-logical.cpp
index 731e79b933..6950caf327 100644
--- a/flang/lib/Evaluate/fold-logical.cpp
+++ b/flang/lib/Evaluate/fold-logical.cpp
@@ -880,7 +880,7 @@ Expr<Type<TypeCategory::Logical, KIND>> FoldIntrinsicFunction(
if (args[0]) {
if (const auto *cst{UnwrapExpr<Constant<SomeDerived>>(args[0])}) {
if (auto constr{cst->GetScalarValue()}) {
- if (StructureConstructorValues &values{constr->values()};
+ if (StructureConstructorValues & values{constr->values()};
values.size() == 1) {
const Expr<SomeType> &value{values.begin()->second.value()};
if (auto flag{ToInt64(value)}) {
diff --git a/libcxx/test/std/utilities/utility/forward/forward_like.verify.cpp b/libcxx/test/std/utilities/utility/forward/forward_like.verify.cpp
index 5f7a319ff3..279f0e60a1 100644
--- a/libcxx/test/std/utilities/utility/forward/forward_like.verify.cpp
+++ b/libcxx/test/std/utilities/utility/forward/forward_like.verify.cpp
@@ -39,8 +39,8 @@ void test() {
(void)std::forward_like<vfp>(i); // expected-error {{no matching function for call to 'forward_like'}}
(void)std::forward_like<cvfp>(i); // expected-error {{no matching function for call to 'forward_like'}}
- using fpr = void() &;
- using fprr = void() &&;
+ using fpr = void()&;
+ using fprr = void()&&;
(void)std::forward_like<fpr>(i); // expected-error {{no matching function for call to 'forward_like'}}
(void)std::forward_like<fprr>(i); // expected-error {{no matching function for call to 'forward_like'}}
}
diff --git a/llvm/tools/llvm-reduce/DeltaManager.cpp b/llvm/tools/llvm-reduce/DeltaManager.cpp
index dfa4aa6a53..4ee6826eb9 100644
--- a/llvm/tools/llvm-reduce/DeltaManager.cpp
+++ b/llvm/tools/llvm-reduce/DeltaManager.cpp
@@ -12,6 +12,7 @@
//===----------------------------------------------------------------------===//
#include "DeltaManager.h"
+#include "DeltaPass.h"
#include "ReducerWorkItem.h"
#include "TestRunner.h"
#include "deltas/Delta.h"
@@ -51,10 +52,9 @@
#include "deltas/RunIRPasses.h"
#include "deltas/SimplifyInstructions.h"
#include "deltas/StripDebugInfo.h"
+#include "llvm/ADT/ArrayRef.h"
#include "llvm/ADT/SmallSet.h"
#include "llvm/Support/CommandLine.h"
-#include "DeltaPass.h"
-#include "llvm/ADT/ArrayRef.h"
using namespace llvm;
@@ -75,71 +75,70 @@ static cl::list<std::string>
// Generate two separate Pass lists: IR_Passes and MIR_Passes
static const DeltaPass IR_Passes[] = {
- #undef DELTA_PASS_IR
- #undef DELTA_PASS_MIR
- #define DELTA_PASS_IR(NAME, FUNC, DESC) {NAME, FUNC, DESC},
- #include "DeltaPasses.def"
- #undef DELTA_PASS_IR
+#undef DELTA_PASS_IR
+#undef DELTA_PASS_MIR
+#define DELTA_PASS_IR(NAME, FUNC, DESC) {NAME, FUNC, DESC},
+#include "DeltaPasses.def"
+#undef DELTA_PASS_IR
};
static const DeltaPass MIR_Passes[] = {
- #undef DELTA_PASS_IR
+#undef DELTA_PASS_IR
#undef DELTA_PASS_MIR
#define DELTA_PASS_MIR(NAME, FUNC, DESC) {NAME, FUNC, DESC},
#include "DeltaPasses.def"
#undef DELTA_PASS_MIR
};
-
static void runAllDeltaPasses(TestRunner &Tester,
const SmallStringSet &SkipPass) {
if (Tester.getProgram().isMIR()) {
- for(const DeltaPass &Pass : MIR_Passes) {
+ for (const DeltaPass &Pass : MIR_Passes) {
if (!SkipPass.count(Pass.Name)) {
SmallString<64> Message;
Message += Pass.Desc;
Message += " (";
Message += Pass.Name;
Message += ")";
- Pass.Func(Tester,Message);
- }
+ Pass.Func(Tester, Message);
+ }
}
} else {
- for(const DeltaPass &Pass : IR_Passes) {
+ for (const DeltaPass &Pass : IR_Passes) {
if (!SkipPass.count(Pass.Name)) {
SmallString<64> Message;
Message += Pass.Desc;
Message += " (";
Message += Pass.Name;
Message += ")";
- Pass.Func(Tester,Message);
- }
+ Pass.Func(Tester, Message);
+ }
}
}
}
static void runDeltaPassName(TestRunner &Tester, StringRef PassName) {
if (Tester.getProgram().isMIR()) {
- for(const DeltaPass &Pass : MIR_Passes) {
+ for (const DeltaPass &Pass : MIR_Passes) {
if (PassName == Pass.Name) {
SmallString<64> Message;
Message += Pass.Desc;
Message += " (";
Message += Pass.Name;
Message += ")";
- Pass.Func(Tester,Message);
+ Pass.Func(Tester, Message);
return;
}
}
} else {
- for(const DeltaPass &Pass : IR_Passes) {
+ for (const DeltaPass &Pass : IR_Passes) {
if (PassName == Pass.Name) {
SmallString<64> Message;
Message += Pass.Desc;
Message += " (";
Message += Pass.Name;
Message += ")";
- Pass.Func(Tester,Message);
+ Pass.Func(Tester, Message);
return;
}
}
@@ -154,11 +153,11 @@ void llvm::printDeltaPasses(raw_ostream &OS) {
OS << "Delta passes (pass to `--delta-passes=` as a comma separated list):\n";
OS << " IR:\n";
for (const DeltaPass &Pass : IR_Passes) {
- OS << " " << Pass.Name << "\n";
+ OS << " " << Pass.Name << "\n";
}
OS << " MIR:\n";
for (const DeltaPass &Pass : MIR_Passes) {
- OS << " " << Pass.Name << "\n";
+ OS << " " << Pass.Name << "\n";
}
}
diff --git a/llvm/tools/llvm-reduce/DeltaPass.h b/llvm/tools/llvm-reduce/DeltaPass.h
index ae8fd489e4..e99c0aae55 100644
--- a/llvm/tools/llvm-reduce/DeltaPass.h
+++ b/llvm/tools/llvm-reduce/DeltaPass.h
@@ -6,8 +6,6 @@
//
//===----------------------------------------------------------------------===//
-
-
#ifndef LLVM_TOOLS_LLVM_REDUCE_DELTAPASS_H
#define LLVM_TOOLS_LLVM_REDUCE_DELTAPASS_H
@@ -15,11 +13,11 @@
namespace llvm {
struct DeltaPass {
- StringRef Name; // e.g., "strip-debug-info"
- void (*Func)(TestRunner &, StringRef); // function pointer, e.g.,stripDebugInfoDeltaPass
- StringRef Desc; // e.g., "Stripping Debug Info"
+ StringRef Name; // e.g., "strip-debug-info"
+ void (*Func)(TestRunner &,
+ StringRef); // function pointer, e.g.,stripDebugInfoDeltaPass
+ StringRef Desc; // e.g., "Stripping Debug Info"
};
} // namespace llvm
-
#endif
\ No newline at end of file
diff --git a/llvm/tools/llvm-reduce/deltas/Delta.h b/llvm/tools/llvm-reduce/deltas/Delta.h
index 140fa1e870..0f12282e66 100644
--- a/llvm/tools/llvm-reduce/deltas/Delta.h
+++ b/llvm/tools/llvm-reduce/deltas/Delta.h
@@ -17,10 +17,10 @@
#include "ReducerWorkItem.h"
#include "llvm/ADT/ArrayRef.h"
+#include "llvm/ADT/StringRef.h"
#include "llvm/Support/raw_ostream.h"
#include <functional>
#include <utility>
-#include "llvm/ADT/StringRef.h"
namespace llvm {
diff --git a/llvm/tools/llvm-reduce/deltas/ReduceBasicBlocks.cpp b/llvm/tools/llvm-reduce/deltas/ReduceBasicBlocks.cpp
index c8cfea3f73..f4b0a43c3f 100644
--- a/llvm/tools/llvm-reduce/deltas/ReduceBasicBlocks.cpp
+++ b/llvm/tools/llvm-reduce/deltas/ReduceBasicBlocks.cpp
@@ -220,7 +220,7 @@ static void removeUnreachableBasicBlocksFromModule(Oracle &O,
}
}
-void llvm::reduceUnreachableBasicBlocksDeltaPass(TestRunner &Test, StringRef PassMessage) {
- runDeltaPass(Test, removeUnreachableBasicBlocksFromModule,
- PassMessage);
+void llvm::reduceUnreachableBasicBlocksDeltaPass(TestRunner &Test,
+ StringRef PassMessage) {
+ runDeltaPass(Test, removeUnreachableBasicBlocksFromModule, PassMessage);
}
diff --git a/llvm/tools/llvm-reduce/deltas/ReduceBasicBlocks.h b/llvm/tools/llvm-reduce/deltas/ReduceBasicBlocks.h
index 93d5122e75..224c610aae 100644
--- a/llvm/tools/llvm-reduce/deltas/ReduceBasicBlocks.h
+++ b/llvm/tools/llvm-reduce/deltas/ReduceBasicBlocks.h
@@ -19,7 +19,8 @@
namespace llvm {
void reduceBasicBlocksDeltaPass(TestRunner &Test, StringRef PassMessage);
-void reduceUnreachableBasicBlocksDeltaPass(TestRunner &Test, StringRef PassMessage);
+void reduceUnreachableBasicBlocksDeltaPass(TestRunner &Test,
+ StringRef PassMessage);
} // namespace llvm
#endif
diff --git a/llvm/tools/llvm-reduce/deltas/ReduceDistinctMetadata.cpp b/llvm/tools/llvm-reduce/deltas/ReduceDistinctMetadata.cpp
index aaa1a9569e..6c56144b03 100644
--- a/llvm/tools/llvm-reduce/deltas/ReduceDistinctMetadata.cpp
+++ b/llvm/tools/llvm-reduce/deltas/ReduceDistinctMetadata.cpp
@@ -136,7 +136,7 @@ static void extractDistinctMetadataFromModule(Oracle &O,
cleanUpTemporaries(NamedNode, TemporaryTuple, Program);
}
-void llvm::reduceDistinctMetadataDeltaPass(TestRunner &Test, StringRef PassMessage) {
- runDeltaPass(Test, extractDistinctMetadataFromModule,
- PassMessage);
+void llvm::reduceDistinctMetadataDeltaPass(TestRunner &Test,
+ StringRef PassMessage) {
+ runDeltaPass(Test, extractDistinctMetadataFromModule, PassMessage);
}
diff --git a/llvm/tools/llvm-reduce/deltas/ReduceFunctionBodies.cpp b/llvm/tools/llvm-reduce/deltas/ReduceFunctionBodies.cpp
index d856db74f8..60ab0d84c7 100644
--- a/llvm/tools/llvm-reduce/deltas/ReduceFunctionBodies.cpp
+++ b/llvm/tools/llvm-reduce/deltas/ReduceFunctionBodies.cpp
@@ -32,9 +32,9 @@ static void extractFunctionBodiesFromModule(Oracle &O,
}
}
-void llvm::reduceFunctionBodiesDeltaPass(TestRunner &Test, StringRef PassMessage) {
- runDeltaPass(Test, extractFunctionBodiesFromModule,
- PassMessage);
+void llvm::reduceFunctionBodiesDeltaPass(TestRunner &Test,
+ StringRef PassMessage) {
+ runDeltaPass(Test, extractFunctionBodiesFromModule, PassMessage);
}
static void reduceFunctionData(Oracle &O, ReducerWorkItem &WorkItem) {
@@ -57,6 +57,7 @@ static void reduceFunctionData(Oracle &O, ReducerWorkItem &WorkItem) {
}
}
-void llvm::reduceFunctionDataDeltaPass(TestRunner &Test, StringRef PassMessage) {
+void llvm::reduceFunctionDataDeltaPass(TestRunner &Test,
+ StringRef PassMessage) {
runDeltaPass(Test, reduceFunctionData, PassMessage);
}
diff --git a/llvm/tools/llvm-reduce/deltas/ReduceGlobalObjects.cpp b/llvm/tools/llvm-reduce/deltas/ReduceGlobalObjects.cpp
index 27b354ce86..6b77cc8944 100644
--- a/llvm/tools/llvm-reduce/deltas/ReduceGlobalObjects.cpp
+++ b/llvm/tools/llvm-reduce/deltas/ReduceGlobalObjects.cpp
@@ -30,6 +30,7 @@ static void reduceGOs(Oracle &O, ReducerWorkItem &Program) {
}
}
-void llvm::reduceGlobalObjectsDeltaPass(TestRunner &Test, StringRef PassMessage) {
+void llvm::reduceGlobalObjectsDeltaPass(TestRunner &Test,
+ StringRef PassMessage) {
runDeltaPass(Test, reduceGOs, PassMessage);
}
diff --git a/llvm/tools/llvm-reduce/deltas/ReduceGlobalValues.cpp b/llvm/tools/llvm-reduce/deltas/ReduceGlobalValues.cpp
index c956efad9a..e15045e21e 100644
--- a/llvm/tools/llvm-reduce/deltas/ReduceGlobalValues.cpp
+++ b/llvm/tools/llvm-reduce/deltas/ReduceGlobalValues.cpp
@@ -67,6 +67,7 @@ static void reduceGVs(Oracle &O, ReducerWorkItem &Program) {
}
}
-void llvm::reduceGlobalValuesDeltaPass(TestRunner &Test, StringRef PassMessage) {
+void llvm::reduceGlobalValuesDeltaPass(TestRunner &Test,
+ StringRef PassMessage) {
runDeltaPass(Test, reduceGVs, PassMessage);
}
diff --git a/llvm/tools/llvm-reduce/deltas/ReduceGlobalVarInitializers.cpp b/llvm/tools/llvm-reduce/deltas/ReduceGlobalVarInitializers.cpp
index 4569de7061..30d5e8f156 100644
--- a/llvm/tools/llvm-reduce/deltas/ReduceGlobalVarInitializers.cpp
+++ b/llvm/tools/llvm-reduce/deltas/ReduceGlobalVarInitializers.cpp
@@ -28,6 +28,7 @@ static void extractGVsFromModule(Oracle &O, ReducerWorkItem &WorkItem) {
}
}
-void llvm::reduceGlobalsInitializersDeltaPass(TestRunner &Test, StringRef PassMessage) {
+void llvm::reduceGlobalsInitializersDeltaPass(TestRunner &Test,
+ StringRef PassMessage) {
runDeltaPass(Test, extractGVsFromModule, PassMessage);
}
diff --git a/llvm/tools/llvm-reduce/deltas/ReduceGlobalVarInitializers.h b/llvm/tools/llvm-reduce/deltas/ReduceGlobalVarInitializers.h
index 25b5be7ab1..b1314747e1 100644
--- a/llvm/tools/llvm-reduce/deltas/ReduceGlobalVarInitializers.h
+++ b/llvm/tools/llvm-reduce/deltas/ReduceGlobalVarInitializers.h
@@ -19,7 +19,8 @@
#include "llvm/Transforms/Utils/Cloning.h"
namespace llvm {
-void reduceGlobalsInitializersDeltaPass(TestRunner &Test, StringRef PassMessage);
+void reduceGlobalsInitializersDeltaPass(TestRunner &Test,
+ StringRef PassMessage);
} // namespace llvm
#endif
diff --git a/llvm/tools/llvm-reduce/deltas/ReduceIRReferences.cpp b/llvm/tools/llvm-reduce/deltas/ReduceIRReferences.cpp
index 43c4b6a785..54ec877466 100644
--- a/llvm/tools/llvm-reduce/deltas/ReduceIRReferences.cpp
+++ b/llvm/tools/llvm-reduce/deltas/ReduceIRReferences.cpp
@@ -68,14 +68,17 @@ static void stripIRFromFunctions(Oracle &O, ReducerWorkItem &WorkItem) {
}
}
-void llvm::reduceIRInstructionReferencesDeltaPass(TestRunner &Test, StringRef PassMessage) {
+void llvm::reduceIRInstructionReferencesDeltaPass(TestRunner &Test,
+ StringRef PassMessage) {
runDeltaPass(Test, stripIRFromInstructions, PassMessage);
}
-void llvm::reduceIRBlockReferencesDeltaPass(TestRunner &Test, StringRef PassMessage) {
+void llvm::reduceIRBlockReferencesDeltaPass(TestRunner &Test,
+ StringRef PassMessage) {
runDeltaPass(Test, stripIRFromBlocks, PassMessage);
}
-void llvm::reduceIRFunctionReferencesDeltaPass(TestRunner &Test, StringRef PassMessage) {
+void llvm::reduceIRFunctionReferencesDeltaPass(TestRunner &Test,
+ StringRef PassMessage) {
runDeltaPass(Test, stripIRFromFunctions, PassMessage);
}
diff --git a/llvm/tools/llvm-reduce/deltas/ReduceIRReferences.h b/llvm/tools/llvm-reduce/deltas/ReduceIRReferences.h
index 1b0a64a212..a7cf24b3c2 100644
--- a/llvm/tools/llvm-reduce/deltas/ReduceIRReferences.h
+++ b/llvm/tools/llvm-reduce/deltas/ReduceIRReferences.h
@@ -20,13 +20,15 @@ namespace llvm {
class TestRunner;
/// Remove IR references from instructions (i.e. from memory operands)
-void reduceIRInstructionReferencesDeltaPass(TestRunner &Test, StringRef PassMessage);
+void reduceIRInstructionReferencesDeltaPass(TestRunner &Test,
+ StringRef PassMessage);
/// Remove IR BasicBlock references (the block names)
void reduceIRBlockReferencesDeltaPass(TestRunner &Test, StringRef PassMessage);
/// Remove IR references from function level fields (e.g. frame object names)
-void reduceIRFunctionReferencesDeltaPass(TestRunner &Test, StringRef PassMessage);
+void reduceIRFunctionReferencesDeltaPass(TestRunner &Test,
+ StringRef PassMessage);
} // namespace llvm
diff --git a/llvm/tools/llvm-reduce/deltas/ReduceInstructionFlags.cpp b/llvm/tools/llvm-reduce/deltas/ReduceInstructionFlags.cpp
index a9f08fc541..cf5e55e13e 100644
--- a/llvm/tools/llvm-reduce/deltas/ReduceInstructionFlags.cpp
+++ b/llvm/tools/llvm-reduce/deltas/ReduceInstructionFlags.cpp
@@ -84,6 +84,7 @@ static void reduceFlagsInModule(Oracle &O, ReducerWorkItem &WorkItem) {
}
}
-void llvm::reduceInstructionFlagsDeltaPass(TestRunner &Test, StringRef PassMessage) {
+void llvm::reduceInstructionFlagsDeltaPass(TestRunner &Test,
+ StringRef PassMessage) {
runDeltaPass(Test, reduceFlagsInModule, PassMessage);
}
diff --git a/llvm/tools/llvm-reduce/deltas/ReduceInstructionFlagsMIR.cpp b/llvm/tools/llvm-reduce/deltas/ReduceInstructionFlagsMIR.cpp
index 9d4ff7c045..9b57190be7 100644
--- a/llvm/tools/llvm-reduce/deltas/ReduceInstructionFlagsMIR.cpp
+++ b/llvm/tools/llvm-reduce/deltas/ReduceInstructionFlagsMIR.cpp
@@ -30,6 +30,7 @@ static void removeFlagsFromModule(Oracle &O, ReducerWorkItem &WorkItem) {
}
}
-void llvm::reduceInstructionFlagsMIRDeltaPass(TestRunner &Test, StringRef PassMessage) {
+void llvm::reduceInstructionFlagsMIRDeltaPass(TestRunner &Test,
+ StringRef PassMessage) {
runDeltaPass(Test, removeFlagsFromModule, PassMessage);
}
diff --git a/llvm/tools/llvm-reduce/deltas/ReduceInstructionFlagsMIR.h b/llvm/tools/llvm-reduce/deltas/ReduceInstructionFlagsMIR.h
index 43e4471c3a..4589a5b588 100644
--- a/llvm/tools/llvm-reduce/deltas/ReduceInstructionFlagsMIR.h
+++ b/llvm/tools/llvm-reduce/deltas/ReduceInstructionFlagsMIR.h
@@ -17,7 +17,8 @@
#include "Delta.h"
namespace llvm {
-void reduceInstructionFlagsMIRDeltaPass(TestRunner &Test, StringRef PassMessage);
+void reduceInstructionFlagsMIRDeltaPass(TestRunner &Test,
+ StringRef PassMessage);
} // namespace llvm
#endif
diff --git a/llvm/tools/llvm-reduce/deltas/ReduceInstructions.cpp b/llvm/tools/llvm-reduce/deltas/ReduceInstructions.cpp
index 8273dbc828..2e2ee0e661 100644
--- a/llvm/tools/llvm-reduce/deltas/ReduceInstructions.cpp
+++ b/llvm/tools/llvm-reduce/deltas/ReduceInstructions.cpp
@@ -63,6 +63,7 @@ static void extractInstrFromModule(Oracle &O, ReducerWorkItem &WorkItem) {
I->eraseFromParent();
}
-void llvm::reduceInstructionsDeltaPass(TestRunner &Test, StringRef PassMessage) {
+void llvm::reduceInstructionsDeltaPass(TestRunner &Test,
+ StringRef PassMessage) {
runDeltaPass(Test, extractInstrFromModule, PassMessage);
}
diff --git a/llvm/tools/llvm-reduce/deltas/ReduceInstructionsMIR.cpp b/llvm/tools/llvm-reduce/deltas/ReduceInstructionsMIR.cpp
index a02f2a158f..095c9f3855 100644
--- a/llvm/tools/llvm-reduce/deltas/ReduceInstructionsMIR.cpp
+++ b/llvm/tools/llvm-reduce/deltas/ReduceInstructionsMIR.cpp
@@ -158,6 +158,7 @@ static void extractInstrFromModule(Oracle &O, ReducerWorkItem &WorkItem) {
}
}
-void llvm::reduceInstructionsMIRDeltaPass(TestRunner &Test, StringRef PassMessage) {
+void llvm::reduceInstructionsMIRDeltaPass(TestRunner &Test,
+ StringRef PassMessage) {
runDeltaPass(Test, extractInstrFromModule, PassMessage);
}
diff --git a/llvm/tools/llvm-reduce/deltas/ReduceMemoryOperations.cpp b/llvm/tools/llvm-reduce/deltas/ReduceMemoryOperations.cpp
index ed11c177f3..92458cf5c1 100644
--- a/llvm/tools/llvm-reduce/deltas/ReduceMemoryOperations.cpp
+++ b/llvm/tools/llvm-reduce/deltas/ReduceMemoryOperations.cpp
@@ -41,7 +41,8 @@ static void removeVolatileInModule(Oracle &O, ReducerWorkItem &WorkItem) {
removeVolatileInFunction(O, F);
}
-void llvm::reduceVolatileInstructionsDeltaPass(TestRunner &Test, StringRef PassMessage) {
+void llvm::reduceVolatileInstructionsDeltaPass(TestRunner &Test,
+ StringRef PassMessage) {
runDeltaPass(Test, removeVolatileInModule, PassMessage);
}
@@ -72,9 +73,9 @@ static void reduceAtomicSyncScopesInModule(Oracle &O,
reduceAtomicSyncScopesInFunction(O, F);
}
-void llvm::reduceAtomicSyncScopesDeltaPass(TestRunner &Test, StringRef PassMessage) {
- runDeltaPass(Test, reduceAtomicSyncScopesInModule,
- PassMessage);
+void llvm::reduceAtomicSyncScopesDeltaPass(TestRunner &Test,
+ StringRef PassMessage) {
+ runDeltaPass(Test, reduceAtomicSyncScopesInModule, PassMessage);
}
// TODO: Might be helpful to incrementally relax orders
@@ -105,6 +106,7 @@ static void reduceAtomicOrderingInModule(Oracle &O, ReducerWorkItem &WorkItem) {
reduceAtomicOrderingInFunction(O, F);
}
-void llvm::reduceAtomicOrderingDeltaPass(TestRunner &Test, StringRef PassMessage) {
+void llvm::reduceAtomicOrderingDeltaPass(TestRunner &Test,
+ StringRef PassMessage) {
runDeltaPass(Test, reduceAtomicOrderingInModule, PassMessage);
}
diff --git a/llvm/tools/llvm-reduce/deltas/ReduceMemoryOperations.h b/llvm/tools/llvm-reduce/deltas/ReduceMemoryOperations.h
index 406d271bee..65923654b0 100644
--- a/llvm/tools/llvm-reduce/deltas/ReduceMemoryOperations.h
+++ b/llvm/tools/llvm-reduce/deltas/ReduceMemoryOperations.h
@@ -12,7 +12,8 @@
#include "TestRunner.h"
namespace llvm {
-void reduceVolatileInstructionsDeltaPass(TestRunner &Test, StringRef PassMessage);
+void reduceVolatileInstructionsDeltaPass(TestRunner &Test,
+ StringRef PassMessage);
void reduceAtomicSyncScopesDeltaPass(TestRunner &Test, StringRef PassMessage);
void reduceAtomicOrderingDeltaPass(TestRunner &Test, StringRef PassMessage);
} // namespace llvm
diff --git a/llvm/tools/llvm-reduce/deltas/ReduceMetadata.cpp b/llvm/tools/llvm-reduce/deltas/ReduceMetadata.cpp
index 3d5dca19cf..1904ad58fe 100644
--- a/llvm/tools/llvm-reduce/deltas/ReduceMetadata.cpp
+++ b/llvm/tools/llvm-reduce/deltas/ReduceMetadata.cpp
@@ -127,6 +127,7 @@ void llvm::reduceMetadataDeltaPass(TestRunner &Test, StringRef PassMessage) {
runDeltaPass(Test, extractMetadataFromModule, PassMessage);
}
-void llvm::reduceNamedMetadataDeltaPass(TestRunner &Test, StringRef PassMessage) {
+void llvm::reduceNamedMetadataDeltaPass(TestRunner &Test,
+ StringRef PassMessage) {
runDeltaPass(Test, reduceNamedMetadataOperands, PassMessage);
}
diff --git a/llvm/tools/llvm-reduce/deltas/ReduceOperandBundles.cpp b/llvm/tools/llvm-reduce/deltas/ReduceOperandBundles.cpp
index 1887ec4b1e..d168b9d506 100644
--- a/llvm/tools/llvm-reduce/deltas/ReduceOperandBundles.cpp
+++ b/llvm/tools/llvm-reduce/deltas/ReduceOperandBundles.cpp
@@ -105,7 +105,7 @@ static void extractOperandBundesFromModule(Oracle &O,
maybeRewriteCallWithDifferentBundles(I.first, I.second);
}
-void llvm::reduceOperandBundesDeltaPass(TestRunner &Test, StringRef PassMessage) {
- runDeltaPass(Test, extractOperandBundesFromModule,
- PassMessage);
+void llvm::reduceOperandBundesDeltaPass(TestRunner &Test,
+ StringRef PassMessage) {
+ runDeltaPass(Test, extractOperandBundesFromModule, PassMessage);
}
diff --git a/llvm/tools/llvm-reduce/deltas/ReduceOperands.cpp b/llvm/tools/llvm-reduce/deltas/ReduceOperands.cpp
index e3e72b1823..457f9ad640 100644
--- a/llvm/tools/llvm-reduce/deltas/ReduceOperands.cpp
+++ b/llvm/tools/llvm-reduce/deltas/ReduceOperands.cpp
@@ -126,7 +126,8 @@ void llvm::reduceOperandsOneDeltaPass(TestRunner &Test, StringRef PassMessage) {
PassMessage);
}
-void llvm::reduceOperandsZeroDeltaPass(TestRunner &Test, StringRef PassMessage) {
+void llvm::reduceOperandsZeroDeltaPass(TestRunner &Test,
+ StringRef PassMessage) {
auto ReduceValue = [](Use &Op) -> Value * {
if (!shouldReduceOperand(Op))
return nullptr;
diff --git a/llvm/tools/llvm-reduce/deltas/ReduceOperandsSkip.cpp b/llvm/tools/llvm-reduce/deltas/ReduceOperandsSkip.cpp
index fe8b240bed..e335ce7767 100644
--- a/llvm/tools/llvm-reduce/deltas/ReduceOperandsSkip.cpp
+++ b/llvm/tools/llvm-reduce/deltas/ReduceOperandsSkip.cpp
@@ -230,7 +230,7 @@ static void extractOperandsFromModule(Oracle &O, ReducerWorkItem &WorkItem) {
}
}
-void llvm::reduceOperandsSkipDeltaPass(TestRunner &Test, StringRef PassMessage) {
- runDeltaPass(Test, extractOperandsFromModule,
- PassMessage);
+void llvm::reduceOperandsSkipDeltaPass(TestRunner &Test,
+ StringRef PassMessage) {
+ runDeltaPass(Test, extractOperandsFromModule, PassMessage);
}
diff --git a/llvm/tools/llvm-reduce/deltas/ReduceOperandsToArgs.cpp b/llvm/tools/llvm-reduce/deltas/ReduceOperandsToArgs.cpp
index d90913db42..dd7a5f23d4 100644
--- a/llvm/tools/llvm-reduce/deltas/ReduceOperandsToArgs.cpp
+++ b/llvm/tools/llvm-reduce/deltas/ReduceOperandsToArgs.cpp
@@ -214,7 +214,7 @@ static void reduceOperandsToArgs(Oracle &O, ReducerWorkItem &WorkItem) {
}
}
-void llvm::reduceOperandsToArgsDeltaPass(TestRunner &Test, StringRef PassMessage) {
- runDeltaPass(Test, reduceOperandsToArgs,
- PassMessage);
+void llvm::reduceOperandsToArgsDeltaPass(TestRunner &Test,
+ StringRef PassMessage) {
+ runDeltaPass(Test, reduceOperandsToArgs, PassMessage);
}
diff --git a/llvm/tools/llvm-reduce/deltas/ReduceRegisterDefs.cpp b/llvm/tools/llvm-reduce/deltas/ReduceRegisterDefs.cpp
index 609bb53132..497ab8d834 100644
--- a/llvm/tools/llvm-reduce/deltas/ReduceRegisterDefs.cpp
+++ b/llvm/tools/llvm-reduce/deltas/ReduceRegisterDefs.cpp
@@ -117,6 +117,7 @@ static void removeDefsFromModule(Oracle &O, ReducerWorkItem &WorkItem) {
}
}
-void llvm::reduceRegisterDefsMIRDeltaPass(TestRunner &Test, StringRef PassMessage) {
+void llvm::reduceRegisterDefsMIRDeltaPass(TestRunner &Test,
+ StringRef PassMessage) {
runDeltaPass(Test, removeDefsFromModule, PassMessage);
}
diff --git a/llvm/tools/llvm-reduce/deltas/ReduceRegisterMasks.cpp b/llvm/tools/llvm-reduce/deltas/ReduceRegisterMasks.cpp
index f077c42553..894f25f9c8 100644
--- a/llvm/tools/llvm-reduce/deltas/ReduceRegisterMasks.cpp
+++ b/llvm/tools/llvm-reduce/deltas/ReduceRegisterMasks.cpp
@@ -67,6 +67,7 @@ static void reduceMasksInModule(Oracle &O, ReducerWorkItem &WorkItem) {
}
}
-void llvm::reduceRegisterMasksMIRDeltaPass(TestRunner &Test, StringRef PassMessage) {
+void llvm::reduceRegisterMasksMIRDeltaPass(TestRunner &Test,
+ StringRef PassMessage) {
runDeltaPass(Test, reduceMasksInModule, PassMessage);
}
diff --git a/llvm/tools/llvm-reduce/deltas/ReduceRegisterUses.cpp b/llvm/tools/llvm-reduce/deltas/ReduceRegisterUses.cpp
index 572bc61ae6..a48e84a7b2 100644
--- a/llvm/tools/llvm-reduce/deltas/ReduceRegisterUses.cpp
+++ b/llvm/tools/llvm-reduce/deltas/ReduceRegisterUses.cpp
@@ -62,6 +62,7 @@ static void removeUsesFromModule(Oracle &O, ReducerWorkItem &WorkItem) {
}
}
-void llvm::reduceRegisterUsesMIRDeltaPass(TestRunner &Test, StringRef PassMessage) {
+void llvm::reduceRegisterUsesMIRDeltaPass(TestRunner &Test,
+ StringRef PassMessage) {
runDeltaPass(Test, removeUsesFromModule, PassMessage);
}
diff --git a/llvm/tools/llvm-reduce/deltas/ReduceSpecialGlobals.cpp b/llvm/tools/llvm-reduce/deltas/ReduceSpecialGlobals.cpp
index a4d173bff1..62b8182769 100644
--- a/llvm/tools/llvm-reduce/deltas/ReduceSpecialGlobals.cpp
+++ b/llvm/tools/llvm-reduce/deltas/ReduceSpecialGlobals.cpp
@@ -41,7 +41,7 @@ static void extractSpecialGlobalsFromModule(Oracle &O,
}
}
-void llvm::reduceSpecialGlobalsDeltaPass(TestRunner &Test, StringRef PassMessage) {
- runDeltaPass(Test, extractSpecialGlobalsFromModule,
- PassMessage);
+void llvm::reduceSpecialGlobalsDeltaPass(TestRunner &Test,
+ StringRef PassMessage) {
+ runDeltaPass(Test, extractSpecialGlobalsFromModule, PassMessage);
}
diff --git a/llvm/tools/llvm-reduce/deltas/ReduceUsingSimplifyCFG.cpp b/llvm/tools/llvm-reduce/deltas/ReduceUsingSimplifyCFG.cpp
index af1c64150c..079b8253c3 100644
--- a/llvm/tools/llvm-reduce/deltas/ReduceUsingSimplifyCFG.cpp
+++ b/llvm/tools/llvm-reduce/deltas/ReduceUsingSimplifyCFG.cpp
@@ -31,7 +31,8 @@ static void reduceUsingSimplifyCFG(Oracle &O, ReducerWorkItem &WorkItem) {
simplifyCFG(BB, TTI);
}
-void llvm::reduceUsingSimplifyCFGDeltaPass(TestRunner &Test, StringRef PassMessage) {
+void llvm::reduceUsingSimplifyCFGDeltaPass(TestRunner &Test,
+ StringRef PassMessage) {
runDeltaPass(Test, reduceUsingSimplifyCFG, PassMessage);
}
static void reduceConditionals(Oracle &O, ReducerWorkItem &WorkItem,
@@ -59,7 +60,8 @@ static void reduceConditionals(Oracle &O, ReducerWorkItem &WorkItem,
simplifyCFG(BB, TTI);
}
-void llvm::reduceConditionalsTrueDeltaPass(TestRunner &Test, StringRef PassMessage) {
+void llvm::reduceConditionalsTrueDeltaPass(TestRunner &Test,
+ StringRef PassMessage) {
runDeltaPass(
Test,
[](Oracle &O, ReducerWorkItem &WorkItem) {
@@ -68,7 +70,8 @@ void llvm::reduceConditionalsTrueDeltaPass(TestRunner &Test, StringRef PassMessa
PassMessage);
}
-void llvm::reduceConditionalsFalseDeltaPass(TestRunner &Test, StringRef PassMessage) {
+void llvm::reduceConditionalsFalseDeltaPass(TestRunner &Test,
+ StringRef PassMessage) {
runDeltaPass(
Test,
[](Oracle &O, ReducerWorkItem &WorkItem) {
diff --git a/llvm/tools/llvm-reduce/deltas/ReduceVirtualRegisters.cpp b/llvm/tools/llvm-reduce/deltas/ReduceVirtualRegisters.cpp
index e183fb5f68..734a0da97b 100644
--- a/llvm/tools/llvm-reduce/deltas/ReduceVirtualRegisters.cpp
+++ b/llvm/tools/llvm-reduce/deltas/ReduceVirtualRegisters.cpp
@@ -41,7 +41,7 @@ static void dropRegisterHintsFromFunctions(Oracle &O,
}
}
-void llvm::reduceVirtualRegisterHintsDeltaPass(TestRunner &Test, StringRef PassMessage) {
- runDeltaPass(Test, dropRegisterHintsFromFunctions,
- PassMessage);
+void llvm::reduceVirtualRegisterHintsDeltaPass(TestRunner &Test,
+ StringRef PassMessage) {
+ runDeltaPass(Test, dropRegisterHintsFromFunctions, PassMessage);
}
diff --git a/llvm/tools/llvm-reduce/deltas/ReduceVirtualRegisters.h b/llvm/tools/llvm-reduce/deltas/ReduceVirtualRegisters.h
index fbf4f923a0..75b4fc8642 100644
--- a/llvm/tools/llvm-reduce/deltas/ReduceVirtualRegisters.h
+++ b/llvm/tools/llvm-reduce/deltas/ReduceVirtualRegisters.h
@@ -20,7 +20,8 @@ namespace llvm {
class TestRunner;
/// Remove register allocation hints from virtual registes.
-void reduceVirtualRegisterHintsDeltaPass(TestRunner &Test, StringRef PassMessage);
+void reduceVirtualRegisterHintsDeltaPass(TestRunner &Test,
+ StringRef PassMessage);
} // namespace llvm
diff --git a/llvm/tools/llvm-reduce/deltas/SimplifyInstructions.cpp b/llvm/tools/llvm-reduce/deltas/SimplifyInstructions.cpp
index d151e40afc..17ee38553a 100644
--- a/llvm/tools/llvm-reduce/deltas/SimplifyInstructions.cpp
+++ b/llvm/tools/llvm-reduce/deltas/SimplifyInstructions.cpp
@@ -45,6 +45,7 @@ static void extractInstrFromModule(Oracle &O, ReducerWorkItem &WorkItem) {
I->eraseFromParent();
}
-void llvm::simplifyInstructionsDeltaPass(TestRunner &Test, StringRef PassMessage) {
+void llvm::simplifyInstructionsDeltaPass(TestRunner &Test,
+ StringRef PassMessage) {
runDeltaPass(Test, extractInstrFromModule, PassMessage);
}
|
YLChenZ
force-pushed
the
task/llvm-reduce
branch
from
4bc2a46 to
668da24
Compare
llvmbot
added
clang
|
@llvm/pr-subscribers-flang-semantics @llvm/pr-subscribers-clang-modules Author: None (YLChenZ) ChangesCloses #132696. before the patch like this: after the patch like this: Patch is 69.52 KiB, truncated to 20.00 KiB below, full version: https://github.com/llvm/llvm-project/pull/132813.diff 81 Files Affected:
diff --git a/clang/lib/Frontend/ASTUnit.cpp b/clang/lib/Frontend/ASTUnit.cpp
index 0a5f1cfd1a264..4bc0496253f70 100644
--- a/clang/lib/Frontend/ASTUnit.cpp
+++ b/clang/lib/Frontend/ASTUnit.cpp
@@ -832,11 +832,10 @@ std::unique_ptr<ASTUnit> ASTUnit::LoadFromASTFile(
AST->ModCache = createCrossProcessModuleCache();
AST->HSOpts = HSOpts ? HSOpts : std::make_shared<HeaderSearchOptions>();
AST->HSOpts->ModuleFormat = std::string(PCHContainerRdr.getFormats().front());
- AST->HeaderInfo.reset(new HeaderSearch(AST->getHeaderSearchOpts(),
- AST->getSourceManager(),
- AST->getDiagnostics(),
- AST->getLangOpts(),
- /*Target=*/nullptr));
+ AST->HeaderInfo.reset(
+ new HeaderSearch(AST->getHeaderSearchOpts(), AST->getSourceManager(),
+ AST->getDiagnostics(), AST->getLangOpts(),
+ /*Target=*/nullptr));
AST->PPOpts = std::make_shared<PreprocessorOptions>();
// Gather Info for preprocessor construction later on.
diff --git a/clang/lib/Lex/ModuleMap.cpp b/clang/lib/Lex/ModuleMap.cpp
index a1394fd3900b0..c9b5f767555cf 100644
--- a/clang/lib/Lex/ModuleMap.cpp
+++ b/clang/lib/Lex/ModuleMap.cpp
@@ -353,8 +353,7 @@ ModuleMap::ModuleMap(SourceManager &SourceMgr, DiagnosticsEngine &Diags,
const LangOptions &LangOpts, const TargetInfo *Target,
HeaderSearch &HeaderInfo)
: SourceMgr(SourceMgr), Diags(Diags), LangOpts(LangOpts), Target(Target),
- HeaderInfo(HeaderInfo) {
-}
+ HeaderInfo(HeaderInfo) {}
ModuleMap::~ModuleMap() = default;
diff --git a/clang/lib/Serialization/ASTReader.cpp b/clang/lib/Serialization/ASTReader.cpp
index 0cd2cedb48dd9..ce7b9d966d736 100644
--- a/clang/lib/Serialization/ASTReader.cpp
+++ b/clang/lib/Serialization/ASTReader.cpp
@@ -9613,9 +9613,11 @@ ModuleFile *ASTReader::getLocalModuleFile(ModuleFile &M, unsigned ID) const {
return I == GlobalSubmoduleMap.end() ? nullptr : I->second;
} else {
// It's a prefix (preamble, PCH, ...). Look it up by index.
- int IndexFromEnd = static_cast<int>(ID >> 1);
+ int IndexFromEnd = static_cast<int>(ID >> 1);
assert(IndexFromEnd && "got reference to unknown module file");
- return getModuleManager().pch_modules().end()[-static_cast<int>(IndexFromEnd)];
+ return getModuleManager()
+ .pch_modules()
+ .end()[-static_cast<int>(IndexFromEnd)];
}
}
diff --git a/flang/lib/Evaluate/fold-logical.cpp b/flang/lib/Evaluate/fold-logical.cpp
index 6950caf327419..731e79b9337da 100644
--- a/flang/lib/Evaluate/fold-logical.cpp
+++ b/flang/lib/Evaluate/fold-logical.cpp
@@ -880,7 +880,7 @@ Expr<Type<TypeCategory::Logical, KIND>> FoldIntrinsicFunction(
if (args[0]) {
if (const auto *cst{UnwrapExpr<Constant<SomeDerived>>(args[0])}) {
if (auto constr{cst->GetScalarValue()}) {
- if (StructureConstructorValues & values{constr->values()};
+ if (StructureConstructorValues &values{constr->values()};
values.size() == 1) {
const Expr<SomeType> &value{values.begin()->second.value()};
if (auto flag{ToInt64(value)}) {
diff --git a/libcxx/test/std/utilities/utility/forward/forward_like.verify.cpp b/libcxx/test/std/utilities/utility/forward/forward_like.verify.cpp
index 279f0e60a1c38..5f7a319ff38ee 100644
--- a/libcxx/test/std/utilities/utility/forward/forward_like.verify.cpp
+++ b/libcxx/test/std/utilities/utility/forward/forward_like.verify.cpp
@@ -39,8 +39,8 @@ void test() {
(void)std::forward_like<vfp>(i); // expected-error {{no matching function for call to 'forward_like'}}
(void)std::forward_like<cvfp>(i); // expected-error {{no matching function for call to 'forward_like'}}
- using fpr = void()&;
- using fprr = void()&&;
+ using fpr = void() &;
+ using fprr = void() &&;
(void)std::forward_like<fpr>(i); // expected-error {{no matching function for call to 'forward_like'}}
(void)std::forward_like<fprr>(i); // expected-error {{no matching function for call to 'forward_like'}}
}
diff --git a/llvm/tools/llvm-reduce/DeltaManager.cpp b/llvm/tools/llvm-reduce/DeltaManager.cpp
index 624b5306bc71b..dfa4aa6a534fd 100644
--- a/llvm/tools/llvm-reduce/DeltaManager.cpp
+++ b/llvm/tools/llvm-reduce/DeltaManager.cpp
@@ -53,6 +53,8 @@
#include "deltas/StripDebugInfo.h"
#include "llvm/ADT/SmallSet.h"
#include "llvm/Support/CommandLine.h"
+#include "DeltaPass.h"
+#include "llvm/ADT/ArrayRef.h"
using namespace llvm;
@@ -71,91 +73,77 @@ static cl::list<std::string>
"default, run all delta passes."),
cl::cat(LLVMReduceOptions), cl::CommaSeparated);
-#define DELTA_PASSES \
- do { \
- DELTA_PASS("strip-debug-info", stripDebugInfoDeltaPass) \
- DELTA_PASS("functions", reduceFunctionsDeltaPass) \
- DELTA_PASS("function-bodies", reduceFunctionBodiesDeltaPass) \
- DELTA_PASS("special-globals", reduceSpecialGlobalsDeltaPass) \
- DELTA_PASS("aliases", reduceAliasesDeltaPass) \
- DELTA_PASS("ifuncs", reduceIFuncsDeltaPass) \
- DELTA_PASS("simplify-conditionals-true", reduceConditionalsTrueDeltaPass) \
- DELTA_PASS("simplify-conditionals-false", \
- reduceConditionalsFalseDeltaPass) \
- DELTA_PASS("invokes", reduceInvokesDeltaPass) \
- DELTA_PASS("unreachable-basic-blocks", \
- reduceUnreachableBasicBlocksDeltaPass) \
- DELTA_PASS("basic-blocks", reduceBasicBlocksDeltaPass) \
- DELTA_PASS("simplify-cfg", reduceUsingSimplifyCFGDeltaPass) \
- DELTA_PASS("function-data", reduceFunctionDataDeltaPass) \
- DELTA_PASS("global-values", reduceGlobalValuesDeltaPass) \
- DELTA_PASS("global-objects", reduceGlobalObjectsDeltaPass) \
- DELTA_PASS("global-initializers", reduceGlobalsInitializersDeltaPass) \
- DELTA_PASS("global-variables", reduceGlobalsDeltaPass) \
- DELTA_PASS("di-metadata", reduceDIMetadataDeltaPass) \
- DELTA_PASS("dbg-records", reduceDbgRecordDeltaPass) \
- DELTA_PASS("distinct-metadata", reduceDistinctMetadataDeltaPass) \
- DELTA_PASS("metadata", reduceMetadataDeltaPass) \
- DELTA_PASS("named-metadata", reduceNamedMetadataDeltaPass) \
- DELTA_PASS("arguments", reduceArgumentsDeltaPass) \
- DELTA_PASS("instructions", reduceInstructionsDeltaPass) \
- DELTA_PASS("simplify-instructions", simplifyInstructionsDeltaPass) \
- DELTA_PASS("ir-passes", runIRPassesDeltaPass) \
- DELTA_PASS("operands-zero", reduceOperandsZeroDeltaPass) \
- DELTA_PASS("operands-one", reduceOperandsOneDeltaPass) \
- DELTA_PASS("operands-nan", reduceOperandsNaNDeltaPass) \
- DELTA_PASS("operands-to-args", reduceOperandsToArgsDeltaPass) \
- DELTA_PASS("operands-skip", reduceOperandsSkipDeltaPass) \
- DELTA_PASS("operand-bundles", reduceOperandBundesDeltaPass) \
- DELTA_PASS("attributes", reduceAttributesDeltaPass) \
- DELTA_PASS("module-data", reduceModuleDataDeltaPass) \
- DELTA_PASS("opcodes", reduceOpcodesDeltaPass) \
- DELTA_PASS("volatile", reduceVolatileInstructionsDeltaPass) \
- DELTA_PASS("atomic-ordering", reduceAtomicOrderingDeltaPass) \
- DELTA_PASS("syncscopes", reduceAtomicSyncScopesDeltaPass) \
- DELTA_PASS("instruction-flags", reduceInstructionFlagsDeltaPass) \
- } while (false)
-
-#define DELTA_PASSES_MIR \
- do { \
- DELTA_PASS("instructions", reduceInstructionsMIRDeltaPass) \
- DELTA_PASS("ir-instruction-references", \
- reduceIRInstructionReferencesDeltaPass) \
- DELTA_PASS("ir-block-references", reduceIRBlockReferencesDeltaPass) \
- DELTA_PASS("ir-function-references", reduceIRFunctionReferencesDeltaPass) \
- DELTA_PASS("instruction-flags", reduceInstructionFlagsMIRDeltaPass) \
- DELTA_PASS("register-uses", reduceRegisterUsesMIRDeltaPass) \
- DELTA_PASS("register-defs", reduceRegisterDefsMIRDeltaPass) \
- DELTA_PASS("register-hints", reduceVirtualRegisterHintsDeltaPass) \
- DELTA_PASS("register-masks", reduceRegisterMasksMIRDeltaPass) \
- } while (false)
+// Generate two separate Pass lists: IR_Passes and MIR_Passes
+static const DeltaPass IR_Passes[] = {
+ #undef DELTA_PASS_IR
+ #undef DELTA_PASS_MIR
+ #define DELTA_PASS_IR(NAME, FUNC, DESC) {NAME, FUNC, DESC},
+ #include "DeltaPasses.def"
+ #undef DELTA_PASS_IR
+};
+
+static const DeltaPass MIR_Passes[] = {
+ #undef DELTA_PASS_IR
+#undef DELTA_PASS_MIR
+#define DELTA_PASS_MIR(NAME, FUNC, DESC) {NAME, FUNC, DESC},
+#include "DeltaPasses.def"
+#undef DELTA_PASS_MIR
+};
+
static void runAllDeltaPasses(TestRunner &Tester,
const SmallStringSet &SkipPass) {
-#define DELTA_PASS(NAME, FUNC) \
- if (!SkipPass.count(NAME)) { \
- FUNC(Tester); \
- }
if (Tester.getProgram().isMIR()) {
- DELTA_PASSES_MIR;
+ for(const DeltaPass &Pass : MIR_Passes) {
+ if (!SkipPass.count(Pass.Name)) {
+ SmallString<64> Message;
+ Message += Pass.Desc;
+ Message += " (";
+ Message += Pass.Name;
+ Message += ")";
+ Pass.Func(Tester,Message);
+ }
+ }
} else {
- DELTA_PASSES;
+ for(const DeltaPass &Pass : IR_Passes) {
+ if (!SkipPass.count(Pass.Name)) {
+ SmallString<64> Message;
+ Message += Pass.Desc;
+ Message += " (";
+ Message += Pass.Name;
+ Message += ")";
+ Pass.Func(Tester,Message);
+ }
+ }
}
-#undef DELTA_PASS
}
static void runDeltaPassName(TestRunner &Tester, StringRef PassName) {
-#define DELTA_PASS(NAME, FUNC) \
- if (PassName == NAME) { \
- FUNC(Tester); \
- return; \
- }
if (Tester.getProgram().isMIR()) {
- DELTA_PASSES_MIR;
+ for(const DeltaPass &Pass : MIR_Passes) {
+ if (PassName == Pass.Name) {
+ SmallString<64> Message;
+ Message += Pass.Desc;
+ Message += " (";
+ Message += Pass.Name;
+ Message += ")";
+ Pass.Func(Tester,Message);
+ return;
+ }
+ }
} else {
- DELTA_PASSES;
+ for(const DeltaPass &Pass : IR_Passes) {
+ if (PassName == Pass.Name) {
+ SmallString<64> Message;
+ Message += Pass.Desc;
+ Message += " (";
+ Message += Pass.Name;
+ Message += ")";
+ Pass.Func(Tester,Message);
+ return;
+ }
+ }
}
-#undef DELTA_PASS
// We should have errored on unrecognized passes before trying to run
// anything.
@@ -164,24 +152,25 @@ static void runDeltaPassName(TestRunner &Tester, StringRef PassName) {
void llvm::printDeltaPasses(raw_ostream &OS) {
OS << "Delta passes (pass to `--delta-passes=` as a comma separated list):\n";
-#define DELTA_PASS(NAME, FUNC) OS << " " << NAME << "\n";
OS << " IR:\n";
- DELTA_PASSES;
+ for (const DeltaPass &Pass : IR_Passes) {
+ OS << " " << Pass.Name << "\n";
+ }
OS << " MIR:\n";
- DELTA_PASSES_MIR;
-#undef DELTA_PASS
+ for (const DeltaPass &Pass : MIR_Passes) {
+ OS << " " << Pass.Name << "\n";
+ }
}
// Built a set of available delta passes.
static void collectPassNames(const TestRunner &Tester,
SmallStringSet &NameSet) {
-#define DELTA_PASS(NAME, FUNC) NameSet.insert(NAME);
- if (Tester.getProgram().isMIR()) {
- DELTA_PASSES_MIR;
- } else {
- DELTA_PASSES;
+ for (const DeltaPass &Pass : MIR_Passes) {
+ NameSet.insert(Pass.Name);
+ }
+ for (const DeltaPass &Pass : IR_Passes) {
+ NameSet.insert(Pass.Name);
}
-#undef DELTA_PASS
}
/// Verify all requested or skipped passes are valid names, and return them in a
diff --git a/llvm/tools/llvm-reduce/DeltaPass.h b/llvm/tools/llvm-reduce/DeltaPass.h
new file mode 100644
index 0000000000000..ae8fd489e4308
--- /dev/null
+++ b/llvm/tools/llvm-reduce/DeltaPass.h
@@ -0,0 +1,25 @@
+//===--- DeltaPass.h - Delta Pass Structure --------------------*- C++ -*-===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+
+
+#ifndef LLVM_TOOLS_LLVM_REDUCE_DELTAPASS_H
+#define LLVM_TOOLS_LLVM_REDUCE_DELTAPASS_H
+
+#include "TestRunner.h"
+
+namespace llvm {
+struct DeltaPass {
+ StringRef Name; // e.g., "strip-debug-info"
+ void (*Func)(TestRunner &, StringRef); // function pointer, e.g.,stripDebugInfoDeltaPass
+ StringRef Desc; // e.g., "Stripping Debug Info"
+};
+} // namespace llvm
+
+
+#endif
\ No newline at end of file
diff --git a/llvm/tools/llvm-reduce/DeltaPasses.def b/llvm/tools/llvm-reduce/DeltaPasses.def
new file mode 100644
index 0000000000000..5ef3f79604918
--- /dev/null
+++ b/llvm/tools/llvm-reduce/DeltaPasses.def
@@ -0,0 +1,68 @@
+//===--- DeltaPasses.def - Delta Pass Definitions --------------*- C++ -*-===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+
+#ifndef DELTA_PASS_IR
+#define DELTA_PASS_IR(NAME, FUNC, DESC)
+#endif
+DELTA_PASS_IR("strip-debug-info", stripDebugInfoDeltaPass, "Stripping Debug Info")
+DELTA_PASS_IR("functions", reduceFunctionsDeltaPass, "Reducing Functions")
+DELTA_PASS_IR("function-bodies", reduceFunctionBodiesDeltaPass, "Reducing Function Bodies")
+DELTA_PASS_IR("special-globals", reduceSpecialGlobalsDeltaPass, "Reducing Special Globals")
+DELTA_PASS_IR("aliases", reduceAliasesDeltaPass, "Reducing Aliases")
+DELTA_PASS_IR("ifuncs", reduceIFuncsDeltaPass, "Reducing Ifuncs")
+DELTA_PASS_IR("simplify-conditionals-true", reduceConditionalsTrueDeltaPass,"Reducing conditional branches to true")
+DELTA_PASS_IR("simplify-conditionals-false",
+ reduceConditionalsFalseDeltaPass,"Reducing conditional branches to false")
+DELTA_PASS_IR("invokes", reduceInvokesDeltaPass, "Reducing Invokes")
+DELTA_PASS_IR("unreachable-basic-blocks",
+ reduceUnreachableBasicBlocksDeltaPass, "Removing Unreachable Basic Blocks")
+DELTA_PASS_IR("basic-blocks", reduceBasicBlocksDeltaPass, "Reducing Basic Blocks")
+DELTA_PASS_IR("simplify-cfg", reduceUsingSimplifyCFGDeltaPass,"Reducing using SimplifyCFG")
+DELTA_PASS_IR("function-data", reduceFunctionDataDeltaPass, "Reducing Function Data")
+DELTA_PASS_IR("global-values", reduceGlobalValuesDeltaPass, "Reducing GlobalValues")
+DELTA_PASS_IR("global-objects", reduceGlobalObjectsDeltaPass, "Reducing GlobalObjects")
+DELTA_PASS_IR("global-initializers", reduceGlobalsInitializersDeltaPass, "Reducing GV Initializers")
+DELTA_PASS_IR("global-variables", reduceGlobalsDeltaPass, "Reducing GlobalVariables")
+DELTA_PASS_IR("di-metadata", reduceDIMetadataDeltaPass, "Reducing DIMetadata")
+DELTA_PASS_IR("dbg-records", reduceDbgRecordDeltaPass, "Reducing DbgRecords")
+DELTA_PASS_IR("distinct-metadata", reduceDistinctMetadataDeltaPass, "Reducing Distinct Metadata")
+DELTA_PASS_IR("metadata", reduceMetadataDeltaPass,"Reducing Metadata")
+DELTA_PASS_IR("named-metadata", reduceNamedMetadataDeltaPass,"Reducing Named Metadata")
+DELTA_PASS_IR("arguments", reduceArgumentsDeltaPass, "Reducing Arguments")
+DELTA_PASS_IR("instructions", reduceInstructionsDeltaPass, "Reducing Instructions")
+DELTA_PASS_IR("simplify-instructions", simplifyInstructionsDeltaPass,"Simplifying Instructions")
+DELTA_PASS_IR("ir-passes", runIRPassesDeltaPass,"Running passes")
+DELTA_PASS_IR("operands-zero", reduceOperandsZeroDeltaPass,"Reducing Operands to zero")
+DELTA_PASS_IR("operands-one", reduceOperandsOneDeltaPass,"Reducing Operands to one")
+DELTA_PASS_IR("operands-nan", reduceOperandsNaNDeltaPass,"Reducing Operands to NaN")
+DELTA_PASS_IR("operands-to-args", reduceOperandsToArgsDeltaPass,"Converting operands to function arguments")
+DELTA_PASS_IR("operands-skip", reduceOperandsSkipDeltaPass,"Reducing operands by skipping over instructions")
+DELTA_PASS_IR("operand-bundles", reduceOperandBundesDeltaPass,"Reducing Operand Bundles")
+DELTA_PASS_IR("attributes", reduceAttributesDeltaPass, "Reducing Attributes")
+DELTA_PASS_IR("module-data", reduceModuleDataDeltaPass,"Reducing Module Data")
+DELTA_PASS_IR("opcodes", reduceOpcodesDeltaPass,"Reducing Opcodes")
+DELTA_PASS_IR("volatile", reduceVolatileInstructionsDeltaPass,"Reducing Volatile Instructions")
+DELTA_PASS_IR("atomic-ordering", reduceAtomicOrderingDeltaPass,"Reducing Atomic Ordering")
+DELTA_PASS_IR("syncscopes", reduceAtomicSyncScopesDeltaPass,"Reducing Atomic Sync Scopes")
+DELTA_PASS_IR("instruction-flags", reduceInstructionFlagsDeltaPass, "Reducing Instruction Flags")
+
+
+#ifndef DELTA_PASS_MIR
+#define DELTA_PASS_MIR(NAME, FUNC, DESC)
+#endif
+DELTA_PASS_MIR("instructions", reduceInstructionsMIRDeltaPass, "Reducing Instructions")
+DELTA_PASS_MIR("ir-instruction-references",
+ reduceIRInstructionReferencesDeltaPass,"Reducing IR references from instructions")
+DELTA_PASS_MIR("ir-block-references", reduceIRBlockReferencesDeltaPass,"Reducing IR references from blocks")
+DELTA_PASS_MIR("ir-function-references", reduceIRFunctionReferencesDeltaPass,"Reducing IR references from functions")
+DELTA_PASS_MIR("instruction-flags", reduceInstructionFlagsMIRDeltaPass, "Reducing Instruction Flags")
+DELTA_PASS_MIR("register-uses", reduceRegisterUsesMIRDeltaPass,"Reducing register uses")
+DELTA_PASS_MIR("register-defs", reduceRegisterDefsMIRDeltaPass,"Reducing register defs")
+DELTA_PASS_MIR("register-hints", reduceVirtualRegisterHintsDeltaPass,"Reducing virtual register hints from functions")
+DELTA_PASS_MIR("register-masks", reduceRegisterMasksMIRDeltaPass,"Reducing register m...
[truncated]
|
|
I'm having some problems with my code branch, I guess I should resubmit a PR, I apologize for that! |
arsenm
reviewed
Mar 27, 2025
Comment on lines
+835
to
+838
| AST->HeaderInfo.reset( | ||
| new HeaderSearch(AST->getHeaderSearchOpts(), AST->getSourceManager(), | ||
| AST->getDiagnostics(), AST->getLangOpts(), | ||
| /*Target=*/nullptr)); |
There was a problem hiding this comment.
Seems to have pulled in a lot of unrelated changes
| Message += Pass.Desc; | ||
| Message += " ("; | ||
| Message += Pass.Name; | ||
| Message += ")"; |
There was a problem hiding this comment.
Suggested change
| Message += ")"; | |
| Message += ')'; |
| Message += Pass.Desc; | ||
| Message += " ("; | ||
| Message += Pass.Name; | ||
| Message += ")"; |
There was a problem hiding this comment.
Suggested change
| Message += ")"; | |
| Message += ')'; |
| Message += Pass.Desc; | ||
| Message += " ("; | ||
| Message += Pass.Name; | ||
| Message += ")"; |
There was a problem hiding this comment.
Suggested change
| Message += ")"; | |
| Message += ')'; |
Comment on lines
+125
to
+126
| SmallString<64> Message; | ||
| Message += Pass.Desc; |
There was a problem hiding this comment.
Suggested change
| SmallString<64> Message; | |
| Message += Pass.Desc; | |
| SmallString<64> Message = Pass.Desc; |
Comment on lines
+9
to
+10
|
|
||
|
|
| } // namespace llvm | ||
|
|
||
|
|
||
| #endif |
There was a problem hiding this comment.
Suggested change
| #endif | |
| #endif | |
| DELTA_PASS_MIR("register-uses", reduceRegisterUsesMIRDeltaPass,"Reducing register uses") | ||
| DELTA_PASS_MIR("register-defs", reduceRegisterDefsMIRDeltaPass,"Reducing register defs") | ||
| DELTA_PASS_MIR("register-hints", reduceVirtualRegisterHintsDeltaPass,"Reducing virtual register hints from functions") | ||
| DELTA_PASS_MIR("register-masks", reduceRegisterMasksMIRDeltaPass,"Reducing register masks") |
There was a problem hiding this comment.
Suggested change
| DELTA_PASS_MIR("register-masks", reduceRegisterMasksMIRDeltaPass,"Reducing register masks") | |
| DELTA_PASS_MIR("register-masks", reduceRegisterMasksMIRDeltaPass,"Reducing register masks") | |
| DELTA_PASSES; | ||
| for(const DeltaPass &Pass : IR_Passes) { | ||
| if (PassName == Pass.Name) { | ||
| SmallString<64> Message; |
There was a problem hiding this comment.
These cases are all building the same message formatting. I think the formatting should only be done in one place where the print finally occurs, without an intermediate string
| @@ -17,8 +17,8 @@ | |||
| #include "Delta.h" | |||
|
|
|||
| namespace llvm { | |||
| void reduceAliasesDeltaPass(TestRunner &Test); | |||
| void reduceIFuncsDeltaPass(TestRunner &Test); | |||
| void reduceAliasesDeltaPass(TestRunner &Test, StringRef PassMessage); | |||
There was a problem hiding this comment.
Something is backwards here. The delta pass implementations shouldn't need to be told what the message is. Instead, can we have these reduce*DeltaPasses return the function_ref to the implementation function, and have the driver in DeltaManager handle the printing of the message from the DeltaPass information?
There was a problem hiding this comment.
That is, the DeltaPass struct would contain function_ref<void(Oracle &, ReducerWorkitem &)> as the implementation function
There was a problem hiding this comment.
Returning the function_ref is an unnecessary indirection. The entry point signatures should just change to void(Oracle &, ReducerWorkitem&). The table can directly refer to those
mordante
reviewed
Mar 27, 2025
Comment on lines
-42
to
+43
| using fpr = void()&; | ||
| using fprr = void()&&; | ||
| using fpr = void() &; | ||
| using fprr = void() &&; |
There was a problem hiding this comment.
Please undo this change since it is not related to the patch.
I notice unneeded whitepaces at other places too, please undo these too.
arsenm
added
llvm-reduce
and removed
clang
|
@arsenm Based on your tips, I have the following in mind: For example: //===- ReduceAliases.h - Specialized Delta Pass -----------------*- C++ -*-===//
#ifndef LLVM_TOOLS_LLVM_REDUCE_DELTAS_REDUCEALIASES_H
#define LLVM_TOOLS_LLVM_REDUCE_DELTAS_REDUCEALIASES_H
#include "Delta.h"
namespace llvm {
void reduceAliasesDeltaPass(TestRunner &Test);
void reduceIFuncsDeltaPass(TestRunner &Test);
} // namespace llvm
#endif//===- ReduceAliases.cpp - Specialized Delta Pass -------------------------===//
#include "ReduceAliases.h"
...
using namespace llvm;
/// Removes all aliases aren't inside any of the
/// desired Chunks.
static void extractAliasesFromModule(Oracle &O, ReducerWorkItem &Program) {
...
}
static void extractIFuncsFromModule(Oracle &O, ReducerWorkItem &WorkItem) {
...
}
void llvm::reduceAliasesDeltaPass(TestRunner &Test, StringRef PassMessage) {
runDeltaPass(Test, extractAliasesFromModule, PassMessage);
}
void llvm::reduceIFuncsDeltaPass(TestRunner &Test, StringRef PassMessage) {
runDeltaPass(Test, extractIFuncsFromModule, PassMessage);
}after: //===- ReduceAliases.h - Specialized Delta Pass -----------------*- C++ -*-===//
#ifndef LLVM_TOOLS_LLVM_REDUCE_DELTAS_REDUCEALIASES_H
#define LLVM_TOOLS_LLVM_REDUCE_DELTAS_REDUCEALIASES_H
#include "Delta.h"
namespace llvm {
void extractAliasesFromModule(Oracle &O, ReducerWorkItem &Program);
void extractIFuncsFromModule(Oracle &O, ReducerWorkItem &WorkItem);
} // namespace llvm
#endif//===- ReduceAliases.cpp - Specialized Delta Pass -------------------------===//
#include "ReduceAliases.h"
...
using namespace llvm;
/// Removes all aliases aren't inside any of the
/// desired Chunks.
void llvm::extractAliasesFromModule(Oracle &O, ReducerWorkItem &Program) {
...
}
void llvm::extractIFuncsFromModule(Oracle &O, ReducerWorkItem &WorkItem) {
...
}
Call runDeltaPass directly in DeltaManager: ...
static void runAllDeltaPasses(TestRunner &Tester,
const SmallStringSet &SkipPass) {
if (Tester.getProgram().isMIR()) {
for(const DeltaPass &Pass : MIR_Passes) {
if (!SkipPass.count(Pass.Name)) {
SmallString<64> Message = Pass.Desc;
Message += " (";
Message += Pass.Name;
Message += ')';
runDeltaPass(Tester,Pass.Func,Message);
}
}
}
... |
|
Yes, that's about right. I think the entry points should be renamed for consistency though. So keep the original reduceIFuncsDeltaPass instead of taking the old implementation detail name (like extractIFuncsFromModule) |
|
Replaced with new PR |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes #132696.
before the patch like this:
after the patch like this: