Merge rust-lang#45

45: Add the `-yk-alloc-llvmbc-section` flag. r=ltratt a=vext01



Co-authored-by: Edd Barrett <vext01@gmail.com>

Author: bors[bot]

llvm/lib/Bitcode/Writer/BitcodeWriter.cpp

@@ -98,6 +98,8 @@ static cl::opt<bool> WriteRelBFToSummary(
 
 extern FunctionSummary::ForceSummaryHotnessType ForceSummaryEdgesCold;
 
+extern bool YkAllocLLVMBCSection;
+
 namespace {
 
 /// These are manifest constants used by the bitcode writer. They do not need to
@@ -4992,11 +4994,32 @@ void llvm::embedBitcodeInModule(llvm::Module &M, llvm::MemoryBufferRef Buf,
       ModuleData = ArrayRef<uint8_t>((const uint8_t *)Buf.getBufferStart(),
                                      Buf.getBufferSize());
   }
+
+  GlobalValue::LinkageTypes SymLinkage = GlobalValue::PrivateLinkage;
+
+  // For the YK JIT we prepend a header containing the size of the bitcode.
+  // This is required in order to load bitcode from memory.
+  std::vector<uint8_t> YkModuleData;
+  if (YkAllocLLVMBCSection) {
+    // Write length field.
+    size_t ModuleDataSize = ModuleData.size();
+    uint8_t *Bytes = reinterpret_cast<uint8_t *>(&ModuleDataSize);
+    for (size_t I = 0; I < sizeof(ModuleDataSize); I++)
+      YkModuleData.push_back(Bytes[I]);
+
+    // Append bitcode.
+    std::move(ModuleData.begin(), ModuleData.end(),
+              std::back_inserter(YkModuleData));
+    ModuleData = YkModuleData;
+
+    // Ensure the symbol is exported in the resulting binary.
+    SymLinkage = GlobalValue::ExternalLinkage;
+  }
+
   llvm::Constant *ModuleConstant =
       llvm::ConstantDataArray::get(M.getContext(), ModuleData);
   llvm::GlobalVariable *GV = new llvm::GlobalVariable(
-      M, ModuleConstant->getType(), true, llvm::GlobalValue::PrivateLinkage,
-      ModuleConstant);
+      M, ModuleConstant->getType(), true, SymLinkage, ModuleConstant);
   GV->setSection(getSectionNameForBitcode(T));
   // Set alignment to 1 to prevent padding between two contributions from input
   // sections after linking.

llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp

@@ -70,6 +70,8 @@
 using namespace llvm;
 using namespace dwarf;
 
+extern bool YkAllocLLVMBCSection;
+
 static void GetObjCImageInfo(Module &M, unsigned &Version, unsigned &Flags,
                              StringRef &Section) {
   SmallVector<Module::ModuleFlagEntry, 8> ModuleFlags;
@@ -786,6 +788,12 @@ static MCSection *selectExplicitSectionGlobal(
       Retain, ForceUnique);
 
   const MCSymbolELF *LinkedToSym = getLinkedToSymbol(GO, TM);
+
+  // The Yk JIT expects to load the IR from its address space. This tells the
+  // loader to load the section.
+  if (YkAllocLLVMBCSection && (SectionName == ".llvmbc"))
+    Flags |= llvm::ELF::SHF_ALLOC;
+
   MCSectionELF *Section = Ctx.getELFSection(
       SectionName, getELFSectionType(SectionName, Kind), Flags, EntrySize,
       Group, IsComdat, UniqueID, LinkedToSym);

llvm/lib/Support/CMakeLists.txt

@@ -236,6 +236,7 @@ add_llvm_component_library(LLVMSupport
   X86TargetParser.cpp
   YAMLParser.cpp
   YAMLTraits.cpp
+  Yk.cpp
   raw_os_ostream.cpp
   raw_ostream.cpp
   regcomp.c

llvm/lib/Support/Yk.cpp

@@ -0,0 +1,8 @@
+#include "llvm/Support/CommandLine.h"
+
+using namespace llvm;
+
+bool YkAllocLLVMBCSection;
+static cl::opt<bool, true> YkAllocLLVMBCSectionParser(
+    "yk-alloc-llvmbc-section", cl::desc("Make the `.llvmbc` section loadable"),
+    cl::NotHidden, cl::location(YkAllocLLVMBCSection));