remove containerization

Signed-off-by: Sarnie, Nick <[email protected]>

Author: sarnex

clang/tools/clang-linker-wrapper/ClangLinkerWrapper.cpp

@@ -736,15 +736,11 @@ wrapDeviceImages(ArrayRef<std::unique_ptr<MemoryBuffer>> Buffers,
 }
 
 Expected<SmallVector<std::unique_ptr<MemoryBuffer>>>
-bundleOpenMP(SmallVectorImpl<OffloadingImage> &Images) {
+bundleOpenMP(ArrayRef<OffloadingImage> Images) {
   SmallVector<std::unique_ptr<MemoryBuffer>> Buffers;
-  for (OffloadingImage &Image : Images) {
-    llvm::Triple Triple(Image.StringData.lookup("triple"));
-    if (Triple.isSPIRV() && Triple.getVendor() == llvm::Triple::Intel)
-      offloading::intel::containerizeOpenMPSPIRVImage(Image);
+  for (const OffloadingImage &Image : Images)
     Buffers.emplace_back(
         MemoryBuffer::getMemBufferCopy(OffloadBinary::write(Image)));
-  }
 
   return std::move(Buffers);
 }
@@ -798,8 +794,8 @@ bundleHIP(ArrayRef<OffloadingImage> Images, const ArgList &Args) {
 /// Transforms the input \p Images into the binary format the runtime expects
 /// for the given \p Kind.
 Expected<SmallVector<std::unique_ptr<MemoryBuffer>>>
-bundleLinkedOutput(SmallVectorImpl<OffloadingImage> &Images,
-                   const ArgList &Args, OffloadKind Kind) {
+bundleLinkedOutput(ArrayRef<OffloadingImage> Images, const ArgList &Args,
+                   OffloadKind Kind) {
   llvm::TimeTraceScope TimeScope("Bundle linked output");
   switch (Kind) {
   case OFK_OpenMP:

llvm/include/llvm/Frontend/Offloading/Utility.h

@@ -133,11 +133,6 @@ Error getAMDGPUMetaDataFromImage(MemoryBufferRef MemBuffer,
                                  StringMap<AMDGPUKernelMetaData> &KernelInfoMap,
                                  uint16_t &ELFABIVersion);
 } // namespace amdgpu
-namespace intel {
-/// Containerizes an offloading image into the ELF binary format expected by
-/// the Intel runtime offload plugin.
-void containerizeOpenMPSPIRVImage(object::OffloadBinary::OffloadingImage &Img);
-} // namespace intel
 } // namespace offloading
 } // namespace llvm
 

llvm/lib/Frontend/Offloading/Utility.cpp

@@ -15,8 +15,6 @@
 #include "llvm/IR/GlobalVariable.h"
 #include "llvm/IR/Value.h"
 #include "llvm/Object/ELFObjectFile.h"
-#include "llvm/ObjectYAML/ELFYAML.h"
-#include "llvm/ObjectYAML/yaml2obj.h"
 #include "llvm/Support/MemoryBufferRef.h"
 #include "llvm/Transforms/Utils/ModuleUtils.h"
 
@@ -367,87 +365,3 @@ Error llvm::offloading::amdgpu::getAMDGPUMetaDataFromImage(
   }
   return Error::success();
 }
-
-void offloading::intel::containerizeOpenMPSPIRVImage(
-    object::OffloadBinary::OffloadingImage &Img) {
-  constexpr char INTEL_ONEOMP_OFFLOAD_VERSION[] = "1.0";
-  constexpr int NT_INTEL_ONEOMP_OFFLOAD_VERSION = 1;
-  constexpr int NT_INTEL_ONEOMP_OFFLOAD_IMAGE_COUNT = 2;
-  constexpr int NT_INTEL_ONEOMP_OFFLOAD_IMAGE_AUX = 3;
-  llvm::Triple Triple(Img.StringData.lookup("triple"));
-  assert((Triple.isSPIRV() && Triple.getVendor() == llvm::Triple::Intel) &&
-         "Unexpected triple");
-
-  // Start creating notes for the ELF container.
-  std::vector<ELFYAML::NoteEntry> Notes;
-  std::string Version = toHex(INTEL_ONEOMP_OFFLOAD_VERSION);
-  Notes.emplace_back(ELFYAML::NoteEntry{"INTELONEOMPOFFLOAD",
-                                        yaml::BinaryRef(Version),
-                                        NT_INTEL_ONEOMP_OFFLOAD_VERSION});
-
-  // The AuxInfo string will hold auxiliary information for the image.
-  // ELFYAML::NoteEntry structures will hold references to the
-  // string, so we have to make sure the string is valid.
-  std::string AuxInfo;
-
-  // TODO: Pass compile/link opts
-  StringRef CompileOpts = "";
-  StringRef LinkOpts = "";
-
-  unsigned ImageFmt = 1; // SPIR-V format
-
-  AuxInfo = toHex((Twine(0) + Twine('\0') + Twine(ImageFmt) + Twine('\0') +
-                   CompileOpts + Twine('\0') + LinkOpts)
-                      .str());
-  Notes.emplace_back(ELFYAML::NoteEntry{"INTELONEOMPOFFLOAD",
-                                        yaml::BinaryRef(AuxInfo),
-                                        NT_INTEL_ONEOMP_OFFLOAD_IMAGE_AUX});
-
-  std::string ImgCount = toHex(Twine(1).str()); // always one image per ELF
-  Notes.emplace_back(ELFYAML::NoteEntry{"INTELONEOMPOFFLOAD",
-                                        yaml::BinaryRef(ImgCount),
-                                        NT_INTEL_ONEOMP_OFFLOAD_IMAGE_COUNT});
-
-  std::string YamlFile;
-  llvm::raw_string_ostream YamlFileStream(YamlFile);
-
-  // Write YAML template file.
-  {
-    // We use 64-bit little-endian ELF currently.
-    ELFYAML::FileHeader Header{};
-    Header.Class = ELF::ELFCLASS64;
-    Header.Data = ELF::ELFDATA2LSB;
-    Header.Type = ELF::ET_DYN;
-    // Use an existing Intel machine type as there is not one specifically for
-    // Intel GPUs.
-    Header.Machine = ELF::EM_IA_64;
-
-    // Create a section with notes.
-    ELFYAML::NoteSection Section{};
-    Section.Type = ELF::SHT_NOTE;
-    Section.AddressAlign = 0;
-    Section.Name = ".note.inteloneompoffload";
-    Section.Notes.emplace(std::move(Notes));
-
-    ELFYAML::Object Object{};
-    Object.Header = Header;
-    Object.Chunks.push_back(
-        std::make_unique<ELFYAML::NoteSection>(std::move(Section)));
-
-    // Create the section that will hold the image
-    ELFYAML::RawContentSection ImageSection{};
-    ImageSection.Type = ELF::SHT_PROGBITS;
-    ImageSection.AddressAlign = 0;
-    std::string Name = "__openmp_offload_spirv_0";
-    ImageSection.Name = Name;
-    ImageSection.Content =
-        llvm::yaml::BinaryRef(arrayRefFromStringRef(Img.Image->getBuffer()));
-    Object.Chunks.push_back(
-        std::make_unique<ELFYAML::RawContentSection>(std::move(ImageSection)));
-
-    llvm::yaml::yaml2elf(
-        Object, YamlFileStream,
-        [](const Twine &Msg) { llvm::report_fatal_error(Msg); }, UINT64_MAX);
-  }
-  Img.Image = MemoryBuffer::getMemBufferCopy(YamlFile);
-}