Address comments

Author: V-FEXrt

llvm/include/llvm/Analysis/DXILResource.h

@@ -448,10 +448,10 @@ class DXILBindingMap {
 
   /// Resolves a resource handle into a vector of ResourceBindingInfos that
   /// represent the possible unique creations of the handle. Certain cases are
-  /// ambiguous so mulitple creation points may be returned. The resulting
+  /// ambiguous so mulitple creation instructions may be returned. The resulting
   /// ResourceBindingInfo can be used to depuplicate unique handles that
   /// reference the same resource
-  SmallVector<dxil::ResourceBindingInfo> findByUse(const Value *Key) const;
+  SmallVector<dxil::ResourceBindingInfo> findCreationInfo(const Value *Key) const;
 
   const_iterator find(const CallInst *Key) const {
     auto Pos = CallMap.find(Key);

llvm/lib/Analysis/DXILResource.cpp

@@ -771,11 +771,11 @@ void DXILBindingMap::print(raw_ostream &OS, DXILResourceTypeMap &DRTM,
 }
 
 SmallVector<dxil::ResourceBindingInfo>
-DXILBindingMap::findByUse(const Value *Key) const {
+DXILBindingMap::findCreationInfo(const Value *Key) const {
   if (const PHINode *Phi = dyn_cast<PHINode>(Key)) {
     SmallVector<dxil::ResourceBindingInfo> Children;
     for (const Value *V : Phi->operands()) {
-      Children.append(findByUse(V));
+      Children.append(findCreationInfo(V));
     }
     return Children;
   }
@@ -784,30 +784,29 @@ DXILBindingMap::findByUse(const Value *Key) const {
   if (!CI)
     return {};
 
-  const Type *UseType = CI->getType();
-
   switch (CI->getIntrinsicID()) {
-  // Check if any of the parameters are the resource we are following. If so
-  // keep searching
-  case Intrinsic::not_intrinsic: {
-    SmallVector<dxil::ResourceBindingInfo> Children;
-    for (const Value *V : CI->args()) {
-      if (V->getType() != UseType)
-        continue;
-
-      Children.append(findByUse(V));
-    }
-
-    return Children;
-  }
   // Found the create, return the binding
-  case Intrinsic::dx_resource_handlefrombinding:
+  case Intrinsic::dx_resource_handlefrombinding: {
     const auto *It = find(CI);
     assert(It != Infos.end() && "HandleFromBinding must be in resource map");
     return {*It};
+    }
+  default:
+    break;
+  }
+
+  // Check if any of the parameters are the resource we are following. If so
+  // keep searching. If none of them are return an empty list
+  const Type *UseType = CI->getType();
+  SmallVector<dxil::ResourceBindingInfo> Children;
+  for (const Value *V : CI->args()) {
+    if (V->getType() != UseType)
+      continue;
+
+    Children.append(findCreationInfo(V));
   }
 
-  return {};
+  return Children;
 }
 
 //===----------------------------------------------------------------------===//

llvm/unittests/Target/DirectX/UniqueResourceFromUseTests.cpp

@@ -73,7 +73,7 @@ declare void @a.func(target("dx.RawBuffer", float, 1, 0) %handle)
     for (const User *U : F.users()) {
       const CallInst *CI = cast<CallInst>(U);
       const Value *Handle = CI->getArgOperand(0);
-      const auto Bindings = DBM.findByUse(Handle);
+      const auto Bindings = DBM.findCreationInfo(Handle);
       ASSERT_EQ(Bindings.size(), 1u)
           << "Handle should resolve into one resource";
 
@@ -123,7 +123,7 @@ declare target("dx.RawBuffer", float, 1, 0) @ind.func(target("dx.RawBuffer", flo
     for (const User *U : F.users()) {
       const CallInst *CI = cast<CallInst>(U);
       const Value *Handle = CI->getArgOperand(0);
-      const auto Bindings = DBM.findByUse(Handle);
+      const auto Bindings = DBM.findCreationInfo(Handle);
       ASSERT_EQ(Bindings.size(), 1u)
           << "Handle should resolve into one resource";
 
@@ -176,7 +176,7 @@ declare target("dx.RawBuffer", float, 1, 0) @ind.func(target("dx.RawBuffer", flo
     for (const User *U : F.users()) {
       const CallInst *CI = cast<CallInst>(U);
       const Value *Handle = CI->getArgOperand(0);
-      const auto Bindings = DBM.findByUse(Handle);
+      const auto Bindings = DBM.findCreationInfo(Handle);
       ASSERT_EQ(Bindings.size(), 4u)
           << "Handle should resolve into four resources";
 
@@ -256,7 +256,7 @@ declare target("dx.RawBuffer", float, 1, 0) @ind.func(target("dx.RawBuffer", flo
     for (const User *U : F.users()) {
       const CallInst *CI = cast<CallInst>(U);
       const Value *Handle = CI->getArgOperand(0);
-      const auto Bindings = DBM.findByUse(Handle);
+      const auto Bindings = DBM.findCreationInfo(Handle);
       ASSERT_EQ(Bindings.size(), 2u)
           << "Handle should resolve into four resources";