Skip to content

[Targets] Move *TargetStreamer.h files into their MCTargetDesc directory. #127433

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
Feb 17, 2025
Merged

[Targets] Move *TargetStreamer.h files into their MCTargetDesc directory. #127433

merged 1 commit into from
Feb 17, 2025

Conversation

@topperc
Copy link
Collaborator

@topperc topperc commented Feb 17, 2025

This file is included from MCTargetDesc so should be there instead of in the main directory for the target.

@topperc
[Target] Move *TargetStreamer.h files into their MCTargetDesc directory.
a71b6c5 
This file is included from MCTargetDesc so should be there instead
of in the main directory for the target.
@topperc topperc requested review from MaskRay and arsenm February 17, 2025 04:22
@llvmbot
Copy link
Member

llvmbot commented Feb 17, 2025 •
edited
Loading

@llvm/pr-subscribers-backend-powerpc
@llvm/pr-subscribers-backend-systemz

@llvm/pr-subscribers-backend-hexagon

Author: Craig Topper (topperc)

Changes

This file is included from MCTargetDesc so should be there instead of in the main directory for the target.

Full diff: https://github.com/llvm/llvm-project/pull/127433.diff

15 Files Affected:

  • (renamed) llvm/lib/Target/ARC/MCTargetDesc/ARCTargetStreamer.h ()
  • (modified) llvm/lib/Target/Hexagon/AsmParser/HexagonAsmParser.cpp (+1-1)
  • (modified) llvm/lib/Target/Hexagon/HexagonAsmPrinter.cpp (+1-1)
  • (renamed) llvm/lib/Target/Hexagon/MCTargetDesc/HexagonTargetStreamer.h ()
  • (modified) llvm/lib/Target/Mips/AsmParser/MipsAsmParser.cpp (+1-1)
  • (renamed) llvm/lib/Target/Mips/MCTargetDesc/MipsTargetStreamer.h ()
  • (modified) llvm/lib/Target/Mips/MipsAsmPrinter.cpp (+1-1)
  • (modified) llvm/lib/Target/PowerPC/AsmParser/PPCAsmParser.cpp (+1-1)
  • (renamed) llvm/lib/Target/PowerPC/MCTargetDesc/PPCTargetStreamer.h ()
  • (modified) llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp (+1-1)
  • (modified) llvm/lib/Target/SystemZ/AsmParser/SystemZAsmParser.cpp (+1-1)
  • (renamed) llvm/lib/Target/SystemZ/MCTargetDesc/SystemZTargetStreamer.h ()
  • (modified) llvm/lib/Target/SystemZ/SystemZAsmPrinter.h (+1-1)
  • (renamed) llvm/lib/Target/XCore/MCTargetDesc/XCoreTargetStreamer.h ()
  • (modified) llvm/lib/Target/XCore/XCoreAsmPrinter.cpp (+1-1)
diff --git a/llvm/lib/Target/ARC/ARCTargetStreamer.h b/llvm/lib/Target/ARC/MCTargetDesc/ARCTargetStreamer.h
similarity index 100%
rename from llvm/lib/Target/ARC/ARCTargetStreamer.h
rename to llvm/lib/Target/ARC/MCTargetDesc/ARCTargetStreamer.h
diff --git a/llvm/lib/Target/Hexagon/AsmParser/HexagonAsmParser.cpp b/llvm/lib/Target/Hexagon/AsmParser/HexagonAsmParser.cpp
index 20881de1d94f4..f8c57fc5e0058 100644
--- a/llvm/lib/Target/Hexagon/AsmParser/HexagonAsmParser.cpp
+++ b/llvm/lib/Target/Hexagon/AsmParser/HexagonAsmParser.cpp
@@ -6,13 +6,13 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "HexagonTargetStreamer.h"
 #include "MCTargetDesc/HexagonMCChecker.h"
 #include "MCTargetDesc/HexagonMCELFStreamer.h"
 #include "MCTargetDesc/HexagonMCExpr.h"
 #include "MCTargetDesc/HexagonMCInstrInfo.h"
 #include "MCTargetDesc/HexagonMCTargetDesc.h"
 #include "MCTargetDesc/HexagonShuffler.h"
+#include "MCTargetDesc/HexagonTargetStreamer.h"
 #include "TargetInfo/HexagonTargetInfo.h"
 #include "llvm/ADT/STLExtras.h"
 #include "llvm/ADT/SmallVector.h"
diff --git a/llvm/lib/Target/Hexagon/HexagonAsmPrinter.cpp b/llvm/lib/Target/Hexagon/HexagonAsmPrinter.cpp
index f10122fdacfcd..c6f250353f736 100644
--- a/llvm/lib/Target/Hexagon/HexagonAsmPrinter.cpp
+++ b/llvm/lib/Target/Hexagon/HexagonAsmPrinter.cpp
@@ -16,11 +16,11 @@
 #include "HexagonInstrInfo.h"
 #include "HexagonRegisterInfo.h"
 #include "HexagonSubtarget.h"
-#include "HexagonTargetStreamer.h"
 #include "MCTargetDesc/HexagonInstPrinter.h"
 #include "MCTargetDesc/HexagonMCExpr.h"
 #include "MCTargetDesc/HexagonMCInstrInfo.h"
 #include "MCTargetDesc/HexagonMCTargetDesc.h"
+#include "MCTargetDesc/HexagonTargetStreamer.h"
 #include "TargetInfo/HexagonTargetInfo.h"
 #include "llvm/ADT/StringExtras.h"
 #include "llvm/ADT/StringRef.h"
diff --git a/llvm/lib/Target/Hexagon/HexagonTargetStreamer.h b/llvm/lib/Target/Hexagon/MCTargetDesc/HexagonTargetStreamer.h
similarity index 100%
rename from llvm/lib/Target/Hexagon/HexagonTargetStreamer.h
rename to llvm/lib/Target/Hexagon/MCTargetDesc/HexagonTargetStreamer.h
diff --git a/llvm/lib/Target/Mips/AsmParser/MipsAsmParser.cpp b/llvm/lib/Target/Mips/AsmParser/MipsAsmParser.cpp
index d108564e128c0..8c328d5ed7234 100644
--- a/llvm/lib/Target/Mips/AsmParser/MipsAsmParser.cpp
+++ b/llvm/lib/Target/Mips/AsmParser/MipsAsmParser.cpp
@@ -11,7 +11,7 @@
 #include "MCTargetDesc/MipsBaseInfo.h"
 #include "MCTargetDesc/MipsMCExpr.h"
 #include "MCTargetDesc/MipsMCTargetDesc.h"
-#include "MipsTargetStreamer.h"
+#include "MCTargetDesc/MipsTargetStreamer.h"
 #include "TargetInfo/MipsTargetInfo.h"
 #include "llvm/ADT/APFloat.h"
 #include "llvm/ADT/SmallVector.h"
diff --git a/llvm/lib/Target/Mips/MipsTargetStreamer.h b/llvm/lib/Target/Mips/MCTargetDesc/MipsTargetStreamer.h
similarity index 100%
rename from llvm/lib/Target/Mips/MipsTargetStreamer.h
rename to llvm/lib/Target/Mips/MCTargetDesc/MipsTargetStreamer.h
diff --git a/llvm/lib/Target/Mips/MipsAsmPrinter.cpp b/llvm/lib/Target/Mips/MipsAsmPrinter.cpp
index b0b7b5dc7a31d..e06a9b36bfe4f 100644
--- a/llvm/lib/Target/Mips/MipsAsmPrinter.cpp
+++ b/llvm/lib/Target/Mips/MipsAsmPrinter.cpp
@@ -17,12 +17,12 @@
 #include "MCTargetDesc/MipsInstPrinter.h"
 #include "MCTargetDesc/MipsMCNaCl.h"
 #include "MCTargetDesc/MipsMCTargetDesc.h"
+#include "MCTargetDesc/MipsTargetStreamer.h"
 #include "Mips.h"
 #include "MipsMCInstLower.h"
 #include "MipsMachineFunction.h"
 #include "MipsSubtarget.h"
 #include "MipsTargetMachine.h"
-#include "MipsTargetStreamer.h"
 #include "TargetInfo/MipsTargetInfo.h"
 #include "llvm/ADT/SmallString.h"
 #include "llvm/ADT/StringRef.h"
