[AIE1][NFC] The easy cases of getting AIESubtarget.h includes right

Martien de Jong · martien-de-jong · commit 99d07a298671 · 2025-06-24T17:44:45.000+02:00
Plus some random clang-tidiness
diff --git a/llvm/lib/Target/AIE/AIE2FrameLowering.cpp b/llvm/lib/Target/AIE/AIE2FrameLowering.cpp
@@ -34,7 +34,7 @@ void AIE2FrameLowering::adjustSPReg(MachineBasicBlock &MBB,
                                     MachineBasicBlock::iterator MBBI,
                                     const DebugLoc &DL, int64_t StackPtrIncr,
                                     MachineInstr::MIFlag Flag) const {
-  auto *TII = static_cast<const AIEInstrInfo *>(STI.getInstrInfo());
+  auto *TII = static_cast<const AIE2InstrInfo *>(STI.getInstrInfo());
 
   if (StackPtrIncr == 0)
     return;
@@ -66,7 +66,7 @@ void AIE2FrameLowering::adjustReg(MachineBasicBlock &MBB,
                                   int64_t StackPtrIncr,
                                   MachineInstr::MIFlag Flag) const {
   MachineRegisterInfo &MRI = MBB.getParent()->getRegInfo();
-  auto *TII = static_cast<const AIEInstrInfo *>(STI.getInstrInfo());
+  auto *TII = static_cast<const AIE2InstrInfo *>(STI.getInstrInfo());
 
   if (StackPtrIncr == 0)
     return;
diff --git a/llvm/lib/Target/AIE/AIE2ISelLowering.cpp b/llvm/lib/Target/AIE/AIE2ISelLowering.cpp
@@ -13,7 +13,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "AIE2ISelLowering.h"
-#include "AIESubtarget.h"
+#include "AIEBaseSubtarget.h"
 #include "MCTargetDesc/AIE2MCTargetDesc.h"
 #include "llvm/CodeGen/ISDOpcodes.h"
 #include "llvm/CodeGen/TargetLowering.h"
diff --git a/llvm/lib/Target/AIE/AIE2Subtarget.h b/llvm/lib/Target/AIE/AIE2Subtarget.h
@@ -19,7 +19,7 @@
 #include "AIE2FrameLowering.h"
 #include "AIE2ISelLowering.h"
 #include "AIE2InstrInfo.h"
-#include "AIESubtarget.h"
+#include "AIEBaseSubtarget.h"
 #include "Utils/AIEBaseInfo.h"
 #include "llvm/CodeGen/GlobalISel/CallLowering.h"
 #include "llvm/CodeGen/GlobalISel/InstructionSelector.h"
diff --git a/llvm/lib/Target/AIE/AIEBaseFrameLowering.cpp b/llvm/lib/Target/AIE/AIEBaseFrameLowering.cpp
@@ -14,14 +14,13 @@
 //===----------------------------------------------------------------------===//
 
 #include "AIEBaseFrameLowering.h"
-#include "AIEMachineFunctionInfo.h"
-#include "AIESubtarget.h"
+#include "AIEBaseRegisterInfo.h"
+#include "AIEBaseSubtarget.h"
 #include "llvm/CodeGen/MachineFrameInfo.h"
 #include "llvm/CodeGen/MachineFunction.h"
 #include "llvm/CodeGen/MachineInstrBuilder.h"
 #include "llvm/CodeGen/MachineRegisterInfo.h"
 #include "llvm/CodeGen/RegisterScavenging.h"
-#include "llvm/Support/Debug.h"
 
 #define DEBUG_TYPE "aie-frame-lowering"
 
@@ -291,7 +290,7 @@ void AIEBaseFrameLowering::emitPrologue(MachineFunction &MF,
 
   MachineFrameInfo &MFI = MF.getFrameInfo();
   MachineBasicBlock::iterator MBBI = MBB.begin();
-  auto *TII = static_cast<const AIEInstrInfo *>(STI.getInstrInfo());
+  auto *TII = static_cast<const AIEBaseInstrInfo *>(STI.getInstrInfo());
   auto *RI = static_cast<const AIEBaseRegisterInfo *>(STI.getRegisterInfo());
   Register SPReg = RI->getStackPointerRegister();
 
@@ -341,7 +340,7 @@ void AIEBaseFrameLowering::emitEpilogue(MachineFunction &MF,
                                         MachineBasicBlock &MBB) const {
   MachineFrameInfo &MFI = MF.getFrameInfo();
   MachineBasicBlock::iterator MBBI = MBB.getLastNonDebugInstr();
-  auto *TII = static_cast<const AIEInstrInfo *>(STI.getInstrInfo());
+  auto *TII = static_cast<const AIEBaseInstrInfo *>(STI.getInstrInfo());
   auto *RI = static_cast<const AIEBaseRegisterInfo *>(STI.getRegisterInfo());
 
   DebugLoc DL = MBBI->getDebugLoc();
diff --git a/llvm/lib/Target/AIE/AIEBaseISelLowering.cpp b/llvm/lib/Target/AIE/AIEBaseISelLowering.cpp
@@ -14,7 +14,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "AIEBaseISelLowering.h"
-#include "AIESubtarget.h" // For AIEBaseSubTarget
+#include "AIEBaseSubtarget.h"
 #include "MCTargetDesc/AIE2MCTargetDesc.h"
 #include "MCTargetDesc/AIEMCTargetDesc.h"
 #include "MCTargetDesc/aie2p/AIE2PMCTargetDesc.h"
diff --git a/llvm/lib/Target/AIE/AIEBaseInstrInfo.cpp b/llvm/lib/Target/AIE/AIEBaseInstrInfo.cpp
@@ -15,9 +15,8 @@
 #include "AIEBaseInstrInfo.h"
 #include "AIE.h"
 #include "AIEBasePipelinerLoopInfo.h"
+#include "AIEBaseSubtarget.h"
 #include "AIEHazardRecognizer.h"
-#include "AIESubtarget.h"
-#include "AIETargetMachine.h"
 #include "MCTargetDesc/AIEFormat.h"
 #include "MCTargetDesc/AIEMCFormats.h"
 #include "Utils/AIELoopUtils.h"
@@ -26,13 +25,11 @@
 #include "llvm/CodeGen/GlobalISel/GenericMachineInstrs.h"
 #include "llvm/CodeGen/LivePhysRegs.h"
 #include "llvm/CodeGen/MachineFrameInfo.h"
-#include "llvm/CodeGen/MachineFunctionPass.h"
 #include "llvm/CodeGen/MachineInstrBuilder.h"
 #include "llvm/CodeGen/MachineRegisterInfo.h"
 #include "llvm/CodeGen/RegisterScavenging.h"
 #include "llvm/MC/MCInstrItineraries.h"
 #include "llvm/MC/TargetRegistry.h"
-#include "llvm/Support/Automaton.h"
 #include "llvm/Support/Debug.h"
 #include "llvm/Support/ErrorHandling.h"
 #include <limits>
diff --git a/llvm/lib/Target/AIE/AIEBaseSubtarget.cpp b/llvm/lib/Target/AIE/AIEBaseSubtarget.cpp
@@ -14,21 +14,19 @@
 
 #include "AIEBaseSubtarget.h"
 #include "AIE.h"
-#include "AIE2Subtarget.h"
 #include "AIEBaseRegisterInfo.h"
 #include "AIEInterBlockScheduling.h"
 #include "AIEMachineScheduler.h"
 #include "AIEMaxLatencyFinder.h"
 #include "AIERegMemEventTracker.h"
-#include "AIESubtarget.h"
 #include "Utils/AIELoopUtils.h"
+#include "aie1/AIE1Subtarget.h"
 #include "aie2p/AIE2PSubtarget.h"
 #include "llvm/CodeGen/MachineInstr.h"
 #include "llvm/CodeGen/MachineRegisterInfo.h"
 #include "llvm/CodeGen/ScheduleDAG.h"
 #include "llvm/CodeGen/ScheduleDAGInstrs.h"
 #include "llvm/CodeGen/ScheduleDAGMutation.h"
-#include "llvm/MC/MCRegisterInfo.h"
 #include "llvm/Support/Debug.h"
 
 using namespace llvm;
@@ -149,18 +147,21 @@ void AIEBaseSubtarget::adjustSchedDependency(
   }
 }
 
+// Note: AIEBaseSubtarget is not derived from TargetSubtargetInfo.
+// It is glued in through multiple inheritance of the AIE classes, so we go down
+// from TargetSubtargetInfo, and then up to AIEBaseSubTarget.
+// Someone should build the base class injection in tablegen.
 const AIEBaseSubtarget &AIEBaseSubtarget::get(const MachineFunction &MF) {
   if (MF.getTarget().getTargetTriple().isAIE1())
     return static_cast<const AIEBaseSubtarget &>(
         MF.getSubtarget<AIESubtarget>());
-  else if (MF.getTarget().getTargetTriple().isAIE2())
+  if (MF.getTarget().getTargetTriple().isAIE2())
     return static_cast<const AIEBaseSubtarget &>(
         MF.getSubtarget<AIE2Subtarget>());
-  else if (MF.getTarget().getTargetTriple().isAIE2P())
+  if (MF.getTarget().getTargetTriple().isAIE2P())
     return static_cast<const AIEBaseSubtarget &>(
         MF.getSubtarget<AIE2PSubtarget>());
-  else
-    llvm_unreachable("Unknown subtarget");
+  llvm_unreachable("Unknown subtarget");
 }
 
 namespace {
diff --git a/llvm/lib/Target/AIE/AIEBaseTargetTransformInfo.cpp b/llvm/lib/Target/AIE/AIEBaseTargetTransformInfo.cpp
@@ -9,7 +9,6 @@
 //===----------------------------------------------------------------------===//
 
 #include "AIEBaseTargetTransformInfo.h"
-#include "Utils/AIELoopUtils.h"
 #include "llvm/Analysis/TargetTransformInfo.h"
 #include "llvm/CodeGen/BasicTTIImpl.h"
 #include "llvm/IR/Instruction.h"
diff --git a/llvm/lib/Target/AIE/AIEBaseTargetTransformInfo.h b/llvm/lib/Target/AIE/AIEBaseTargetTransformInfo.h
@@ -18,7 +18,7 @@
 #ifndef LLVM_LIB_TARGET_AIE_AIEBASETARGETTRANSFORMINFO_H
 #define LLVM_LIB_TARGET_AIE_AIEBASETARGETTRANSFORMINFO_H
 
-#include "AIESubtarget.h" // For AIEBaseSubTarget
+#include "aie1/AIE1Subtarget.h" // For AIEBaseSubTarget
 #include "llvm/Analysis/TargetTransformInfo.h"
 #include "llvm/CodeGen/BasicTTIImpl.h"
 
diff --git a/llvm/lib/Target/AIE/AIECallLowering.cpp b/llvm/lib/Target/AIE/AIECallLowering.cpp
@@ -18,9 +18,9 @@
 #include "AIEBaseISelLowering.h"
 #include "AIEBaseInstrInfo.h"
 #include "AIEMachineFunctionInfo.h"
-#include "AIESubtarget.h"
 #include "MCTargetDesc/AIE2MCTargetDesc.h"
 #include "MCTargetDesc/AIEMCTargetDesc.h"
+#include "aie1/AIE1Subtarget.h"
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/CodeGen/Analysis.h"
 #include "llvm/CodeGen/CallingConvLower.h"
diff --git a/llvm/lib/Target/AIE/AIEFrameLowering.cpp b/llvm/lib/Target/AIE/AIEFrameLowering.cpp
@@ -15,7 +15,7 @@
 #include "AIEFrameLowering.h"
 #include "AIEBaseRegisterInfo.h"
 #include "AIEMachineFunctionInfo.h"
-#include "AIESubtarget.h"
+#include "aie1/AIE1Subtarget.h"
 #include "llvm/CodeGen/MachineFrameInfo.h"
 #include "llvm/CodeGen/MachineFunction.h"
 #include "llvm/CodeGen/MachineInstrBuilder.h"
diff --git a/llvm/lib/Target/AIE/AIEMachineAlignment.cpp b/llvm/lib/Target/AIE/AIEMachineAlignment.cpp
@@ -8,16 +8,9 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "AIEMachineAlignment.h"
 #include "AIE.h"
-#include "AIE2.h"
-#include "AIE2InstrInfo.h"
-#include "AIE2Subtarget.h"
-#include "AIE2TargetMachine.h"
-#include "AIEBundle.h"
-#include "AIESubtarget.h"
-
 #include "AIEBundle.h"
-#include "AIEMachineAlignment.h"
 #include "llvm/CodeGen/MachineInstrBuilder.h"
 #include "llvm/CodeGen/MachineInstrBundle.h"
 
diff --git a/llvm/lib/Target/AIE/AIETargetMachine.h b/llvm/lib/Target/AIE/AIETargetMachine.h
@@ -16,8 +16,8 @@
 #define LLVM_LIB_TARGET_AIE_AIETARGETMACHINE_H
 
 #include "AIEBaseTargetMachine.h"
-#include "AIESubtarget.h"
 #include "MCTargetDesc/AIEMCTargetDesc.h"
+#include "aie1/AIE1Subtarget.h"
 
 namespace llvm {
 
diff --git a/llvm/lib/Target/AIE/CMakeLists.txt b/llvm/lib/Target/AIE/CMakeLists.txt
@@ -121,7 +121,6 @@ add_llvm_target(AIECodeGen
    AIESlotCounts.cpp
    AIESplitInstructionRewriter.cpp
    AIESubRegConstrainer.cpp
-   AIESubtarget.cpp
    AIESuperRegRewriter.cpp
    AIETargetMachine.cpp
    AIETargetObjectFile.cpp
@@ -150,6 +149,7 @@ add_llvm_target(AIECodeGen
    aie1/AIE1LegalizerInfo.cpp
    aie1/AIE1RegisterBankInfo.cpp
    aie1/AIE1RegisterInfo.cpp
+   aie1/AIE1Subtarget.cpp
    aie2p/AIE2PSubtarget.cpp
    aie2p/AIE2PTargetMachine.cpp
    aie2p/AIE2PTargetTransformInfo.cpp
diff --git a/llvm/lib/Target/AIE/aie1/AIE1ISelLowering.cpp b/llvm/lib/Target/AIE/aie1/AIE1ISelLowering.cpp
@@ -18,8 +18,8 @@
 #include "AIE1ISelLowering.h"
 #include "AIE.h"
 #include "AIE1RegisterInfo.h"
+#include "AIE1Subtarget.h"
 #include "AIEMachineFunctionInfo.h"
-#include "AIESubtarget.h"
 #include "AIETargetMachine.h"
 #include "llvm/ADT/Statistic.h"
 #include "llvm/CodeGen/CallingConvLower.h"
diff --git a/llvm/lib/Target/AIE/aie1/AIE1InstrInfo.cpp b/llvm/lib/Target/AIE/aie1/AIE1InstrInfo.cpp
@@ -15,19 +15,13 @@
 #include "AIE1InstrInfo.h"
 #include "AIE.h"
 #include "AIEHazardRecognizerPRAS.h"
-#include "AIESubtarget.h"
-#include "AIETargetMachine.h"
-#include "MCTargetDesc/AIEFormat.h"
 #include "MCTargetDesc/AIEMCFormats.h"
-#include "llvm/ADT/STLExtras.h"
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/CodeGen/MachineFrameInfo.h"
-#include "llvm/CodeGen/MachineFunctionPass.h"
 #include "llvm/CodeGen/MachineInstrBuilder.h"
 #include "llvm/CodeGen/MachineRegisterInfo.h"
 #include "llvm/CodeGen/RegisterScavenging.h"
 #include "llvm/MC/TargetRegistry.h"
-#include "llvm/Support/Automaton.h"
 #include "llvm/Support/Debug.h"
 #include "llvm/Support/ErrorHandling.h"
 
diff --git a/llvm/lib/Target/AIE/aie1/AIE1RegisterInfo.cpp b/llvm/lib/Target/AIE/aie1/AIE1RegisterInfo.cpp
@@ -14,7 +14,7 @@
 
 #include "AIE1RegisterInfo.h"
 #include "AIE.h"
-#include "AIESubtarget.h"
+#include "AIE1Subtarget.h"
 #include "MCTargetDesc/AIEMCTargetDesc.h"
 #include "llvm/CodeGen/MachineFrameInfo.h"
 #include "llvm/CodeGen/MachineFunction.h"
diff --git a/llvm/lib/Target/AIE/aie1/AIE1Subtarget.cpp b/llvm/lib/Target/AIE/aie1/AIE1Subtarget.cpp
@@ -12,7 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "AIESubtarget.h"
+#include "AIE1Subtarget.h"
 #include "AIE.h"
 #include "AIECallLowering.h"
 #include "AIEFrameLowering.h"
@@ -32,10 +32,12 @@ using namespace llvm;
 
 void AIESubtarget::anchor() {}
 
-AIESubtarget &AIESubtarget::initializeSubtargetDependencies(
-    const Triple &TT, StringRef CPU, StringRef FS, StringRef ABIName) {
+AIESubtarget &AIESubtarget::initializeSubtargetDependencies(const Triple &TT,
+                                                            StringRef CPU,
+                                                            StringRef FS,
+                                                            StringRef ABIName) {
   if (CPUName.empty())
-      CPUName = "aie";
+    CPUName = "aie";
   ParseSubtargetFeatures(CPUName, CPUName, FS);
 
   return *this;
diff --git a/llvm/lib/Target/AIE/aie1/AIE1Subtarget.h b/llvm/lib/Target/AIE/aie1/AIE1Subtarget.h
@@ -47,14 +47,13 @@ class AIESubtarget final : public AIEGenSubtargetInfo, public AIEBaseSubtarget {
 
   /// Initializes using the passed in CPU and feature strings so that we can
   /// use initializer lists for subtarget initialization.
-  AIESubtarget &initializeSubtargetDependencies(const Triple &TT,
-                                                  StringRef CPU, StringRef FS,
-                                                  StringRef ABIName);
+  AIESubtarget &initializeSubtargetDependencies(const Triple &TT, StringRef CPU,
+                                                StringRef FS,
+                                                StringRef ABIName);
 
 public:
   // Initializes the data members to match that of the specified triple.
-  AIESubtarget(const Triple &TT, StringRef CPU,
-               StringRef TuneCPU, StringRef FS,
+  AIESubtarget(const Triple &TT, StringRef CPU, StringRef TuneCPU, StringRef FS,
                StringRef ABIName, const TargetMachine &TM);
 
   bool enablePostRAScheduler() const override { return true; }
@@ -79,9 +78,7 @@ class AIESubtarget final : public AIEGenSubtargetInfo, public AIEBaseSubtarget {
     return &InstrItins;
   }
   const AIEInstrInfo *getInstrInfo() const override { return &InstrInfo; }
-  const AIERegisterInfo *getRegisterInfo() const override {
-    return &RegInfo;
-  }
+  const AIERegisterInfo *getRegisterInfo() const override { return &RegInfo; }
   const AIE1TargetLowering *getTargetLowering() const override {
     return &TLInfo;
   }
diff --git a/llvm/lib/Target/AIE/aie2p/AIE2PFrameLowering.cpp b/llvm/lib/Target/AIE/aie2p/AIE2PFrameLowering.cpp
@@ -13,7 +13,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "AIE2PFrameLowering.h"
-#include "AIE2PSubtarget.h"
+#include "AIE2PInstrInfo.h"
 #include "MCTargetDesc/aie2p/AIE2PMCTargetDesc.h"
 #include "llvm/CodeGen/MachineFrameInfo.h"
 #include "llvm/CodeGen/RegisterScavenging.h"
@@ -28,7 +28,7 @@ void AIE2PFrameLowering::adjustReg(MachineBasicBlock &MBB,
                                    int64_t StackPtrIncr,
                                    MachineInstr::MIFlag Flag) const {
   MachineRegisterInfo &MRI = MBB.getParent()->getRegInfo();
-  auto *TII = static_cast<const AIEInstrInfo *>(STI.getInstrInfo());
+  auto *TII = static_cast<const AIE2PInstrInfo *>(STI.getInstrInfo());
 
   if (StackPtrIncr == 0)
     return;
@@ -62,7 +62,7 @@ void AIE2PFrameLowering::adjustSPReg(MachineBasicBlock &MBB,
                                      const DebugLoc &DL, int64_t StackPtrIncr,
                                      MachineInstr::MIFlag Flag) const {
 
-  auto *TII = static_cast<const AIEInstrInfo *>(STI.getInstrInfo());
+  auto *TII = static_cast<const AIE2PInstrInfo *>(STI.getInstrInfo());
 
   if (StackPtrIncr == 0)
     return;
diff --git a/llvm/lib/Target/AIE/aie2p/AIE2PISelLowering.cpp b/llvm/lib/Target/AIE/aie2p/AIE2PISelLowering.cpp
@@ -13,7 +13,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "AIE2PISelLowering.h"
-#include "AIESubtarget.h"
+#include "AIEBaseSubtarget.h"
 #include "MCTargetDesc/aie2p/AIE2PMCTargetDesc.h"
 #include "llvm/IR/IntrinsicsAIE2P.h"
 
@@ -53,14 +53,14 @@ namespace {
 bool isTyNameBfp16(StringRef TyName) {
   if (TyName.ends_with("struct.v64bfp16ebs16"))
     return true;
-  else if (TyName.ends_with("struct.v64bfp16ebs8"))
+  if (TyName.ends_with("struct.v64bfp16ebs8"))
     return true;
-  else if (TyName.ends_with("struct.v128bfp16ebs16"))
+  if (TyName.ends_with("struct.v128bfp16ebs16"))
     return true;
-  else if (TyName.ends_with("struct.v128bfp16ebs8"))
+  if (TyName.ends_with("struct.v128bfp16ebs8"))
     return true;
-  else
-    return false;
+
+  return false;
 }
 } // namespace
 bool AIE2PTargetLowering::functionArgumentNeedsConsecutiveRegisters(
