Skip to content
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

Integrate LLVM at llvm/llvm-project@2e5a5237daf8 #21923

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+219 −174
Open

Integrate LLVM at llvm/llvm-project@2e5a5237daf8 #21923

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
100 changes: 51 additions & 49 deletions third_party/llvm/generated.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,56 +1,58 @@
Auto generated patch. Do not edit or delete it, even if empty.
diff -ruN --strip-trailing-cr a/llvm/lib/CodeGen/GlobalMerge.cpp b/llvm/lib/CodeGen/GlobalMerge.cpp
--- a/llvm/lib/CodeGen/GlobalMerge.cpp
+++ b/llvm/lib/CodeGen/GlobalMerge.cpp
@@ -423,12 +423,24 @@
diff -ruN --strip-trailing-cr a/lld/ELF/Config.h b/lld/ELF/Config.h
--- a/lld/ELF/Config.h
+++ b/lld/ELF/Config.h
@@ -619,7 +619,6 @@
};
ElfSym sym{};
std::unique_ptr<SymbolTable> symtab;
- SmallVector<Symbol *, 0> synthesizedSymbols;

SmallVector<std::unique_ptr<MemoryBuffer>> memoryBuffers;
SmallVector<ELFFileBase *, 0> objectFiles;
diff -ruN --strip-trailing-cr a/lld/ELF/Writer.cpp b/lld/ELF/Writer.cpp
--- a/lld/ELF/Writer.cpp
+++ b/lld/ELF/Writer.cpp
@@ -149,7 +149,6 @@
if (!s || s->isDefined() || s->isCommon())
return nullptr;

- ctx.synthesizedSymbols.push_back(s);
s->resolve(ctx, Defined{ctx, ctx.internalFile, StringRef(), STB_GLOBAL,
stOther, STT_NOTYPE, val,
/*size=*/0, sec});
@@ -283,7 +282,6 @@
static void demoteSymbolsAndComputeIsPreemptible(Ctx &ctx) {
llvm::TimeTraceScope timeScope("Demote symbols");
DenseMap<InputFile *, DenseMap<SectionBase *, size_t>> sectionIndexMap;
- bool hasDynSymTab = ctx.arg.hasDynSymTab;
for (Symbol *sym : ctx.symtab->getSymbols()) {
if (auto *d = dyn_cast<Defined>(sym)) {
if (d->section && !d->section->isLive())
@@ -296,12 +294,11 @@
sym->type)
.overwrite(*sym);
sym->versionId = VER_NDX_GLOBAL;
- if (sym->includeInDynsym(ctx))
- sym->isExported = true;
}
}
}

+ // Now we found a bunch of sets of globals used together. We accumulated
+ // the number of times we encountered the sets (i.e., the number of functions
+ // that use that exact set of globals).
+ //
+ // Multiply that by the size of the set to give us a crude profitability
+ // metric.
+ llvm::stable_sort(UsedGlobalSets,
+ [](const UsedGlobalSet &UGS1, const UsedGlobalSet &UGS2) {
+ return UGS1.Globals.count() * UGS1.UsageCount <
+ UGS2.Globals.count() * UGS2.UsageCount;
+ });
+
// We can choose to merge all globals together, but ignore globals never used
// with another global. This catches the obviously non-profitable cases of
// having a single global, but is aggressive enough for any other case.
if (GlobalMergeIgnoreSingleUse) {
BitVector AllGlobals(Globals.size());
- for (const UsedGlobalSet &UGS : UsedGlobalSets) {
+ for (const UsedGlobalSet &UGS : llvm::reverse(UsedGlobalSets)) {
if (UGS.UsageCount == 0)
continue;
if (UGS.Globals.count() > 1)
@@ -437,16 +449,6 @@
return doMerge(Globals, AllGlobals, M, isConst, AddrSpace);
- if (hasDynSymTab)
+ sym->isExported = sym->includeInDynsym(ctx);
+ if (ctx.arg.hasDynSymTab)
sym->isPreemptible = sym->isExported && computeIsPreemptible(ctx, *sym);
}
}
@@ -1839,11 +1836,6 @@
}
}

