[llvm] r347706 - [TableGen] Refactor macro names (NFC)

Evandro Menezes via llvm-commits llvm-commits at lists.llvm.org
Tue Nov 27 12:58:27 PST 2018


Author: evandro
Date: Tue Nov 27 12:58:27 2018
New Revision: 347706

URL: http://llvm.org/viewvc/llvm-project?rev=347706&view=rev
Log:
[TableGen] Refactor macro names (NFC)

Make the names for the macros for `TargetInstrInfo` uniform.

Modified:
    llvm/trunk/lib/Target/AArch64/AArch64InstrInfo.cpp
    llvm/trunk/lib/Target/AArch64/AArch64InstrInfo.h
    llvm/trunk/lib/Target/AArch64/MCTargetDesc/AArch64MCTargetDesc.cpp
    llvm/trunk/lib/Target/AArch64/MCTargetDesc/AArch64MCTargetDesc.h
    llvm/trunk/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.cpp
    llvm/trunk/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.h
    llvm/trunk/lib/Target/X86/X86InstrInfo.cpp
    llvm/trunk/lib/Target/X86/X86InstrInfo.h
    llvm/trunk/utils/TableGen/InstrInfoEmitter.cpp

Modified: llvm/trunk/lib/Target/AArch64/AArch64InstrInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/AArch64/AArch64InstrInfo.cpp?rev=347706&r1=347705&r2=347706&view=diff
==============================================================================
--- llvm/trunk/lib/Target/AArch64/AArch64InstrInfo.cpp (original)
+++ llvm/trunk/lib/Target/AArch64/AArch64InstrInfo.cpp Tue Nov 27 12:58:27 2018
@@ -5639,5 +5639,5 @@ bool AArch64InstrInfo::shouldOutlineFrom
   return MF.getFunction().optForMinSize();
 }
 
-#define GET_TII_HELPERS
+#define GET_INSTRINFO_HELPERS
 #include "AArch64GenInstrInfo.inc"

Modified: llvm/trunk/lib/Target/AArch64/AArch64InstrInfo.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/AArch64/AArch64InstrInfo.h?rev=347706&r1=347705&r2=347706&view=diff
==============================================================================
--- llvm/trunk/lib/Target/AArch64/AArch64InstrInfo.h (original)
+++ llvm/trunk/lib/Target/AArch64/AArch64InstrInfo.h Tue Nov 27 12:58:27 2018
@@ -258,7 +258,7 @@ public:
   /// on Windows.
   static bool isSEHInstruction(const MachineInstr &MI);
 
-#define GET_TII_HELPER_DECLS
+#define GET_INSTRINFO_HELPER_DECLS
 #include "AArch64GenInstrInfo.inc"
 
 private:

Modified: llvm/trunk/lib/Target/AArch64/MCTargetDesc/AArch64MCTargetDesc.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/AArch64/MCTargetDesc/AArch64MCTargetDesc.cpp?rev=347706&r1=347705&r2=347706&view=diff
==============================================================================
--- llvm/trunk/lib/Target/AArch64/MCTargetDesc/AArch64MCTargetDesc.cpp (original)
+++ llvm/trunk/lib/Target/AArch64/MCTargetDesc/AArch64MCTargetDesc.cpp Tue Nov 27 12:58:27 2018
@@ -32,7 +32,7 @@
 using namespace llvm;
 
 #define GET_INSTRINFO_MC_DESC
-#define GET_GENINSTRINFO_MC_HELPERS
+#define GET_INSTRINFO_MC_HELPERS
 #include "AArch64GenInstrInfo.inc"
 
 #define GET_SUBTARGETINFO_MC_DESC