diff --git a/llvm/lib/Target/PowerPC/AsmParser/PPCAsmParser.cpp b/llvm/lib/Target/PowerPC/AsmParser/PPCAsmParser.cpp
index dc75814b9796b..016e4f9f7c6b6 100644
--- a/llvm/lib/Target/PowerPC/AsmParser/PPCAsmParser.cpp
+++ b/llvm/lib/Target/PowerPC/AsmParser/PPCAsmParser.cpp
@@ -8,8 +8,8 @@
 
 #include "MCTargetDesc/PPCMCExpr.h"
 #include "MCTargetDesc/PPCMCTargetDesc.h"
+#include "MCTargetDesc/PPCTargetStreamer.h"
 #include "PPCInstrInfo.h"
-#include "PPCTargetStreamer.h"
 #include "TargetInfo/PowerPCTargetInfo.h"
 #include "llvm/ADT/Twine.h"
 #include "llvm/MC/MCContext.h"
diff --git a/llvm/lib/Target/PowerPC/PPCTargetStreamer.h b/llvm/lib/Target/PowerPC/MCTargetDesc/PPCTargetStreamer.h
similarity index 100%
rename from llvm/lib/Target/PowerPC/PPCTargetStreamer.h
rename to llvm/lib/Target/PowerPC/MCTargetDesc/PPCTargetStreamer.h
diff --git a/llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp b/llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp
index 162d11058266f..5784fe43879fe 100644
--- a/llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp
+++ b/llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp
@@ -19,12 +19,12 @@
 #include "MCTargetDesc/PPCMCExpr.h"
 #include "MCTargetDesc/PPCMCTargetDesc.h"
 #include "MCTargetDesc/PPCPredicates.h"
+#include "MCTargetDesc/PPCTargetStreamer.h"
 #include "PPC.h"
 #include "PPCInstrInfo.h"
 #include "PPCMachineFunctionInfo.h"
 #include "PPCSubtarget.h"
 #include "PPCTargetMachine.h"
-#include "PPCTargetStreamer.h"
 #include "TargetInfo/PowerPCTargetInfo.h"
 #include "llvm/ADT/MapVector.h"
 #include "llvm/ADT/SetVector.h"
diff --git a/llvm/lib/Target/SystemZ/AsmParser/SystemZAsmParser.cpp b/llvm/lib/Target/SystemZ/AsmParser/SystemZAsmParser.cpp
index b892c9ea69602..4b26437c5fecb 100644
--- a/llvm/lib/Target/SystemZ/AsmParser/SystemZAsmParser.cpp
+++ b/llvm/lib/Target/SystemZ/AsmParser/SystemZAsmParser.cpp
@@ -9,7 +9,7 @@
 #include "MCTargetDesc/SystemZGNUInstPrinter.h"
 #include "MCTargetDesc/SystemZMCAsmInfo.h"
 #include "MCTargetDesc/SystemZMCTargetDesc.h"
-#include "SystemZTargetStreamer.h"
+#include "MCTargetDesc/SystemZTargetStreamer.h"
 #include "TargetInfo/SystemZTargetInfo.h"
 #include "llvm/ADT/STLExtras.h"
 #include "llvm/ADT/SmallVector.h"
diff --git a/llvm/lib/Target/SystemZ/SystemZTargetStreamer.h b/llvm/lib/Target/SystemZ/MCTargetDesc/SystemZTargetStreamer.h
similarity index 100%
rename from llvm/lib/Target/SystemZ/SystemZTargetStreamer.h
rename to llvm/lib/Target/SystemZ/MCTargetDesc/SystemZTargetStreamer.h
diff --git a/llvm/lib/Target/SystemZ/SystemZAsmPrinter.h b/llvm/lib/Target/SystemZ/SystemZAsmPrinter.h
index 2696702b44551..47e7f67e2cdc7 100644
--- a/llvm/lib/Target/SystemZ/SystemZAsmPrinter.h
+++ b/llvm/lib/Target/SystemZ/SystemZAsmPrinter.h
@@ -9,9 +9,9 @@
 #ifndef LLVM_LIB_TARGET_SYSTEMZ_SYSTEMZASMPRINTER_H
 #define LLVM_LIB_TARGET_SYSTEMZ_SYSTEMZASMPRINTER_H
 
+#include "MCTargetDesc/SystemZTargetStreamer.h"
 #include "SystemZMCInstLower.h"
 #include "SystemZTargetMachine.h"