- // Now we found a bunch of sets of globals used together. We accumulated
- // the number of times we encountered the sets (i.e., the number of functions
- // that use that exact set of globals). Multiply that by the size of the set
- // to give us a crude profitability metric.
- llvm::stable_sort(UsedGlobalSets,
- [](const UsedGlobalSet &UGS1, const UsedGlobalSet &UGS2) {
- return UGS1.Globals.count() * UGS1.UsageCount >=
- UGS2.Globals.count() * UGS2.UsageCount;
- });
- // If the previous code block defines any non-hidden symbols (e.g.
- // __global_pointer$), they may be exported.
- for (Symbol *sym : ctx.synthesizedSymbols)
- sym->isExported = sym->includeInDynsym(ctx);
-
// Starting from the sets with the best (=biggest) profitability, find a
// good combination.
// The ideal (and expensive) solution can only be found by trying all
@@ -456,7 +458,7 @@
BitVector PickedGlobals(Globals.size());
bool Changed = false;
demoteSymbolsAndComputeIsPreemptible(ctx);

- for (const UsedGlobalSet &UGS : UsedGlobalSets) {
+ for (const UsedGlobalSet &UGS : llvm::reverse(UsedGlobalSets)) {
if (UGS.UsageCount == 0)
continue;
if (PickedGlobals.anyCommon(UGS.Globals))
if (ctx.arg.copyRelocs && ctx.arg.discard != DiscardPolicy::None)
4 changes: 2 additions & 2 deletions third_party/llvm/workspace.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ load("//third_party:repo.bzl", "tf_http_archive")

def repo(name):
"""Imports LLVM."""
LLVM_COMMIT = "77c780d64b950d6850d5ec1ee06cd0c21b38b89e"
LLVM_SHA256 = "109bdf7b5e62992fa8ccf9445eb462b046ffc6409de859f5f7482ea3cde8f967"
LLVM_COMMIT = "2e5a5237daf82a657561c490845c406e13657311"
LLVM_SHA256 = "e0622b7f81a046e1576d8d07c5ba916346c2a1c06528655d3ddd45a1028eac89"

tf_http_archive(
name = name,
Expand Down
181 changes: 111 additions & 70 deletions third_party/shardy/temporary.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,86 +1,127 @@
diff --git a/third_party/llvm/generated.patch b/third_party/llvm/generated.patch
index f1b9000..776d4e6 100644
index 776d4e6..bdba21a 100644
--- a/third_party/llvm/generated.patch
+++ b/third_party/llvm/generated.patch
@@ -1,12 +1,56 @@
@@ -1,56 +1,58 @@
Auto generated patch. Do not edit or delete it, even if empty.
-diff -ruN --strip-trailing-cr a/utils/bazel/llvm-project-overlay/libc/BUILD.bazel b/utils/bazel/llvm-project-overlay/libc/BUILD.bazel
---- a/utils/bazel/llvm-project-overlay/libc/BUILD.bazel
-+++ b/utils/bazel/llvm-project-overlay/libc/BUILD.bazel
-@@ -3652,6 +3652,7 @@
- ":__support_macros_optimization",
- ":llvm_libc_types_size_t",
- ":string_memory_utils",
-+ ":types_size_t",
- ],
- )
+diff -ruN --strip-trailing-cr a/llvm/lib/CodeGen/GlobalMerge.cpp b/llvm/lib/CodeGen/GlobalMerge.cpp
+--- a/llvm/lib/CodeGen/GlobalMerge.cpp
++++ b/llvm/lib/CodeGen/GlobalMerge.cpp
+@@ -423,12 +423,24 @@
+ }
+ }

