Run AMDGPUTargetVerifier within AMDGPU pipeline. Move IsValid from

Module to TargetVerify.

Author: jofrn

clang/lib/CodeGen/BackendUtil.cpp

@@ -904,7 +904,7 @@ void EmitAssemblyHelper::RunOptimizationPipeline(
       TheModule->getContext(),
       (CodeGenOpts.DebugPassManager || DebugPassStructure),
       CodeGenOpts.VerifyEach, PrintPassOpts);
-  SI.registerCallbacks(PIC, &MAM);
+  SI.registerCallbacks(PIC, &MAM, &FAM);
   PassBuilder PB(TM.get(), PTO, PGOOpt, &PIC);
 
   // Handle the assignment tracking feature options.

llvm/include/llvm/IR/Module.h

@@ -211,10 +211,6 @@ class LLVM_ABI Module {
 /// @name Constructors
 /// @{
 public:
-  /// Is this Module valid as determined by one of the verification passes
-  /// i.e. Lint, Verifier, TargetVerifier.
-  bool IsValid = true;
-
   /// Is this Module using intrinsics to record the position of debugging
   /// information, or non-intrinsic records? See IsNewDbgInfoFormat in
   /// \ref BasicBlock.

llvm/include/llvm/Target/TargetVerifier.h

@@ -70,6 +70,8 @@ class TargetVerify {
   std::string Messages;
   raw_string_ostream MessagesStr;
 
+  bool IsValid = true;
+
   TargetVerify(Module *Mod)
       : Mod(Mod), TT(Triple::normalize(Mod->getTargetTriple())),
         MessagesStr(Messages) {}

llvm/lib/Analysis/Lint.cpp

@@ -748,7 +748,7 @@ PreservedAnalyses LintPass::run(Function &F, FunctionAnalysisManager &AM) {
   L.visit(F);
   dbgs() << L.MessagesStr.str();
   if (!L.MessagesStr.str().empty()) {
-    F.getParent()->IsValid = false;
+    //F.getParent()->IsValid = false;
     if (LintAbortOnError)
       report_fatal_error(Twine("Linter found errors, aborting. (enabled by --") +
                            LintAbortOnErrorArgName + ")",

llvm/lib/IR/Verifier.cpp

@@ -7744,7 +7744,7 @@ VerifierAnalysis::Result VerifierAnalysis::run(Function &F,
 PreservedAnalyses VerifierPass::run(Module &M, ModuleAnalysisManager &AM) {
   auto Res = AM.getResult<VerifierAnalysis>(M);
   if (Res.IRBroken || Res.DebugInfoBroken) {
-    M.IsValid = false;
+    //M.IsValid = false;
     if (VerifyAbortOnError && FatalErrors)
       report_fatal_error("Broken module found, compilation aborted!");
   }
@@ -7755,7 +7755,7 @@ PreservedAnalyses VerifierPass::run(Module &M, ModuleAnalysisManager &AM) {
 PreservedAnalyses VerifierPass::run(Function &F, FunctionAnalysisManager &AM) {
   auto res = AM.getResult<VerifierAnalysis>(F);
   if (res.IRBroken) {
-    F.getParent()->IsValid = false;
+    //F.getParent()->IsValid = false;
     if (VerifyAbortOnError && FatalErrors)
       report_fatal_error("Broken function found, compilation aborted!");
   }

llvm/lib/Passes/StandardInstrumentations.cpp

@@ -1486,7 +1486,7 @@ void VerifyInstrumentation::registerCallbacks(PassInstrumentationCallbacks &PIC,
           if (FAM) {
             TargetVerify TV(const_cast<Module*>(F->getParent()));
             TV.run(*const_cast<Function*>(F), *FAM);
-	    if (!F->getParent()->IsValid)
+	    if (!TV.IsValid)
               report_fatal_error(formatv("Broken function found after pass "
                                          "\"{0}\", compilation aborted!",
                                          P));

llvm/lib/Target/AMDGPU/AMDGPUTargetMachine.cpp

@@ -73,6 +73,7 @@
 #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"
@@ -1227,6 +1228,8 @@ void AMDGPUPassConfig::addIRPasses() {
       addPass(createLICMPass());
   }
 
+  //addPass(AMDGPUTargetVerifierPass());
+
   TargetPassConfig::addIRPasses();
 
   // EarlyCSE is not always strong enough to clean up what LSR produces. For
@@ -1992,6 +1995,8 @@ void AMDGPUCodeGenPassBuilder::addIRPasses(AddIRPass &addPass) const {
   // but EarlyCSE can do neither of them.
   if (isPassEnabled(EnableScalarIRPasses))
     addEarlyCSEOrGVNPass(addPass);
+
+  addPass(AMDGPUTargetVerifierPass());
 }
 
 void AMDGPUCodeGenPassBuilder::addCodeGenPrepare(AddIRPass &addPass) const {

llvm/lib/Target/AMDGPU/AMDGPUTargetVerifier.cpp

@@ -205,7 +205,8 @@ PreservedAnalyses AMDGPUTargetVerifierPass::run(Function &F, FunctionAnalysisMan
 
   dbgs() << TV.MessagesStr.str();
   if (!TV.MessagesStr.str().empty()) {
-    F.getParent()->IsValid = false;
+    TV.IsValid = false;
+    return PreservedAnalyses::none();
   }
 
   return PreservedAnalyses::all();

llvm/tools/llvm-tgt-verify/llvm-tgt-verify.cpp

@@ -163,9 +163,9 @@ int main(int argc, char **argv) {
     FPM.addPass(TargetVerifierPass());
   MPM.addPass(createModuleToFunctionPassAdaptor(std::move(FPM)));
 
-  MPM.run(*M, MAM);
-
-  if (!M->IsValid)
+  auto PA = MPM.run(*M, MAM);
+  auto PAC = PA.getChecker<VerifierAnalysis>();
+  if (!PAC.preserved())
     return 1;
 
   return 0;