Update patch to use PPCTargetXCOFFStreamer instead.

Author: amy-kwan

llvm/include/llvm/MC/MCObjectStreamer.h

@@ -185,7 +185,6 @@ class MCObjectStreamer : public MCStreamer {
   void emitFileDirective(StringRef Filename) override;
   void emitFileDirective(StringRef Filename, StringRef CompilerVersion,
                          StringRef TimeStamp, StringRef Description) override;
-  void emitMachineDirective(StringRef CPU) override;
 
   void emitAddrsig() override;
   void emitAddrsigSym(const MCSymbol *Sym) override;

llvm/include/llvm/MC/MCStreamer.h

@@ -871,9 +871,6 @@ class MCStreamer {
   virtual void emitFileDirective(StringRef Filename, StringRef CompilerVersion,
                                  StringRef TimeStamp, StringRef Description);
 
-  // Emit '.machine "CPU"' assembler directive.
-  virtual void emitMachineDirective(StringRef CPU);
-
   /// Emit the "identifiers" directive.  This implements the
   /// '.ident "version foo"' assembler directive.
   virtual void emitIdent(StringRef IdentString) {}

llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp

@@ -120,7 +120,6 @@
 #include "llvm/Target/TargetLoweringObjectFile.h"
 #include "llvm/Target/TargetMachine.h"
 #include "llvm/Target/TargetOptions.h"
-#include "llvm/TargetParser/PPCTargetParser.h"
 #include "llvm/TargetParser/Triple.h"
 #include <algorithm>
 #include <cassert>
@@ -520,28 +519,9 @@ bool AsmPrinter::doInitialization(Module &M) {
     }
   }
 
-  if (Target.isOSBinFormatXCOFF()) {
-    // Emit .machine directive on AIX.
-    XCOFF::CFileCpuId TargetCpuId = XCOFF::TCPU_INVALID;
-    // Walk through the "target-cpu" attribute of functions and use the newest
-    // level as the CPU of the module.
-    for (auto &F : M) {
-      XCOFF::CFileCpuId FunCpuId =
-          XCOFF::getCpuID(TM.getSubtargetImpl(F)->getCPU());
-      if (FunCpuId > TargetCpuId)
-        TargetCpuId = FunCpuId;
-    }
-    // If there is no "target-cpu" attribute in functions, take the "-mcpu"
-    // value. If both are omitted, use getNormalizedPPCTargetCPU() to determine
-    // the default CPU.
-    if (!TargetCpuId)
-      TargetCpuId = XCOFF::getCpuID(TM.getTargetCPU().empty()
-                                        ? PPC::getNormalizedPPCTargetCPU(Target)
-                                        : TM.getTargetCPU());
-    OutStreamer->emitMachineDirective(XCOFF::getTCPUString(TargetCpuId));
-
-    // On AIX, emit bytes for llvm.commandline metadata after .file so that the
-    // C_INFO symbol is preserved if any csect is kept by the linker.
+  // On AIX, emit bytes for llvm.commandline metadata after .file so that the
+  // C_INFO symbol is preserved if any csect is kept by the linker.
+  if (TM.getTargetTriple().isOSBinFormatXCOFF()) {
     emitModuleCommandLines(M);
     // Now we can generate section information.
     OutStreamer->initSections(false, *TM.getMCSubtargetInfo());

llvm/lib/MC/MCAsmStreamer.cpp

@@ -288,9 +288,6 @@ class MCAsmStreamer final : public MCStreamer {
   void emitFileDirective(StringRef Filename) override;
   void emitFileDirective(StringRef Filename, StringRef CompilerVersion,
                          StringRef TimeStamp, StringRef Description) override;
-
-  void emitMachineDirective(StringRef CPU) override;
-
   Expected<unsigned> tryEmitDwarfFileDirective(
       unsigned FileNo, StringRef Directory, StringRef Filename,
       std::optional<MD5::MD5Result> Checksum = std::nullopt,
@@ -1632,12 +1629,6 @@ void MCAsmStreamer::emitFileDirective(StringRef Filename,
   EmitEOL();
 }
 
-void MCAsmStreamer::emitMachineDirective(StringRef CPU) {
-  OS << "\t.machine\t";
-  PrintQuotedString(CPU, OS);
-  EmitEOL();
-}
-
 void MCAsmStreamer::printDwarfFileDirective(
     unsigned FileNo, StringRef Directory, StringRef Filename,
     std::optional<MD5::MD5Result> Checksum, std::optional<StringRef> Source,

llvm/lib/MC/MCObjectStreamer.cpp

@@ -804,10 +804,6 @@ void MCObjectStreamer::emitFileDirective(StringRef Filename,
   // with the integrated assembler.
 }
 
-void MCObjectStreamer::emitMachineDirective(StringRef CPU) {
-  getAssembler().getWriter().setCPU(CPU);
-}
-
 void MCObjectStreamer::emitAddrsig() {
   getAssembler().getWriter().emitAddrsigSection();
 }

llvm/lib/MC/MCStreamer.cpp

@@ -1184,9 +1184,6 @@ void MCStreamer::emitFileDirective(StringRef Filename,
                                    StringRef CompilerVersion,
                                    StringRef TimeStamp, StringRef Description) {
 }
-void MCStreamer::emitMachineDirective(StringRef CPU) {
-  llvm_unreachable("this directive only supported on XCOFF targets");
-}
 void MCStreamer::emitCOFFSymbolStorageClass(int StorageClass) {
   llvm_unreachable("this directive only supported on COFF targets");
 }

llvm/lib/Target/PowerPC/MCTargetDesc/PPCMCTargetDesc.cpp

@@ -259,7 +259,11 @@ class PPCTargetAsmStreamer : public PPCTargetStreamer {
   }
 
   void emitMachine(StringRef CPU) override {
-    OS << "\t.machine " << CPU << '\n';
+    const Triple &TT = Streamer.getContext().getTargetTriple();
+    if (TT.isOSBinFormatXCOFF())
+      OS << "\t.machine\t" << '\"' << CPU << '\"' << '\n';
+    else
+      OS << "\t.machine " << CPU << '\n';
   }
 
   void emitAbiVersion(int AbiVersion) override {
@@ -423,7 +427,8 @@ class PPCTargetXCOFFStreamer : public PPCTargetStreamer {
   }
 
   void emitMachine(StringRef CPU) override {
-    llvm_unreachable("Machine pseudo-ops are invalid for XCOFF.");
+    MCXCOFFStreamer &XCOFFStreamer = static_cast<MCXCOFFStreamer &>(Streamer);
+    XCOFFStreamer.getAssembler().getWriter().setCPU(CPU);
   }
 
   void emitAbiVersion(int AbiVersion) override {

llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp

@@ -72,6 +72,7 @@
 #include "llvm/Support/raw_ostream.h"
 #include "llvm/Target/TargetMachine.h"
 #include "llvm/TargetParser/Triple.h"
+#include "llvm/TargetParser/PPCTargetParser.h"
 #include "llvm/Transforms/Utils/ModuleUtils.h"
 #include <algorithm>
 #include <cassert>
@@ -3047,6 +3048,28 @@ void PPCAIXAsmPrinter::emitEndOfAsmFile(Module &M) {
 bool PPCAIXAsmPrinter::doInitialization(Module &M) {
   const bool Result = PPCAsmPrinter::doInitialization(M);
 
+  // Emit .machine directive on AIX.
+  const Triple &Target = TM.getTargetTriple();
+  XCOFF::CFileCpuId TargetCpuId = XCOFF::TCPU_INVALID;
+  // Walk through the "target-cpu" attribute of functions and use the newest
+  // level as the CPU of the module.
+  for (auto &F : M) {
+    XCOFF::CFileCpuId FunCpuId =
+        XCOFF::getCpuID(TM.getSubtargetImpl(F)->getCPU());
+    if (FunCpuId > TargetCpuId)
+      TargetCpuId = FunCpuId;
+  }
+  // If there is no "target-cpu" attribute within the functions, take the
+  // "-mcpu" value. If both are omitted, use getNormalizedPPCTargetCPU() to
+  // determine the default CPU.
+  if (!TargetCpuId)
+    TargetCpuId = XCOFF::getCpuID(TM.getTargetCPU().empty()
+                                      ? PPC::getNormalizedPPCTargetCPU(Target)
+                                      : TM.getTargetCPU());
+  PPCTargetStreamer *TS =
+      static_cast<PPCTargetStreamer *>(OutStreamer->getTargetStreamer());
+  TS->emitMachine(XCOFF::getTCPUString(TargetCpuId));
+
   auto setCsectAlignment = [this](const GlobalObject *GO) {
     // Declarations have 0 alignment which is set by default.
     if (GO->isDeclarationForLinker())

llvm/test/CodeGen/PowerPC/aix-cpu-version.ll

@@ -1,9 +1,9 @@
 ; RUN: llc -verify-machineinstrs -mtriple powerpc64-ibm-aix-xcoff  < %s | FileCheck %s
 
 ; CHECK:      .file "1.c"
-; CHECK-NEXT: .machine "PWR8"
 ; CHECK-NEXT: .csect ..text..[PR],5
 ; CHECK-NEXT: .rename ..text..[PR],""
+; CHECK-NEXT: .machine "PWR8"
 
 source_filename = "1.c"
 

llvm/test/CodeGen/PowerPC/aix-filename-c.ll

@@ -8,9 +8,9 @@
 source_filename = "1.c"
 
 ; ASM:      .file   "1.c",,"LLVM{{.*}}"
-; ASM-NEXT: .machine   "PWR9"
 ; ASM-NEXT: .csect ..text..[PR],5
 ; ASM-NEXT: .rename	..text..[PR],""
+; ASM-NEXT: .machine   "PWR9"
 
 ; OBJ32:      Symbol {
 ; OBJ32-NEXT:   Index: 0