-#include "SystemZTargetStreamer.h"
 #include "llvm/CodeGen/AsmPrinter.h"
 #include "llvm/CodeGen/StackMaps.h"
 #include "llvm/MC/MCInstBuilder.h"
diff --git a/llvm/lib/Target/XCore/XCoreTargetStreamer.h b/llvm/lib/Target/XCore/MCTargetDesc/XCoreTargetStreamer.h
similarity index 100%
rename from llvm/lib/Target/XCore/XCoreTargetStreamer.h
rename to llvm/lib/Target/XCore/MCTargetDesc/XCoreTargetStreamer.h
diff --git a/llvm/lib/Target/XCore/XCoreAsmPrinter.cpp b/llvm/lib/Target/XCore/XCoreAsmPrinter.cpp
index 15be47a73cef3..a1f7608224b90 100644
--- a/llvm/lib/Target/XCore/XCoreAsmPrinter.cpp
+++ b/llvm/lib/Target/XCore/XCoreAsmPrinter.cpp
@@ -12,12 +12,12 @@
 //===----------------------------------------------------------------------===//
 
 #include "MCTargetDesc/XCoreInstPrinter.h"
+#include "MCTargetDesc/XCoreTargetStreamer.h"
 #include "TargetInfo/XCoreTargetInfo.h"
 #include "XCore.h"
 #include "XCoreMCInstLower.h"
 #include "XCoreSubtarget.h"
 #include "XCoreTargetMachine.h"
-#include "XCoreTargetStreamer.h"
 #include "llvm/ADT/SmallString.h"
 #include "llvm/ADT/StringExtras.h"
 #include "llvm/CodeGen/AsmPrinter.h"

@github-actions
Copy link

github-actions bot commented Feb 17, 2025

⚠️ C/C++ code formatter, clang-format found issues in your code. ⚠️

You can test this locally with the following command: 
git-clang-format --diff 5d62a79bb79fee20f92f26dc55fd78440b9945ca a71b6c56ab561f2a22f60bead3b1c25c01a18d98 --extensions cpp,h -- llvm/lib/Target/Hexagon/AsmParser/HexagonAsmParser.cpp llvm/lib/Target/Hexagon/HexagonAsmPrinter.cpp llvm/lib/Target/Mips/AsmParser/MipsAsmParser.cpp llvm/lib/Target/Mips/MipsAsmPrinter.cpp llvm/lib/Target/PowerPC/AsmParser/PPCAsmParser.cpp llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp llvm/lib/Target/SystemZ/AsmParser/SystemZAsmParser.cpp llvm/lib/Target/SystemZ/SystemZAsmPrinter.h llvm/lib/Target/XCore/XCoreAsmPrinter.cpp llvm/lib/Target/ARC/MCTargetDesc/ARCTargetStreamer.h llvm/lib/Target/Hexagon/MCTargetDesc/HexagonTargetStreamer.h llvm/lib/Target/Mips/MCTargetDesc/MipsTargetStreamer.h llvm/lib/Target/PowerPC/MCTargetDesc/PPCTargetStreamer.h llvm/lib/Target/SystemZ/MCTargetDesc/SystemZTargetStreamer.h llvm/lib/Target/XCore/MCTargetDesc/XCoreTargetStreamer.h
View the diff from clang-format here. 
diff --git a/llvm/lib/Target/Hexagon/MCTargetDesc/HexagonTargetStreamer.h b/llvm/lib/Target/Hexagon/MCTargetDesc/HexagonTargetStreamer.h
index a2f93d476b..c931d97e40 100644
--- a/llvm/lib/Target/Hexagon/MCTargetDesc/HexagonTargetStreamer.h
+++ b/llvm/lib/Target/Hexagon/MCTargetDesc/HexagonTargetStreamer.h
@@ -16,14 +16,14 @@ class HexagonTargetStreamer : public MCTargetStreamer {
 public:
   HexagonTargetStreamer(MCStreamer &S) : MCTargetStreamer(S) {}
   virtual void emitCodeAlignment(Align Alignment, const MCSubtargetInfo *STI,
-                                 unsigned MaxBytesToEmit = 0){};
-  virtual void emitFAlign(unsigned Size, unsigned MaxBytesToEmit){};
+                                 unsigned MaxBytesToEmit = 0) {};
+  virtual void emitFAlign(unsigned Size, unsigned MaxBytesToEmit) {};
   virtual void emitCommonSymbolSorted(MCSymbol *Symbol, uint64_t Size,
                                       unsigned ByteAlignment,
-                                      unsigned AccessGranularity){};
+                                      unsigned AccessGranularity) {};
   virtual void emitLocalCommonSymbolSorted(MCSymbol *Symbol, uint64_t Size,
                                            unsigned ByteAlign,
-                                           unsigned AccessGranularity){};
+                                           unsigned AccessGranularity) {};
   void finish() override {}
 
   virtual void finishAttributeSection() {}
