diff --git a/0001-Build-Static-Library b/0001-Build-Static-Library.patch similarity index 79% rename from 0001-Build-Static-Library rename to 0001-Build-Static-Library.patch index 2efa755c3ab105a6a055adc51c6fa19a43f4df39..e6cd1ddcc986e5bedfd82c9187fe11224a851437 100644 --- a/0001-Build-Static-Library +++ b/0001-Build-Static-Library.patch @@ -6,8 +6,8 @@ index 2d00c4d..b6b3a1a 100644 include (GetCacheVariables) include (GNUInstallDirs) --option (BUILD_SHARED_LIBS "Build shared libraries" OFF) -+option (BUILD_SHARED_LIBS "Build shared libraries" ON) +-option (BUILD_SHARED_LIBS "Build shared libraries" ON) ++option (BUILD_SHARED_LIBS "Build shared libraries" OFF) option (PRINT_UNSYMBOLIZED_STACK_TRACES "Print file offsets in traces instead of symbolizing" OFF) option (WITH_GFLAGS "Use gflags" ON) diff --git a/0002-Replace-internal-abseil-with-openEuler-version.patch b/0002-Replace-internal-abseil-with-openEuler-version.patch new file mode 100644 index 0000000000000000000000000000000000000000..ca0704133cc10ef6e4e47541381c908361a6b674 --- /dev/null +++ b/0002-Replace-internal-abseil-with-openEuler-version.patch @@ -0,0 +1,1144 @@ +From ab5b4346a8a0a3d3be1f14954ded2047d93a9cd9 Mon Sep 17 00:00:00 2001 +From: rfwang07 +Date: Thu, 1 Aug 2024 14:33:37 +0800 +Subject: [PATCH] Replace internal abseil with openEuler version. + +--- + CMakeLists.txt | 40 ++++++++++++++----- + addr2line.cc | 4 +- + create_gcov.cc | 6 +-- + create_llvm_prof.cc | 16 ++++---- + dump_gcov.cc | 4 +- + gcov.cc | 2 +- + gcov.h | 2 +- + instruction_map_test.cc | 2 +- + llvm_profile_reader.h | 6 +-- + llvm_profile_reader_test.cc | 4 +- + llvm_profile_writer.cc | 6 +-- + llvm_profile_writer_test.cc | 4 +- + llvm_propeller_abstract_whole_program_info.h | 2 +- + llvm_propeller_cfg.h | 6 +-- + llvm_propeller_chain_cluster_builder.cc | 6 +-- + llvm_propeller_chain_cluster_builder.h | 4 +- + llvm_propeller_code_layout.cc | 6 +-- + llvm_propeller_code_layout.h | 6 +-- + llvm_propeller_file_perf_data_provider.cc | 8 ++-- + llvm_propeller_file_perf_data_provider.h | 2 +- + ..._propeller_file_perf_data_provider_test.cc | 8 ++-- + llvm_propeller_generate_testdata.cc | 14 +++---- + llvm_propeller_mock_whole_program_info.cc | 4 +- + llvm_propeller_node_chain.cc | 2 +- + llvm_propeller_node_chain.h | 4 +- + llvm_propeller_node_chain_assembly.cc | 6 +-- + llvm_propeller_node_chain_assembly.h | 6 +-- + llvm_propeller_node_chain_builder.cc | 8 ++-- + llvm_propeller_node_chain_builder.h | 2 +- + llvm_propeller_perf_data_provider.h | 2 +- + llvm_propeller_profile_writer.cc | 14 +++---- + llvm_propeller_profile_writer.h | 2 +- + llvm_propeller_profile_writer_test.cc | 4 +- + llvm_propeller_statistics.h | 2 +- + llvm_propeller_whole_program_info.cc | 16 ++++---- + llvm_propeller_whole_program_info.h | 8 ++-- + llvm_propeller_whole_program_info_test.cc | 6 +-- + perfdata_reader.cc | 8 ++-- + perfdata_reader_test.cc | 6 +-- + profile.cc | 6 +-- + profile.h | 2 +- + profile_creator.cc | 4 +- + profile_diff.cc | 8 ++-- + profile_merger.cc | 12 +++--- + profile_reader.cc | 2 +- + profile_symbol_list.cc | 2 +- + profile_symbol_list_test.cc | 2 +- + profile_writer.cc | 4 +- + sample_merger.cc | 6 +-- + sample_reader.cc | 6 +-- + sample_reader.h | 2 +- + sample_reader_test.cc | 6 +-- + status_consumer_registry.cc | 2 +- + status_consumer_registry.h | 4 +- + status_provider.cc | 2 +- + status_provider.h | 4 +- + symbol_map.cc | 16 ++++---- + symbol_map.h | 8 ++-- + symbol_map_test.cc | 6 +-- + 59 files changed, 191 insertions(+), 171 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0546830..13cf59f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -5,13 +5,11 @@ set(ABSL_PROPAGATE_CXX_STD on) + project(autofdo) + + function (config_without_llvm) +- add_subdirectory(third_party/abseil) + add_subdirectory(third_party/glog) + + include_directories(${LLVM_INCLUDE_DIRS} + ${CMAKE_HOME_DIRECTORY} + third_party/glog/src +- third_party/abseil + third_party/perf_data_converter/src + third_party/perf_data_converter/src/quipper + util +@@ -76,8 +74,6 @@ function (config_without_llvm) + ${PERF_PARSER_OPTIONS_CC} + ${PERF_STAT_CC} + ${PERF_STAT_HDR}) +- target_include_directories(quipper_perf PRIVATE +- third_party/abseil) + target_include_directories(quipper_perf BEFORE + PUBLIC + third_party/perf_data_converter/src +@@ -86,8 +82,16 @@ function (config_without_llvm) + + add_executable(create_gcov) + target_link_libraries(create_gcov +- absl::flags +- absl::flags_parse ++ absl_demangle_internal ++ absl_throw_delegate ++ absl_hash ++ absl_raw_hash_set ++ absl_flags_reflection ++ absl_str_format_internal ++ absl_flags_marshalling ++ absl_flags_internal ++ absl_flags_usage ++ absl_flags_parse + create_gcov_lib + glog + quipper_perf +@@ -109,8 +113,16 @@ function (config_without_llvm) + + add_executable(profile_merger) + target_link_libraries(profile_merger +- absl::flags +- absl::flags_parse ++ absl_demangle_internal ++ absl_throw_delegate ++ absl_hash ++ absl_raw_hash_set ++ absl_flags_reflection ++ absl_str_format_internal ++ absl_flags_marshalling ++ absl_flags_internal ++ absl_flags_usage ++ absl_flags_parse + profile_merger_lib + glog + quipper_perf +@@ -131,8 +143,16 @@ function (config_without_llvm) + + add_executable(dump_gcov) + target_link_libraries(dump_gcov +- absl::flags +- absl::flags_parse ++ absl_demangle_internal ++ absl_throw_delegate ++ absl_hash ++ absl_raw_hash_set ++ absl_flags_reflection ++ absl_str_format_internal ++ absl_flags_marshalling ++ absl_flags_internal ++ absl_flags_usage ++ absl_flags_parse + dump_gcov_lib + glog + ) +diff --git a/addr2line.cc b/addr2line.cc +index 3979955..6277395 100644 +--- a/addr2line.cc ++++ b/addr2line.cc +@@ -12,8 +12,8 @@ + #include "base/commandlineflags.h" + #include "base/logging.h" + #include "symbol_map.h" +-#include "third_party/abseil/absl/container/node_hash_map.h" +-#include "third_party/abseil/absl/flags/flag.h" ++#include "absl/container/node_hash_map.h" ++#include "absl/flags/flag.h" + #include "llvm/DebugInfo/DWARF/DWARFContext.h" + #include "llvm/DebugInfo/DWARF/DWARFDebugAranges.h" + #include "llvm/Object/ObjectFile.h" +diff --git a/create_gcov.cc b/create_gcov.cc +index cce528d..e982a60 100644 +--- a/create_gcov.cc ++++ b/create_gcov.cc +@@ -20,9 +20,9 @@ + #include "base/commandlineflags.h" + #include "gcov.h" + #include "profile_creator.h" +-#include "third_party/abseil/absl/flags/flag.h" +-#include "third_party/abseil/absl/flags/parse.h" +-#include "third_party/abseil/absl/flags/usage.h" ++#include "absl/flags/flag.h" ++#include "absl/flags/parse.h" ++#include "absl/flags/usage.h" + + ABSL_FLAG(std::string, profile, "perf.data", + "Profile file name"); +diff --git a/create_llvm_prof.cc b/create_llvm_prof.cc +index 9838f8f..2784966 100644 +--- a/create_llvm_prof.cc ++++ b/create_llvm_prof.cc +@@ -3,8 +3,8 @@ + + // This program creates an LLVM profile from an AutoFDO source. + +-#include "third_party/abseil/absl/flags/flag.h" +-#include "third_party/abseil/absl/strings/match.h" ++#include "absl/flags/flag.h" ++#include "absl/strings/match.h" + #if defined(HAVE_LLVM) + #include + #include +@@ -17,10 +17,10 @@ + #include "llvm_propeller_options_builder.h" + #include "llvm_propeller_profile_writer.h" + #include "profile_creator.h" +-#include "third_party/abseil/absl/status/status.h" +-#include "third_party/abseil/absl/strings/str_split.h" +-#include "third_party/abseil/absl/flags/parse.h" +-#include "third_party/abseil/absl/flags/usage.h" ++#include "absl/status/status.h" ++#include "absl/strings/str_split.h" ++#include "absl/flags/parse.h" ++#include "absl/flags/usage.h" + + ABSL_FLAG(std::string, profile, "perf.data", + "Input profile file name. When --format=propeller, this accepts " +@@ -256,8 +256,8 @@ int main(int argc, char **argv) { + + #else + #include +-#include "third_party/abseil/absl/flags/parse.h" +-#include "third_party/abseil/absl/flags/usage.h" ++#include "absl/flags/parse.h" ++#include "absl/flags/usage.h" + int main(int argc, char **argv) { + fprintf(stderr, + "ERROR: LLVM support was not enabled in this configuration.\nPlease " +diff --git a/dump_gcov.cc b/dump_gcov.cc +index 49a2ba6..4a6e882 100644 +--- a/dump_gcov.cc ++++ b/dump_gcov.cc +@@ -17,8 +17,8 @@ + #include "base/commandlineflags.h" + #include "profile_reader.h" + #include "symbol_map.h" +-#include "third_party/abseil/absl/flags/parse.h" +-#include "third_party/abseil/absl/flags/usage.h" ++#include "absl/flags/parse.h" ++#include "absl/flags/usage.h" + + int main(int argc, char **argv) { + absl::SetProgramUsageMessage(argv[0]); +diff --git a/gcov.cc b/gcov.cc +index 6e84b49..6af13ad 100644 +--- a/gcov.cc ++++ b/gcov.cc +@@ -21,7 +21,7 @@ + + + #include "gcov.h" +-#include "third_party/abseil/absl/flags/flag.h" ++#include "absl/flags/flag.h" + + // For different GCC versions, the gcov version number is: + // 4.6: 0x34303670 +diff --git a/gcov.h b/gcov.h +index 562d603..ef3e52d 100644 +--- a/gcov.h ++++ b/gcov.h +@@ -18,7 +18,7 @@ + #define AUTOFDO_GCOV_H_ + + #include "base/common.h" +-#include "third_party/abseil/absl/flags/declare.h" ++#include "absl/flags/declare.h" + + extern const uint32 GCOV_TAG_AFDO_FILE_NAMES; + extern const uint32 GCOV_TAG_AFDO_FUNCTION; +diff --git a/instruction_map_test.cc b/instruction_map_test.cc +index 56b11fd..5fb36bd 100644 +--- a/instruction_map_test.cc ++++ b/instruction_map_test.cc +@@ -11,7 +11,7 @@ + #include "sample_reader.h" + #include "symbol_map.h" + #include "gtest/gtest.h" +-#include "third_party/abseil/absl/flags/flag.h" ++#include "absl/flags/flag.h" + + ABSL_FLAG(std::string, binary, "", "Binary file name"); + +diff --git a/llvm_profile_reader.h b/llvm_profile_reader.h +index 7c4d301..90f0389 100644 +--- a/llvm_profile_reader.h ++++ b/llvm_profile_reader.h +@@ -9,9 +9,9 @@ + #include "base/commandlineflags.h" + #include "base_profile_reader.h" + #include "source_info.h" +-#include "third_party/abseil/absl/container/node_hash_set.h" +-#include "third_party/abseil/absl/flags/declare.h" +-#include "third_party/abseil/absl/flags/flag.h" ++#include "absl/container/node_hash_set.h" ++#include "absl/flags/declare.h" ++#include "absl/flags/flag.h" + #include "llvm/Config/llvm-config.h" + #include "llvm/ProfileData/SampleProf.h" + #if LLVM_VERSION_MAJOR >= 12 +diff --git a/llvm_profile_reader_test.cc b/llvm_profile_reader_test.cc +index 1e22c0e..cad2b6c 100644 +--- a/llvm_profile_reader_test.cc ++++ b/llvm_profile_reader_test.cc +@@ -7,8 +7,8 @@ + #include "base/commandlineflags.h" + #include "symbol_map.h" + #include "gtest/gtest.h" +-#include "third_party/abseil/absl/container/node_hash_set.h" +-#include "third_party/abseil/absl/flags/flag.h" ++#include "absl/container/node_hash_set.h" ++#include "absl/flags/flag.h" + + #define FLAGS_test_tmpdir std::string(testing::UnitTest::GetInstance()->original_working_dir()) + +diff --git a/llvm_profile_writer.cc b/llvm_profile_writer.cc +index 9dd1dcf..32c74db 100644 +--- a/llvm_profile_writer.cc ++++ b/llvm_profile_writer.cc +@@ -18,9 +18,9 @@ + #include "base/logging.h" + #include "llvm_profile_writer.h" + #include "profile_writer.h" +-#include "third_party/abseil/absl/flags/declare.h" +-#include "third_party/abseil/absl/flags/flag.h" +-#include "third_party/abseil/absl/strings/match.h" ++#include "absl/flags/declare.h" ++#include "absl/flags/flag.h" ++#include "absl/strings/match.h" + #include "llvm/Config/llvm-config.h" + + ABSL_DECLARE_FLAG(bool, debug_dump); +diff --git a/llvm_profile_writer_test.cc b/llvm_profile_writer_test.cc +index 7ac57e7..646924a 100644 +--- a/llvm_profile_writer_test.cc ++++ b/llvm_profile_writer_test.cc +@@ -6,8 +6,8 @@ + #include "profile_creator.h" + #include "symbol_map.h" + #include "gmock/gmock.h" +-#include "third_party/abseil/absl/flags/flag.h" +-#include "third_party/abseil/absl/strings/str_cat.h" ++#include "absl/flags/flag.h" ++#include "absl/strings/str_cat.h" + #include "llvm/Config/llvm-config.h" + + #define FLAGS_test_tmpdir std::string(testing::UnitTest::GetInstance()->original_working_dir()) +diff --git a/llvm_propeller_abstract_whole_program_info.h b/llvm_propeller_abstract_whole_program_info.h +index 6de0581..a4c368e 100644 +--- a/llvm_propeller_abstract_whole_program_info.h ++++ b/llvm_propeller_abstract_whole_program_info.h +@@ -10,7 +10,7 @@ + #include "llvm_propeller_cfg.h" + #include "llvm_propeller_options.pb.h" + #include "llvm_propeller_statistics.h" +-#include "third_party/abseil/absl/status/status.h" ++#include "absl/status/status.h" + #include "llvm/ADT/StringRef.h" + + namespace devtools_crosstool_autofdo { +diff --git a/llvm_propeller_cfg.h b/llvm_propeller_cfg.h +index 044d6b0..e260a13 100644 +--- a/llvm_propeller_cfg.h ++++ b/llvm_propeller_cfg.h +@@ -11,9 +11,9 @@ + #include + + #include "base/logging.h" // For "CHECK". +-#include "third_party/abseil/absl/container/flat_hash_map.h" +-#include "third_party/abseil/absl/functional/function_ref.h" +-#include "third_party/abseil/absl/strings/str_format.h" ++#include "absl/container/flat_hash_map.h" ++#include "absl/functional/function_ref.h" ++#include "absl/strings/str_format.h" + #include "llvm/ADT/SmallVector.h" + #include "llvm/ADT/StringRef.h" + #include "llvm/Object/ELFTypes.h" +diff --git a/llvm_propeller_chain_cluster_builder.cc b/llvm_propeller_chain_cluster_builder.cc +index f97dbf0..3a5dd39 100644 +--- a/llvm_propeller_chain_cluster_builder.cc ++++ b/llvm_propeller_chain_cluster_builder.cc +@@ -4,9 +4,9 @@ + + #include "llvm_propeller_cfg.h" + #include "llvm_propeller_node_chain.h" +-#include "third_party/abseil/absl/algorithm/container.h" +-#include "third_party/abseil/absl/container/flat_hash_map.h" +-#include "third_party/abseil/absl/numeric/int128.h" ++#include "absl/algorithm/container.h" ++#include "absl/container/flat_hash_map.h" ++#include "absl/numeric/int128.h" + + namespace devtools_crosstool_autofdo { + +diff --git a/llvm_propeller_chain_cluster_builder.h b/llvm_propeller_chain_cluster_builder.h +index 0c717b3..5738c87 100644 +--- a/llvm_propeller_chain_cluster_builder.h ++++ b/llvm_propeller_chain_cluster_builder.h +@@ -7,8 +7,8 @@ + + #include "llvm_propeller_node_chain.h" + #include "llvm_propeller_options.pb.h" +-#include "third_party/abseil/absl/container/flat_hash_map.h" +-#include "third_party/abseil/absl/functional/function_ref.h" ++#include "absl/container/flat_hash_map.h" ++#include "absl/functional/function_ref.h" + + namespace devtools_crosstool_autofdo { + +diff --git a/llvm_propeller_code_layout.cc b/llvm_propeller_code_layout.cc +index a002a7d..c695fbb 100644 +--- a/llvm_propeller_code_layout.cc ++++ b/llvm_propeller_code_layout.cc +@@ -9,9 +9,9 @@ + #include "llvm_propeller_cfg.h" + #include "llvm_propeller_chain_cluster_builder.h" + #include "llvm_propeller_node_chain_builder.h" +-#include "third_party/abseil/absl/algorithm/container.h" +-#include "third_party/abseil/absl/container/flat_hash_map.h" +-#include "third_party/abseil/absl/functional/function_ref.h" ++#include "absl/algorithm/container.h" ++#include "absl/container/flat_hash_map.h" ++#include "absl/functional/function_ref.h" + + namespace devtools_crosstool_autofdo { + +diff --git a/llvm_propeller_code_layout.h b/llvm_propeller_code_layout.h +index 1edfd27..472b054 100644 +--- a/llvm_propeller_code_layout.h ++++ b/llvm_propeller_code_layout.h +@@ -12,9 +12,9 @@ + #include "llvm_propeller_chain_cluster_builder.h" + #include "llvm_propeller_code_layout_scorer.h" + #include "llvm_propeller_node_chain_assembly.h" +-#include "third_party/abseil/absl/container/flat_hash_map.h" +-#include "third_party/abseil/absl/strings/str_cat.h" +-#include "third_party/abseil/absl/strings/str_join.h" ++#include "absl/container/flat_hash_map.h" ++#include "absl/strings/str_cat.h" ++#include "absl/strings/str_join.h" + + namespace devtools_crosstool_autofdo { + +diff --git a/llvm_propeller_file_perf_data_provider.cc b/llvm_propeller_file_perf_data_provider.cc +index bc9a0f6..cfe40d4 100644 +--- a/llvm_propeller_file_perf_data_provider.cc ++++ b/llvm_propeller_file_perf_data_provider.cc +@@ -6,10 +6,10 @@ + #include + + #include "llvm_propeller_perf_data_provider.h" +-#include "third_party/abseil/absl/status/status.h" +-#include "third_party/abseil/absl/status/statusor.h" +-#include "third_party/abseil/absl/strings/str_cat.h" +-#include "third_party/abseil/absl/strings/str_format.h" ++#include "absl/status/status.h" ++#include "absl/status/statusor.h" ++#include "absl/strings/str_cat.h" ++#include "absl/strings/str_format.h" + #include "llvm/Support/ErrorOr.h" + #include "llvm/Support/MemoryBuffer.h" + +diff --git a/llvm_propeller_file_perf_data_provider.h b/llvm_propeller_file_perf_data_provider.h +index 21ac73e..92f74af 100644 +--- a/llvm_propeller_file_perf_data_provider.h ++++ b/llvm_propeller_file_perf_data_provider.h +@@ -10,7 +10,7 @@ + #include + + #include "llvm_propeller_perf_data_provider.h" +-#include "third_party/abseil/absl/status/statusor.h" ++#include "absl/status/statusor.h" + #include "llvm/Support/MemoryBuffer.h" + + namespace devtools_crosstool_autofdo { +diff --git a/llvm_propeller_file_perf_data_provider_test.cc b/llvm_propeller_file_perf_data_provider_test.cc +index b8925e8..9ef3867 100644 +--- a/llvm_propeller_file_perf_data_provider_test.cc ++++ b/llvm_propeller_file_perf_data_provider_test.cc +@@ -7,10 +7,10 @@ + #include "base/logging.h" + #include "gmock/gmock.h" + #include "gtest/gtest.h" +-#include "third_party/abseil/absl/flags/flag.h" +-#include "third_party/abseil/absl/status/status.h" +-#include "third_party/abseil/absl/strings/str_cat.h" +-#include "third_party/abseil/absl/strings/string_view.h" ++#include "absl/flags/flag.h" ++#include "absl/status/status.h" ++#include "absl/strings/str_cat.h" ++#include "absl/strings/string_view.h" + + #define FLAGS_test_tmpdir std::string(testing::UnitTest::GetInstance()->original_working_dir()) + +diff --git a/llvm_propeller_generate_testdata.cc b/llvm_propeller_generate_testdata.cc +index f045bbc..becfcdc 100644 +--- a/llvm_propeller_generate_testdata.cc ++++ b/llvm_propeller_generate_testdata.cc +@@ -1,8 +1,8 @@ + #include "llvm_propeller_abstract_whole_program_info.h" + #include "llvm_propeller_protobuf.h" +-#include "third_party/abseil/absl/flags/flag.h" +-#include "third_party/abseil/absl/flags/parse.h" +-#include "third_party/abseil/absl/flags/usage.h" ++#include "absl/flags/flag.h" ++#include "absl/flags/parse.h" ++#include "absl/flags/usage.h" + #if defined(HAVE_LLVM) + + #include +@@ -12,8 +12,8 @@ + #include "llvm_propeller_options.pb.h" + #include "llvm_propeller_options_builder.h" + #include "llvm_propeller_whole_program_info.h" +-#include "third_party/abseil/absl/flags/parse.h" +-#include "third_party/abseil/absl/flags/usage.h" ++#include "absl/flags/parse.h" ++#include "absl/flags/usage.h" + + DEFINE_string(binary, "a.out", "Binary file name"); + DEFINE_string(profile, "perf.data", "Input profile file name"); +@@ -80,8 +80,8 @@ int main(int argc, char **argv) { + + #else + #include +-#include "third_party/abseil/absl/flags/parse.h" +-#include "third_party/abseil/absl/flags/usage.h" ++#include "absl/flags/parse.h" ++#include "absl/flags/usage.h" + int main(int argc, char **argv) { + fprintf(stderr, + "ERROR: LLVM support was not enabled in this configuration.\nPlease " +diff --git a/llvm_propeller_mock_whole_program_info.cc b/llvm_propeller_mock_whole_program_info.cc +index 1bc5c6b..3cbf9a3 100644 +--- a/llvm_propeller_mock_whole_program_info.cc ++++ b/llvm_propeller_mock_whole_program_info.cc +@@ -12,8 +12,8 @@ + #include "llvm_propeller_options.pb.h" + #include "google/protobuf/io/zero_copy_stream_impl.h" // for "typename google::protobuf::io::FileInputStream" + #include "google/protobuf/text_format.h" +-#include "third_party/abseil/absl/status/status.h" +-#include "third_party/abseil/absl/strings/str_format.h" ++#include "absl/status/status.h" ++#include "absl/strings/str_format.h" + #include "llvm/Support/Allocator.h" + #include "llvm/Support/StringSaver.h" + +diff --git a/llvm_propeller_node_chain.cc b/llvm_propeller_node_chain.cc +index aa3b96c..bb0debe 100644 +--- a/llvm_propeller_node_chain.cc ++++ b/llvm_propeller_node_chain.cc +@@ -7,7 +7,7 @@ + #include "llvm_propeller_code_layout_scorer.h" + #include "llvm_propeller_node_chain_assembly.h" + #include "llvm_propeller_options.pb.h" +-#include "third_party/abseil/absl/algorithm/container.h" ++#include "absl/algorithm/container.h" + + namespace devtools_crosstool_autofdo { + +diff --git a/llvm_propeller_node_chain.h b/llvm_propeller_node_chain.h +index b18ccbc..50d5a9f 100644 +--- a/llvm_propeller_node_chain.h ++++ b/llvm_propeller_node_chain.h +@@ -11,8 +11,8 @@ + + #include "llvm_propeller_cfg.h" + #include "llvm_propeller_code_layout_scorer.h" +-#include "third_party/abseil/absl/algorithm/container.h" +-#include "third_party/abseil/absl/container/btree_set.h" ++#include "absl/algorithm/container.h" ++#include "absl/container/btree_set.h" + + // A node chain represents an ordered list of CFG nodes, which are further + // split into multiple (ordered) list of nodes called bundles. For example +diff --git a/llvm_propeller_node_chain_assembly.cc b/llvm_propeller_node_chain_assembly.cc +index aceaa05..e01b458 100644 +--- a/llvm_propeller_node_chain_assembly.cc ++++ b/llvm_propeller_node_chain_assembly.cc +@@ -9,9 +9,9 @@ + + #include "llvm_propeller_code_layout_scorer.h" + #include "llvm_propeller_node_chain.h" +-#include "third_party/abseil/absl/status/status.h" +-#include "third_party/abseil/absl/status/statusor.h" +-#include "third_party/abseil/absl/strings/str_format.h" ++#include "absl/status/status.h" ++#include "absl/status/statusor.h" ++#include "absl/strings/str_format.h" + + namespace devtools_crosstool_autofdo { + +diff --git a/llvm_propeller_node_chain_assembly.h b/llvm_propeller_node_chain_assembly.h +index 8549d4d..d079826 100644 +--- a/llvm_propeller_node_chain_assembly.h ++++ b/llvm_propeller_node_chain_assembly.h +@@ -10,9 +10,9 @@ + #include "llvm_propeller_cfg.h" + #include "llvm_propeller_code_layout_scorer.h" + #include "llvm_propeller_node_chain.h" +-#include "third_party/abseil/absl/functional/function_ref.h" +-#include "third_party/abseil/absl/status/statusor.h" +-#include "third_party/abseil/absl/strings/string_view.h" ++#include "absl/functional/function_ref.h" ++#include "absl/status/statusor.h" ++#include "absl/strings/string_view.h" + + namespace devtools_crosstool_autofdo { + +diff --git a/llvm_propeller_node_chain_builder.cc b/llvm_propeller_node_chain_builder.cc +index 4dd2066..cce375a 100644 +--- a/llvm_propeller_node_chain_builder.cc ++++ b/llvm_propeller_node_chain_builder.cc +@@ -12,10 +12,10 @@ + #include "llvm_propeller_cfg.h" + #include "llvm_propeller_node_chain.h" + #include "llvm_propeller_node_chain_assembly.h" +-#include "third_party/abseil/absl/algorithm/container.h" +-#include "third_party/abseil/absl/log/check.h" +-#include "third_party/abseil/absl/container/flat_hash_set.h" +-#include "third_party/abseil/absl/status/statusor.h" ++#include "absl/algorithm/container.h" ++#include "absl/log/check.h" ++#include "absl/container/flat_hash_set.h" ++#include "absl/status/statusor.h" + + // This file contains the implementation of the ext-TSP algorithm + // (https://ieeexplore.ieee.org/abstract/document/9050435). +diff --git a/llvm_propeller_node_chain_builder.h b/llvm_propeller_node_chain_builder.h +index b59fe71..de83d08 100644 +--- a/llvm_propeller_node_chain_builder.h ++++ b/llvm_propeller_node_chain_builder.h +@@ -11,7 +11,7 @@ + #include "llvm_propeller_code_layout_scorer.h" + #include "llvm_propeller_node_chain.h" + #include "llvm_propeller_node_chain_assembly.h" +-#include "third_party/abseil/absl/container/flat_hash_map.h" ++#include "absl/container/flat_hash_map.h" + + namespace devtools_crosstool_autofdo { + +diff --git a/llvm_propeller_perf_data_provider.h b/llvm_propeller_perf_data_provider.h +index 7a4390c..495a96a 100644 +--- a/llvm_propeller_perf_data_provider.h ++++ b/llvm_propeller_perf_data_provider.h +@@ -7,7 +7,7 @@ + #include + #include + +-#include "third_party/abseil/absl/status/statusor.h" ++#include "absl/status/statusor.h" + #include "llvm/Support/MemoryBuffer.h" + + namespace devtools_crosstool_autofdo { +diff --git a/llvm_propeller_profile_writer.cc b/llvm_propeller_profile_writer.cc +index 94b88f9..c4fce58 100644 +--- a/llvm_propeller_profile_writer.cc ++++ b/llvm_propeller_profile_writer.cc +@@ -21,13 +21,13 @@ + #include "llvm_propeller_whole_program_info.h" + #include "status_consumer_registry.h" + #include "status_provider.h" +-#include "third_party/abseil/absl/log/log.h" +-#include "third_party/abseil/absl/memory/memory.h" +-#include "third_party/abseil/absl/status/status.h" +-#include "third_party/abseil/absl/strings/str_cat.h" +-#include "third_party/abseil/absl/strings/str_format.h" +-#include "third_party/abseil/absl/strings/str_join.h" +-#include "third_party/abseil/absl/strings/string_view.h" ++#include "absl/log/log.h" ++#include "absl/memory/memory.h" ++#include "absl/status/status.h" ++#include "absl/strings/str_cat.h" ++#include "absl/strings/str_format.h" ++#include "absl/strings/str_join.h" ++#include "absl/strings/string_view.h" + #include "llvm/ADT/SmallVector.h" + #include "llvm/ADT/StringRef.h" + #include "llvm/Object/ELFObjectFile.h" +diff --git a/llvm_propeller_profile_writer.h b/llvm_propeller_profile_writer.h +index fcc38f6..9f762bf 100644 +--- a/llvm_propeller_profile_writer.h ++++ b/llvm_propeller_profile_writer.h +@@ -13,7 +13,7 @@ + #include "llvm_propeller_perf_data_provider.h" + #include "llvm_propeller_statistics.h" + #include "status_provider.h" +-#include "third_party/abseil/absl/status/status.h" ++#include "absl/status/status.h" + + namespace devtools_crosstool_autofdo { + +diff --git a/llvm_propeller_profile_writer_test.cc b/llvm_propeller_profile_writer_test.cc +index cd23f47..2d88f6a 100644 +--- a/llvm_propeller_profile_writer_test.cc ++++ b/llvm_propeller_profile_writer_test.cc +@@ -12,8 +12,8 @@ + #include "llvm_propeller_whole_program_info.h" + #include "gmock/gmock.h" + #include "gtest/gtest.h" +-#include "third_party/abseil/absl/flags/flag.h" +-#include "third_party/abseil/absl/strings/str_cat.h" ++#include "absl/flags/flag.h" ++#include "absl/strings/str_cat.h" + #include "llvm/Support/Error.h" + #include "llvm/Support/MemoryBuffer.h" + +diff --git a/llvm_propeller_statistics.h b/llvm_propeller_statistics.h +index e880b0d..ec42c40 100644 +--- a/llvm_propeller_statistics.h ++++ b/llvm_propeller_statistics.h +@@ -5,7 +5,7 @@ + #include + + #include "llvm_propeller_cfg.h" +-#include "third_party/abseil/absl/algorithm/container.h" ++#include "absl/algorithm/container.h" + + namespace devtools_crosstool_autofdo { + struct PropellerStats { +diff --git a/llvm_propeller_whole_program_info.cc b/llvm_propeller_whole_program_info.cc +index 21d56f0..914bade 100644 +--- a/llvm_propeller_whole_program_info.cc ++++ b/llvm_propeller_whole_program_info.cc +@@ -22,14 +22,14 @@ + #include "llvm_propeller_options.pb.h" + #include "llvm_propeller_perf_data_provider.h" + #include "perfdata_reader.h" +-#include "third_party/abseil/absl/algorithm/container.h" +-#include "third_party/abseil/absl/container/btree_map.h" +-#include "third_party/abseil/absl/container/btree_set.h" +-#include "third_party/abseil/absl/container/flat_hash_map.h" +-#include "third_party/abseil/absl/status/status.h" +-#include "third_party/abseil/absl/status/statusor.h" +-#include "third_party/abseil/absl/strings/str_format.h" +-#include "third_party/abseil/absl/strings/string_view.h" ++#include "absl/algorithm/container.h" ++#include "absl/container/btree_map.h" ++#include "absl/container/btree_set.h" ++#include "absl/container/flat_hash_map.h" ++#include "absl/status/status.h" ++#include "absl/status/statusor.h" ++#include "absl/strings/str_format.h" ++#include "absl/strings/string_view.h" + #include "llvm/ADT/StringRef.h" + #include "llvm/BinaryFormat/ELF.h" + #include "llvm/Object/ELFObjectFile.h" +diff --git a/llvm_propeller_whole_program_info.h b/llvm_propeller_whole_program_info.h +index 7b8fd0c..e4c7c0d 100644 +--- a/llvm_propeller_whole_program_info.h ++++ b/llvm_propeller_whole_program_info.h +@@ -19,10 +19,10 @@ + #include "llvm_propeller_statistics.h" + #include "perfdata_reader.h" + #include "status_provider.h" +-#include "third_party/abseil/absl/container/btree_set.h" +-#include "third_party/abseil/absl/status/status.h" +-#include "third_party/abseil/absl/status/statusor.h" +-#include "third_party/abseil/absl/strings/str_cat.h" ++#include "absl/container/btree_set.h" ++#include "absl/status/status.h" ++#include "absl/status/statusor.h" ++#include "absl/strings/str_cat.h" + #include "llvm/ADT/StringRef.h" + #include "llvm/Object/ELFTypes.h" + #include "llvm/Object/ObjectFile.h" +diff --git a/llvm_propeller_whole_program_info_test.cc b/llvm_propeller_whole_program_info_test.cc +index 91cf6df..691e0bf 100644 +--- a/llvm_propeller_whole_program_info_test.cc ++++ b/llvm_propeller_whole_program_info_test.cc +@@ -17,9 +17,9 @@ + #include "perfdata_reader.h" + #include "gmock/gmock.h" + #include "gtest/gtest.h" +-#include "third_party/abseil/absl/container/flat_hash_set.h" +-#include "third_party/abseil/absl/flags/flag.h" +-#include "third_party/abseil/absl/strings/str_cat.h" ++#include "absl/container/flat_hash_set.h" ++#include "absl/flags/flag.h" ++#include "absl/strings/str_cat.h" + #include "llvm/Object/ELFTypes.h" + #include "llvm/Support/Error.h" + #include "llvm/Support/Path.h" +diff --git a/perfdata_reader.cc b/perfdata_reader.cc +index ab3075d..10f56fd 100644 +--- a/perfdata_reader.cc ++++ b/perfdata_reader.cc +@@ -7,10 +7,10 @@ + #include + + #include "llvm_propeller_perf_data_provider.h" +-#include "third_party/abseil/absl/log/check.h" +-#include "third_party/abseil/absl/log/log.h" +-#include "third_party/abseil/absl/status/status.h" +-#include "third_party/abseil/absl/strings/str_format.h" ++#include "absl/log/check.h" ++#include "absl/log/log.h" ++#include "absl/status/status.h" ++#include "absl/strings/str_format.h" + #include "llvm/ADT/ArrayRef.h" + #include "llvm/BinaryFormat/ELF.h" + #include "llvm/Object/ObjectFile.h" +diff --git a/perfdata_reader_test.cc b/perfdata_reader_test.cc +index 4535e87..64de446 100644 +--- a/perfdata_reader_test.cc ++++ b/perfdata_reader_test.cc +@@ -5,9 +5,9 @@ + + #include "gmock/gmock.h" + #include "gtest/gtest.h" +-#include "third_party/abseil/absl/flags/flag.h" +-#include "third_party/abseil/absl/strings/match.h" +-#include "third_party/abseil/absl/strings/str_cat.h" ++#include "absl/flags/flag.h" ++#include "absl/strings/match.h" ++#include "absl/strings/str_cat.h" + + #define FLAGS_test_tmpdir std::string(testing::UnitTest::GetInstance()->original_working_dir()) + +diff --git a/profile.cc b/profile.cc +index bd380f6..3fbae17 100644 +--- a/profile.cc ++++ b/profile.cc +@@ -15,9 +15,9 @@ + #include "instruction_map.h" + #include "sample_reader.h" + #include "symbol_map.h" +-#include "third_party/abseil/absl/flags/flag.h" +-#include "third_party/abseil/absl/strings/match.h" +-#include "third_party/abseil/absl/strings/strip.h" ++#include "absl/flags/flag.h" ++#include "absl/strings/match.h" ++#include "absl/strings/strip.h" + + ABSL_FLAG(bool, use_lbr, true, + "Whether to use lbr profile."); +diff --git a/profile.h b/profile.h +index 66fe5ff..bdfcda8 100644 +--- a/profile.h ++++ b/profile.h +@@ -13,7 +13,7 @@ + #include "base/integral_types.h" + #include "base/macros.h" + #include "sample_reader.h" +-#include "third_party/abseil/absl/container/node_hash_map.h" ++#include "absl/container/node_hash_map.h" + + namespace devtools_crosstool_autofdo { + +diff --git a/profile_creator.cc b/profile_creator.cc +index 807bce9..0095944 100644 +--- a/profile_creator.cc ++++ b/profile_creator.cc +@@ -24,8 +24,8 @@ + #include "profile_writer.h" + #include "sample_reader.h" + #include "symbol_map.h" +-#include "third_party/abseil/absl/flags/flag.h" +-#include "third_party/abseil/absl/memory/memory.h" ++#include "absl/flags/flag.h" ++#include "absl/memory/memory.h" + #include "util/symbolize/elf_reader.h" + + ABSL_FLAG(std::string, focus_binary_re, "", +diff --git a/profile_diff.cc b/profile_diff.cc +index fc11f27..07a43c3 100644 +--- a/profile_diff.cc ++++ b/profile_diff.cc +@@ -9,10 +9,10 @@ + #include "base/logging.h" + #include "llvm_profile_reader.h" + #include "symbol_map.h" +-#include "third_party/abseil/absl/container/node_hash_set.h" +-#include "third_party/abseil/absl/flags/flag.h" +-#include "third_party/abseil/absl/flags/parse.h" +-#include "third_party/abseil/absl/flags/usage.h" ++#include "absl/container/node_hash_set.h" ++#include "absl/flags/flag.h" ++#include "absl/flags/parse.h" ++#include "absl/flags/usage.h" + + ABSL_FLAG(bool, compare_function, false, + "whether to compare function level profile"); +diff --git a/profile_merger.cc b/profile_merger.cc +index 0a3770e..520dc67 100644 +--- a/profile_merger.cc ++++ b/profile_merger.cc +@@ -16,15 +16,15 @@ + #include "profile_reader.h" + #include "profile_writer.h" + #include "symbol_map.h" +-#include "third_party/abseil/absl/base/macros.h" +-#include "third_party/abseil/absl/container/node_hash_set.h" +-#include "third_party/abseil/absl/flags/flag.h" +-#include "third_party/abseil/absl/memory/memory.h" ++#include "absl/base/macros.h" ++#include "absl/container/node_hash_set.h" ++#include "absl/flags/flag.h" ++#include "absl/memory/memory.h" + #if defined(HAVE_LLVM) + #include "llvm/Config/llvm-config.h" + #endif +-#include "third_party/abseil/absl/flags/parse.h" +-#include "third_party/abseil/absl/flags/usage.h" ++#include "absl/flags/parse.h" ++#include "absl/flags/usage.h" + + ABSL_FLAG(std::string, output_file, "fbdata.afdo", "Output file name"); + #if defined(HAVE_LLVM) +diff --git a/profile_reader.cc b/profile_reader.cc +index 8097a50..a4439b9 100644 +--- a/profile_reader.cc ++++ b/profile_reader.cc +@@ -8,7 +8,7 @@ + #include "addr2line.h" + #include "gcov.h" + #include "symbol_map.h" +-#include "third_party/abseil/absl/flags/flag.h" ++#include "absl/flags/flag.h" + + namespace devtools_crosstool_autofdo { + +diff --git a/profile_symbol_list.cc b/profile_symbol_list.cc +index d7d0f19..0114ba7 100644 +--- a/profile_symbol_list.cc ++++ b/profile_symbol_list.cc +@@ -8,7 +8,7 @@ + #include + + #include "symbol_map.h" +-#include "third_party/abseil/absl/flags/flag.h" ++#include "absl/flags/flag.h" + #include "llvm/ProfileData/SampleProf.h" + + namespace devtools_crosstool_autofdo { +diff --git a/profile_symbol_list_test.cc b/profile_symbol_list_test.cc +index 3383ef1..1f67aad 100644 +--- a/profile_symbol_list_test.cc ++++ b/profile_symbol_list_test.cc +@@ -3,7 +3,7 @@ + #include + + #include "gmock/gmock.h" +-#include "third_party/abseil/absl/memory/memory.h" ++#include "absl/memory/memory.h" + + #define FLAGS_test_tmpdir std::string(testing::UnitTest::GetInstance()->original_working_dir()) + +diff --git a/profile_writer.cc b/profile_writer.cc +index ef066cb..c2167b5 100644 +--- a/profile_writer.cc ++++ b/profile_writer.cc +@@ -21,8 +21,8 @@ + #include "gcov.h" + #include "profile.h" + #include "symbol_map.h" +-#include "third_party/abseil/absl/flags/flag.h" +-#include "third_party/abseil/absl/strings/str_format.h" ++#include "absl/flags/flag.h" ++#include "absl/strings/str_format.h" + + // sizeof(gcov_unsigned_t) + #define SIZEOF_UNSIGNED 4 +diff --git a/sample_merger.cc b/sample_merger.cc +index 7376fd4..e015a42 100644 +--- a/sample_merger.cc ++++ b/sample_merger.cc +@@ -5,9 +5,9 @@ + + #include "base/commandlineflags.h" + #include "profile_creator.h" +-#include "third_party/abseil/absl/flags/flag.h" +-#include "third_party/abseil/absl/flags/parse.h" +-#include "third_party/abseil/absl/flags/usage.h" ++#include "absl/flags/flag.h" ++#include "absl/flags/parse.h" ++#include "absl/flags/usage.h" + + ABSL_FLAG(std::string, profile, "data.profile", "Profile file name"); + ABSL_FLAG(std::string, profiler, "perf", "Profile type"); +diff --git a/sample_reader.cc b/sample_reader.cc +index b11bde4..995f76b 100644 +--- a/sample_reader.cc ++++ b/sample_reader.cc +@@ -17,9 +17,9 @@ + #include "base/commandlineflags.h" + #include "base/logging.h" + #include "base/port.h" +-#include "third_party/abseil/absl/flags/flag.h" +-#include "third_party/abseil/absl/strings/str_format.h" +-#include "third_party/abseil/absl/strings/str_join.h" ++#include "absl/flags/flag.h" ++#include "absl/strings/str_format.h" ++#include "absl/strings/str_join.h" + #include "quipper/perf_parser.h" + #include "quipper/perf_reader.h" + +diff --git a/sample_reader.h b/sample_reader.h +index ed27b4c..0fe4e32 100644 +--- a/sample_reader.h ++++ b/sample_reader.h +@@ -15,7 +15,7 @@ + + #include "base/integral_types.h" + #include "base/macros.h" +-#include "third_party/abseil/absl/container/flat_hash_map.h" ++#include "absl/container/flat_hash_map.h" + #include "quipper/perf_parser.h" + + namespace quipper { +diff --git a/sample_reader_test.cc b/sample_reader_test.cc +index 6961210..008d6bc 100644 +--- a/sample_reader_test.cc ++++ b/sample_reader_test.cc +@@ -13,9 +13,9 @@ + + #include "base/commandlineflags.h" + #include "gtest/gtest.h" +-#include "third_party/abseil/absl/flags/declare.h" +-#include "third_party/abseil/absl/flags/flag.h" +-#include "third_party/abseil/absl/strings/str_cat.h" ++#include "absl/flags/declare.h" ++#include "absl/flags/flag.h" ++#include "absl/strings/str_cat.h" + + ABSL_DECLARE_FLAG(uint64_t, strip_dup_backedge_stride_limit); + +diff --git a/status_consumer_registry.cc b/status_consumer_registry.cc +index 56d3a80..dd52c9a 100644 +--- a/status_consumer_registry.cc ++++ b/status_consumer_registry.cc +@@ -3,7 +3,7 @@ + #include + + #include "status_provider.h" +-#include "third_party/abseil/absl/synchronization/mutex.h" ++#include "absl/synchronization/mutex.h" + + namespace devtools_crosstool_autofdo { + +diff --git a/status_consumer_registry.h b/status_consumer_registry.h +index 8fd94f8..4a4bfdf 100644 +--- a/status_consumer_registry.h ++++ b/status_consumer_registry.h +@@ -6,8 +6,8 @@ + #include + + #include "status_provider.h" +-#include "third_party/abseil/absl/base/thread_annotations.h" +-#include "third_party/abseil/absl/synchronization/mutex.h" ++#include "absl/base/thread_annotations.h" ++#include "absl/synchronization/mutex.h" + + namespace devtools_crosstool_autofdo { + +diff --git a/status_provider.cc b/status_provider.cc +index 442f0e2..cd44487 100644 +--- a/status_provider.cc ++++ b/status_provider.cc +@@ -2,7 +2,7 @@ + + #include + +-#include "third_party/abseil/absl/strings/str_format.h" ++#include "absl/strings/str_format.h" + + namespace devtools_crosstool_autofdo { + std::string MultiStatusProvider::GetJob() const { +diff --git a/status_provider.h b/status_provider.h +index 5977465..e10c63f 100644 +--- a/status_provider.h ++++ b/status_provider.h +@@ -7,8 +7,8 @@ + #include + #include + +-#include "third_party/abseil/absl/algorithm/container.h" +-#include "third_party/abseil/absl/strings/string_view.h" ++#include "absl/algorithm/container.h" ++#include "absl/strings/string_view.h" + + namespace devtools_crosstool_autofdo { + +diff --git a/symbol_map.cc b/symbol_map.cc +index f33d867..2f9d333 100644 +--- a/symbol_map.cc ++++ b/symbol_map.cc +@@ -13,14 +13,14 @@ + #include "base/commandlineflags.h" + #include "base/logging.h" + #include "addr2line.h" +-#include "third_party/abseil/absl/container/flat_hash_map.h" +-#include "third_party/abseil/absl/container/flat_hash_set.h" +-#include "third_party/abseil/absl/container/node_hash_map.h" +-#include "third_party/abseil/absl/debugging/internal/demangle.h" +-#include "third_party/abseil/absl/flags/flag.h" +-#include "third_party/abseil/absl/memory/memory.h" +-#include "third_party/abseil/absl/strings/match.h" +-#include "third_party/abseil/absl/strings/str_format.h" ++#include "absl/container/flat_hash_map.h" ++#include "absl/container/flat_hash_set.h" ++#include "absl/container/node_hash_map.h" ++#include "absl/debugging/internal/demangle.h" ++#include "absl/flags/flag.h" ++#include "absl/memory/memory.h" ++#include "absl/strings/match.h" ++#include "absl/strings/str_format.h" + #include + #include "util/symbolize/elf_reader.h" + +diff --git a/symbol_map.h b/symbol_map.h +index 8be950c..d41f66e 100644 +--- a/symbol_map.h ++++ b/symbol_map.h +@@ -17,10 +17,10 @@ + #include "base/macros.h" + #include "addr2line.h" + #include "source_info.h" +-#include "third_party/abseil/absl/container/flat_hash_map.h" +-#include "third_party/abseil/absl/container/flat_hash_set.h" +-#include "third_party/abseil/absl/container/node_hash_map.h" +-#include "third_party/abseil/absl/flags/declare.h" ++#include "absl/container/flat_hash_map.h" ++#include "absl/container/flat_hash_set.h" ++#include "absl/container/node_hash_map.h" ++#include "absl/flags/declare.h" + + #if defined(HAVE_LLVM) + #include "llvm/ADT/StringSet.h" +diff --git a/symbol_map_test.cc b/symbol_map_test.cc +index 6630495..cadf7a0 100644 +--- a/symbol_map_test.cc ++++ b/symbol_map_test.cc +@@ -12,9 +12,9 @@ + #include "source_info.h" + #include "gmock/gmock.h" + #include "gtest/gtest.h" +-#include "third_party/abseil/absl/container/node_hash_set.h" +-#include "third_party/abseil/absl/flags/flag.h" +-#include "third_party/abseil/absl/types/optional.h" ++#include "absl/container/node_hash_set.h" ++#include "absl/flags/flag.h" ++#include "absl/types/optional.h" + + #define FLAGS_test_tmpdir std::string(testing::UnitTest::GetInstance()->original_working_dir()) + +-- +2.39.3 (Apple Git-146) + diff --git a/autofdo-0.19.tar.xz b/autofdo-0.19.tar.xz index 3e56a5a852f0232aba9f20c14428b18be5657d00..140c6819b63edf399ef60ac97de255d01cfec677 100644 Binary files a/autofdo-0.19.tar.xz and b/autofdo-0.19.tar.xz differ diff --git a/autofdo.spec b/autofdo.spec index 25ab027fdce8c1626b38bcd819aa47db267f472a..64f018155718cc7cef41e99f5f1921287932c23a 100644 --- a/autofdo.spec +++ b/autofdo.spec @@ -1,6 +1,6 @@ Name: autofdo Version: 0.19 -Release: 3.20231228.git0e296280 +Release: 5.20231228.git0e296280 Summary: A tool to convert perf.data profile to AutoFDO profile License: Apache-2.0 URL: https://github.com/google/autofdo @@ -8,15 +8,18 @@ URL: https://github.com/google/autofdo # so remove the GIT information and repackage it. Source0: %{name}-%{version}.tar.xz -BuildRequires: gcc gcc-c++ libtool git cmake elfutils-libelf-devel openssl-devel pkg-config ninja-build gtest libunwind-devel protobuf-devel -Requires: glibc openssl-libs elfutils libgcc libstdc++ zlib +Patch1: 0001-Build-Static-Library.patch +Patch2: 0002-Replace-internal-abseil-with-openEuler-version.patch + +BuildRequires: gcc gcc-c++ libtool git cmake elfutils-libelf-devel openssl-devel pkg-config ninja-build gtest libunwind-devel protobuf-devel abseil-cpp-devel +Requires: glibc openssl-libs elfutils libgcc libstdc++ zlib abseil-cpp %description This package contains a tool to convert perf.data profile to AutoFDO profile that can be used by GCC and LLVM. %prep -%autosetup +%autosetup -p1 %build cmake -G Ninja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=. ./ @@ -35,8 +38,20 @@ cp %{_builddir}/%{name}-%{version}/profile_merger ./ %{_bindir}/profile_merger %changelog -* Fri Dec 22 2023 zhaozhenyu - 0.19-3.20231228.git0e296280 -- Type:update +* Thu Aug 1 2024 rfwang07 - 0.19-5.20231228.git0e296280 +- Type:Fix +- ID:NA +- SUG:NA +- DESC:Replace internal abseil with openEuler version + +* Wed Apr 24 2024 zhaozhenyu - 0.19-4.20231228.git0e296280 +- Type:Bugfix +- ID:NA +- SUG:NA +- DESC:Correct file extension and enable pacth in the spec file + +* Fri Dec 22 2023 zhaozhenyu - 0.19-3.20231228.git0e296280 +- Type:Update - ID:NA - SUG:NA - DESC:Update AutoFDO toolchain to 0.19-3.20231228