Add VerifyTarget option

Author: jofrn

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

@@ -37,17 +37,15 @@ class AMDGPUTargetVerifierPass : public TargetVerifierPass {
 
 class AMDGPUTargetVerify : public TargetVerify {
 public:
-  Module *Mod;
-
   DominatorTree *DT = nullptr;
   PostDominatorTree *PDT = nullptr;
   UniformityInfo *UA = nullptr;
 
-  AMDGPUTargetVerify(Module *Mod) : TargetVerify(Mod), Mod(Mod) {}
+  AMDGPUTargetVerify(Module *Mod) : TargetVerify(Mod) {}
 
   AMDGPUTargetVerify(Module *Mod, DominatorTree *DT, PostDominatorTree *PDT,
                      UniformityInfo *UA)
-    : TargetVerify(Mod), Mod(Mod), DT(DT), PDT(PDT), UA(UA) {}
+      : TargetVerify(Mod), DT(DT), PDT(PDT), UA(UA) {}
 
   bool run(Function &F) override;
 };

llvm/lib/Target/AMDGPU/AMDGPUTargetMachine.cpp

@@ -482,6 +482,9 @@ static cl::opt<bool> HasClosedWorldAssumption(
     cl::desc("Whether has closed-world assumption at link time"),
     cl::init(false), cl::Hidden);
 
+static cl::opt<bool> VerifyTarget("verify-tgt",
+                                  cl::desc("Enable the target verifier"));
+
 extern "C" LLVM_EXTERNAL_VISIBILITY void LLVMInitializeAMDGPUTarget() {
   // Register the target
   RegisterTargetMachine<R600TargetMachine> X(getTheR600Target());
@@ -1411,7 +1414,8 @@ bool AMDGPUPassConfig::addGCPasses() {
 //===----------------------------------------------------------------------===//
 
 bool GCNPassConfig::addPreISel() {
-  addPass(createAMDGPUTargetVerifierLegacyPass(false));
+  if (VerifyTarget)
+    addPass(createAMDGPUTargetVerifierLegacyPass(false));
   AMDGPUPassConfig::addPreISel();
 
   if (TM->getOptLevel() > CodeGenOptLevel::None)
@@ -2011,7 +2015,8 @@ AMDGPUCodeGenPassBuilder::AMDGPUCodeGenPassBuilder(
 }
 
 void AMDGPUCodeGenPassBuilder::addIRPasses(AddIRPass &addPass) const {
-  addPass(AMDGPUTargetVerifierPass());
+  if (VerifyTarget)
+    addPass(AMDGPUTargetVerifierPass());
 
   if (RemoveIncompatibleFunctions && TM.getTargetTriple().isAMDGCN())
     addPass(AMDGPURemoveIncompatibleFunctionsPass(TM));