[llvm] ffcd7e9 - [MC] Export llvm::SPIRVObjectTargetWriter and drop reliance on Mach-o specific VersionInfo

[Fangrui Song via llvm-commits]

Author: Fangrui Song
Date: 2024-07-21T12:48:09-07:00
New Revision: ffcd7e98d93cda157b4ab9dddd0aa42f364db576

URL: https://github.com/llvm/llvm-project/commit/ffcd7e98d93cda157b4ab9dddd0aa42f364db576
DIFF: https://github.com/llvm/llvm-project/commit/ffcd7e98d93cda157b4ab9dddd0aa42f364db576.diff

LOG: [MC] Export llvm::SPIRVObjectTargetWriter and drop reliance on Mach-o specific VersionInfo

Added: 
    

Modified: 
    llvm/include/llvm/MC/MCSPIRVObjectWriter.h
    llvm/lib/MC/SPIRVObjectWriter.cpp
    llvm/lib/Target/SPIRV/SPIRVAsmPrinter.cpp

Removed: 
    


################################################################################
diff  --git a/llvm/include/llvm/MC/MCSPIRVObjectWriter.h b/llvm/include/llvm/MC/MCSPIRVObjectWriter.h
index a8baf96b83842..18bdb8be0145e 100644
--- a/llvm/include/llvm/MC/MCSPIRVObjectWriter.h
+++ b/llvm/include/llvm/MC/MCSPIRVObjectWriter.h
@@ -10,6 +10,8 @@
 #define LLVM_MC_MCSPIRVOBJECTWRITER_H
 
 #include "llvm/MC/MCObjectWriter.h"
+#include "llvm/MC/MCValue.h"
+#include "llvm/Support/EndianStream.h"
 #include "llvm/Support/raw_ostream.h"
 #include <memory>
 
@@ -26,6 +28,32 @@ class MCSPIRVObjectTargetWriter : public MCObjectTargetWriter {
   }
 };
 
+class SPIRVObjectWriter final : public MCObjectWriter {
+  support::endian::Writer W;
+  std::unique_ptr<MCSPIRVObjectTargetWriter> TargetObjectWriter;
+
+  struct VersionInfoType {
+    unsigned Major = 0;
+    unsigned Minor = 0;
+    unsigned Bound = 0;
+  } VersionInfo;
+
+public:
+  SPIRVObjectWriter(std::unique_ptr<MCSPIRVObjectTargetWriter> MOTW,
+                    raw_pwrite_stream &OS)
+      : W(OS, llvm::endianness::little), TargetObjectWriter(std::move(MOTW)) {}
+
+  void setBuildVersion(unsigned Major, unsigned Minor, unsigned Bound);
+
+private:
+  void recordRelocation(MCAssembler &Asm, const MCFragment *Fragment,
+                        const MCFixup &Fixup, MCValue Target,
+                        uint64_t &FixedValue) override {}
+
+  uint64_t writeObject(MCAssembler &Asm) override;
+  void writeHeader(const MCAssembler &Asm);
+};
+
 /// Construct a new SPIR-V writer instance.
 ///
 /// \param MOTW - The target specific SPIR-V writer subclass.

diff  --git a/llvm/lib/MC/SPIRVObjectWriter.cpp b/llvm/lib/MC/SPIRVObjectWriter.cpp
index 91bde7ab62c1e..ef3d4b029e43e 100644
--- a/llvm/lib/MC/SPIRVObjectWriter.cpp
+++ b/llvm/lib/MC/SPIRVObjectWriter.cpp
@@ -14,47 +14,27 @@
 
 using namespace llvm;
 
-namespace {
-class SPIRVObjectWriter : public MCObjectWriter {
-  ::support::endian::Writer W;
-
-  /// The target specific SPIR-V writer instance.
-  std::unique_ptr<MCSPIRVObjectTargetWriter> TargetObjectWriter;
-
-public:
-  SPIRVObjectWriter(std::unique_ptr<MCSPIRVObjectTargetWriter> MOTW,
-                    raw_pwrite_stream &OS)
-      : W(OS, llvm::endianness::little), TargetObjectWriter(std::move(MOTW)) {}
-
-  ~SPIRVObjectWriter() override {}
-
-private:
-  void recordRelocation(MCAssembler &Asm, const MCFragment *Fragment,
-                        const MCFixup &Fixup, MCValue Target,
-                        uint64_t &FixedValue) override {}
-
-  uint64_t writeObject(MCAssembler &Asm) override;
-  void writeHeader(const MCAssembler &Asm);
-};
-} // namespace
-
 void SPIRVObjectWriter::writeHeader(const MCAssembler &Asm) {
   constexpr uint32_t MagicNumber = 0x07230203;
   constexpr uint32_t GeneratorID = 43;
   constexpr uint32_t GeneratorMagicNumber =
       (GeneratorID << 16) | (LLVM_VERSION_MAJOR);
   constexpr uint32_t Schema = 0;
-  const MCAssembler::VersionInfoType &VIT = Asm.getVersionInfo();
-  uint32_t VersionNumber = 0 | (VIT.Major << 16) | (VIT.Minor << 8);
-  uint32_t Bound = VIT.Update;
 
   W.write<uint32_t>(MagicNumber);
-  W.write<uint32_t>(VersionNumber);
+  W.write<uint32_t>((VersionInfo.Major << 16) | (VersionInfo.Minor << 8));
   W.write<uint32_t>(GeneratorMagicNumber);
-  W.write<uint32_t>(Bound);
+  W.write<uint32_t>(VersionInfo.Bound);
   W.write<uint32_t>(Schema);
 }
 
+void SPIRVObjectWriter::setBuildVersion(unsigned Major, unsigned Minor,
+                                        unsigned Bound) {
+  VersionInfo.Major = Major;
+  VersionInfo.Minor = Minor;
+  VersionInfo.Bound = Bound;
+}
+
 uint64_t SPIRVObjectWriter::writeObject(MCAssembler &Asm) {
   uint64_t StartOffset = W.OS.tell();
   writeHeader(Asm);

diff  --git a/llvm/lib/Target/SPIRV/SPIRVAsmPrinter.cpp b/llvm/lib/Target/SPIRV/SPIRVAsmPrinter.cpp
index 3206c264f99d3..7fe8e11aaa420 100644
--- a/llvm/lib/Target/SPIRV/SPIRVAsmPrinter.cpp
+++ b/llvm/lib/Target/SPIRV/SPIRVAsmPrinter.cpp
@@ -32,6 +32,7 @@
 #include "llvm/MC/MCAssembler.h"
 #include "llvm/MC/MCInst.h"
 #include "llvm/MC/MCObjectStreamer.h"
+#include "llvm/MC/MCSPIRVObjectWriter.h"
 #include "llvm/MC/MCStreamer.h"
 #include "llvm/MC/MCSymbol.h"
 #include "llvm/MC/TargetRegistry.h"
@@ -116,8 +117,8 @@ void SPIRVAsmPrinter::emitEndOfAsmFile(Module &M) {
   // number and number of generated OpLabels
   unsigned Bound = 2 * (ST->getBound() + 1) + NLabels;
   if (MCAssembler *Asm = OutStreamer->getAssemblerPtr())
-    Asm->setBuildVersion(static_cast<MachO::PlatformType>(0), Major, Minor,
-                         Bound, VersionTuple(Major, Minor, 0, Bound));
+    static_cast<SPIRVObjectWriter &>(Asm->getWriter())
+        .setBuildVersion(Major, Minor, Bound);
 }
 
 void SPIRVAsmPrinter::emitFunctionHeader() {