Skip to content

Commit c3e8acc

Browse files
authored
Merge branch 'llvm:main' into add_FPAC_to_CPUs
2 parents 99ad372 + 63a2b0b commit c3e8acc

File tree

1,190 files changed

+153462
-72259
lines changed

Some content is hidden

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

1,190 files changed

+153462
-72259
lines changed

.github/workflows/commit-access-greeter.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ jobs:
1212
commit-access-greeter:
1313
permissions:
1414
issues: write
15+
pull-requests: read
1516
if: >-
1617
github.repository_owner == 'llvm' &&
1718
github.event.label.name == 'infra:commit-access-request'

bolt/docs/CMakeLists.txt

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -48,14 +48,6 @@ if (LLVM_ENABLE_DOXYGEN)
4848
set(bolt_doxygen_qhp_cust_filter_attrs "")
4949
endif()
5050

51-
option(LLVM_DOXYGEN_SVG
52-
"Use svg instead of png files for doxygen graphs." OFF)
53-
if (LLVM_DOXYGEN_SVG)
54-
set(DOT_IMAGE_FORMAT "svg")
55-
else()
56-
set(DOT_IMAGE_FORMAT "png")
57-
endif()
58-
5951
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/doxygen.cfg.in
6052
${CMAKE_CURRENT_BINARY_DIR}/doxygen.cfg @ONLY)
6153

@@ -73,7 +65,6 @@ if (LLVM_ENABLE_DOXYGEN)
7365
set(bolt_doxygen_qhelpgenerator_path)
7466
set(bolt_doxygen_qhp_cust_filter_name)
7567
set(bolt_doxygen_qhp_cust_filter_attrs)
76-
set(DOT_IMAGE_FORMAT)
7768

7869
add_custom_target(doxygen-bolt
7970
COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/doxygen.cfg

bolt/docs/doxygen.cfg.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2210,7 +2210,7 @@ DIRECTORY_GRAPH = YES
22102210
# The default value is: png.
22112211
# This tag requires that the tag HAVE_DOT is set to YES.
22122212

2213-
DOT_IMAGE_FORMAT = @DOT_IMAGE_FORMAT@
2213+
DOT_IMAGE_FORMAT = svg
22142214

22152215
# If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
22162216
# enable generation of interactive SVG images that allow zooming and panning.

bolt/include/bolt/Profile/DataAggregator.h

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -223,14 +223,16 @@ class DataAggregator : public DataReader {
223223
bool recordExit(BinaryFunction &BF, uint64_t From, bool Mispred,
224224
uint64_t Count = 1) const;
225225

226-
/// Aggregation statistics
226+
/// Branch stacks aggregation statistics
227+
uint64_t NumTraces{0};
227228
uint64_t NumInvalidTraces{0};
228229
uint64_t NumLongRangeTraces{0};
229230
/// Specifies how many samples were recorded in cold areas if we are dealing
230231
/// with profiling data collected in a bolted binary. For LBRs, incremented
231232
/// for the source of the branch to avoid counting cold activity twice (one
232233
/// for source and another for destination).
233234
uint64_t NumColdSamples{0};
235+
uint64_t NumTotalSamples{0};
234236

235237
/// Looks into system PATH for Linux Perf and set up the aggregator to use it
236238
void findPerfExecutable();
@@ -327,8 +329,8 @@ class DataAggregator : public DataReader {
327329
/// Parse a single LBR entry as output by perf script -Fbrstack
328330
ErrorOr<LBREntry> parseLBREntry();
329331

330-
/// Parse LBR sample, returns the number of traces.
331-
uint64_t parseLBRSample(const PerfBranchSample &Sample, bool NeedsSkylakeFix);
332+
/// Parse LBR sample.
333+
void parseLBRSample(const PerfBranchSample &Sample, bool NeedsSkylakeFix);
332334

333335
/// Parse and pre-aggregate branch events.
334336
std::error_code parseBranchEvents();
@@ -487,6 +489,13 @@ class DataAggregator : public DataReader {
487489
void dump(const PerfBranchSample &Sample) const;
488490
void dump(const PerfMemSample &Sample) const;
489491

492+
/// Profile diagnostics print methods
493+
void printColdSamplesDiagnostic() const;
494+
void printLongRangeTracesDiagnostic() const;
495+
void printBranchSamplesDiagnostics() const;
496+
void printBasicSamplesDiagnostics(uint64_t OutOfRangeSamples) const;
497+
void printBranchStacksDiagnostics(uint64_t IgnoredSamples) const;
498+
490499
public:
491500
/// If perf.data was collected without build ids, the buildid-list may contain
492501
/// incomplete entries. Return true if the buffer containing

0 commit comments

Comments
 (0)