[PPC][BOLT] Use PPCMCTargetDesc.h to include generated .inc files

Replace direct inclusion of PPCGenInstrInfo.inc and PPCGenRegisterInfo.inc with PPCMCTargetDesc.h, which pulls in the necessary enums. This aligns the PowerPC target with the AArch64 and X86 patterns and follows the guidance from initial code review.

Author: kostasalv

bolt/lib/Target/PowerPC/CMakeLists.txt

@@ -1,29 +1,33 @@
-add_llvm_library(LLVMBOLTTargetPowerPC
-    PPCMCPlusBuilder.cpp
+set(LLVM_LINK_COMPONENTS
+  MC
+  MCDisassembler
+  Support
+  PowerPCDesc
 )
 
-target_include_directories(LLVMBOLTTargetPowerPC PRIVATE
-    ${LLVM_BINARY_DIR}/include
-    ${LLVM_SOURCE_DIR}/include
+if(BOLT_BUILT_STANDALONE)
+  set(LLVM_TARGET_DEFINITIONS ${LLVM_MAIN_SRC_DIR}/lib/Target/PowerPC/PPC.td)
+  list(APPEND LLVM_TABLEGEN_FLAGS -I ${LLVM_MAIN_SRC_DIR}/lib/Target/PowerPC)
+  tablegen(LLVM PPCGenInstrInfo.inc      -gen-instr-info)
+  tablegen(LLVM PPCGenRegisterInfo.inc   -gen-register-info)
+  tablegen(LLVM PPCGenSubtargetInfo.inc  -gen-subtarget)
+  add_public_tablegen_target(PowerPCCommonTableGen)
+  include_directories(${CMAKE_CURRENT_BINARY_DIR})
+endif()
+
+add_llvm_library(LLVMBOLTTargetPowerPC
+  PPCMCPlusBuilder.cpp
+
+  NO_EXPORT
+  DISABLE_LLVM_LINK_LLVM_DYLIB
+
+  DEPENDS
+  PowerPCCommonTableGen
 )
 
-file(MAKE_DIRECTORY "${LLVM_BINARY_DIR}/include/llvm/Target/PowerPC")
+target_link_libraries(LLVMBOLTTargetPowerPC PRIVATE LLVMBOLTCore)
 
-foreach(incfile IN ITEMS
-    PPCGenInstrInfo.inc
-    PPCGenRegisterInfo.inc
+include_directories(
+  ${LLVM_MAIN_SRC_DIR}/lib/Target/PowerPC
+  ${LLVM_BINARY_DIR}/lib/Target/PowerPC
 )
-    add_custom_command(
-        OUTPUT "${LLVM_BINARY_DIR}/include/llvm/Target/PowerPC/${incfile}"
-        COMMAND ${CMAKE_COMMAND} -E copy_if_different
-            "${LLVM_BINARY_DIR}/lib/Target/PowerPC/${incfile}"
-            "${LLVM_BINARY_DIR}/include/llvm/Target/PowerPC/${incfile}"
-        DEPENDS "${LLVM_BINARY_DIR}/lib/Target/PowerPC/${incfile}"
-        COMMENT "Copying ${incfile} to include directory"
-    )
-    add_custom_target(
-        "BoltCopy${incfile}" ALL
-        DEPENDS "${LLVM_BINARY_DIR}/include/llvm/Target/PowerPC/${incfile}"
-    )
-    add_dependencies(LLVMBOLTTargetPowerPC "BoltCopy${incfile}")
-endforeach()

bolt/lib/Target/PowerPC/PPCMCPlusBuilder.cpp

@@ -11,20 +11,17 @@
 //===----------------------------------------------------------------------===//
 
 #include "bolt/Target/PowerPC/PPCMCPlusBuilder.h"
-#include "bolt/Core/MCPlusBuilder.h"
+#include "MCTargetDesc/PPCMCTargetDesc.h"
 #include "llvm/MC/MCInst.h"
 #include "llvm/MC/MCRegisterInfo.h"
-#define GET_INSTRINFO_ENUM
-#include "llvm/Target/PowerPC/PPCGenInstrInfo.inc"
-#define GET_REGINFO_ENUM
-#include "llvm/Target/PowerPC/PPCGenRegisterInfo.inc"
 
-namespace llvm {
-namespace bolt {
+using namespace llvm;
+using namespace bolt;
 
 // Create instructions to push two registers onto the stack
 void PPCMCPlusBuilder::createPushRegisters(MCInst &Inst1, MCInst &Inst2,
                                            MCPhysReg Reg1, MCPhysReg /*Reg2*/) {
+
   Inst1.clear();
   Inst1.setOpcode(PPC::STDU);
   Inst1.addOperand(MCOperand::createReg(PPC::R1)); // destination (SP)
@@ -38,6 +35,9 @@ void PPCMCPlusBuilder::createPushRegisters(MCInst &Inst1, MCInst &Inst2,
   Inst2.addOperand(MCOperand::createImm(0));       // offset
 }
 
+namespace llvm {
+namespace bolt {
+
 MCPlusBuilder *createPowerPCMCPlusBuilder(const MCInstrAnalysis *Analysis,
                                           const MCInstrInfo *Info,
                                           const MCRegisterInfo *RegInfo,
@@ -46,4 +46,4 @@ MCPlusBuilder *createPowerPCMCPlusBuilder(const MCInstrAnalysis *Analysis,
 }
 
 } // namespace bolt
-} // namespace llvm
+} // namespace llvm

bolt/unittests/Target/PowerPC/CMakeLists.txt

@@ -17,4 +17,6 @@ target_include_directories(BOLTTargetPowerPCTests PRIVATE
   ${LLVM_SOURCE_DIR}/bolt/include
   ${LLVM_BINARY_DIR}/tools/bolt/include
   ${CMAKE_SOURCE_DIR}
+  ${LLVM_MAIN_SRC_DIR}/lib/Target/PowerPC
+  ${LLVM_BINARY_DIR}/lib/Target/PowerPC
 )

bolt/unittests/Target/PowerPC/PPCMCPlusBuilderTest.cpp

@@ -8,13 +8,10 @@
 //===----------------------------------------------------------------------===//
 
 #include "bolt/Target/PowerPC/PPCMCPlusBuilder.h"
+#include "MCTargetDesc/PPCMCTargetDesc.h"
 #include "bolt/Core/MCPlusBuilder.h"
 #include "llvm/MC/MCInst.h"
 #include "gtest/gtest.h"
-#define GET_INSTRINFO_ENUM
-#include "llvm/Target/PowerPC/PPCGenInstrInfo.inc"
-#define GET_REGINFO_ENUM
-#include "llvm/Target/PowerPC/PPCGenRegisterInfo.inc"
 
 using namespace llvm;
 using namespace bolt;