[TableGen] Enable "Type set is empty for each HW mode" error in non-debug builds

[foad]

I could not measure any consistent slow-down when building lib/Target/AMDGPU/AMDGPUGenDAGISel.inc with this patch.

[arsenm]

llvm/utils/TableGen/CodeGenDAGPatterns.cpp

890–891

Should switch these to errs

897–898

I thought dumps had a separate macro which was implied by NDEBUG

[foad]

Update

[arsenm]

llvm/utils/TableGen/CodeGenDAGPatterns.cpp

890

Could just move this to limit the part with the dumps and still print the error

[foad]

llvm/utils/TableGen/CodeGenDAGPatterns.cpp

890

We print the error unconditionally in the PrintFatalError call below. The only reason for these errs() is to provide a bit of context for the dump()s.

[Joe_Nash]

I think this can catch bugs earlier, LGTM.

llvm/utils/TableGen/CodeGenDAGPatterns.h

struct TypeInfer {
   /// For each overloaded type (i.e. of form *Any), replace it with the
   /// corresponding subset of legal, specific types.
   void expandOverloads(TypeSetByHwMode &VTS);
   void expandOverloads(TypeSetByHwMode::SetType &Out,
                        const TypeSetByHwMode::SetType &Legal);
 
   struct ValidateOnExit {
     ValidateOnExit(TypeSetByHwMode &T, TypeInfer &TI) : Infer(TI), VTS(T) {}
-  #ifndef NDEBUG
     ~ValidateOnExit();
-  #else
-    ~ValidateOnExit() {}  // Empty destructor with NDEBUG.
-  #endif
     TypeInfer &Infer;
     TypeSetByHwMode &VTS;
   };
 
   struct SuppressValidation {
     SuppressValidation(TypeInfer &TI) : Infer(TI), SavedValidate(TI.Validate) {
       Infer.Validate = false;
     }

llvm/utils/TableGen/CodeGenDAGPatterns.cpp

bool TypeSetByHwMode::intersect(SetType &Out, const SetType &In) {
   // NumI > 1: Keep the iPTR in Out.
   Out.insert(MVT::iPTR);
   // If iPTR was the only element initially removed from Out, then Out
   // has not changed.
   return SizeOut != Out.size();
 }
 
 bool TypeSetByHwMode::validate() const {
-#ifndef NDEBUG
   if (empty())
     return true;
   bool AllEmpty = true;
   for (const auto &I : *this)
     AllEmpty &= I.second.empty();
   return !AllEmpty;
-#endif
-  return true;
 }
 
 // --- TypeInfer
 
 bool TypeInfer::MergeInTypeInfo(TypeSetByHwMode &Out,
                                 const TypeSetByHwMode &In) {
   ValidateOnExit _1(Out, *this);
   In.validate();
if (!LegalTypesCached) {
     for (const auto &I : LTS)
       LegalTypes.insert(I.second);
     LegalTypesCached = true;
   }
   assert(LegalCache.isDefaultOnly() && "Default-mode only expected");
   return LegalCache;
 }
 
-#ifndef NDEBUG
 TypeInfer::ValidateOnExit::~ValidateOnExit() {
   if (Infer.Validate && !VTS.validate()) {
-    dbgs() << "Type set is empty for each HW mode:\n"
+#if !defined(NDEBUG) || defined(LLVM_ENABLE_DUMP)
+    errs() << "Type set is empty for each HW mode:\n"
               "possible type contradiction in the pattern below "
               "(use -print-records with llvm-tblgen to see all "
               "expanded records).\n";
     Infer.TP.dump();
-    dbgs() << "Generated from record:\n";
+    errs() << "Generated from record:\n";
     Infer.TP.getRecord()->dump();
+#endif
     PrintFatalError(Infer.TP.getRecord()->getLoc(),
                     "Type set is empty for each HW mode in '" +
                         Infer.TP.getRecord()->getName() + "'");
   }
 }
-#endif
 
 
 //===----------------------------------------------------------------------===//
 // ScopedName Implementation
 //===----------------------------------------------------------------------===//
 
 bool ScopedName::operator==(const ScopedName &o) const {
   return Scope == o.Scope && Identifier == o.Identifier;