Modified: llvm/trunk/lib/Target/AArch64/MCTargetDesc/AArch64MCTargetDesc.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/AArch64/MCTargetDesc/AArch64MCTargetDesc.h?rev=347706&r1=347705&r2=347706&view=diff
==============================================================================
--- llvm/trunk/lib/Target/AArch64/MCTargetDesc/AArch64MCTargetDesc.h (original)
+++ llvm/trunk/lib/Target/AArch64/MCTargetDesc/AArch64MCTargetDesc.h Tue Nov 27 12:58:27 2018
@@ -84,7 +84,7 @@ void initLLVMToCVRegMapping(MCRegisterIn
 // Defines symbolic names for the AArch64 instructions.
 //
 #define GET_INSTRINFO_ENUM
-#define GET_GENINSTRINFO_MC_DECL
+#define GET_INSTRINFO_MC_HELPER_DECLS
 #include "AArch64GenInstrInfo.inc"
 
 #define GET_SUBTARGETINFO_ENUM

Modified: llvm/trunk/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.cpp?rev=347706&r1=347705&r2=347706&view=diff
==============================================================================
--- llvm/trunk/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.cpp (original)
+++ llvm/trunk/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.cpp Tue Nov 27 12:58:27 2018
@@ -39,7 +39,7 @@ using namespace llvm;
 #include "X86GenRegisterInfo.inc"
 
 #define GET_INSTRINFO_MC_DESC
-#define GET_GENINSTRINFO_MC_HELPERS
+#define GET_INSTRINFO_MC_HELPERS
 #include "X86GenInstrInfo.inc"
 
 #define GET_SUBTARGETINFO_MC_DESC

Modified: llvm/trunk/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.h?rev=347706&r1=347705&r2=347706&view=diff
==============================================================================
--- llvm/trunk/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.h (original)
+++ llvm/trunk/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.h Tue Nov 27 12:58:27 2018
@@ -134,7 +134,7 @@ unsigned getX86SubSuperRegisterOrZero(un
 // Defines symbolic names for the X86 instructions.
 //
 #define GET_INSTRINFO_ENUM
-#define GET_GENINSTRINFO_MC_DECL
+#define GET_INSTRINFO_MC_HELPER_DECLS
 #include "X86GenInstrInfo.inc"
 
 #define GET_SUBTARGETINFO_ENUM

Modified: llvm/trunk/lib/Target/X86/X86InstrInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86InstrInfo.cpp?rev=347706&r1=347705&r2=347706&view=diff
==============================================================================
--- llvm/trunk/lib/Target/X86/X86InstrInfo.cpp (original)
+++ llvm/trunk/lib/Target/X86/X86InstrInfo.cpp Tue Nov 27 12:58:27 2018
@@ -7830,5 +7830,5 @@ X86InstrInfo::insertOutlinedCall(Module
   return It;
 }
 
-#define GET_TII_HELPERS
+#define GET_INSTRINFO_HELPERS
 #include "X86GenInstrInfo.inc"

Modified: llvm/trunk/lib/Target/X86/X86InstrInfo.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86InstrInfo.h?rev=347706&r1=347705&r2=347706&view=diff
==============================================================================
--- llvm/trunk/lib/Target/X86/X86InstrInfo.h (original)
+++ llvm/trunk/lib/Target/X86/X86InstrInfo.h Tue Nov 27 12:58:27 2018
@@ -558,7 +558,7 @@ public:
                      MachineBasicBlock::iterator &It, MachineFunction &MF,
                      const outliner::Candidate &C) const override;
 
-#define GET_TII_HELPER_DECLS
+#define GET_INSTRINFO_HELPER_DECLS
 #include "X86GenInstrInfo.inc"
 
 protected:

Modified: llvm/trunk/utils/TableGen/InstrInfoEmitter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/TableGen/InstrInfoEmitter.cpp?rev=347706&r1=347705&r2=347706&view=diff
==============================================================================
--- llvm/trunk/utils/TableGen/InstrInfoEmitter.cpp (original)
+++ llvm/trunk/utils/TableGen/InstrInfoEmitter.cpp Tue Nov 27 12:58:27 2018
@@ -358,8 +358,8 @@ void InstrInfoEmitter::emitMCIIHelperMet
   if (TIIPredicates.empty())
     return;
 
-  OS << "#ifdef GET_GENINSTRINFO_MC_DECL\n";
-  OS << "#undef GET_GENINSTRINFO_MC_DECL\n\n";
+  OS << "#ifdef GET_INSTRINFO_MC_HELPER_DECLS\n";
+  OS << "#undef GET_INSTRINFO_MC_HELPER_DECLS\n\n";
 
   OS << "namespace llvm {\n";
   OS << "class MCInst;\n\n";
@@ -374,10 +374,10 @@ void InstrInfoEmitter::emitMCIIHelperMet
   OS << "\n} // end " << TargetName << "_MC namespace\n";
   OS << "} // end llvm namespace\n\n";
 
-  OS << "#endif // GET_GENINSTRINFO_MC_DECL\n\n";
+  OS << "#endif // GET_INSTRINFO_MC_HELPER_DECLS\n\n";
 
-  OS << "#ifdef GET_GENINSTRINFO_MC_HELPERS\n";
-  OS << "#undef GET_GENINSTRINFO_MC_HELPERS\n\n";
+  OS << "#ifdef GET_INSTRINFO_MC_HELPERS\n";
+  OS << "#undef GET_INSTRINFO_MC_HELPERS\n\n";
 
   OS << "namespace llvm {\n";
   OS << "namespace " << TargetName << "_MC {\n\n";
@@ -533,13 +533,13 @@ void InstrInfoEmitter::run(raw_ostream &
 
   OS << "#endif // GET_INSTRINFO_HEADER\n\n";
 
-  OS << "#ifdef GET_TII_HELPER_DECLS\n";
-  OS << "#undef GET_TII_HELPER_DECLS\n";
+  OS << "#ifdef GET_INSTRINFO_HELPER_DECLS\n";
+  OS << "#undef GET_INSTRINFO_HELPER_DECLS\n";
   emitTIIHelperMethods(OS, TargetName, /* ExpandDefintion = */false);
-  OS << "#endif // GET_TII_HELPER_DECLS\n\n";
+  OS << "#endif // GET_INSTRINFO_HELPER_DECLS\n\n";
 
-  OS << "#ifdef GET_TII_HELPERS\n";
-  OS << "#undef GET_TII_HELPERS\n";
+  OS << "#ifdef GET_INSTRINFO_HELPERS\n";
+  OS << "#undef GET_INSTRINFO_HELPERS\n";
   emitTIIHelperMethods(OS, TargetName, /* ExpandDefintion = */true);
   OS << "#endif // GET_TTI_HELPERS\n\n";
 




More information about the llvm-commits mailing list