Add back to legacy PM.

Author: jofrn

llvm/include/llvm/InitializePasses.h

@@ -333,7 +333,6 @@ LLVM_ABI void initializeUnpackMachineBundlesPass(PassRegistry &);
 LLVM_ABI void initializeUnreachableBlockElimLegacyPassPass(PassRegistry &);
 LLVM_ABI void initializeUnreachableMachineBlockElimLegacyPass(PassRegistry &);
 LLVM_ABI void initializeVerifierLegacyPassPass(PassRegistry &);
-//LLVM_ABI void initializeAMDGPUTargetVerifierLegacyPassPass(PassRegistry &);
 LLVM_ABI void initializeVirtRegMapWrapperLegacyPass(PassRegistry &);
 LLVM_ABI void initializeVirtRegRewriterLegacyPass(PassRegistry &);
 LLVM_ABI void initializeWasmEHPreparePass(PassRegistry &);

llvm/lib/Target/AMDGPU/AMDGPU.h

@@ -549,6 +549,9 @@ extern char &GCNRewritePartialRegUsesID;
 void initializeAMDGPUWaitSGPRHazardsLegacyPass(PassRegistry &);
 extern char &AMDGPUWaitSGPRHazardsLegacyID;
 
+FunctionPass *createAMDGPUTargetVerifierLegacyPass(bool FatalErrors);
+void initializeAMDGPUTargetVerifierLegacyPassPass(PassRegistry &);
+
 namespace AMDGPU {
 enum TargetIndex {
   TI_CONSTDATA_START,

llvm/lib/Target/AMDGPU/AMDGPUTargetMachine.cpp

@@ -1411,6 +1411,7 @@ bool AMDGPUPassConfig::addGCPasses() {
 //===----------------------------------------------------------------------===//
 
 bool GCNPassConfig::addPreISel() {
+  addPass(createAMDGPUTargetVerifierLegacyPass(false));
   AMDGPUPassConfig::addPreISel();
 
   if (TM->getOptLevel() > CodeGenOptLevel::None)

llvm/lib/Target/AMDGPU/AMDGPUTargetVerifier.cpp

@@ -17,14 +17,15 @@
 ////
 ////===----------------------------------------------------------------------===//
 
+#include "AMDGPU.h"
 #include "llvm/Target/TargetVerify/AMDGPUTargetVerifier.h"
 
 #include "llvm/Analysis/UniformityAnalysis.h"
 #include "llvm/Analysis/PostDominators.h"
 #include "llvm/Support/Debug.h"
 #include "llvm/IR/Dominators.h"
 #include "llvm/IR/Function.h"
-#include "llvm/InitializePasses.h"
+//#include "llvm/InitializePasses.h"
 #include "llvm/IR/IntrinsicInst.h"
 #include "llvm/IR/IntrinsicsAMDGPU.h"
 #include "llvm/IR/Module.h"
@@ -133,7 +134,6 @@ PreservedAnalyses AMDGPUTargetVerifierPass::run(Function &F, FunctionAnalysisMan
   return PreservedAnalyses::all();
 }
 
-/*
 struct AMDGPUTargetVerifierLegacyPass : public FunctionPass {
   static char ID;
 
@@ -183,6 +183,6 @@ struct AMDGPUTargetVerifierLegacyPass : public FunctionPass {
 char AMDGPUTargetVerifierLegacyPass::ID = 0;
 FunctionPass *createAMDGPUTargetVerifierLegacyPass(bool FatalErrors) {
   return new AMDGPUTargetVerifierLegacyPass(FatalErrors);
-}*/
+}
 } // namespace llvm
-//INITIALIZE_PASS(AMDGPUTargetVerifierLegacyPass, "amdgpu-tgtverifier", "AMDGPU Target Verifier", false, false)
+INITIALIZE_PASS(AMDGPUTargetVerifierLegacyPass, "amdgpu-tgtverifier", "AMDGPU Target Verifier", false, false)