Address Comments

Author: V-FEXrt

llvm/lib/Analysis/DXILResource.cpp

@@ -467,7 +467,7 @@ uint32_t ResourceTypeInfo::getMultiSampleCount() const {
 }
 
 bool ResourceTypeInfo::operator==(const ResourceTypeInfo &RHS) const {
-  return std::tie(HandleTy) == std::tie(RHS.HandleTy);
+  return HandleTy == RHS.HandleTy;
 }
 
 bool ResourceTypeInfo::operator<(const ResourceTypeInfo &RHS) const {

llvm/lib/Target/DirectX/DXILPrettyPrinter.cpp

@@ -139,8 +139,12 @@ static StringRef getTextureDimName(dxil::ResourceKind RK) {
 namespace {
 struct FormatResourceDimension
     : public llvm::FormatAdapter<const dxil::ResourceTypeInfo &> {
-  explicit FormatResourceDimension(const dxil::ResourceTypeInfo &RI)
-      : llvm::FormatAdapter<const dxil::ResourceTypeInfo &>(RI) {}
+  explicit FormatResourceDimension(const dxil::ResourceTypeInfo &RI,
+                                   bool HasCounter)
+      : llvm::FormatAdapter<const dxil::ResourceTypeInfo &>(RI),
+        HasCounter(HasCounter) {}
+
+  bool HasCounter;
 
   void format(llvm::raw_ostream &OS, StringRef Style) override {
     dxil::ResourceKind RK = Item.getResourceKind();
@@ -155,8 +159,8 @@ struct FormatResourceDimension
     case dxil::ResourceKind::StructuredBuffer:
       if (!Item.isUAV())
         OS << "r/o";
-      //      else if (Item.getUAV().HasCounter)
-      //        OS << "r/w+cnt";
+      else if (HasCounter)
+        OS << "r/w+cnt";
       else
         OS << "r/w";
       break;
@@ -238,7 +242,7 @@ static void prettyPrintResources(raw_ostream &OS, const DXILResourceMap &DRM,
     StringRef Name(RI.getName());
     StringRef Type(getRCName(RC));
     StringRef Format(getFormatName(RTI));
-    FormatResourceDimension Dim(RTI);
+    FormatResourceDimension Dim(RTI, RI.hasCounter());
     FormatBindingID ID(RI, RTI);
     FormatBindingLocation Bind(RI, RTI);
     FormatBindingSize Count(RI);