Resolve merge conflicts

Author: hsharsha

tensorflow/lite/experimental/litert/vendors/google_tensor/BUILD

@@ -1,37 +1,18 @@
-<<<<<<< HEAD:tensorflow/tools/tf_sig_build_dockerfiles/setup.packages.rocm.cs7.sh
-#!/usr/bin/env bash
-#
-# Copyright 2022 The TensorFlow Authors. All Rights Reserved.
-=======
 # Copyright 2024 Google LLC.
->>>>>>> upstream/master:tensorflow/lite/experimental/litert/vendors/google_tensor/BUILD
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#      http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-# ==============================================================================
-#
-# setup.packages.sh: Given a list of Ubuntu packages, install them and clean up.
-# Usage: setup.packages.sh <package_list.txt>
-set -e
-set -x
 
-<<<<<<< HEAD:tensorflow/tools/tf_sig_build_dockerfiles/setup.packages.rocm.cs7.sh
-yum clean all
-yum update -y
-PKG_LIST=$(sed -e '/^\s*#.*$/d' -e '/^\s*$/d' "$1" | sort -u)
-yum --enablerepo=extras install -y $PKG_LIST
-=======
 package(
     # copybara:uncomment default_applicable_licenses = ["//tensorflow:license"],
     default_visibility = ["//tensorflow/lite/experimental/litert:__subpackages__"],
 )
->>>>>>> upstream/master:tensorflow/lite/experimental/litert/vendors/google_tensor/BUILD

third_party/llvm/generated.patch

@@ -1,5 +1,4 @@
 Auto generated patch. Do not edit or delete it, even if empty.
-<<<<<<< HEAD
 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
@@ -57,5 +56,3 @@ diff -ruN --strip-trailing-cr a/lld/ELF/Writer.cpp b/lld/ELF/Writer.cpp
    demoteSymbolsAndComputeIsPreemptible(ctx);
 
    if (ctx.arg.copyRelocs && ctx.arg.discard != DiscardPolicy::None)
-=======
->>>>>>> upstream/master

third_party/llvm/workspace.bzl

@@ -4,13 +4,8 @@ load("//third_party:repo.bzl", "tf_http_archive")
 
 def repo(name):
     """Imports LLVM."""
-<<<<<<< HEAD
     LLVM_COMMIT = "2e5a5237daf82a657561c490845c406e13657311"
     LLVM_SHA256 = "e0622b7f81a046e1576d8d07c5ba916346c2a1c06528655d3ddd45a1028eac89"
-=======
-    LLVM_COMMIT = "386af4a5c64ab75eaee2448dc38f2e34a40bfed0"
-    LLVM_SHA256 = "4b752a2dfb5e4e55cf9812a353bce7e437e0852f4eef64929f48d74732080c50"
->>>>>>> upstream/master
 
     tf_http_archive(
         name = name,

third_party/shardy/temporary.patch

@@ -1,119 +1,4 @@
 diff --git a/third_party/llvm/generated.patch b/third_party/llvm/generated.patch
-<<<<<<< HEAD
-index 776d4e6..bdba21a 100644
---- a/third_party/llvm/generated.patch
-+++ b/third_party/llvm/generated.patch
-@@ -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)
-diff --git a/third_party/llvm/workspace.bzl b/third_party/llvm/workspace.bzl
-index 6b3934d..9a336b9 100644
-=======
 index f35b1a3..509398d 100644
 --- a/third_party/llvm/generated.patch
 +++ b/third_party/llvm/generated.patch
@@ -628,24 +513,16 @@ index f35b1a3..509398d 100644
 -+^11 = blockcount: 0
 diff --git a/third_party/llvm/workspace.bzl b/third_party/llvm/workspace.bzl
 index d2ef15d..c4a6676 100644
->>>>>>> upstream/master
 --- 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."""
-<<<<<<< HEAD
--    LLVM_COMMIT = "77c780d64b950d6850d5ec1ee06cd0c21b38b89e"
--    LLVM_SHA256 = "109bdf7b5e62992fa8ccf9445eb462b046ffc6409de859f5f7482ea3cde8f967"
-+    LLVM_COMMIT = "2e5a5237daf82a657561c490845c406e13657311"
-+    LLVM_SHA256 = "e0622b7f81a046e1576d8d07c5ba916346c2a1c06528655d3ddd45a1028eac89"
-=======
 -    LLVM_COMMIT = "f0d05b099dafda89df4c971b64b2051c33db5da1"
 -    LLVM_SHA256 = "29326f27b5bffa5f57b0f8a99d3e864c09a67bf899341103a7cd609fd3ea80e3"
 +    LLVM_COMMIT = "386af4a5c64ab75eaee2448dc38f2e34a40bfed0"
 +    LLVM_SHA256 = "4b752a2dfb5e4e55cf9812a353bce7e437e0852f4eef64929f48d74732080c50"
->>>>>>> upstream/master
 
      tf_http_archive(
          name = name,

third_party/shardy/workspace.bzl

@@ -3,13 +3,8 @@
 load("//third_party:repo.bzl", "tf_http_archive", "tf_mirror_urls")
 
 def repo():
-<<<<<<< HEAD
-    SHARDY_COMMIT = "8cf632f5e74c3777fc47d19525a9e2e1c597fc54"
-    SHARDY_SHA256 = "12be33b73a5d2bb45df138fab2400b411e4e7b3ad5a058acb6ef397b2252c8df"
-=======
     SHARDY_COMMIT = "71c3f3293063aa4301d72c9b3a1e15bd568a8ffd"
     SHARDY_SHA256 = "d60c69d1f842c4358586a5eed572818b7320485924b0bdd4fcc4ca2ea367b37c"
->>>>>>> upstream/master
 
     tf_http_archive(
         name = "shardy",