Skip to content
This repository was archived by the owner on Sep 15, 2025. It is now read-only.

Commit d95b5e7

Browse files
SC llvm teamSC llvm team
SC llvm team
authored and
SC llvm team
committed
Merged main:63b2595846b86b4e4eb9afba5e97dd64e8135c10 into amd-gfx:c176ed1b3b93
Local branch amd-gfx c176ed1 Merged main:caf0897c9c7f6f2a142af06bff8680a23d1d4bf5 into amd-gfx:bd53c0b2e9b9 Remote branch main 63b2595 [AMDGPU][GlobalIsel] Use isRegisterClassType for G_FREEZE and G_IMPLICIT_DEF (llvm#101331)
2 parents c176ed1 + 63b2595 commit d95b5e7

File tree

308 files changed

+12399
-3802
lines changed

Some content is hidden

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

308 files changed

+12399
-3802
lines changed

‎bolt/include/bolt/Core/BinaryData.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,6 @@ inline raw_ostream &operator<<(raw_ostream &OS,
226226
Sep = ",\n ";
227227
TotalCount += AccessInfo.Count;
228228
}
229-
SS.flush();
230229

231230
OS << TotalCount << " total counts : " << TempString;
232231
return OS;

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,6 @@ inline raw_ostream &operator<<(raw_ostream &OS,
117117
TotalCount += CSP.Count;
118118
TotalMispreds += CSP.Mispreds;
119119
}
120-
SS.flush();
121120

122121
OS << TotalCount << " (" << TotalMispreds << " misses) :" << TempString;
123122
return OS;

‎bolt/lib/Passes/RetpolineInsertion.cpp‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,6 @@ std::string createRetpolineFunctionTag(BinaryContext &BC,
181181
if (BrInfo.isReg()) {
182182
BC.InstPrinter->printRegName(TagOS, BrInfo.BranchReg);
183183
TagOS << "_";
184-
TagOS.flush();
185184
return Tag;
186185
}
187186

@@ -212,7 +211,6 @@ std::string createRetpolineFunctionTag(BinaryContext &BC,
212211
BC.InstPrinter->printRegName(TagOS, MemRef.SegRegNum);
213212
}
214213

215-
TagOS.flush();
216214
return Tag;
217215
}
218216

‎bolt/lib/Rewrite/RewriteInstance.cpp‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4245,7 +4245,6 @@ void RewriteInstance::addBoltInfoSection() {
42454245
<< "command line:";
42464246
for (int I = 0; I < Argc; ++I)
42474247
DescOS << " " << Argv[I];
4248-
DescOS.flush();
42494248

42504249
// Encode as GNU GOLD VERSION so it is easily printable by 'readelf -n'
42514250
const std::string BoltInfo =
@@ -4268,7 +4267,6 @@ void RewriteInstance::encodeBATSection() {
42684267
raw_string_ostream DescOS(DescStr);
42694268

42704269
BAT->write(*BC, DescOS);
4271-
DescOS.flush();
42724270

42734271
const std::string BoltInfo =
42744272
BinarySection::encodeELFNote("BOLT", DescStr, BinarySection::NT_BOLT_BAT);

‎bolt/lib/RuntimeLibs/InstrumentationRuntimeLibrary.cpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,6 @@ std::string InstrumentationRuntimeLibrary::buildTables(BinaryContext &BC) {
314314
}
315315
// Our string table lives immediately after descriptions vector
316316
OS << Summary->StringTable;
317-
OS.flush();
318317

319318
return TablesStr;
320319
}

‎bolt/test/X86/log.test‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ RUN: yaml2obj %p/Inputs/blarge.yaml &> %t.exe
66
RUN: llvm-bolt %t.exe -o %t.null --data %p/Inputs/blarge.fdata -v=2 \
77
RUN: --reorder-blocks=normal --print-finalized --log-file=%t.log 2>&1 \
88
RUN: | FileCheck --check-prefix=CHECK --allow-empty %s
9-
RUN: cat %t.log | FileCheck %s --check-prefix=CHECK-LOG
9+
RUN: FileCheck %s --check-prefix=CHECK-LOG --input-file %t.log
1010

1111
CHECK-NOT: BOLT-INFO
1212
CHECK-NOT: BOLT-WARNING
@@ -16,4 +16,4 @@ CHECK-NOT: BOLT-ERROR
1616
CHECK-LOG: BOLT-INFO: Target architecture
1717
CHECK-LOG: BOLT-INFO: BOLT version
1818
CHECK-LOG: BOLT-INFO: basic block reordering modified layout
19-
CHECK-LOG: Binary Function "usqrt"
19+
CHECK-LOG: Binary Function "main"

‎bolt/test/perf2bolt/perf_test.test‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,12 @@
33
REQUIRES: system-linux, perf
44

55
RUN: %clang %S/Inputs/perf_test.c -fuse-ld=lld -Wl,--script=%S/Inputs/perf_test.lds -o %t
6-
RUN: perf record -e cycles:u -o %t2 -- %t
6+
RUN: perf record -Fmax -e cycles:u -o %t2 -- %t
77
RUN: perf2bolt %t -p=%t2 -o %t3 -nl -ignore-build-id 2>&1 | FileCheck %s
88

99
CHECK-NOT: PERF2BOLT-ERROR
1010
CHECK-NOT: !! WARNING !! This high mismatch ratio indicates the input binary is probably not the same binary used during profiling collection.
1111

1212
RUN: %clang %S/Inputs/perf_test.c -no-pie -fuse-ld=lld -o %t4
13-
RUN: perf record -e cycles:u -o %t5 -- %t4
14-
RUN: perf2bolt %t4 -p=%t5 -o %t6 -nl -ignore-build-id 2>&1 | FileCheck %s --check-prefix=CHECK-NO-PIE
15-
16-
CHECK-NO-PIE-NOT: PERF2BOLT-ERROR
17-
CHECK-NO-PIE-NOT: !! WARNING !! This high mismatch ratio indicates the input binary is probably not the same binary used during profiling collection.
13+
RUN: perf record -Fmax -e cycles:u -o %t5 -- %t4
14+
RUN: perf2bolt %t4 -p=%t5 -o %t6 -nl -ignore-build-id 2>&1 | FileCheck %s

‎clang/docs/OpenMPSupport.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ implementation.
294294
+------------------------------+--------------------------------------------------------------+--------------------------+-----------------------------------------------------------------------+
295295
| misc | error directive | :good:`done` | D139166 |
296296
+------------------------------+--------------------------------------------------------------+--------------------------+-----------------------------------------------------------------------+
297-
| misc | scope construct | :none:`worked on` | D157933 |
297+
| misc | scope construct | :good:`done` | D157933, https://github.com/llvm/llvm-project/pull/109197 |
298298
+------------------------------+--------------------------------------------------------------+--------------------------+-----------------------------------------------------------------------+
299299
| misc | routines for controlling and querying team regions | :part:`partial` | D95003 (libomp only) |
300300
+------------------------------+--------------------------------------------------------------+--------------------------+-----------------------------------------------------------------------+

‎clang/include/clang/Basic/BuiltinsNVPTX.def‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -599,14 +599,6 @@ TARGET_BUILTIN(__nvvm_e4m3x2_to_f16x2_rn_relu, "V2hs", "", AND(SM_89,PTX81))
599599
TARGET_BUILTIN(__nvvm_e5m2x2_to_f16x2_rn, "V2hs", "", AND(SM_89,PTX81))
600600
TARGET_BUILTIN(__nvvm_e5m2x2_to_f16x2_rn_relu, "V2hs", "", AND(SM_89,PTX81))
601601

602-
// Bitcast
603-
604-
BUILTIN(__nvvm_bitcast_f2i, "if", "")
605-
BUILTIN(__nvvm_bitcast_i2f, "fi", "")
606-
607-
BUILTIN(__nvvm_bitcast_ll2d, "dLLi", "")
608-
BUILTIN(__nvvm_bitcast_d2ll, "LLid", "")
609-
610602
// FNS
611603
TARGET_BUILTIN(__nvvm_fns, "UiUiUii", "n", PTX60)
612604

‎clang/include/clang/Frontend/ASTUnit.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -692,8 +692,8 @@ class ASTUnit {
692692
///
693693
/// \returns - The initialized ASTUnit or null if the AST failed to load.
694694
static std::unique_ptr<ASTUnit>
695-
LoadFromASTFile(const std::string &Filename,
696-
const PCHContainerReader &PCHContainerRdr, WhatToLoad ToLoad,
695+
LoadFromASTFile(StringRef Filename, const PCHContainerReader &PCHContainerRdr,
696+
WhatToLoad ToLoad,
697697
IntrusiveRefCntPtr<DiagnosticsEngine> Diags,
698698
const FileSystemOptions &FileSystemOpts,
699699
std::shared_ptr<HeaderSearchOptions> HSOpts,

0 commit comments

Comments
 (0)