Address Comments

Author: V-FEXrt

llvm/include/llvm/Analysis/DXILResource.h

@@ -306,6 +306,13 @@ class ResourceTypeInfo {
 
 //===----------------------------------------------------------------------===//
 
+enum class ResourceCounterDirection {
+  Increment,
+  Decrement,
+  Unknown,
+  Invalid,
+};
+
 class ResourceInfo {
 public:
   struct ResourceBinding {
@@ -333,20 +340,22 @@ class ResourceInfo {
   GlobalVariable *Symbol = nullptr;
 
 public:
-  bool GloballyCoherent;
-  bool HasCounter;
+  bool GloballyCoherent = false;
+  ResourceCounterDirection CounterDirection = ResourceCounterDirection::Unknown;
 
   ResourceInfo(uint32_t RecordID, uint32_t Space, uint32_t LowerBound,
                uint32_t Size, TargetExtType *HandleTy,
-               GlobalVariable *Symbol = nullptr, bool GloballyCoherent = false,
-               bool HasCounter = false)
+               GlobalVariable *Symbol = nullptr)
       : Binding{RecordID, Space, LowerBound, Size}, HandleTy(HandleTy),
-        Symbol(Symbol), GloballyCoherent(GloballyCoherent),
-        HasCounter(HasCounter) {}
+        Symbol(Symbol) {}
 
   void setBindingID(unsigned ID) { Binding.RecordID = ID; }
   void setGloballyCoherent(bool V) { GloballyCoherent = V; }
-  void setHasCounter(bool V) { HasCounter = V; }
+  void setCounterDirection(ResourceCounterDirection V) { CounterDirection = V; }
+
+  bool hasCounter() const {
+    return CounterDirection != ResourceCounterDirection::Unknown;
+  }
 
   const ResourceBinding &getBinding() const { return Binding; }
   TargetExtType *getHandleTy() const { return HandleTy; }

llvm/lib/Analysis/DXILResource.cpp

@@ -573,7 +573,7 @@ MDTuple *ResourceInfo::getAsMetadata(Module &M,
     if (RTI.isUAV()) {
       ResourceTypeInfo::UAVInfo UAVFlags = RTI.getUAV();
       MDVals.push_back(getBoolMD(GloballyCoherent));
-      MDVals.push_back(getBoolMD(HasCounter));
+      MDVals.push_back(getBoolMD(hasCounter()));
       MDVals.push_back(getBoolMD(UAVFlags.IsROV));
     } else {
       // All SRVs include sample count in the metadata, but it's only meaningful
@@ -617,7 +617,7 @@ ResourceInfo::getAnnotateProps(Module &M, dxil::ResourceTypeInfo &RTI) const {
   bool IsGloballyCoherent = IsUAV && GloballyCoherent;
   uint8_t SamplerCmpOrHasCounter = 0;
   if (IsUAV)
-    SamplerCmpOrHasCounter = HasCounter;
+    SamplerCmpOrHasCounter = hasCounter();
   else if (RTI.isSampler())
     SamplerCmpOrHasCounter = RTI.getSamplerType() == SamplerType::Comparison;
 
@@ -667,7 +667,22 @@ void ResourceInfo::print(raw_ostream &OS, dxil::ResourceTypeInfo &RTI,
      << "    Size: " << Binding.Size << "\n";
 
   OS << "  Globally Coherent: " << GloballyCoherent << "\n";
-  OS << "  HasCounter: " << HasCounter << "\n";
+  OS << "  Counter Direction: ";
+
+  switch (CounterDirection) {
+  case ResourceCounterDirection::Increment:
+    OS << "Increment\n";
+    break;
+  case ResourceCounterDirection::Decrement:
+    OS << "Decrement\n";
+    break;
+  case ResourceCounterDirection::Unknown:
+    OS << "Unknown\n";
+    break;
+  case ResourceCounterDirection::Invalid:
+    OS << "Invalid\n";
+    break;
+  }
 
   RTI.print(OS, DL);
 }

llvm/lib/Target/DirectX/DXContainerGlobals.cpp

@@ -229,7 +229,7 @@ void DXContainerGlobals::addResourcesForPSV(Module &M, PSVRuntimeInfo &PSV) {
 
     dxil::ResourceTypeInfo &TypeInfo = DRTM[RI.getHandleTy()];
     dxbc::PSV::ResourceType ResType;
-    if (RI.HasCounter)
+    if (RI.hasCounter())
       ResType = dxbc::PSV::ResourceType::UAVStructuredWithCounter;
     else if (TypeInfo.isStruct())
       ResType = dxbc::PSV::ResourceType::UAVStructured;

llvm/test/Analysis/DXILResource/buffer-frombinding.ll

@@ -58,7 +58,7 @@ define void @test_typedbuffer() {
   ; CHECK:     Lower Bound: 7
   ; CHECK:     Size: 1
   ; CHECK:   Globally Coherent: 0
-  ; CHECK:   HasCounter: 0
+  ; CHECK:   Counter Direction: Unknown
   ; CHECK:   Class: UAV
   ; CHECK:   Kind: TypedBuffer
   ; CHECK:   IsROV: 0
@@ -76,7 +76,7 @@ define void @test_typedbuffer() {
   ; CHECK:     Lower Bound: 5
   ; CHECK:     Size: 1
   ; CHECK:   Globally Coherent: 0
-  ; CHECK:   HasCounter: 0
+  ; CHECK:   Counter Direction: Unknown
   ; CHECK:   Class: UAV
   ; CHECK:   Kind: TypedBuffer
   ; CHECK:   IsROV: 0
@@ -99,7 +99,7 @@ define void @test_typedbuffer() {
   ; CHECK:     Lower Bound: 0
   ; CHECK:     Size: 10
   ; CHECK:   Globally Coherent: 0
-  ; CHECK:   HasCounter: 0
+  ; CHECK:   Counter Direction: Unknown
   ; CHECK:   Class: UAV
   ; CHECK:   Kind: TypedBuffer
   ; CHECK:   IsROV: 0

llvm/unittests/Analysis/DXILResourceTest.cpp

@@ -127,7 +127,8 @@ TEST(DXILResource, AnnotationsAndMetadata) {
                 TestMD.get(1, GV, "BufferOut", 2, 3, 1, 11, false, false, false,
                            nullptr));
     EXPECT_EQ(RI.GloballyCoherent, false);
-    EXPECT_EQ(RI.HasCounter, false);
+    EXPECT_EQ(RI.hasCounter(), false);
+    EXPECT_EQ(RI.CounterDirection, ResourceCounterDirection::Unknown);
   }
 
   // struct BufType0 { int i; float f; double d; };
@@ -279,8 +280,8 @@ TEST(DXILResource, AnnotationsAndMetadata) {
 
     ResourceInfo RI(
         /*RecordID=*/0, /*Space=*/2, /*LowerBound=*/0, /*Size=*/1,
-        RTI.getHandleTy(),
-        /*Symbol=*/nullptr, /*GloballyCoherent=*/true, /*HasCounter=*/false);
+        RTI.getHandleTy());
+    RI.setGloballyCoherent(true);
     GlobalVariable *GV =
         RI.createSymbol(M, RTI.createElementStruct(), "OutputTexture");
     EXPECT_PROPS_EQ(RI.getAnnotateProps(M, RTI), 0x00005002U, 0x00000204U);
@@ -289,7 +290,8 @@ TEST(DXILResource, AnnotationsAndMetadata) {
                            false, TestMD.get(0, 4)));
 
     EXPECT_EQ(RI.GloballyCoherent, true);
-    EXPECT_EQ(RI.HasCounter, false);
+    EXPECT_EQ(RI.hasCounter(), false);
+    EXPECT_EQ(RI.CounterDirection, ResourceCounterDirection::Unknown);
   }
 
   // RasterizerOrderedBuffer<float4> ROB;
@@ -313,7 +315,8 @@ TEST(DXILResource, AnnotationsAndMetadata) {
                 TestMD.get(0, GV, "ROB", 0, 0, 1, 10, false, false, true,
                            TestMD.get(0, 9)));
     EXPECT_EQ(RI.GloballyCoherent, false);
-    EXPECT_EQ(RI.HasCounter, false);
+    EXPECT_EQ(RI.hasCounter(), false);
+    EXPECT_EQ(RI.CounterDirection, ResourceCounterDirection::Unknown);
   }
 
   // RWStructuredBuffer<ParticleMotion> g_OutputBuffer : register(u2);
@@ -331,16 +334,17 @@ TEST(DXILResource, AnnotationsAndMetadata) {
 
     ResourceInfo RI(
         /*RecordID=*/0, /*Space=*/0, /*LowerBound=*/2, /*Size=*/1,
-        RTI.getHandleTy(),
-        /*Symbol=*/nullptr, /*GloballyCoherent=*/false, /*HasCounter=*/true);
+        RTI.getHandleTy());
+    RI.setCounterDirection(ResourceCounterDirection::Increment);
     GlobalVariable *GV =
         RI.createSymbol(M, RTI.createElementStruct(), "g_OutputBuffer");
     EXPECT_PROPS_EQ(RI.getAnnotateProps(M, RTI), 0x0000920cU, 0x00000014U);
     EXPECT_MDEQ(RI.getAsMetadata(M, RTI),
                 TestMD.get(0, GV, "g_OutputBuffer", 0, 2, 1, 12, false, true,
                            false, TestMD.get(1, 20)));
     EXPECT_EQ(RI.GloballyCoherent, false);
-    EXPECT_EQ(RI.HasCounter, true);
+    EXPECT_EQ(RI.hasCounter(), true);
+    EXPECT_EQ(RI.CounterDirection, ResourceCounterDirection::Increment);
   }
 
   // RWTexture2DMSArray<uint, 8> g_rw_t2dmsa;
@@ -368,7 +372,8 @@ TEST(DXILResource, AnnotationsAndMetadata) {
                 TestMD.get(0, GV, "g_rw_t2dmsa", 0, 0, 1, 8, false, false,
                            false, TestMD.get(0, 5)));
     EXPECT_EQ(RI.GloballyCoherent, false);
-    EXPECT_EQ(RI.HasCounter, false);
+    EXPECT_EQ(RI.hasCounter(), false);
+    EXPECT_EQ(RI.CounterDirection, ResourceCounterDirection::Unknown);
   }
 
   // cbuffer cb0 { float4 g_X; float4 g_Y; }