Address Comments

Author: V-FEXrt

llvm/include/llvm/Analysis/DXILResource.h

@@ -458,6 +458,7 @@ class DXILResourceMap {
   unsigned FirstUAV = 0;
   unsigned FirstCBuffer = 0;
   unsigned FirstSampler = 0;
+  bool HasInvalidDirection = false;
 
   /// Populate all the resource instance data.
   void populate(Module &M, DXILResourceTypeMap &DRTM);
@@ -549,6 +550,8 @@ class DXILResourceMap {
     return make_range(call_begin(), call_end());
   }
 
+  bool hasInvalidCounterDirection() const { return HasInvalidDirection; }
+
   void print(raw_ostream &OS, DXILResourceTypeMap &DRTM,
              const DataLayout &DL) const;
 

llvm/lib/Analysis/DXILResource.cpp

@@ -811,8 +811,10 @@ void DXILResourceMap::populateCounterDirections(Module &M) {
       for (ResourceInfo *RBInfo : RBInfos) {
         if (RBInfo->CounterDirection == ResourceCounterDirection::Unknown)
           RBInfo->CounterDirection = Direction;
-        else if (RBInfo->CounterDirection != Direction)
+        else if (RBInfo->CounterDirection != Direction) {
           RBInfo->CounterDirection = ResourceCounterDirection::Invalid;
+          HasInvalidDirection = true;
+        }
       }
     }
   }

llvm/lib/Target/DirectX/DXILPostOptimizationValidation.cpp

@@ -7,76 +7,58 @@
 //===----------------------------------------------------------------------===//
 
 #include "DXILPostOptimizationValidation.h"
-#include "DXILConstants.h"
-#include "DXILIntrinsicExpansion.h"
-#include "DXILOpBuilder.h"
 #include "DXILShaderFlags.h"
 #include "DirectX.h"
-#include "llvm/ADT/SmallVector.h"
 #include "llvm/Analysis/DXILMetadataAnalysis.h"
 #include "llvm/Analysis/DXILResource.h"
-#include "llvm/CodeGen/Passes.h"
 #include "llvm/IR/DiagnosticInfo.h"
-#include "llvm/IR/Function.h"
-#include "llvm/IR/IRBuilder.h"
-#include "llvm/IR/Instruction.h"
 #include "llvm/IR/Instructions.h"
-#include "llvm/IR/Intrinsics.h"
 #include "llvm/IR/IntrinsicsDirectX.h"
 #include "llvm/IR/Module.h"
-#include "llvm/IR/PassManager.h"
 #include "llvm/InitializePasses.h"
-#include "llvm/Pass.h"
-#include "llvm/Support/ErrorHandling.h"
-#include <cstdio>
 
 #define DEBUG_TYPE "dxil-post-optimization-validation"
 
 using namespace llvm;
 using namespace llvm::dxil;
 
 namespace {
-class DXILValidator {
-  Module &M;
-  DXILResourceMap &DRM;
 
-public:
-  DXILValidator(Module &M, DXILResourceMap &DRM) : M(M), DRM(DRM) {}
-
-  void validate() {
-    for (const auto &UAV : DRM.uavs()) {
-      if (UAV.CounterDirection != ResourceCounterDirection::Invalid)
-        continue;
+static void reportInvalidDirection(Module &M, DXILResourceMap &DRM) {
+  for (const auto &UAV : DRM.uavs()) {
+    if (UAV.CounterDirection != ResourceCounterDirection::Invalid)
+      continue;
 
-      CallInst *ResourceHandle = nullptr;
-      for (CallInst *MaybeHandle : DRM.calls()) {
-        if (*DRM.find(MaybeHandle) == UAV) {
-          ResourceHandle = MaybeHandle;
-          break;
-        }
+    CallInst *ResourceHandle = nullptr;
+    for (CallInst *MaybeHandle : DRM.calls()) {
+      if (*DRM.find(MaybeHandle) == UAV) {
+        ResourceHandle = MaybeHandle;
+        break;
       }
+    }
 
-      StringRef Message =
-          "RWStructuredBuffers may increment or decrement their "
-          "counters, but not both.";
-      for (const auto &U : ResourceHandle->users()) {
-        const CallInst *CI = dyn_cast<CallInst>(U);
-        if (!CI && CI->getIntrinsicID() != Intrinsic::dx_resource_updatecounter)
-          continue;
+    StringRef Message = "RWStructuredBuffers may increment or decrement their "
+                        "counters, but not both.";
+    for (const auto &U : ResourceHandle->users()) {
+      const CallInst *CI = dyn_cast<CallInst>(U);
+      if (!CI && CI->getIntrinsicID() != Intrinsic::dx_resource_updatecounter)
+        continue;
 
-        M.getContext().diagnose(DiagnosticInfoGenericWithLoc(
-            Message, *CI->getFunction(), CI->getDebugLoc()));
-      }
+      M.getContext().diagnose(DiagnosticInfoGenericWithLoc(
+          Message, *CI->getFunction(), CI->getDebugLoc()));
     }
   }
-};
+}
+
 } // namespace
 
 PreservedAnalyses
 DXILPostOptimizationValidation::run(Module &M, ModuleAnalysisManager &MAM) {
   DXILResourceMap &DRM = MAM.getResult<DXILResourceAnalysis>(M);
 
-  DXILValidator(M, DRM).validate();
+  if (DRM.hasInvalidCounterDirection())
+    reportInvalidDirection(M, DRM);
+
   return PreservedAnalyses::all();
 }
 
@@ -87,7 +69,8 @@ class DXILPostOptimizationValidationLegacy : public ModulePass {
     DXILResourceMap &DRM =
         getAnalysis<DXILResourceWrapperPass>().getResourceMap();
 
-    DXILValidator(M, DRM).validate();
+    if (DRM.hasInvalidCounterDirection())
+      reportInvalidDirection(M, DRM);
 
     return false;
   }

llvm/lib/Target/DirectX/DXILPostOptimizationValidation.h

@@ -6,7 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 //
-// \file Pass for validating DXIL after lowering and optimizations are applied.
+// \file Pass for validating IR after optimizations are applied and before
+// lowering to DXIL.
 //
 //===----------------------------------------------------------------------===//