Skip to content

Commit 07ffc7b

Browse files
YonahGoldbergYonahGoldberg
authored
Merge branch 'main' into nvmm-reflect-update
2 parents d4ab347 + b07c885 commit 07ffc7b

File tree

353 files changed

+22042
-3962
lines changed

Some content is hidden

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

353 files changed

+22042
-3962
lines changed

‎bolt/include/bolt/Core/BinaryFunction.h‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1174,6 +1174,11 @@ class BinaryFunction {
11741174
return getSecondaryEntryPointSymbol(BB.getLabel());
11751175
}
11761176

1177+
/// Remove a label from the secondary entry point map.
1178+
void removeSymbolFromSecondaryEntryPointMap(const MCSymbol *Label) {
1179+
SecondaryEntryPoints.erase(Label);
1180+
}
1181+
11771182
/// Return true if the basic block is an entry point into the function
11781183
/// (either primary or secondary).
11791184
bool isEntryPoint(const BinaryBasicBlock &BB) const {
@@ -2126,6 +2131,10 @@ class BinaryFunction {
21262131
return Islands && !Islands->DataOffsets.empty();
21272132
}
21282133

2134+
bool isStartOfConstantIsland(uint64_t Offset) const {
2135+
return hasConstantIsland() && Islands->DataOffsets.count(Offset);
2136+
}
2137+
21292138
/// Return true iff the symbol could be seen inside this function otherwise
21302139
/// it is probably another function.
21312140
bool isSymbolValidInScope(const SymbolRef &Symbol, uint64_t SymbolSize) const;

‎bolt/lib/Core/BinaryFunction.cpp‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1896,6 +1896,15 @@ void BinaryFunction::postProcessEntryPoints() {
18961896
if (BC.isAArch64() && Offset == getSize())
18971897
continue;
18981898

1899+
// If we have grabbed a wrong code label which actually points to some
1900+
// constant island inside the function, ignore this label and remove it
1901+
// from the secondary entry point map.
1902+
if (isStartOfConstantIsland(Offset)) {
1903+
BC.SymbolToFunctionMap.erase(Label);
1904+
removeSymbolFromSecondaryEntryPointMap(Label);
1905+
continue;
1906+
}
1907+
18991908
BC.errs() << "BOLT-WARNING: reference in the middle of instruction "
19001909
"detected in function "
19011910
<< *this << " at offset 0x" << Twine::utohexstr(Offset) << '\n';

‎bolt/runtime/hugify.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
//
77
//===---------------------------------------------------------------------===//
88

9-
#if defined(__x86_64__) || \
10-
(defined(__aarch64__) || defined(__arm64__)) && !defined(__APPLE__)
9+
#if (defined(__x86_64__) || defined(__aarch64__) || defined(__arm64__)) && \
10+
!defined(__APPLE__)
1111

1212
#include "common.h"
1313

‎bolt/test/AArch64/validate-secondary-entry-point.s‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
# This test is to verify that BOLT won't take a label pointing to constant
2+
# island as a secondary entry point (function `_start` doesn't have ELF size
3+
# set originally) and the function won't otherwise be mistaken as non-simple.
4+
5+
# RUN: %clang %cflags -pie %s -o %t.so -Wl,-q -Wl,--init=_foo -Wl,--fini=_foo
6+
# RUN: llvm-bolt %t.so -o %t.bolt.so --print-cfg 2>&1 | FileCheck %s
7+
# CHECK-NOT: BOLT-WARNING: reference in the middle of instruction detected \
8+
# CHECK-NOT: function _start at offset 0x{{[0-9a-f]+}}
9+
# CHECK: Binary Function "_start" after building cfg
10+
11+
.text
12+
13+
.global _foo
14+
.type _foo, %function
15+
_foo:
16+
ret
17+
18+
.global _start
19+
.type _start, %function
20+
_start:
21+
b _foo
22+
23+
.balign 16
24+
_random_consts:
25+
.long 0x12345678
26+
.long 0x90abcdef
27+
28+
.global _bar
29+
.type _bar, %function
30+
_bar:
31+
ret
32+
33+
# Dummy relocation to force relocation mode
34+
.reloc 0, R_AARCH64_NONE

‎bolt/test/RISCV/validate-secondary-entry-point.s‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
# This test is to verify that BOLT won't take a label pointing to constant
2+
# island as a secondary entry point (function `_start` doesn't have ELF size
3+
# set originally) and the function won't otherwise be mistaken as non-simple.
4+
5+
# RUN: %clang %cflags -pie %s -o %t.so -Wl,-q -Wl,--init=_foo -Wl,--fini=_foo
6+
# RUN: llvm-bolt %t.so -o %t.bolt.so --print-cfg 2>&1 | FileCheck %s
7+
# CHECK-NOT: BOLT-WARNING: reference in the middle of instruction detected \
8+
# CHECK-NOT: function _start at offset 0x{{[0-9a-f]+}}
9+
# CHECK: Binary Function "_start" after building cfg
10+
11+
.text
12+
13+
.global _foo
14+
.type _foo, %function
15+
_foo:
16+
ret
17+
18+
.global _start
19+
.type _start, %function
20+
_start:
21+
j _foo
22+
23+
.balign 16
24+
_random_consts:
25+
.long 0x12345678
26+
.long 0x90abcdef
27+
28+
.global _bar
29+
.type _bar, %function
30+
_bar:
31+
ret
32+
33+
# Dummy relocation to force relocation mode
34+
.reloc 0, R_RISCV_NONE

‎clang-tools-extra/test/clang-tidy/checkers/performance/for-range-copy.cpp‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %check_clang_tidy --match-partial-fixes %s performance-for-range-copy %t -- -- -fno-delayed-template-parsing
1+
// RUN: %check_clang_tidy %s performance-for-range-copy %t -- -- -fno-delayed-template-parsing
22

33
namespace std {
44

@@ -79,7 +79,7 @@ template <typename T>
7979
void uninstantiated() {
8080
for (const S S1 : View<Iterator<S>>()) {}
8181
// CHECK-MESSAGES: [[@LINE-1]]:16: warning: the loop variable's type is not a reference type; this creates a copy in each iteration; consider making this a reference [performance-for-range-copy]
82-
// CHECK-FIXES: {{^}} for (const S& S1 : View<Iterator<S>>()) {}
82+
// CHECK-FIXES: for (const S& S1 : View<Iterator<S>>()) {}
8383

8484
// Don't warn on dependent types.
8585
for (const T t1 : View<Iterator<T>>()) {
@@ -90,15 +90,15 @@ template <typename T>
9090
void instantiated() {
9191
for (const S S2 : View<Iterator<S>>()) {}
9292
// CHECK-MESSAGES: [[@LINE-1]]:16: warning: the loop variable's type is {{.*}}
93-
// CHECK-FIXES: {{^}} for (const S& S2 : View<Iterator<S>>()) {}
93+
// CHECK-FIXES: for (const S& S2 : View<Iterator<S>>()) {}
9494

9595
for (const auto [X, Y] : View<Iterator<Point>>()) {}
9696
// CHECK-MESSAGES: [[@LINE-1]]:19: warning: the loop variable's type is
97-
// CHECK-FIXES: {{^}} for (const auto& [X, Y] : View<Iterator<Point>>()) {}
97+
// CHECK-FIXES: for (const auto& [X, Y] : View<Iterator<Point>>()) {}
9898

9999
for (const T T2 : View<Iterator<T>>()) {}
100100
// CHECK-MESSAGES: [[@LINE-1]]:16: warning: the loop variable's type is {{.*}}
101-
// CHECK-FIXES: {{^}} for (const T& T2 : View<Iterator<T>>()) {}
101+
// CHECK-FIXES: for (const T& T2 : View<Iterator<T>>()) {}
102102
}
103103

104104
template <typename T>
@@ -311,10 +311,8 @@ View<Iterator<S>> createView(S) { return View<Iterator<S>>(); }
311311

312312
void positiveValueIteratorUsedElseWhere() {
313313
for (const S SS : createView(*ValueReturningIterator<S>())) {
314-
// CHECK-MESSAGES: [[@LINE-1]]:16: warning: the loop variable's type is not
315-
// a reference type; this creates a copy in each iteration; consider making
316-
// this a reference [performance-for-range-copy] CHECK-FIXES: for (const S&
317-
// SS : createView(*ValueReturningIterator<S>())) {
314+
// CHECK-MESSAGES: [[@LINE-1]]:16: warning: the loop variable's type is not a reference type; this creates a copy in each iteration; consider making this a reference [performance-for-range-copy]
315+
// CHECK-FIXES: for (const S& SS : createView(*ValueReturningIterator<S>())) {
318316
}
319317
}
320318

‎clang-tools-extra/test/clang-tidy/checkers/performance/inefficient-algorithm.cpp‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -69,83 +69,83 @@ template <typename T> void f(const T &t) {
6969
std::set<int> s;
7070
find(s.begin(), s.end(), 46);
7171
// CHECK-MESSAGES: :[[@LINE-1]]:3: warning: this STL algorithm call should be
72-
// CHECK-FIXES: {{^ }}s.find(46);{{$}}
72+
// CHECK-FIXES: s.find(46);
7373

7474
find(t.begin(), t.end(), 46);
75-
// CHECK-FIXES: {{^ }}find(t.begin(), t.end(), 46);{{$}}
75+
// CHECK-FIXES: find(t.begin(), t.end(), 46);
7676
}
7777

7878
int main() {
7979
std::set<int> s;
8080
auto it = std::find(s.begin(), s.end(), 43);
8181
// CHECK-MESSAGES: :[[@LINE-1]]:13: warning: this STL algorithm call should be replaced with a container method [performance-inefficient-algorithm]
82-
// CHECK-FIXES: {{^ }}auto it = s.find(43);{{$}}
82+
// CHECK-FIXES: auto it = s.find(43);
8383
auto c = count(s.begin(), s.end(), 43);
8484
// CHECK-MESSAGES: :[[@LINE-1]]:12: warning: this STL algorithm call should be
85-
// CHECK-FIXES: {{^ }}auto c = s.count(43);{{$}}
85+
// CHECK-FIXES: auto c = s.count(43);
8686

8787
#define SECOND(x, y, z) y
8888
SECOND(q,std::count(s.begin(), s.end(), 22),w);
8989
// CHECK-MESSAGES: :[[@LINE-1]]:12: warning: this STL algorithm call should be
90-
// CHECK-FIXES: {{^ }}SECOND(q,s.count(22),w);{{$}}
90+
// CHECK-FIXES: SECOND(q,s.count(22),w);
9191

9292
it = find_if(s.begin(), s.end(), [](int) { return false; });
9393

9494
std::multiset<int> ms;
9595
find(ms.begin(), ms.end(), 46);
9696
// CHECK-MESSAGES: :[[@LINE-1]]:3: warning: this STL algorithm call should be
97-
// CHECK-FIXES: {{^ }}ms.find(46);{{$}}
97+
// CHECK-FIXES: ms.find(46);
9898

9999
const std::multiset<int> &msref = ms;
100100
find(msref.begin(), msref.end(), 46);
101101
// CHECK-MESSAGES: :[[@LINE-1]]:3: warning: this STL algorithm call should be
102-
// CHECK-FIXES: {{^ }}msref.find(46);{{$}}
102+
// CHECK-FIXES: msref.find(46);
103103

104104
std::multiset<int> *msptr = &ms;
105105
find(msptr->begin(), msptr->end(), 46);
106106
// CHECK-MESSAGES: :[[@LINE-1]]:3: warning: this STL algorithm call should be
107-
// CHECK-FIXES: {{^ }}msptr->find(46);{{$}}
107+
// CHECK-FIXES: msptr->find(46);
108108

109109
it = std::find(s.begin(), s.end(), 43, std::greater<int>());
110110
// CHECK-MESSAGES: :[[@LINE-1]]:42: warning: different comparers used in the algorithm and the container [performance-inefficient-algorithm]
111111

112112
FIND_IN_SET(s);
113113
// CHECK-MESSAGES: :[[@LINE-1]]:3: warning: this STL algorithm call should be
114-
// CHECK-FIXES: {{^ }}FIND_IN_SET(s);{{$}}
114+
// CHECK-FIXES: FIND_IN_SET(s);
115115

116116
f(s);
117117

118118
std::unordered_set<int> us;
119119
lower_bound(us.begin(), us.end(), 10);
120-
// CHECK-FIXES: {{^ }}lower_bound(us.begin(), us.end(), 10);{{$}}
120+
// CHECK-FIXES: lower_bound(us.begin(), us.end(), 10);
121121
find(us.begin(), us.end(), 10);
122122
// CHECK-MESSAGES: :[[@LINE-1]]:3: warning: this STL algorithm call should be
123-
// CHECK-FIXES: {{^ }}us.find(10);{{$}}
123+
// CHECK-FIXES: us.find(10);
124124

125125
std::unordered_multiset<int> ums;
126126
find(ums.begin(), ums.end(), 10);
127127
// CHECK-MESSAGES: :[[@LINE-1]]:3: warning: this STL algorithm call should be
128-
// CHECK-FIXES: {{^ }}ums.find(10);{{$}}
128+
// CHECK-FIXES: ums.find(10);
129129

130130
std::map<int, int> intmap;
131131
find(intmap.begin(), intmap.end(), 46);
132132
// CHECK-MESSAGES: :[[@LINE-1]]:3: warning: this STL algorithm call should be
133-
// CHECK-FIXES: {{^ }}find(intmap.begin(), intmap.end(), 46);{{$}}
133+
// CHECK-FIXES: find(intmap.begin(), intmap.end(), 46);
134134

135135
std::multimap<int, int> intmmap;
136136
find(intmmap.begin(), intmmap.end(), 46);
137137
// CHECK-MESSAGES: :[[@LINE-1]]:3: warning: this STL algorithm call should be
138-
// CHECK-FIXES: {{^ }}find(intmmap.begin(), intmmap.end(), 46);{{$}}
138+
// CHECK-FIXES: find(intmmap.begin(), intmmap.end(), 46);
139139

140140
std::unordered_map<int, int> umap;
141141
find(umap.begin(), umap.end(), 46);
142142
// CHECK-MESSAGES: :[[@LINE-1]]:3: warning: this STL algorithm call should be
143-
// CHECK-FIXES: {{^ }}find(umap.begin(), umap.end(), 46);{{$}}
143+
// CHECK-FIXES: find(umap.begin(), umap.end(), 46);
144144

145145
std::unordered_multimap<int, int> ummap;
146146
find(ummap.begin(), ummap.end(), 46);
147147
// CHECK-MESSAGES: :[[@LINE-1]]:3: warning: this STL algorithm call should be
148-
// CHECK-FIXES: {{^ }}find(ummap.begin(), ummap.end(), 46);{{$}}
148+
// CHECK-FIXES: find(ummap.begin(), ummap.end(), 46);
149149
}
150150

151151
struct Value {
@@ -162,5 +162,5 @@ struct Ordering {
162162
void g(std::set<Value, Ordering> container, int value) {
163163
lower_bound(container.begin(), container.end(), value, Ordering());
164164
// CHECK-MESSAGES: :[[@LINE-1]]:3: warning: this STL algorithm call should be
165-
// CHECK-FIXES: {{^ }}lower_bound(container.begin(), container.end(), value, Ordering());{{$}}
165+
// CHECK-FIXES: lower_bound(container.begin(), container.end(), value, Ordering());
166166
}

‎clang-tools-extra/test/clang-tidy/checkers/performance/trivially-destructible.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ struct NotTriviallyDestructible1 : TriviallyDestructible2 {
2121

2222
NotTriviallyDestructible1::~NotTriviallyDestructible1() = default; // to-be-removed
2323
// CHECK-MESSAGES: :[[@LINE-1]]:28: note: destructor definition is here
24-
// CHECK-FIXES: {{^}}// to-be-removed
24+
// CHECK-FIXES: // to-be-removed
2525

2626
// Don't emit for class template with type-dependent fields.
2727
template <class T>
@@ -57,7 +57,7 @@ struct MaybeTriviallyDestructible1<T *> {
5757
template <class T>
5858
MaybeTriviallyDestructible1<T *>::~MaybeTriviallyDestructible1() noexcept = default; // to-be-removed
5959
// CHECK-MESSAGES: :[[@LINE-1]]:35: note: destructor definition is here
60-
// CHECK-FIXES: {{^}}// to-be-removed
60+
// CHECK-FIXES: // to-be-removed
6161

6262
// Emit for explicit specializations.
6363
template <>
@@ -69,7 +69,7 @@ struct MaybeTriviallyDestructible1<double>: TriviallyDestructible1 {
6969

7070
MaybeTriviallyDestructible1<double>::~MaybeTriviallyDestructible1() noexcept = default; // to-be-removed
7171
// CHECK-MESSAGES: :[[@LINE-1]]:38: note: destructor definition is here
72-
// CHECK-FIXES: {{^}}// to-be-removed
72+
// CHECK-FIXES: // to-be-removed
7373

7474
struct NotTriviallyDestructible2 {
7575
virtual ~NotTriviallyDestructible2();

0 commit comments

Comments
 (0)