Skip to content

llvm-16-compile-fix #168 #169

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
20083017 wants to merge 3 commits into
base: master
Choose a base branch
from
Open

llvm-16-compile-fix #168 #169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6dc5403
llvm-16-compile-fix #168
20083017 May 21, 2023
c1cec70
llvm-16-compile-fix #168
20083017 May 21, 2023
bc2a444
Merge branch 'master-llvm-16-compile-fix' of https://github.com/20083…
20083017 May 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions llvm_propeller_profile_writer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,6 @@ void DumpCfgs(
} // namespace

namespace devtools_crosstool_autofdo {

using ::devtools_crosstool_autofdo::PropellerOptions;
using ::llvm::StringRef;

Expand Down Expand Up @@ -252,7 +251,7 @@ bool PropellerProfWriter::Write(
total_clusters += func_cluster_info.clusters.size();

// Allocate the symbol order vector
std::vector<std::pair<llvm::SmallVector<StringRef, 3>,
std::vector<std::pair<::llvm::SmallVector<StringRef, 3>,
std::optional<unsigned>>>symbol_order(total_clusters);
// Allocate the cold symbol order vector equally sized as
// all_functions_cluster_info, as there is (at most) one cold cluster per
Expand All @@ -272,7 +271,7 @@ bool PropellerProfWriter::Write(
func_layout_info.optimized_score.inter_out_score;

// Print all alias names of the function, separated by '/'.
out_stream << "!" << llvm::join(func_layout_info.cfg->names(), "/") << "\n";
out_stream << "!" << ::llvm::join(func_layout_info.cfg->names(), "/") << "\n";

if (options_.verbose_cluster_output()) {
// Print the layout score for intra-function and inter-function edges
Expand All @@ -295,7 +294,7 @@ bool PropellerProfWriter::Write(
// the function name is sufficient for section ordering. Otherwise,
// the cluster number is required.
symbol_order[cluster.layout_index] =
std::pair<llvm::SmallVector<StringRef, 3>, std::optional<unsigned>>(
std::pair<::llvm::SmallVector<StringRef, 3>, std::optional<unsigned>>(
func_layout_info.cfg->names_, cluster.bb_indexes.front() == 0
? std::optional<unsigned>()
: cluster_id);
Expand Down
2 changes: 1 addition & 1 deletion llvm_propeller_whole_program_info.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ class PropellerWholeProgramInfo : public AbstractPropellerWholeProgramInfo {
bool binary_is_pie() const { return binary_perf_info_.binary_info.is_pie; }

// Getters.
const string binary_build_id() const {
const std::string binary_build_id() const {
return binary_perf_info_.binary_info.build_id;
}

Expand Down