Remove AMDGPUTargetVerifier.h

Author: jofrn

llvm/include/llvm/Target/TargetVerify/AMDGPUTargetVerifier.h

@@ -15,6 +15,7 @@
 #include "llvm/Pass.h"
 #include "llvm/Support/AMDGPUAddrSpace.h"
 #include "llvm/Support/CodeGen.h"
+#include "llvm/Target/TargetVerifier.h"
 
 namespace llvm {
 
@@ -551,6 +552,10 @@ extern char &AMDGPUWaitSGPRHazardsLegacyID;
 
 FunctionPass *createAMDGPUTargetVerifierLegacyPass(bool FatalErrors);
 void initializeAMDGPUTargetVerifierLegacyPassPass(PassRegistry &);
+class AMDGPUTargetVerifierPass : public TargetVerifierPass {
+public:
+  PreservedAnalyses run(Function &F, FunctionAnalysisManager &AM) override;
+};
 
 namespace AMDGPU {
 enum TargetIndex {

llvm/lib/Target/AMDGPU/AMDGPU.h

@@ -90,7 +90,6 @@
 #include "llvm/MC/TargetRegistry.h"
 #include "llvm/Passes/PassBuilder.h"
 #include "llvm/Support/FormatVariadic.h"
-#include "llvm/Target/TargetVerify/AMDGPUTargetVerifier.h"
 #include "llvm/Transforms/HipStdPar/HipStdPar.h"
 #include "llvm/Transforms/IPO.h"
 #include "llvm/Transforms/IPO/AlwaysInliner.h"

llvm/lib/Target/AMDGPU/AMDGPUTargetMachine.cpp

@@ -17,7 +17,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "llvm/Target/TargetVerify/AMDGPUTargetVerifier.h"
 #include "AMDGPU.h"
 
 #include "llvm/Analysis/PostDominators.h"
@@ -44,6 +43,21 @@ using namespace llvm;
 
 namespace llvm {
 
+class AMDGPUTargetVerify : public TargetVerify {
+public:
+  DominatorTree *DT = nullptr;
+  PostDominatorTree *PDT = nullptr;
+  UniformityInfo *UA = nullptr;
+
+  AMDGPUTargetVerify(Module *Mod) : TargetVerify(Mod) {}
+
+  AMDGPUTargetVerify(Module *Mod, DominatorTree *DT, PostDominatorTree *PDT,
+                     UniformityInfo *UA)
+      : TargetVerify(Mod), DT(DT), PDT(PDT), UA(UA) {}
+
+  bool run(Function &F) override;
+};
+
 static bool isShader(CallingConv::ID CC) {
   switch (CC) {
   case CallingConv::AMDGPU_VS: