Skip to content

Commit 7d5a0f7

Browse files
HaohaiWenHaohaiWen
committed
Merge from 'main' to 'sycl-web' (109 commits)
 CONFLICT (content): Merge conflict in clang/lib/Sema/SemaDeclAttr.cpp
2 parents 6b16fbc + d937289 commit 7d5a0f7

File tree

569 files changed

+7733
-3980
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

569 files changed

+7733
-3980
lines changed

‎bolt/include/bolt/Passes/BinaryPasses.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,8 @@ class ReorderBasicBlocks : public BinaryFunctionPass {
142142
/// LT_OPTIMIZE_CACHE piggybacks on the idea from Ispike paper (CGO '04)
143143
/// that suggests putting frequently executed chains first in the layout.
144144
LT_OPTIMIZE_CACHE,
145+
// CACHE_PLUS and EXT_TSP are synonyms, emit warning of deprecation.
146+
LT_OPTIMIZE_CACHE_PLUS,
145147
/// Block reordering guided by the extended TSP metric.
146148
LT_OPTIMIZE_EXT_TSP,
147149
/// Create clusters and use random order for them.

‎bolt/lib/Core/BinaryContext.cpp

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,9 @@ using namespace llvm;
4747

4848
namespace opts {
4949

50-
cl::opt<bool>
51-
NoHugePages("no-huge-pages",
52-
cl::desc("use regular size pages for code alignment"),
53-
cl::ZeroOrMore,
54-
cl::Hidden,
55-
cl::cat(BoltCategory));
50+
cl::opt<bool> NoHugePages("no-huge-pages",
51+
cl::desc("use regular size pages for code alignment"),
52+
cl::Hidden, cl::cat(BoltCategory));
5653

5754
static cl::opt<bool>
5855
PrintDebugInfo("print-debug-info",
@@ -61,12 +58,10 @@ PrintDebugInfo("print-debug-info",
6158
cl::ZeroOrMore,
6259
cl::cat(BoltCategory));
6360

64-
cl::opt<bool>
65-
PrintRelocations("print-relocations",
66-
cl::desc("print relocations when printing functions/objects"),
67-
cl::Hidden,
68-
cl::ZeroOrMore,
69-
cl::cat(BoltCategory));
61+
cl::opt<bool> PrintRelocations(
62+
"print-relocations",
63+
cl::desc("print relocations when printing functions/objects"), cl::Hidden,
64+
cl::cat(BoltCategory));
7065

7166
static cl::opt<bool>
7267
PrintMemData("print-mem-data",

‎bolt/lib/Core/BinaryData.cpp

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,9 @@ extern cl::OptionCategory BoltCategory;
2525
extern cl::opt<unsigned> Verbosity;
2626

2727
cl::opt<bool>
28-
PrintSymbolAliases("print-aliases",
29-
cl::desc("print aliases when printing objects"),
30-
cl::Hidden,
31-
cl::ZeroOrMore,
32-
cl::cat(BoltCategory));
28+
PrintSymbolAliases("print-aliases",
29+
cl::desc("print aliases when printing objects"),
30+
cl::Hidden, cl::cat(BoltCategory));
3331
}
3432

3533
bool BinaryData::isAbsolute() const { return Flags & SymbolRef::SF_Absolute; }

‎bolt/lib/Core/BinaryEmitter.cpp

Lines changed: 10 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,8 @@ namespace opts {
3434
extern cl::opt<JumpTableSupportLevel> JumpTables;
3535
extern cl::opt<bool> PreserveBlocksAlignment;
3636

37-
cl::opt<bool>
38-
AlignBlocks("align-blocks",
39-
cl::desc("align basic blocks"),
40-
cl::init(false),
41-
cl::ZeroOrMore,
42-
cl::cat(BoltOptCategory));
37+
cl::opt<bool> AlignBlocks("align-blocks", cl::desc("align basic blocks"),
38+
cl::cat(BoltOptCategory));
4339

4440
cl::opt<MacroFusionType>
4541
AlignMacroOpFusion("align-macro-fusion",
@@ -70,20 +66,15 @@ FunctionPadSpec("pad-funcs",
7066
cl::Hidden,
7167
cl::cat(BoltCategory));
7268

73-
static cl::opt<bool>
74-
MarkFuncs("mark-funcs",
75-
cl::desc("mark function boundaries with break instruction to make "
76-
"sure we accidentally don't cross them"),
77-
cl::ReallyHidden,
78-
cl::ZeroOrMore,
79-
cl::cat(BoltCategory));
69+
static cl::opt<bool> MarkFuncs(
70+
"mark-funcs",
71+
cl::desc("mark function boundaries with break instruction to make "
72+
"sure we accidentally don't cross them"),
73+
cl::ReallyHidden, cl::cat(BoltCategory));
8074

81-
static cl::opt<bool>
82-
PrintJumpTables("print-jump-tables",
83-
cl::desc("print jump tables"),
84-
cl::ZeroOrMore,
85-
cl::Hidden,
86-
cl::cat(BoltCategory));
75+
static cl::opt<bool> PrintJumpTables("print-jump-tables",
76+
cl::desc("print jump tables"), cl::Hidden,
77+
cl::cat(BoltCategory));
8778

8879
static cl::opt<bool>
8980
X86AlignBranchBoundaryHotOnly("x86-align-branch-boundary-hot-only",

‎bolt/lib/Core/BinaryFunction.cpp

Lines changed: 24 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -64,23 +64,18 @@ extern cl::opt<unsigned> Verbosity;
6464

6565
extern bool processAllFunctions();
6666

67-
cl::opt<bool>
68-
CheckEncoding("check-encoding",
69-
cl::desc("perform verification of LLVM instruction encoding/decoding. "
70-
"Every instruction in the input is decoded and re-encoded. "
71-
"If the resulting bytes do not match the input, a warning message "
72-
"is printed."),
73-
cl::init(false),
74-
cl::ZeroOrMore,
75-
cl::Hidden,
76-
cl::cat(BoltCategory));
77-
78-
static cl::opt<bool>
79-
DotToolTipCode("dot-tooltip-code",
80-
cl::desc("add basic block instructions as tool tips on nodes"),
81-
cl::ZeroOrMore,
82-
cl::Hidden,
83-
cl::cat(BoltCategory));
67+
cl::opt<bool> CheckEncoding(
68+
"check-encoding",
69+
cl::desc("perform verification of LLVM instruction encoding/decoding. "
70+
"Every instruction in the input is decoded and re-encoded. "
71+
"If the resulting bytes do not match the input, a warning message "
72+
"is printed."),
73+
cl::Hidden, cl::cat(BoltCategory));
74+
75+
static cl::opt<bool> DotToolTipCode(
76+
"dot-tooltip-code",
77+
cl::desc("add basic block instructions as tool tips on nodes"), cl::Hidden,
78+
cl::cat(BoltCategory));
8479

8580
cl::opt<JumpTableSupportLevel>
8681
JumpTables("jump-tables",
@@ -102,21 +97,17 @@ JumpTables("jump-tables",
10297
cl::ZeroOrMore,
10398
cl::cat(BoltOptCategory));
10499

105-
static cl::opt<bool>
106-
NoScan("no-scan",
107-
cl::desc("do not scan cold functions for external references (may result in "
108-
"slower binary)"),
109-
cl::init(false),
110-
cl::ZeroOrMore,
111-
cl::Hidden,
112-
cl::cat(BoltOptCategory));
100+
static cl::opt<bool> NoScan(
101+
"no-scan",
102+
cl::desc(
103+
"do not scan cold functions for external references (may result in "
104+
"slower binary)"),
105+
cl::Hidden, cl::cat(BoltOptCategory));
113106

114107
cl::opt<bool>
115-
PreserveBlocksAlignment("preserve-blocks-alignment",
116-
cl::desc("try to preserve basic block alignment"),
117-
cl::init(false),
118-
cl::ZeroOrMore,
119-
cl::cat(BoltOptCategory));
108+
PreserveBlocksAlignment("preserve-blocks-alignment",
109+
cl::desc("try to preserve basic block alignment"),
110+
cl::cat(BoltOptCategory));
120111

121112
cl::opt<bool>
122113
PrintDynoStats("dyno-stats",
@@ -139,11 +130,9 @@ PrintOnly("print-only",
139130
cl::cat(BoltCategory));
140131

141132
cl::opt<bool>
142-
TimeBuild("time-build",
143-
cl::desc("print time spent constructing binary functions"),
144-
cl::ZeroOrMore,
145-
cl::Hidden,
146-
cl::cat(BoltCategory));
133+
TimeBuild("time-build",
134+
cl::desc("print time spent constructing binary functions"),
135+
cl::Hidden, cl::cat(BoltCategory));
147136

148137
cl::opt<bool>
149138
TrapOnAVX512("trap-avx512",

‎bolt/lib/Core/BinaryFunctionProfile.cpp

Lines changed: 11 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -40,29 +40,20 @@ cl::opt<IndirectCallPromotionType> ICP(
4040

4141
extern cl::opt<JumpTableSupportLevel> JumpTables;
4242

43-
static cl::opt<bool>
44-
FixFuncCounts("fix-func-counts",
45-
cl::desc("adjust function counts based on basic blocks execution count"),
46-
cl::init(false),
47-
cl::ZeroOrMore,
48-
cl::Hidden,
49-
cl::cat(BoltOptCategory));
43+
static cl::opt<bool> FixFuncCounts(
44+
"fix-func-counts",
45+
cl::desc("adjust function counts based on basic blocks execution count"),
46+
cl::Hidden, cl::cat(BoltOptCategory));
5047

51-
static cl::opt<bool>
52-
FixBlockCounts("fix-block-counts",
53-
cl::desc("adjust block counts based on outgoing branch counts"),
54-
cl::init(true),
55-
cl::ZeroOrMore,
56-
cl::Hidden,
57-
cl::cat(BoltOptCategory));
48+
static cl::opt<bool> FixBlockCounts(
49+
"fix-block-counts",
50+
cl::desc("adjust block counts based on outgoing branch counts"),
51+
cl::init(true), cl::Hidden, cl::cat(BoltOptCategory));
5852

5953
static cl::opt<bool>
60-
InferFallThroughs("infer-fall-throughs",
61-
cl::desc("infer execution count for fall-through blocks"),
62-
cl::init(false),
63-
cl::ZeroOrMore,
64-
cl::Hidden,
65-
cl::cat(BoltOptCategory));
54+
InferFallThroughs("infer-fall-throughs",
55+
cl::desc("infer execution count for fall-through blocks"),
56+
cl::Hidden, cl::cat(BoltOptCategory));
6657

6758
} // namespace opts
6859

‎bolt/lib/Core/Exceptions.cpp

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,9 @@ extern llvm::cl::OptionCategory BoltCategory;
3939
extern llvm::cl::opt<unsigned> Verbosity;
4040

4141
static llvm::cl::opt<bool>
42-
PrintExceptions("print-exceptions",
43-
llvm::cl::desc("print exception handling data"),
44-
llvm::cl::ZeroOrMore,
45-
llvm::cl::Hidden,
46-
llvm::cl::cat(BoltCategory));
42+
PrintExceptions("print-exceptions",
43+
llvm::cl::desc("print exception handling data"),
44+
llvm::cl::Hidden, llvm::cl::cat(BoltCategory));
4745

4846
} // namespace opts
4947

‎bolt/lib/Passes/Aligner.cpp

Lines changed: 16 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -33,23 +33,19 @@ AlignBlocksMinSize("align-blocks-min-size",
3333
cl::Hidden,
3434
cl::cat(BoltOptCategory));
3535

36-
cl::opt<unsigned>
37-
AlignBlocksThreshold("align-blocks-threshold",
38-
cl::desc("align only blocks with frequency larger than containing function "
39-
"execution frequency specified in percent. E.g. 1000 means aligning "
40-
"blocks that are 10 times more frequently executed than the "
41-
"containing function."),
42-
cl::init(800),
43-
cl::ZeroOrMore,
44-
cl::Hidden,
45-
cl::cat(BoltOptCategory));
46-
47-
cl::opt<unsigned>
48-
AlignFunctionsMaxBytes("align-functions-max-bytes",
49-
cl::desc("maximum number of bytes to use to align functions"),
50-
cl::init(32),
51-
cl::ZeroOrMore,
52-
cl::cat(BoltOptCategory));
36+
cl::opt<unsigned> AlignBlocksThreshold(
37+
"align-blocks-threshold",
38+
cl::desc(
39+
"align only blocks with frequency larger than containing function "
40+
"execution frequency specified in percent. E.g. 1000 means aligning "
41+
"blocks that are 10 times more frequently executed than the "
42+
"containing function."),
43+
cl::init(800), cl::Hidden, cl::cat(BoltOptCategory));
44+
45+
cl::opt<unsigned> AlignFunctionsMaxBytes(
46+
"align-functions-max-bytes",
47+
cl::desc("maximum number of bytes to use to align functions"), cl::init(32),
48+
cl::cat(BoltOptCategory));
5349

5450
cl::opt<unsigned>
5551
BlockAlignment("block-alignment",
@@ -59,11 +55,9 @@ BlockAlignment("block-alignment",
5955
cl::cat(BoltOptCategory));
6056

6157
cl::opt<bool>
62-
UseCompactAligner("use-compact-aligner",
63-
cl::desc("Use compact approach for aligning functions"),
64-
cl::init(true),
65-
cl::ZeroOrMore,
66-
cl::cat(BoltOptCategory));
58+
UseCompactAligner("use-compact-aligner",
59+
cl::desc("Use compact approach for aligning functions"),
60+
cl::init(true), cl::cat(BoltOptCategory));
6761

6862
} // end namespace opts
6963

‎bolt/lib/Passes/AsmDump.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ extern cl::opt<unsigned> Verbosity;
3030
cl::opt<std::string> AsmDump("asm-dump",
3131
cl::desc("dump function into assembly"),
3232
cl::value_desc("dump folder"), cl::ValueOptional,
33-
cl::ZeroOrMore, cl::Hidden, cl::cat(BoltCategory));
33+
cl::Hidden, cl::cat(BoltCategory));
3434
} // end namespace opts
3535

3636
namespace llvm {

0 commit comments

Comments
 (0)