Skip to content

Commit fcc318f

Browse files
authored
Revert "[DXIL][Analysis] Implement enough of DXILResourceAnalysis for buffers" (llvm#104504)
Reverts llvm#100699 This broke a few bots unfortunately.
1 parent 290e485 commit fcc318f

File tree

4 files changed

+8
-521
lines changed

4 files changed

+8
-521
lines changed

llvm/include/llvm/Analysis/DXILResource.h

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,20 +18,19 @@
1818
namespace llvm {
1919
class CallInst;
2020
class MDTuple;
21-
class TargetExtType;
2221

2322
namespace dxil {
2423

2524
class ResourceInfo {
2625
struct ResourceBinding {
27-
uint32_t RecordID;
26+
uint32_t UniqueID;
2827
uint32_t Space;
2928
uint32_t LowerBound;
3029
uint32_t Size;
3130

3231
bool operator==(const ResourceBinding &RHS) const {
33-
return std::tie(RecordID, Space, LowerBound, Size) ==
34-
std::tie(RHS.RecordID, RHS.Space, RHS.LowerBound, RHS.Size);
32+
return std::tie(UniqueID, Space, LowerBound, Size) ==
33+
std::tie(RHS.UniqueID, RHS.Space, RHS.LowerBound, RHS.Size);
3534
}
3635
bool operator!=(const ResourceBinding &RHS) const {
3736
return !(*this == RHS);
@@ -129,9 +128,9 @@ class ResourceInfo {
129128
bool isFeedback() const;
130129
bool isMultiSample() const;
131130

132-
void bind(uint32_t RecordID, uint32_t Space, uint32_t LowerBound,
131+
void bind(uint32_t UniqueID, uint32_t Space, uint32_t LowerBound,
133132
uint32_t Size) {
134-
Binding.RecordID = RecordID;
133+
Binding.UniqueID = UniqueID;
135134
Binding.Space = Space;
136135
Binding.LowerBound = LowerBound;
137136
Binding.Size = Size;
@@ -216,8 +215,6 @@ class ResourceInfo {
216215

217216
ResourceBinding getBinding() const { return Binding; }
218217
std::pair<uint32_t, uint32_t> getAnnotateProps() const;
219-
220-
void print(raw_ostream &OS) const;
221218
};
222219

223220
} // namespace dxil

llvm/include/llvm/IR/IntrinsicsDirectX.td

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,6 @@ def int_dx_flattened_thread_id_in_group : Intrinsic<[llvm_i32_ty], [], [IntrNoMe
2020
def int_dx_create_handle : ClangBuiltin<"__builtin_hlsl_create_handle">,
2121
Intrinsic<[ llvm_ptr_ty ], [llvm_i8_ty], [IntrWillReturn]>;
2222

23-
// Create resource handle given binding information. Returns a `target("dx.")`
24-
// type appropriate for the kind of resource given a register space ID, lower
25-
// bound and range size of the binding, as well as an index and an indicator
26-
// whether that index may be non-uniform.
27-
def int_dx_handle_fromBinding
28-
: DefaultAttrsIntrinsic<
29-
[llvm_any_ty],
30-
[llvm_i32_ty, llvm_i32_ty, llvm_i32_ty, llvm_i32_ty, llvm_i1_ty],
31-
[IntrNoMem]>;
32-
3323
def int_dx_all : DefaultAttrsIntrinsic<[llvm_i1_ty], [llvm_any_ty]>;
3424
def int_dx_any : DefaultAttrsIntrinsic<[llvm_i1_ty], [llvm_any_ty]>;
3525
def int_dx_clamp : DefaultAttrsIntrinsic<[llvm_any_ty], [LLVMMatchType<0>, LLVMMatchType<0>, LLVMMatchType<0>]>;

0 commit comments

Comments
 (0)