++ // Now we found a bunch of sets of globals used together. We accumulated
++ // the number of times we encountered the sets (i.e., the number of functions
++ // that use that exact set of globals).
++ //
++ // Multiply that by the size of the set to give us a crude profitability
++ // metric.
++ llvm::stable_sort(UsedGlobalSets,
++ [](const UsedGlobalSet &UGS1, const UsedGlobalSet &UGS2) {
++ return UGS1.Globals.count() * UGS1.UsageCount <
++ UGS2.Globals.count() * UGS2.UsageCount;
++ });
++
+ // We can choose to merge all globals together, but ignore globals never used
+ // with another global. This catches the obviously non-profitable cases of
+ // having a single global, but is aggressive enough for any other case.
+ if (GlobalMergeIgnoreSingleUse) {
+ BitVector AllGlobals(Globals.size());
+- for (const UsedGlobalSet &UGS : UsedGlobalSets) {
++ for (const UsedGlobalSet &UGS : llvm::reverse(UsedGlobalSets)) {
+ if (UGS.UsageCount == 0)
+ continue;
+ if (UGS.Globals.count() > 1)
+@@ -437,16 +449,6 @@
+ return doMerge(Globals, AllGlobals, M, isConst, AddrSpace);
+ }
-diff -ruN --strip-trailing-cr a/llvm/lib/CodeGen/GlobalMerge.cpp b/llvm/lib/CodeGen/GlobalMerge.cpp
---- a/llvm/lib/CodeGen/GlobalMerge.cpp
-+++ b/llvm/lib/CodeGen/GlobalMerge.cpp
-@@ -423,12 +423,24 @@
+diff -ruN --strip-trailing-cr a/lld/ELF/Config.h b/lld/ELF/Config.h
+--- a/lld/ELF/Config.h
++++ b/lld/ELF/Config.h
+@@ -619,7 +619,6 @@
+ };
+ ElfSym sym{};
+ std::unique_ptr<SymbolTable> symtab;
+- SmallVector<Symbol *, 0> synthesizedSymbols;
+
+- // Now we found a bunch of sets of globals used together. We accumulated
+- // the number of times we encountered the sets (i.e., the number of functions
+- // that use that exact set of globals). Multiply that by the size of the set
+- // to give us a crude profitability metric.
+- llvm::stable_sort(UsedGlobalSets,
+- [](const UsedGlobalSet &UGS1, const UsedGlobalSet &UGS2) {
+- return UGS1.Globals.count() * UGS1.UsageCount >=
+- UGS2.Globals.count() * UGS2.UsageCount;
+- });
+-
+ // Starting from the sets with the best (=biggest) profitability, find a
+ // good combination.
+ // The ideal (and expensive) solution can only be found by trying all
+@@ -456,7 +458,7 @@
+ BitVector PickedGlobals(Globals.size());
+ bool Changed = false;
+ SmallVector<std::unique_ptr<MemoryBuffer>> memoryBuffers;
+ SmallVector<ELFFileBase *, 0> objectFiles;
+diff -ruN --strip-trailing-cr a/lld/ELF/Writer.cpp b/lld/ELF/Writer.cpp
+--- a/lld/ELF/Writer.cpp
++++ b/lld/ELF/Writer.cpp
+@@ -149,7 +149,6 @@
+ if (!s || s->isDefined() || s->isCommon())
+ return nullptr;
+
+- for (const UsedGlobalSet &UGS : UsedGlobalSets) {
++ for (const UsedGlobalSet &UGS : llvm::reverse(UsedGlobalSets)) {
+ if (UGS.UsageCount == 0)
+ continue;
+ if (PickedGlobals.anyCommon(UGS.Globals))
+- ctx.synthesizedSymbols.push_back(s);
+ s->resolve(ctx, Defined{ctx, ctx.internalFile, StringRef(), STB_GLOBAL,
+ stOther, STT_NOTYPE, val,
+ /*size=*/0, sec});
+@@ -283,7 +282,6 @@
+ static void demoteSymbolsAndComputeIsPreemptible(Ctx &ctx) {
+ llvm::TimeTraceScope timeScope("Demote symbols");
+ DenseMap<InputFile *, DenseMap<SectionBase *, size_t>> sectionIndexMap;
+- bool hasDynSymTab = ctx.arg.hasDynSymTab;
+ for (Symbol *sym : ctx.symtab->getSymbols()) {
+ if (auto *d = dyn_cast<Defined>(sym)) {
+ if (d->section && !d->section->isLive())
+@@ -296,12 +294,11 @@
+ sym->type)
+ .overwrite(*sym);
+ sym->versionId = VER_NDX_GLOBAL;
+- if (sym->includeInDynsym(ctx))
+- sym->isExported = true;
+ }
}
- }

-+ // Now we found a bunch of sets of globals used together. We accumulated
-+ // the number of times we encountered the sets (i.e., the number of functions
-+ // that use that exact set of globals).
-+ //
-+ // Multiply that by the size of the set to give us a crude profitability
-+ // metric.
-+ llvm::stable_sort(UsedGlobalSets,
-+ [](const UsedGlobalSet &UGS1, const UsedGlobalSet &UGS2) {
-+ return UGS1.Globals.count() * UGS1.UsageCount <
-+ UGS2.Globals.count() * UGS2.UsageCount;
-+ });
-+
- // We can choose to merge all globals together, but ignore globals never used
- // with another global. This catches the obviously non-profitable cases of
- // having a single global, but is aggressive enough for any other case.
- if (GlobalMergeIgnoreSingleUse) {
- BitVector AllGlobals(Globals.size());
-- for (const UsedGlobalSet &UGS : UsedGlobalSets) {
-+ for (const UsedGlobalSet &UGS : llvm::reverse(UsedGlobalSets)) {
- if (UGS.UsageCount == 0)
- continue;
- if (UGS.Globals.count() > 1)
-@@ -437,16 +449,6 @@
- return doMerge(Globals, AllGlobals, M, isConst, AddrSpace);
+- if (hasDynSymTab)
++ sym->isExported = sym->includeInDynsym(ctx);
++ if (ctx.arg.hasDynSymTab)
+ sym->isPreemptible = sym->isExported && computeIsPreemptible(ctx, *sym);
+ }
+ }
+@@ -1839,11 +1836,6 @@
+ }
}

-- // Now we found a bunch of sets of globals used together. We accumulated
-- // the number of times we encountered the sets (i.e., the number of functions
-- // that use that exact set of globals). Multiply that by the size of the set
-- // to give us a crude profitability metric.
-- llvm::stable_sort(UsedGlobalSets,
-- [](const UsedGlobalSet &UGS1, const UsedGlobalSet &UGS2) {
-- return UGS1.Globals.count() * UGS1.UsageCount >=
-- UGS2.Globals.count() * UGS2.UsageCount;
-- });
+- // If the previous code block defines any non-hidden symbols (e.g.
+- // __global_pointer$), they may be exported.
+- for (Symbol *sym : ctx.synthesizedSymbols)
+- sym->isExported = sym->includeInDynsym(ctx);
-
- // Starting from the sets with the best (=biggest) profitability, find a
- // good combination.
- // The ideal (and expensive) solution can only be found by trying all
-@@ -456,7 +458,7 @@
- BitVector PickedGlobals(Globals.size());
- bool Changed = false;
+ demoteSymbolsAndComputeIsPreemptible(ctx);

-- for (const UsedGlobalSet &UGS : UsedGlobalSets) {
-+ for (const UsedGlobalSet &UGS : llvm::reverse(UsedGlobalSets)) {
- if (UGS.UsageCount == 0)
- continue;
- if (PickedGlobals.anyCommon(UGS.Globals))
+ if (ctx.arg.copyRelocs && ctx.arg.discard != DiscardPolicy::None)
diff --git a/third_party/llvm/workspace.bzl b/third_party/llvm/workspace.bzl
index 975c604..6b3934d 100644
index 6b3934d..9a336b9 100644
--- a/third_party/llvm/workspace.bzl
+++ b/third_party/llvm/workspace.bzl
@@ -4,8 +4,8 @@ load("//third_party:repo.bzl", "tf_http_archive")

def repo(name):
"""Imports LLVM."""
- LLVM_COMMIT = "9fecb4f9071740f6c1e665940583e9dceae2beb5"
- LLVM_SHA256 = "4fdbe474546073cb311a30d9d6f55766ce4217d6e30b45af74abbf6f93207c91"
+ LLVM_COMMIT = "77c780d64b950d6850d5ec1ee06cd0c21b38b89e"
+ LLVM_SHA256 = "109bdf7b5e62992fa8ccf9445eb462b046ffc6409de859f5f7482ea3cde8f967"
- LLVM_COMMIT = "77c780d64b950d6850d5ec1ee06cd0c21b38b89e"
- LLVM_SHA256 = "109bdf7b5e62992fa8ccf9445eb462b046ffc6409de859f5f7482ea3cde8f967"
+ LLVM_COMMIT = "2e5a5237daf82a657561c490845c406e13657311"
+ LLVM_SHA256 = "e0622b7f81a046e1576d8d07c5ba916346c2a1c06528655d3ddd45a1028eac89"

tf_http_archive(
name = name,
4 changes: 2 additions & 2 deletions third_party/shardy/workspace.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
load("//third_party:repo.bzl", "tf_http_archive", "tf_mirror_urls")

def repo():
SHARDY_COMMIT = "48181c5de14fc3d54e4ff134de568f95d4ccc471"
SHARDY_SHA256 = "05e3d6ef7897a0cb6bae65db9961d29f327132568fc339df200594f68463689c"
SHARDY_COMMIT = "8cf632f5e74c3777fc47d19525a9e2e1c597fc54"
SHARDY_SHA256 = "12be33b73a5d2bb45df138fab2400b411e4e7b3ad5a058acb6ef397b2252c8df"

tf_http_archive(
name = "shardy",
Expand Down
Loading