@@ -34,6 +34,6 @@ public:
 
   virtual void reset() {}
 };
-}
+} // namespace llvm
 
 #endif
diff --git a/llvm/lib/Target/Mips/MCTargetDesc/MipsTargetStreamer.h b/llvm/lib/Target/Mips/MCTargetDesc/MipsTargetStreamer.h
index c73013baa4..7562e41410 100644
--- a/llvm/lib/Target/Mips/MCTargetDesc/MipsTargetStreamer.h
+++ b/llvm/lib/Target/Mips/MCTargetDesc/MipsTargetStreamer.h
@@ -360,5 +360,5 @@ public:
 
   void emitMipsAbiFlags();
 };
-}
+} // namespace llvm
 #endif
diff --git a/llvm/lib/Target/PowerPC/MCTargetDesc/PPCTargetStreamer.h b/llvm/lib/Target/PowerPC/MCTargetDesc/PPCTargetStreamer.h
index daf5b93ff2..bc1a5e070e 100644
--- a/llvm/lib/Target/PowerPC/MCTargetDesc/PPCTargetStreamer.h
+++ b/llvm/lib/Target/PowerPC/MCTargetDesc/PPCTargetStreamer.h
@@ -25,10 +25,10 @@ public:
   ~PPCTargetStreamer() override;
 
   virtual void emitTCEntry(const MCSymbol &S,
-                           MCSymbolRefExpr::VariantKind Kind){};
-  virtual void emitMachine(StringRef CPU){};
-  virtual void emitAbiVersion(int AbiVersion){};
-  virtual void emitLocalEntry(MCSymbolELF *S, const MCExpr *LocalOffset){};
+                           MCSymbolRefExpr::VariantKind Kind) {};
+  virtual void emitMachine(StringRef CPU) {};
+  virtual void emitAbiVersion(int AbiVersion) {};
+  virtual void emitLocalEntry(MCSymbolELF *S, const MCExpr *LocalOffset) {};
 };
 
 } // end namespace llvm
diff --git a/llvm/lib/Target/XCore/MCTargetDesc/XCoreTargetStreamer.h b/llvm/lib/Target/XCore/MCTargetDesc/XCoreTargetStreamer.h
index 373f0d7b9f..fac8662e98 100644
--- a/llvm/lib/Target/XCore/MCTargetDesc/XCoreTargetStreamer.h
+++ b/llvm/lib/Target/XCore/MCTargetDesc/XCoreTargetStreamer.h
@@ -16,11 +16,11 @@ class XCoreTargetStreamer : public MCTargetStreamer {
 public:
   XCoreTargetStreamer(MCStreamer &S);
   ~XCoreTargetStreamer() override;
-  virtual void emitCCTopData(StringRef Name){};
-  virtual void emitCCTopFunction(StringRef Name){};
-  virtual void emitCCBottomData(StringRef Name){};
-  virtual void emitCCBottomFunction(StringRef Name){};
+  virtual void emitCCTopData(StringRef Name) {};
+  virtual void emitCCTopFunction(StringRef Name) {};
+  virtual void emitCCBottomData(StringRef Name) {};
+  virtual void emitCCBottomFunction(StringRef Name) {};
 };
-}
+} // namespace llvm
 
 #endif

@topperc topperc merged commit 62254f6 into llvm:main Feb 17, 2025
11 of 12 checks passed
@topperc topperc deleted the pr/targetstreamer branch February 17, 2025 17:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@arsenm arsenm arsenm approved these changes

@MaskRay MaskRay MaskRay approved these changes

Assignees

No one assigned

Labels

backend:Hexagon backend:PowerPC backend:SystemZ

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@topperc @llvmbot @arsenm @MaskRay