[llvm] [HLSL] Add support to lookup a ResourceBindingInfo from its use (PR #126556)
Ashley Coleman via llvm-commits
llvm-commits at lists.llvm.org
Tue Feb 18 12:59:42 PST 2025
https://github.com/V-FEXrt updated https://github.com/llvm/llvm-project/pull/126556
>From ab1e78dd414c3d2c816451f2310082c1a1827e2f Mon Sep 17 00:00:00 2001
From: Ashley Coleman <ascoleman at microsoft.com>
Date: Fri, 7 Feb 2025 16:30:44 -0700
Subject: [PATCH 1/9] Implement trivial resource lookup with test
---
llvm/include/llvm/Analysis/DXILResource.h | 4 +
llvm/lib/Analysis/DXILResource.cpp | 20 ++++-
llvm/unittests/Target/DirectX/CMakeLists.txt | 1 +
.../DirectX/UniqueResourceFromUseTests.cpp | 87 +++++++++++++++++++
4 files changed, 111 insertions(+), 1 deletion(-)
create mode 100644 llvm/unittests/Target/DirectX/UniqueResourceFromUseTests.cpp
diff --git a/llvm/include/llvm/Analysis/DXILResource.h b/llvm/include/llvm/Analysis/DXILResource.h
index 87c5615c28ee0..8a861c510c001 100644
--- a/llvm/include/llvm/Analysis/DXILResource.h
+++ b/llvm/include/llvm/Analysis/DXILResource.h
@@ -446,6 +446,10 @@ class DXILBindingMap {
return Pos == CallMap.end() ? Infos.end() : (Infos.begin() + Pos->second);
}
+ // Resoloves the use of a resource handle into the unique description of that
+ // resource by deduping calls to create.
+ const_iterator findByUse(const Value *Key) const;
+
const_iterator find(const CallInst *Key) const {
auto Pos = CallMap.find(Key);
return Pos == CallMap.end() ? Infos.end() : (Infos.begin() + Pos->second);
diff --git a/llvm/lib/Analysis/DXILResource.cpp b/llvm/lib/Analysis/DXILResource.cpp
index 7f28e63cc117d..56957a7ea09b6 100644
--- a/llvm/lib/Analysis/DXILResource.cpp
+++ b/llvm/lib/Analysis/DXILResource.cpp
@@ -770,6 +770,23 @@ void DXILBindingMap::print(raw_ostream &OS, DXILResourceTypeMap &DRTM,
}
}
+SmallVector<dxil::ResourceBindingInfo>::const_iterator DXILBindingMap::findByUse(const Value *Key) const {
+ const CallInst *CI = dyn_cast<CallInst>(Key);
+ if (!CI) {
+ // TODO: Any other cases to follow up the tree?
+ return Infos.end();
+ }
+
+ switch (CI->getIntrinsicID()) {
+ case Intrinsic::not_intrinsic:
+ return Infos.end();
+ case Intrinsic::dx_resource_handlefrombinding:
+ return find(CI);
+ }
+
+ return Infos.end();
+}
+
//===----------------------------------------------------------------------===//
AnalysisKey DXILResourceTypeAnalysis::Key;
@@ -828,7 +845,8 @@ bool DXILResourceBindingWrapperPass::runOnModule(Module &M) {
return false;
}
-void DXILResourceBindingWrapperPass::releaseMemory() { Map.reset(); }
+void DXILResourceBindingWrapperPass::releaseMemory() {
+ /*Map.reset();*/ }
void DXILResourceBindingWrapperPass::print(raw_ostream &OS,
const Module *M) const {
diff --git a/llvm/unittests/Target/DirectX/CMakeLists.txt b/llvm/unittests/Target/DirectX/CMakeLists.txt
index 626c0d6384268..4aed48c0b9a2a 100644
--- a/llvm/unittests/Target/DirectX/CMakeLists.txt
+++ b/llvm/unittests/Target/DirectX/CMakeLists.txt
@@ -14,4 +14,5 @@ set(LLVM_LINK_COMPONENTS
add_llvm_target_unittest(DirectXTests
CBufferDataLayoutTests.cpp
PointerTypeAnalysisTests.cpp
+ UniqueResourceFromUseTests.cpp
)
diff --git a/llvm/unittests/Target/DirectX/UniqueResourceFromUseTests.cpp b/llvm/unittests/Target/DirectX/UniqueResourceFromUseTests.cpp
new file mode 100644
index 0000000000000..08e9cc77d166a
--- /dev/null
+++ b/llvm/unittests/Target/DirectX/UniqueResourceFromUseTests.cpp
@@ -0,0 +1,87 @@
+//===- llvm/unittests/Target/DirectX/PointerTypeAnalysisTests.cpp ---------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#include "DirectXIRPasses/PointerTypeAnalysis.h"
+#include "llvm/Analysis/DXILResource.h"
+#include "llvm/AsmParser/Parser.h"
+#include "llvm/IR/Instructions.h"
+#include "llvm/IR/LLVMContext.h"
+#include "llvm/IR/Module.h"
+#include "llvm/IR/Type.h"
+#include "llvm/IR/TypedPointerType.h"
+#include "llvm/Support/Casting.h"
+#include "llvm/Support/SourceMgr.h"
+#include "llvm/Transforms/Utils/Debugify.h"
+
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
+
+using ::testing::Contains;
+using ::testing::Pair;
+
+using namespace llvm;
+using namespace llvm::dxil;
+
+template <typename T> struct IsA {
+ friend bool operator==(const Value *V, const IsA &) { return isa<T>(V); }
+};
+
+TEST(UniqueResourceFromUse, TestTrivialUse) {
+ StringRef Assembly = R"(
+define void @main() {
+entry:
+ %handle = call target("dx.RawBuffer", float, 1, 0) @llvm.dx.resource.handlefrombinding.tdx.RawBuffer_f32_1_0t(i32 1, i32 2, i32 3, i32 4, i1 false)
+ call void @a.func(target("dx.RawBuffer", float, 1, 0) %handle)
+ ret void
+}
+
+declare target("dx.RawBuffer", float, 1, 0) @llvm.dx.resource.handlefrombinding.tdx.RawBuffer_f32_1_0t(i32, i32, i32, i32, i1)
+
+declare void @a.func(target("dx.RawBuffer", float, 1, 0) %handle)
+ )";
+
+ LLVMContext Context;
+ SMDiagnostic Error;
+ auto M = parseAssemblyString(Assembly, Error, Context);
+ ASSERT_TRUE(M) << "Bad assembly?";
+ DebugifyCustomPassManager Passes;
+ Passes.add(createDXILResourceTypeWrapperPassPass());
+ DXILResourceBindingWrapperPass* RBPass = new DXILResourceBindingWrapperPass();
+ Passes.add(RBPass);
+ Passes.run(*M);
+
+ const DXILBindingMap &DBM = RBPass->getBindingMap();
+ for (const Function& F : M->functions()) {
+ if (F.getName() != "a.func") {
+ continue;
+ }
+
+ unsigned CalledResources = 0;
+
+ for (const User* U : F.users()) {
+ const CallInst* CI = dyn_cast<CallInst>(U);
+ ASSERT_TRUE(CI) << "All users of @a.func must be CallInst";
+
+ const Value* Handle = CI->getArgOperand(0);
+
+ const auto* It = DBM.findByUse(Handle);
+ ASSERT_TRUE(It != DBM.end()) << "Handle should resolve into resource";
+
+ const llvm::dxil::ResourceBindingInfo::ResourceBinding& Binding = It->getBinding();
+ EXPECT_EQ(0u, Binding.RecordID);
+ EXPECT_EQ(1u, Binding.Space);
+ EXPECT_EQ(2u, Binding.LowerBound);
+ EXPECT_EQ(3u, Binding.Size);
+
+ CalledResources++;
+ }
+
+ EXPECT_EQ(1u, CalledResources) << "Expected exactly 1 resolved call to create resource";
+ }
+
+}
>From e7d1042457256b5580125f6a72789ad191f05b3f Mon Sep 17 00:00:00 2001
From: Ashley Coleman <ascoleman at microsoft.com>
Date: Mon, 10 Feb 2025 10:39:36 -0700
Subject: [PATCH 2/9] format
---
llvm/lib/Analysis/DXILResource.cpp | 29 ++++++++++---------
.../DirectX/UniqueResourceFromUseTests.cpp | 19 ++++++------
2 files changed, 25 insertions(+), 23 deletions(-)
diff --git a/llvm/lib/Analysis/DXILResource.cpp b/llvm/lib/Analysis/DXILResource.cpp
index 56957a7ea09b6..bcf8fed90bcad 100644
--- a/llvm/lib/Analysis/DXILResource.cpp
+++ b/llvm/lib/Analysis/DXILResource.cpp
@@ -770,21 +770,22 @@ void DXILBindingMap::print(raw_ostream &OS, DXILResourceTypeMap &DRTM,
}
}
-SmallVector<dxil::ResourceBindingInfo>::const_iterator DXILBindingMap::findByUse(const Value *Key) const {
- const CallInst *CI = dyn_cast<CallInst>(Key);
- if (!CI) {
- // TODO: Any other cases to follow up the tree?
- return Infos.end();
- }
-
- switch (CI->getIntrinsicID()) {
- case Intrinsic::not_intrinsic:
- return Infos.end();
- case Intrinsic::dx_resource_handlefrombinding:
- return find(CI);
- }
+SmallVector<dxil::ResourceBindingInfo>::const_iterator
+DXILBindingMap::findByUse(const Value *Key) const {
+ const CallInst *CI = dyn_cast<CallInst>(Key);
+ if (!CI) {
+ // TODO: Any other cases to follow up the tree?
+ return Infos.end();
+ }
+ switch (CI->getIntrinsicID()) {
+ case Intrinsic::not_intrinsic:
return Infos.end();
+ case Intrinsic::dx_resource_handlefrombinding:
+ return find(CI);
+ }
+
+ return Infos.end();
}
//===----------------------------------------------------------------------===//
@@ -845,7 +846,7 @@ bool DXILResourceBindingWrapperPass::runOnModule(Module &M) {
return false;
}
-void DXILResourceBindingWrapperPass::releaseMemory() {
+void DXILResourceBindingWrapperPass::releaseMemory() {
/*Map.reset();*/ }
void DXILResourceBindingWrapperPass::print(raw_ostream &OS,
diff --git a/llvm/unittests/Target/DirectX/UniqueResourceFromUseTests.cpp b/llvm/unittests/Target/DirectX/UniqueResourceFromUseTests.cpp
index 08e9cc77d166a..1f40ccebd4a3c 100644
--- a/llvm/unittests/Target/DirectX/UniqueResourceFromUseTests.cpp
+++ b/llvm/unittests/Target/DirectX/UniqueResourceFromUseTests.cpp
@@ -51,28 +51,29 @@ declare void @a.func(target("dx.RawBuffer", float, 1, 0) %handle)
ASSERT_TRUE(M) << "Bad assembly?";
DebugifyCustomPassManager Passes;
Passes.add(createDXILResourceTypeWrapperPassPass());
- DXILResourceBindingWrapperPass* RBPass = new DXILResourceBindingWrapperPass();
+ DXILResourceBindingWrapperPass *RBPass = new DXILResourceBindingWrapperPass();
Passes.add(RBPass);
Passes.run(*M);
const DXILBindingMap &DBM = RBPass->getBindingMap();
- for (const Function& F : M->functions()) {
+ for (const Function &F : M->functions()) {
if (F.getName() != "a.func") {
continue;
}
unsigned CalledResources = 0;
- for (const User* U : F.users()) {
- const CallInst* CI = dyn_cast<CallInst>(U);
+ for (const User *U : F.users()) {
+ const CallInst *CI = dyn_cast<CallInst>(U);
ASSERT_TRUE(CI) << "All users of @a.func must be CallInst";
- const Value* Handle = CI->getArgOperand(0);
+ const Value *Handle = CI->getArgOperand(0);
- const auto* It = DBM.findByUse(Handle);
+ const auto *It = DBM.findByUse(Handle);
ASSERT_TRUE(It != DBM.end()) << "Handle should resolve into resource";
- const llvm::dxil::ResourceBindingInfo::ResourceBinding& Binding = It->getBinding();
+ const llvm::dxil::ResourceBindingInfo::ResourceBinding &Binding =
+ It->getBinding();
EXPECT_EQ(0u, Binding.RecordID);
EXPECT_EQ(1u, Binding.Space);
EXPECT_EQ(2u, Binding.LowerBound);
@@ -81,7 +82,7 @@ declare void @a.func(target("dx.RawBuffer", float, 1, 0) %handle)
CalledResources++;
}
- EXPECT_EQ(1u, CalledResources) << "Expected exactly 1 resolved call to create resource";
+ EXPECT_EQ(1u, CalledResources)
+ << "Expected exactly 1 resolved call to create resource";
}
-
}
>From 09b63733c9edadf42fbebe7e8a8376770cd016cb Mon Sep 17 00:00:00 2001
From: Ashley Coleman <ascoleman at microsoft.com>
Date: Mon, 10 Feb 2025 11:05:00 -0700
Subject: [PATCH 3/9] Add TODOs
---
llvm/lib/Analysis/DXILResource.cpp | 2 ++
1 file changed, 2 insertions(+)
diff --git a/llvm/lib/Analysis/DXILResource.cpp b/llvm/lib/Analysis/DXILResource.cpp
index bcf8fed90bcad..1c34850caa707 100644
--- a/llvm/lib/Analysis/DXILResource.cpp
+++ b/llvm/lib/Analysis/DXILResource.cpp
@@ -780,6 +780,7 @@ DXILBindingMap::findByUse(const Value *Key) const {
switch (CI->getIntrinsicID()) {
case Intrinsic::not_intrinsic:
+ // TODO: Walk the call tree
return Infos.end();
case Intrinsic::dx_resource_handlefrombinding:
return find(CI);
@@ -847,6 +848,7 @@ bool DXILResourceBindingWrapperPass::runOnModule(Module &M) {
}
void DXILResourceBindingWrapperPass::releaseMemory() {
+ // TODO: Can't comment out this code
/*Map.reset();*/ }
void DXILResourceBindingWrapperPass::print(raw_ostream &OS,
>From 2039b3bd934d4a3a2102b6c3001f98099830fc6a Mon Sep 17 00:00:00 2001
From: Ashley Coleman <ascoleman at microsoft.com>
Date: Fri, 14 Feb 2025 15:23:53 -0700
Subject: [PATCH 4/9] Fully implement and add tests
---
llvm/include/llvm/Analysis/DXILResource.h | 2 +-
llvm/lib/Analysis/DXILResource.cpp | 45 +++-
llvm/unittests/Target/DirectX/CMakeLists.txt | 1 +
.../DirectX/UniqueResourceFromUseTests.cpp | 241 +++++++++++++++++-
4 files changed, 265 insertions(+), 24 deletions(-)
diff --git a/llvm/include/llvm/Analysis/DXILResource.h b/llvm/include/llvm/Analysis/DXILResource.h
index 8a861c510c001..9e1e3a6dfc50b 100644
--- a/llvm/include/llvm/Analysis/DXILResource.h
+++ b/llvm/include/llvm/Analysis/DXILResource.h
@@ -448,7 +448,7 @@ class DXILBindingMap {
// Resoloves the use of a resource handle into the unique description of that
// resource by deduping calls to create.
- const_iterator findByUse(const Value *Key) const;
+ SmallVector<dxil::ResourceBindingInfo> findByUse(const Value *Key) const;
const_iterator find(const CallInst *Key) const {
auto Pos = CallMap.find(Key);
diff --git a/llvm/lib/Analysis/DXILResource.cpp b/llvm/lib/Analysis/DXILResource.cpp
index 1c34850caa707..22b365350281b 100644
--- a/llvm/lib/Analysis/DXILResource.cpp
+++ b/llvm/lib/Analysis/DXILResource.cpp
@@ -770,23 +770,48 @@ void DXILBindingMap::print(raw_ostream &OS, DXILResourceTypeMap &DRTM,
}
}
-SmallVector<dxil::ResourceBindingInfo>::const_iterator
+SmallVector<dxil::ResourceBindingInfo>
DXILBindingMap::findByUse(const Value *Key) const {
+ const PHINode *Phi = dyn_cast<PHINode>(Key);
+ if (Phi) {
+ SmallVector<dxil::ResourceBindingInfo> Children;
+ for (const Value *V : Phi->operands()) {
+ Children.append(findByUse(V));
+ }
+ return Children;
+ }
+
const CallInst *CI = dyn_cast<CallInst>(Key);
if (!CI) {
- // TODO: Any other cases to follow up the tree?
- return Infos.end();
+ return {};
}
+ const Type* UseType = CI->getType();
+
switch (CI->getIntrinsicID()) {
- case Intrinsic::not_intrinsic:
- // TODO: Walk the call tree
- return Infos.end();
+ // 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:
- return find(CI);
+ const auto *It = find(CI);
+ if (It == Infos.end())
+ return {};
+ return {*It};
}
- return Infos.end();
+ return {};
}
//===----------------------------------------------------------------------===//
@@ -847,9 +872,7 @@ bool DXILResourceBindingWrapperPass::runOnModule(Module &M) {
return false;
}
-void DXILResourceBindingWrapperPass::releaseMemory() {
- // TODO: Can't comment out this code
- /*Map.reset();*/ }
+void DXILResourceBindingWrapperPass::releaseMemory() { Map.reset(); }
void DXILResourceBindingWrapperPass::print(raw_ostream &OS,
const Module *M) const {
diff --git a/llvm/unittests/Target/DirectX/CMakeLists.txt b/llvm/unittests/Target/DirectX/CMakeLists.txt
index 4aed48c0b9a2a..fd0d5a0dd52c1 100644
--- a/llvm/unittests/Target/DirectX/CMakeLists.txt
+++ b/llvm/unittests/Target/DirectX/CMakeLists.txt
@@ -8,6 +8,7 @@ set(LLVM_LINK_COMPONENTS
Core
DirectXCodeGen
DirectXPointerTypeAnalysis
+ Passes
Support
)
diff --git a/llvm/unittests/Target/DirectX/UniqueResourceFromUseTests.cpp b/llvm/unittests/Target/DirectX/UniqueResourceFromUseTests.cpp
index 1f40ccebd4a3c..7937df3dc40b9 100644
--- a/llvm/unittests/Target/DirectX/UniqueResourceFromUseTests.cpp
+++ b/llvm/unittests/Target/DirectX/UniqueResourceFromUseTests.cpp
@@ -7,19 +7,25 @@
//===----------------------------------------------------------------------===//
#include "DirectXIRPasses/PointerTypeAnalysis.h"
+#include "DirectXTargetMachine.h"
#include "llvm/Analysis/DXILResource.h"
#include "llvm/AsmParser/Parser.h"
+#include "llvm/CodeGen/CommandFlags.h"
#include "llvm/IR/Instructions.h"
#include "llvm/IR/LLVMContext.h"
#include "llvm/IR/Module.h"
#include "llvm/IR/Type.h"
#include "llvm/IR/TypedPointerType.h"
+#include "llvm/MC/TargetRegistry.h"
+#include "llvm/Passes/PassBuilder.h"
#include "llvm/Support/Casting.h"
+#include "llvm/Support/CodeGen.h"
#include "llvm/Support/SourceMgr.h"
#include "llvm/Transforms/Utils/Debugify.h"
#include "gmock/gmock.h"
#include "gtest/gtest.h"
+#include <optional>
using ::testing::Contains;
using ::testing::Pair;
@@ -31,31 +37,153 @@ template <typename T> struct IsA {
friend bool operator==(const Value *V, const IsA &) { return isa<T>(V); }
};
-TEST(UniqueResourceFromUse, TestTrivialUse) {
+namespace {
+class UniqueResourceFromUseTest : public testing::Test {
+protected:
+ PassBuilder *PB;
+ ModuleAnalysisManager* MAM;
+
+ virtual void SetUp() {
+ MAM = new ModuleAnalysisManager();
+ PB = new PassBuilder();
+ PB->registerModuleAnalyses(*MAM);
+ MAM->registerPass([&]{ return DXILResourceTypeAnalysis(); });
+ MAM->registerPass([&] { return DXILResourceBindingAnalysis(); });
+ }
+
+ virtual void TearDown() {
+ delete PB;
+ delete MAM;
+ }
+};
+
+TEST_F(UniqueResourceFromUseTest, TestTrivialUse) {
StringRef Assembly = R"(
define void @main() {
entry:
%handle = call target("dx.RawBuffer", float, 1, 0) @llvm.dx.resource.handlefrombinding.tdx.RawBuffer_f32_1_0t(i32 1, i32 2, i32 3, i32 4, i1 false)
call void @a.func(target("dx.RawBuffer", float, 1, 0) %handle)
+ call void @a.func(target("dx.RawBuffer", float, 1, 0) %handle)
+ ret void
+}
+
+declare target("dx.RawBuffer", float, 1, 0) @llvm.dx.resource.handlefrombinding.tdx.RawBuffer_f32_1_0t(i32, i32, i32, i32, i1)
+declare void @a.func(target("dx.RawBuffer", float, 1, 0) %handle)
+ )";
+
+ LLVMContext Context;
+ SMDiagnostic Error;
+ auto M = parseAssemblyString(Assembly, Error, Context);
+ ASSERT_TRUE(M) << "Bad assembly?";
+
+ const DXILBindingMap &DBM = MAM->getResult<DXILResourceBindingAnalysis>(*M);
+ for (const Function &F : M->functions()) {
+ if (F.getName() != "a.func") {
+ continue;
+ }
+
+ unsigned CalledResources = 0;
+
+ for (const User *U : F.users()) {
+ const CallInst *CI = dyn_cast<CallInst>(U);
+ ASSERT_TRUE(CI) << "All users of @a.func must be CallInst";
+
+ const Value *Handle = CI->getArgOperand(0);
+
+ const auto Bindings = DBM.findByUse(Handle);
+ ASSERT_EQ(Bindings.size(), 1u) << "Handle should resolve into one resource";
+
+ auto Binding = Bindings[0].getBinding();
+ EXPECT_EQ(0u, Binding.RecordID);
+ EXPECT_EQ(1u, Binding.Space);
+ EXPECT_EQ(2u, Binding.LowerBound);
+ EXPECT_EQ(3u, Binding.Size);
+
+ CalledResources++;
+ }
+
+ EXPECT_EQ(2u, CalledResources)
+ << "Expected 2 resolved call to create resource";
+ }
+}
+
+TEST_F(UniqueResourceFromUseTest, TestIndirectUse) {
+ StringRef Assembly = R"(
+define void @foo() {
+ %handle = call target("dx.RawBuffer", float, 1, 0) @llvm.dx.resource.handlefrombinding.tdx.RawBuffer_f32_1_0t(i32 1, i32 2, i32 3, i32 4, i1 false)
+ %handle2 = call target("dx.RawBuffer", float, 1, 0) @ind.func(target("dx.RawBuffer", float, 1, 0) %handle)
+ %handle3 = call target("dx.RawBuffer", float, 1, 0) @ind.func(target("dx.RawBuffer", float, 1, 0) %handle2)
+ %handle4 = call target("dx.RawBuffer", float, 1, 0) @ind.func(target("dx.RawBuffer", float, 1, 0) %handle3)
+ call void @a.func(target("dx.RawBuffer", float, 1, 0) %handle4)
ret void
}
declare target("dx.RawBuffer", float, 1, 0) @llvm.dx.resource.handlefrombinding.tdx.RawBuffer_f32_1_0t(i32, i32, i32, i32, i1)
+declare void @a.func(target("dx.RawBuffer", float, 1, 0) %handle)
+declare target("dx.RawBuffer", float, 1, 0) @ind.func(target("dx.RawBuffer", float, 1, 0) %handle)
+ )";
+
+ LLVMContext Context;
+ SMDiagnostic Error;
+ auto M = parseAssemblyString(Assembly, Error, Context);
+ ASSERT_TRUE(M) << "Bad assembly?";
+
+ const DXILBindingMap &DBM = MAM->getResult<DXILResourceBindingAnalysis>(*M);
+ for (const Function &F : M->functions()) {
+ if (F.getName() != "a.func") {
+ continue;
+ }
+
+ unsigned CalledResources = 0;
+
+ for (const User *U : F.users()) {
+ const CallInst *CI = dyn_cast<CallInst>(U);
+ ASSERT_TRUE(CI) << "All users of @a.func must be CallInst";
+
+ const Value *Handle = CI->getArgOperand(0);
+ const auto Bindings = DBM.findByUse(Handle);
+ ASSERT_EQ(Bindings.size(), 1u) << "Handle should resolve into one resource";
+
+ auto Binding = Bindings[0].getBinding();
+ EXPECT_EQ(0u, Binding.RecordID);
+ EXPECT_EQ(1u, Binding.Space);
+ EXPECT_EQ(2u, Binding.LowerBound);
+ EXPECT_EQ(3u, Binding.Size);
+
+ CalledResources++;
+ }
+
+ EXPECT_EQ(1u, CalledResources)
+ << "Expected 1 resolved call to create resource";
+ }
+}
+
+TEST_F(UniqueResourceFromUseTest, TestAmbigousIndirectUse) {
+ StringRef Assembly = R"(
+define void @foo() {
+ %foo = call target("dx.RawBuffer", float, 1, 0) @llvm.dx.resource.handlefrombinding.tdx.RawBuffer_f32_1_0t(i32 1, i32 1, i32 1, i32 1, i1 false)
+ %bar = call target("dx.RawBuffer", float, 1, 0) @llvm.dx.resource.handlefrombinding.tdx.RawBuffer_f32_1_0t(i32 2, i32 2, i32 2, i32 2, i1 false)
+ %baz = call target("dx.RawBuffer", float, 1, 0) @llvm.dx.resource.handlefrombinding.tdx.RawBuffer_f32_1_0t(i32 3, i32 3, i32 3, i32 3, i1 false)
+ %bat = call target("dx.RawBuffer", float, 1, 0) @llvm.dx.resource.handlefrombinding.tdx.RawBuffer_f32_1_0t(i32 4, i32 4, i32 4, i32 4, i1 false)
+ %a = call target("dx.RawBuffer", float, 1, 0) @ind.func(target("dx.RawBuffer", float, 1, 0) %foo, target("dx.RawBuffer", float, 1, 0) %bar)
+ %b = call target("dx.RawBuffer", float, 1, 0) @ind.func(target("dx.RawBuffer", float, 1, 0) %baz, target("dx.RawBuffer", float, 1, 0) %bat)
+ %handle = call target("dx.RawBuffer", float, 1, 0) @ind.func(target("dx.RawBuffer", float, 1, 0) %a, target("dx.RawBuffer", float, 1, 0) %b)
+ call void @a.func(target("dx.RawBuffer", float, 1, 0) %handle)
+ ret void
+}
+
+declare target("dx.RawBuffer", float, 1, 0) @llvm.dx.resource.handlefrombinding.tdx.RawBuffer_f32_1_0t(i32, i32, i32, i32, i1)
declare void @a.func(target("dx.RawBuffer", float, 1, 0) %handle)
+declare target("dx.RawBuffer", float, 1, 0) @ind.func(target("dx.RawBuffer", float, 1, 0) %x, target("dx.RawBuffer", float, 1, 0) %y)
)";
LLVMContext Context;
SMDiagnostic Error;
auto M = parseAssemblyString(Assembly, Error, Context);
ASSERT_TRUE(M) << "Bad assembly?";
- DebugifyCustomPassManager Passes;
- Passes.add(createDXILResourceTypeWrapperPassPass());
- DXILResourceBindingWrapperPass *RBPass = new DXILResourceBindingWrapperPass();
- Passes.add(RBPass);
- Passes.run(*M);
- const DXILBindingMap &DBM = RBPass->getBindingMap();
+ const DXILBindingMap &DBM = MAM->getResult<DXILResourceBindingAnalysis>(*M);
for (const Function &F : M->functions()) {
if (F.getName() != "a.func") {
continue;
@@ -69,20 +197,109 @@ declare void @a.func(target("dx.RawBuffer", float, 1, 0) %handle)
const Value *Handle = CI->getArgOperand(0);
- const auto *It = DBM.findByUse(Handle);
- ASSERT_TRUE(It != DBM.end()) << "Handle should resolve into resource";
+ const auto Bindings = DBM.findByUse(Handle);
+ ASSERT_EQ(Bindings.size(), 4u) << "Handle should resolve into four resources";
- const llvm::dxil::ResourceBindingInfo::ResourceBinding &Binding =
- It->getBinding();
+ auto Binding = Bindings[0].getBinding();
EXPECT_EQ(0u, Binding.RecordID);
EXPECT_EQ(1u, Binding.Space);
+ EXPECT_EQ(1u, Binding.LowerBound);
+ EXPECT_EQ(1u, Binding.Size);
+
+ Binding = Bindings[1].getBinding();
+ EXPECT_EQ(1u, Binding.RecordID);
+ EXPECT_EQ(2u, Binding.Space);
EXPECT_EQ(2u, Binding.LowerBound);
+ EXPECT_EQ(2u, Binding.Size);
+
+ Binding = Bindings[2].getBinding();
+ EXPECT_EQ(2u, Binding.RecordID);
+ EXPECT_EQ(3u, Binding.Space);
+ EXPECT_EQ(3u, Binding.LowerBound);
EXPECT_EQ(3u, Binding.Size);
+ Binding = Bindings[3].getBinding();
+ EXPECT_EQ(3u, Binding.RecordID);
+ EXPECT_EQ(4u, Binding.Space);
+ EXPECT_EQ(4u, Binding.LowerBound);
+ EXPECT_EQ(4u, Binding.Size);
+
+ CalledResources++;
+ }
+
+ EXPECT_EQ(1u, CalledResources)
+ << "Expected 1 resolved call to create resource";
+ }
+}
+
+TEST_F(UniqueResourceFromUseTest, TestConditionalUse) {
+ StringRef Assembly = R"(
+define void @foo(i32 %n) {
+entry:
+ %x = call target("dx.RawBuffer", float, 1, 0) @llvm.dx.resource.handlefrombinding.tdx.RawBuffer_f32_1_0t(i32 1, i32 1, i32 1, i32 1, i1 false)
+ %y = call target("dx.RawBuffer", float, 1, 0) @llvm.dx.resource.handlefrombinding.tdx.RawBuffer_f32_1_0t(i32 4, i32 4, i32 4, i32 4, i1 false)
+ %cond = icmp eq i32 %n, 0
+ br i1 %cond, label %bb.true, label %bb.false
+
+bb.true:
+ %handle_t = call target("dx.RawBuffer", float, 1, 0) @ind.func(target("dx.RawBuffer", float, 1, 0) %x)
+ br label %bb.exit
+
+bb.false:
+ %handle_f = call target("dx.RawBuffer", float, 1, 0) @ind.func(target("dx.RawBuffer", float, 1, 0) %y)
+ br label %bb.exit
+
+bb.exit:
+ %handle = phi target("dx.RawBuffer", float, 1, 0) [ %handle_t, %bb.true ], [ %handle_f, %bb.false ]
+ call void @a.func(target("dx.RawBuffer", float, 1, 0) %handle)
+ ret void
+}
+
+declare target("dx.RawBuffer", float, 1, 0) @llvm.dx.resource.handlefrombinding.tdx.RawBuffer_f32_1_0t(i32, i32, i32, i32, i1)
+declare void @a.func(target("dx.RawBuffer", float, 1, 0) %handle)
+declare target("dx.RawBuffer", float, 1, 0) @ind.func(target("dx.RawBuffer", float, 1, 0) %x)
+ )";
+
+ LLVMContext Context;
+ SMDiagnostic Error;
+ auto M = parseAssemblyString(Assembly, Error, Context);
+ ASSERT_TRUE(M) << "Bad assembly?";
+
+ const DXILBindingMap &DBM = MAM->getResult<DXILResourceBindingAnalysis>(*M);
+ for (const Function &F : M->functions()) {
+ if (F.getName() != "a.func") {
+ continue;
+ }
+
+ unsigned CalledResources = 0;
+
+ for (const User *U : F.users()) {
+ const CallInst *CI = dyn_cast<CallInst>(U);
+ ASSERT_TRUE(CI) << "All users of @a.func must be CallInst";
+
+ const Value *Handle = CI->getArgOperand(0);
+
+ const auto Bindings = DBM.findByUse(Handle);
+ ASSERT_EQ(Bindings.size(), 2u) << "Handle should resolve into four resources";
+
+ auto Binding = Bindings[0].getBinding();
+ EXPECT_EQ(0u, Binding.RecordID);
+ EXPECT_EQ(1u, Binding.Space);
+ EXPECT_EQ(1u, Binding.LowerBound);
+ EXPECT_EQ(1u, Binding.Size);
+
+ Binding = Bindings[1].getBinding();
+ EXPECT_EQ(1u, Binding.RecordID);
+ EXPECT_EQ(4u, Binding.Space);
+ EXPECT_EQ(4u, Binding.LowerBound);
+ EXPECT_EQ(4u, Binding.Size);
+
CalledResources++;
}
EXPECT_EQ(1u, CalledResources)
- << "Expected exactly 1 resolved call to create resource";
+ << "Expected 1 resolved call to create resource";
}
}
+
+} // namespace
>From f3e3b3fe775dead21777184f7877733b7434120f Mon Sep 17 00:00:00 2001
From: Ashley Coleman <ascoleman at microsoft.com>
Date: Fri, 14 Feb 2025 15:24:24 -0700
Subject: [PATCH 5/9] format
---
llvm/lib/Analysis/DXILResource.cpp | 14 +++++-----
.../DirectX/UniqueResourceFromUseTests.cpp | 28 +++++++++++--------
2 files changed, 23 insertions(+), 19 deletions(-)
diff --git a/llvm/lib/Analysis/DXILResource.cpp b/llvm/lib/Analysis/DXILResource.cpp
index 22b365350281b..25ff7db7a4d71 100644
--- a/llvm/lib/Analysis/DXILResource.cpp
+++ b/llvm/lib/Analysis/DXILResource.cpp
@@ -776,7 +776,7 @@ DXILBindingMap::findByUse(const Value *Key) const {
if (Phi) {
SmallVector<dxil::ResourceBindingInfo> Children;
for (const Value *V : Phi->operands()) {
- Children.append(findByUse(V));
+ Children.append(findByUse(V));
}
return Children;
}
@@ -786,7 +786,7 @@ DXILBindingMap::findByUse(const Value *Key) const {
return {};
}
- const Type* UseType = CI->getType();
+ const Type *UseType = CI->getType();
switch (CI->getIntrinsicID()) {
// Check if any of the parameters are the resource we are following. If so
@@ -794,11 +794,11 @@ DXILBindingMap::findByUse(const Value *Key) const {
case Intrinsic::not_intrinsic: {
SmallVector<dxil::ResourceBindingInfo> Children;
for (const Value *V : CI->args()) {
- if (V->getType() != UseType) {
- continue;
- }
+ if (V->getType() != UseType) {
+ continue;
+ }
- Children.append(findByUse(V));
+ Children.append(findByUse(V));
}
return Children;
@@ -807,7 +807,7 @@ DXILBindingMap::findByUse(const Value *Key) const {
case Intrinsic::dx_resource_handlefrombinding:
const auto *It = find(CI);
if (It == Infos.end())
- return {};
+ return {};
return {*It};
}
diff --git a/llvm/unittests/Target/DirectX/UniqueResourceFromUseTests.cpp b/llvm/unittests/Target/DirectX/UniqueResourceFromUseTests.cpp
index 7937df3dc40b9..5ad7330f05a45 100644
--- a/llvm/unittests/Target/DirectX/UniqueResourceFromUseTests.cpp
+++ b/llvm/unittests/Target/DirectX/UniqueResourceFromUseTests.cpp
@@ -41,17 +41,17 @@ namespace {
class UniqueResourceFromUseTest : public testing::Test {
protected:
PassBuilder *PB;
- ModuleAnalysisManager* MAM;
+ ModuleAnalysisManager *MAM;
virtual void SetUp() {
- MAM = new ModuleAnalysisManager();
- PB = new PassBuilder();
- PB->registerModuleAnalyses(*MAM);
- MAM->registerPass([&]{ return DXILResourceTypeAnalysis(); });
- MAM->registerPass([&] { return DXILResourceBindingAnalysis(); });
+ MAM = new ModuleAnalysisManager();
+ PB = new PassBuilder();
+ PB->registerModuleAnalyses(*MAM);
+ MAM->registerPass([&] { return DXILResourceTypeAnalysis(); });
+ MAM->registerPass([&] { return DXILResourceBindingAnalysis(); });
}
- virtual void TearDown() {
+ virtual void TearDown() {
delete PB;
delete MAM;
}
@@ -91,7 +91,8 @@ declare void @a.func(target("dx.RawBuffer", float, 1, 0) %handle)
const Value *Handle = CI->getArgOperand(0);
const auto Bindings = DBM.findByUse(Handle);
- ASSERT_EQ(Bindings.size(), 1u) << "Handle should resolve into one resource";
+ ASSERT_EQ(Bindings.size(), 1u)
+ << "Handle should resolve into one resource";
auto Binding = Bindings[0].getBinding();
EXPECT_EQ(0u, Binding.RecordID);
@@ -143,7 +144,8 @@ declare target("dx.RawBuffer", float, 1, 0) @ind.func(target("dx.RawBuffer", flo
const Value *Handle = CI->getArgOperand(0);
const auto Bindings = DBM.findByUse(Handle);
- ASSERT_EQ(Bindings.size(), 1u) << "Handle should resolve into one resource";
+ ASSERT_EQ(Bindings.size(), 1u)
+ << "Handle should resolve into one resource";
auto Binding = Bindings[0].getBinding();
EXPECT_EQ(0u, Binding.RecordID);
@@ -198,7 +200,8 @@ declare target("dx.RawBuffer", float, 1, 0) @ind.func(target("dx.RawBuffer", flo
const Value *Handle = CI->getArgOperand(0);
const auto Bindings = DBM.findByUse(Handle);
- ASSERT_EQ(Bindings.size(), 4u) << "Handle should resolve into four resources";
+ ASSERT_EQ(Bindings.size(), 4u)
+ << "Handle should resolve into four resources";
auto Binding = Bindings[0].getBinding();
EXPECT_EQ(0u, Binding.RecordID);
@@ -280,7 +283,8 @@ declare target("dx.RawBuffer", float, 1, 0) @ind.func(target("dx.RawBuffer", flo
const Value *Handle = CI->getArgOperand(0);
const auto Bindings = DBM.findByUse(Handle);
- ASSERT_EQ(Bindings.size(), 2u) << "Handle should resolve into four resources";
+ ASSERT_EQ(Bindings.size(), 2u)
+ << "Handle should resolve into four resources";
auto Binding = Bindings[0].getBinding();
EXPECT_EQ(0u, Binding.RecordID);
@@ -302,4 +306,4 @@ declare target("dx.RawBuffer", float, 1, 0) @ind.func(target("dx.RawBuffer", flo
}
}
-} // namespace
+} // namespace
>From cd70254847bb4a943efc2bffa7b89656b9dd4ebd Mon Sep 17 00:00:00 2001
From: Ashley Coleman <ascoleman at microsoft.com>
Date: Fri, 14 Feb 2025 15:32:09 -0700
Subject: [PATCH 6/9] Fix warnings
---
.../Target/DirectX/UniqueResourceFromUseTests.cpp | 14 --------------
1 file changed, 14 deletions(-)
diff --git a/llvm/unittests/Target/DirectX/UniqueResourceFromUseTests.cpp b/llvm/unittests/Target/DirectX/UniqueResourceFromUseTests.cpp
index 5ad7330f05a45..a07924262f14a 100644
--- a/llvm/unittests/Target/DirectX/UniqueResourceFromUseTests.cpp
+++ b/llvm/unittests/Target/DirectX/UniqueResourceFromUseTests.cpp
@@ -6,7 +6,6 @@
//
//===----------------------------------------------------------------------===//
-#include "DirectXIRPasses/PointerTypeAnalysis.h"
#include "DirectXTargetMachine.h"
#include "llvm/Analysis/DXILResource.h"
#include "llvm/AsmParser/Parser.h"
@@ -15,28 +14,15 @@
#include "llvm/IR/LLVMContext.h"
#include "llvm/IR/Module.h"
#include "llvm/IR/Type.h"
-#include "llvm/IR/TypedPointerType.h"
-#include "llvm/MC/TargetRegistry.h"
#include "llvm/Passes/PassBuilder.h"
#include "llvm/Support/Casting.h"
-#include "llvm/Support/CodeGen.h"
#include "llvm/Support/SourceMgr.h"
-#include "llvm/Transforms/Utils/Debugify.h"
-#include "gmock/gmock.h"
#include "gtest/gtest.h"
-#include <optional>
-
-using ::testing::Contains;
-using ::testing::Pair;
using namespace llvm;
using namespace llvm::dxil;
-template <typename T> struct IsA {
- friend bool operator==(const Value *V, const IsA &) { return isa<T>(V); }
-};
-
namespace {
class UniqueResourceFromUseTest : public testing::Test {
protected:
>From d2f17eb7aca81817b6e96bb5e157cc5fc4787ae5 Mon Sep 17 00:00:00 2001
From: Ashley Coleman <ascoleman at microsoft.com>
Date: Tue, 18 Feb 2025 12:25:45 -0700
Subject: [PATCH 7/9] address comments
---
llvm/include/llvm/Analysis/DXILResource.h | 7 +++++--
llvm/lib/Analysis/DXILResource.cpp | 12 ++++-------
.../DirectX/UniqueResourceFromUseTests.cpp | 20 ++++---------------
3 files changed, 13 insertions(+), 26 deletions(-)
diff --git a/llvm/include/llvm/Analysis/DXILResource.h b/llvm/include/llvm/Analysis/DXILResource.h
index 9e1e3a6dfc50b..d4c0435008fec 100644
--- a/llvm/include/llvm/Analysis/DXILResource.h
+++ b/llvm/include/llvm/Analysis/DXILResource.h
@@ -446,8 +446,11 @@ class DXILBindingMap {
return Pos == CallMap.end() ? Infos.end() : (Infos.begin() + Pos->second);
}
- // Resoloves the use of a resource handle into the unique description of that
- // resource by deduping calls to create.
+ /// 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
+ /// ResourceBindingInfo can be used to depuplicate unique handles that
+ /// reference the same resource
SmallVector<dxil::ResourceBindingInfo> findByUse(const Value *Key) const;
const_iterator find(const CallInst *Key) const {
diff --git a/llvm/lib/Analysis/DXILResource.cpp b/llvm/lib/Analysis/DXILResource.cpp
index 25ff7db7a4d71..e8403aa607848 100644
--- a/llvm/lib/Analysis/DXILResource.cpp
+++ b/llvm/lib/Analysis/DXILResource.cpp
@@ -772,8 +772,7 @@ void DXILBindingMap::print(raw_ostream &OS, DXILResourceTypeMap &DRTM,
SmallVector<dxil::ResourceBindingInfo>
DXILBindingMap::findByUse(const Value *Key) const {
- const PHINode *Phi = dyn_cast<PHINode>(Key);
- if (Phi) {
+ if (const PHINode *Phi = dyn_cast<PHINode>(Key)) {
SmallVector<dxil::ResourceBindingInfo> Children;
for (const Value *V : Phi->operands()) {
Children.append(findByUse(V));
@@ -782,9 +781,8 @@ DXILBindingMap::findByUse(const Value *Key) const {
}
const CallInst *CI = dyn_cast<CallInst>(Key);
- if (!CI) {
+ if (!CI)
return {};
- }
const Type *UseType = CI->getType();
@@ -794,9 +792,8 @@ DXILBindingMap::findByUse(const Value *Key) const {
case Intrinsic::not_intrinsic: {
SmallVector<dxil::ResourceBindingInfo> Children;
for (const Value *V : CI->args()) {
- if (V->getType() != UseType) {
+ if (V->getType() != UseType)
continue;
- }
Children.append(findByUse(V));
}
@@ -806,8 +803,7 @@ DXILBindingMap::findByUse(const Value *Key) const {
// Found the create, return the binding
case Intrinsic::dx_resource_handlefrombinding:
const auto *It = find(CI);
- if (It == Infos.end())
- return {};
+ assert(It != Infos.end() && "HandleFromBinding must be in resource map");
return {*It};
}
diff --git a/llvm/unittests/Target/DirectX/UniqueResourceFromUseTests.cpp b/llvm/unittests/Target/DirectX/UniqueResourceFromUseTests.cpp
index a07924262f14a..f272381c0c250 100644
--- a/llvm/unittests/Target/DirectX/UniqueResourceFromUseTests.cpp
+++ b/llvm/unittests/Target/DirectX/UniqueResourceFromUseTests.cpp
@@ -71,11 +71,8 @@ declare void @a.func(target("dx.RawBuffer", float, 1, 0) %handle)
unsigned CalledResources = 0;
for (const User *U : F.users()) {
- const CallInst *CI = dyn_cast<CallInst>(U);
- ASSERT_TRUE(CI) << "All users of @a.func must be CallInst";
-
+ const CallInst *CI = cast<CallInst>(U);
const Value *Handle = CI->getArgOperand(0);
-
const auto Bindings = DBM.findByUse(Handle);
ASSERT_EQ(Bindings.size(), 1u)
<< "Handle should resolve into one resource";
@@ -124,11 +121,8 @@ declare target("dx.RawBuffer", float, 1, 0) @ind.func(target("dx.RawBuffer", flo
unsigned CalledResources = 0;
for (const User *U : F.users()) {
- const CallInst *CI = dyn_cast<CallInst>(U);
- ASSERT_TRUE(CI) << "All users of @a.func must be CallInst";
-
+ const CallInst *CI = cast<CallInst>(U);
const Value *Handle = CI->getArgOperand(0);
-
const auto Bindings = DBM.findByUse(Handle);
ASSERT_EQ(Bindings.size(), 1u)
<< "Handle should resolve into one resource";
@@ -180,11 +174,8 @@ declare target("dx.RawBuffer", float, 1, 0) @ind.func(target("dx.RawBuffer", flo
unsigned CalledResources = 0;
for (const User *U : F.users()) {
- const CallInst *CI = dyn_cast<CallInst>(U);
- ASSERT_TRUE(CI) << "All users of @a.func must be CallInst";
-
+ const CallInst *CI = cast<CallInst>(U);
const Value *Handle = CI->getArgOperand(0);
-
const auto Bindings = DBM.findByUse(Handle);
ASSERT_EQ(Bindings.size(), 4u)
<< "Handle should resolve into four resources";
@@ -263,11 +254,8 @@ declare target("dx.RawBuffer", float, 1, 0) @ind.func(target("dx.RawBuffer", flo
unsigned CalledResources = 0;
for (const User *U : F.users()) {
- const CallInst *CI = dyn_cast<CallInst>(U);
- ASSERT_TRUE(CI) << "All users of @a.func must be CallInst";
-
+ const CallInst *CI = cast<CallInst>(U);
const Value *Handle = CI->getArgOperand(0);
-
const auto Bindings = DBM.findByUse(Handle);
ASSERT_EQ(Bindings.size(), 2u)
<< "Handle should resolve into four resources";
>From 2ac7284dcced2b30338203446c7d8fa5d9b5de00 Mon Sep 17 00:00:00 2001
From: Ashley Coleman <ascoleman at microsoft.com>
Date: Tue, 18 Feb 2025 13:58:29 -0700
Subject: [PATCH 8/9] Address comments
---
llvm/include/llvm/Analysis/DXILResource.h | 4 +-
llvm/lib/Analysis/DXILResource.cpp | 37 +++++++++----------
.../DirectX/UniqueResourceFromUseTests.cpp | 8 ++--
3 files changed, 24 insertions(+), 25 deletions(-)
diff --git a/llvm/include/llvm/Analysis/DXILResource.h b/llvm/include/llvm/Analysis/DXILResource.h
index d4c0435008fec..db12e06b76ffe 100644
--- a/llvm/include/llvm/Analysis/DXILResource.h
+++ b/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);
diff --git a/llvm/lib/Analysis/DXILResource.cpp b/llvm/lib/Analysis/DXILResource.cpp
index e8403aa607848..abbc690503428 100644
--- a/llvm/lib/Analysis/DXILResource.cpp
+++ b/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;
}
//===----------------------------------------------------------------------===//
diff --git a/llvm/unittests/Target/DirectX/UniqueResourceFromUseTests.cpp b/llvm/unittests/Target/DirectX/UniqueResourceFromUseTests.cpp
index f272381c0c250..54c204111c043 100644
--- a/llvm/unittests/Target/DirectX/UniqueResourceFromUseTests.cpp
+++ b/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";
>From c17776b91ce50cafdb307049883e5abd14399648 Mon Sep 17 00:00:00 2001
From: Ashley Coleman <ascoleman at microsoft.com>
Date: Tue, 18 Feb 2025 13:59:17 -0700
Subject: [PATCH 9/9] format
---
llvm/include/llvm/Analysis/DXILResource.h | 3 ++-
llvm/lib/Analysis/DXILResource.cpp | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/llvm/include/llvm/Analysis/DXILResource.h b/llvm/include/llvm/Analysis/DXILResource.h
index db12e06b76ffe..22f3af97125f0 100644
--- a/llvm/include/llvm/Analysis/DXILResource.h
+++ b/llvm/include/llvm/Analysis/DXILResource.h
@@ -451,7 +451,8 @@ class DXILBindingMap {
/// 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> findCreationInfo(const Value *Key) const;
+ SmallVector<dxil::ResourceBindingInfo>
+ findCreationInfo(const Value *Key) const;
const_iterator find(const CallInst *Key) const {
auto Pos = CallMap.find(Key);
diff --git a/llvm/lib/Analysis/DXILResource.cpp b/llvm/lib/Analysis/DXILResource.cpp
index abbc690503428..a960052eb70fd 100644
--- a/llvm/lib/Analysis/DXILResource.cpp
+++ b/llvm/lib/Analysis/DXILResource.cpp
@@ -790,7 +790,7 @@ DXILBindingMap::findCreationInfo(const Value *Key) const {
const auto *It = find(CI);
assert(It != Infos.end() && "HandleFromBinding must be in resource map");
return {*It};
- }
+ }
default:
break;
}
More information about the llvm-commits
mailing list