Skip to content

Commit d97dce7

Browse files
hekotahekota
committed
code review feedback - omit overload mangling and update comments to match code
1 parent 9953925 commit d97dce7

File tree

3 files changed

+26
-46
lines changed

3 files changed

+26
-46
lines changed

‎llvm/test/CodeGen/DirectX/Metadata/cbuffer_metadata.ll‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,7 @@ define void @test() #0 {
3131
; int2 d;
3232
; }
3333
%CB1.cb_h = call target("dx.CBuffer", target("dx.Layout", %__cblayout_CB1, 24, 0, 4, 8, 16))
34-
@llvm.dx.resource.handlefrombinding.tdx.CBuffer_tdx.Layout_s___cblayout_CB1s_24_0_4_8_16tt(
35-
i32 0, i32 0, i32 1, i32 0, i1 false)
34+
@llvm.dx.resource.handlefrombinding(i32 0, i32 0, i32 1, i32 0, i1 false)
3635
store target("dx.CBuffer", target("dx.Layout", %__cblayout_CB1, 24, 0, 4, 8, 16)) %CB1.cb_h, ptr @CB1.cb, align 4
3736

3837
; cbuffer CB2 : register(b0) {
@@ -46,8 +45,7 @@ define void @test() #0 {
4645
;}
4746

4847
%CB2.cb_h = call target("dx.CBuffer", target("dx.Layout", %__cblayout_CB2, 36, 0, 8, 16, 20, 22, 24, 32))
49-
@llvm.dx.resource.handlefrombinding.tdx.CBuffer_tdx.Layout_s___cblayout_CB2s_36_0_8_16_20_22_24_32tt(
50-
i32 0, i32 1, i32 1, i32 0, i1 false)
48+
@llvm.dx.resource.handlefrombinding(i32 0, i32 1, i32 1, i32 0, i1 false)
5149
store target("dx.CBuffer", target("dx.Layout", %__cblayout_CB2, 36, 0, 8, 16, 20, 22, 24, 32)) %CB2.cb_h, ptr @CB2.cb, align 4
5250

5351
; cbuffer CB3 : register(b5) {
@@ -62,8 +60,7 @@ define void @test() #0 {
6260
; half3 B8;
6361
; }
6462
%CB3.cb_h = call target("dx.CBuffer", target("dx.Layout", %__cblayout_CB3, 96, 0, 16, 28, 32, 56, 64, 80, 84, 90))
65-
@llvm.dx.resource.handlefrombinding.tdx.CBuffer_tdx.Layout_s___cblayout_CB3s_96_0_16_28_32_56_64_80_84_90tt(
66-
i32 15, i32 5, i32 1, i32 0, i1 false)
63+
@llvm.dx.resource.handlefrombinding(i32 15, i32 5, i32 1, i32 0, i1 false)
6764
store target("dx.CBuffer", target("dx.Layout", %__cblayout_CB3, 96, 0, 16, 28, 32, 56, 64, 80, 84, 90)) %CB3.cb_h, ptr @CB3.cb, align 4
6865

6966
ret void

‎llvm/test/CodeGen/DirectX/Metadata/srv_metadata.ll‎

Lines changed: 13 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -34,46 +34,39 @@ target triple = "dxil-pc-shadermodel6.6-compute"
3434
; PRINT-NEXT:; SRV u64 buf T6 t10,space2 1
3535

3636
define void @test() #0 {
37-
; RWBuffer<half4> Buf : register(u0)
37+
; Buffer<half4> Buf : register(u0)
3838
%Zero_h = call target("dx.TypedBuffer", <4 x half>, 0, 0, 0)
39-
@llvm.dx.resource.handlefrombinding.tdx.TypedBuffer_v4f16_0_0_0t(
40-
i32 0, i32 0, i32 1, i32 0, i1 false)
39+
@llvm.dx.resource.handlefrombinding(i32 0, i32 0, i32 1, i32 0, i1 false)
4140
store target("dx.TypedBuffer", <4 x half>, 0, 0, 0) %Zero_h, ptr @Zero, align 4
4241

43-
; RWBuffer<float4> Buf : register(u1)
42+
; Buffer<float4> Buf : register(u1)
4443
%One_h = call target("dx.TypedBuffer", <2 x float>, 0, 0, 0)
45-
@llvm.dx.resource.handlefrombinding.tdx.TypedBuffer_v2f32_0_0_0t(
46-
i32 0, i32 1, i32 1, i32 0, i1 false)
44+
@llvm.dx.resource.handlefrombinding(i32 0, i32 1, i32 1, i32 0, i1 false)
4745
store target("dx.TypedBuffer", <2 x float>, 0, 0, 0) %One_h, ptr @One, align 4
4846

49-
; RWBuffer<double> Two : register(u2);
47+
; Buffer<double> Two : register(u2);
5048
%Two_h = call target("dx.TypedBuffer", double, 0, 0, 0)
51-
@llvm.dx.resource.handlefrombinding.tdx.TypedBuffer_f64_0_0_0t(
52-
i32 0, i32 2, i32 1, i32 0, i1 false)
49+
@llvm.dx.resource.handlefrombinding(i32 0, i32 2, i32 1, i32 0, i1 false)
5350
store target("dx.TypedBuffer", double, 0, 0, 0) %Two_h, ptr @Two, align 4
5451

55-
; RWBuffer<int4> Three : register(u3);
52+
; Buffer<int4> Three : register(u3);
5653
%Three_h = call target("dx.TypedBuffer", <4 x i32>, 0, 0, 1)
57-
@llvm.dx.resource.handlefrombinding.tdx.TypedBuffer_i32_0_0_1t(
58-
i32 0, i32 3, i32 1, i32 0, i1 false)
54+
@llvm.dx.resource.handlefrombinding(i32 0, i32 3, i32 1, i32 0, i1 false)
5955
store target("dx.TypedBuffer", <4 x i32>, 0, 0, 1) %Three_h, ptr @Three, align 4
6056

6157
; ByteAddressBuffer Four : register(u4)
6258
%Four_h = call target("dx.RawBuffer", i8, 0, 0)
63-
@llvm.dx.resource.handlefrombinding.tdx.RawBuffer_i8_0_0t(
64-
i32 0, i32 5, i32 1, i32 0, i1 false)
59+
@llvm.dx.resource.handlefrombinding(i32 0, i32 5, i32 1, i32 0, i1 false)
6560
store target("dx.RawBuffer", i8, 0, 0) %Four_h, ptr @Four, align 4
6661

67-
; StructuredBuffer<int16_t> Five : register(u6);
62+
; StructuredBuffer<int16_t> Five : register(u6);
6863
%Five_h = call target("dx.RawBuffer", i16, 0, 0)
69-
@llvm.dx.resource.handlefrombinding.tdx.RawBuffer_i16_0_0t(
70-
i32 0, i32 6, i32 1, i32 0, i1 false)
64+
@llvm.dx.resource.handlefrombinding(i32 0, i32 6, i32 1, i32 0, i1 false)
7165
store target("dx.RawBuffer", i16, 0, 0) %Five_h, ptr @Five, align 4
7266

73-
; RWBuffer<double> Two : register(u2);
67+
; Buffer<double> Two : register(u2);
7468
%Six_h = call target("dx.TypedBuffer", i64, 0, 0, 0)
75-
@llvm.dx.resource.handlefrombinding.tdx.TypedBuffer_f64_0_0_0t(
76-
i32 2, i32 10, i32 1, i32 0, i1 false)
69+
@llvm.dx.resource.handlefrombinding(i32 2, i32 10, i32 1, i32 0, i1 false)
7770
store target("dx.TypedBuffer", i64, 0, 0, 0) %Six_h, ptr @Six, align 4
7871

7972
ret void

‎llvm/test/CodeGen/DirectX/Metadata/uav_metadata.ll‎

Lines changed: 10 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -45,62 +45,52 @@ target triple = "dxil-pc-shadermodel6.6-compute"
4545
define void @test() #0 {
4646
; RWBuffer<half4> Zero : register(u0)
4747
%Zero_h = call target("dx.TypedBuffer", <4 x half>, 1, 0, 0)
48-
@llvm.dx.resource.handlefrombinding.tdx.TypedBuffer_v4f16_1_0_0t(
49-
i32 0, i32 0, i32 1, i32 0, i1 false)
48+
@llvm.dx.resource.handlefrombinding(i32 0, i32 0, i32 1, i32 0, i1 false)
5049
store target("dx.TypedBuffer", <4 x half>, 1, 0, 0) %Zero_h, ptr @Zero, align 4
5150

5251
; RWBuffer<float4> One : register(u1)
5352
%One_h = call target("dx.TypedBuffer", <2 x float>, 1, 0, 0)
54-
@llvm.dx.resource.handlefrombinding.tdx.TypedBuffer_v2f32_1_0_0t(
55-
i32 0, i32 1, i32 1, i32 0, i1 false)
53+
@llvm.dx.resource.handlefrombinding(i32 0, i32 1, i32 1, i32 0, i1 false)
5654
store target("dx.TypedBuffer", <2 x float>, 1, 0, 0) %One_h, ptr @One, align 4
5755

5856
; RWBuffer<double> Two : register(u2);
5957
%Two_h = call target("dx.TypedBuffer", double, 1, 0, 0)
60-
@llvm.dx.resource.handlefrombinding.tdx.TypedBuffer_f64_1_0_0t(
61-
i32 0, i32 2, i32 1, i32 0, i1 false)
58+
@llvm.dx.resource.handlefrombinding(i32 0, i32 2, i32 1, i32 0, i1 false)
6259
store target("dx.TypedBuffer", double, 1, 0, 0) %Two_h, ptr @Two, align 4
6360

6461
; RWBuffer<int4> Three : register(u3);
6562
%Three_h = call target("dx.TypedBuffer", <4 x i32>, 1, 0, 1)
66-
@llvm.dx.resource.handlefrombinding.tdx.TypedBuffer_i32_1_0_1t(
67-
i32 0, i32 3, i32 1, i32 0, i1 false)
63+
@llvm.dx.resource.handlefrombinding(i32 0, i32 3, i32 1, i32 0, i1 false)
6864
store target("dx.TypedBuffer", <4 x i32>, 1, 0, 1) %Three_h, ptr @Three, align 4
6965

7066
; ByteAddressBuffer Four : register(u5)
7167
%Four_h = call target("dx.RawBuffer", i8, 1, 0)
72-
@llvm.dx.resource.handlefrombinding.tdx.RawBuffer_i8_1_0t(
73-
i32 0, i32 5, i32 1, i32 0, i1 false)
68+
@llvm.dx.resource.handlefrombinding(i32 0, i32 5, i32 1, i32 0, i1 false)
7469
store target("dx.RawBuffer", i8, 1, 0) %Four_h, ptr @Four, align 4
7570

7671
; RWStructuredBuffer<int16_t> Five : register(u6);
7772
%Five_h = call target("dx.RawBuffer", i16, 1, 0)
78-
@llvm.dx.resource.handlefrombinding.tdx.RawBuffer_i16_1_0t(
79-
i32 0, i32 6, i32 1, i32 0, i1 false)
73+
@llvm.dx.resource.handlefrombinding(i32 0, i32 6, i32 1, i32 0, i1 false)
8074
store target("dx.RawBuffer", i16, 1, 0) %Five_h, ptr @Five, align 4
8175

8276
; RasterizerOrderedBuffer<int4> Six : register(u7);
8377
%Six_h = call target("dx.TypedBuffer", <4 x i32>, 1, 1, 1)
84-
@llvm.dx.resource.handlefrombinding.tdx.TypedBuffer_v4i32_1_1_1t(
85-
i32 0, i32 7, i32 1, i32 0, i1 false)
78+
@llvm.dx.resource.handlefrombinding(i32 0, i32 7, i32 1, i32 0, i1 false)
8679
store target("dx.TypedBuffer", <4 x i32>, 1, 1, 1) %Six_h, ptr @Six, align 4
8780

8881
; RasterizerOrderedStructuredBuffer<uint4> Seven : register(u3, space10);
8982
%Seven_h = call target("dx.RawBuffer", <4 x i32>, 1, 1)
90-
@llvm.dx.resource.handlefrombinding.tdx.RawBuffer_v4i32_1_1t(
91-
i32 0, i32 8, i32 1, i32 0, i1 false)
83+
@llvm.dx.resource.handlefrombinding(i32 0, i32 8, i32 1, i32 0, i1 false)
9284
store target("dx.RawBuffer", <4 x i32>, 1, 1) %Seven_h, ptr @Seven, align 4
9385

9486
; RasterizerOrderedByteAddressBuffer Eight : register(u9);
9587
%Eight_h = call target("dx.RawBuffer", i8, 1, 1)
96-
@llvm.dx.resource.handlefrombinding.tdx.RawBuffer_i8_1_1t(
97-
i32 0, i32 9, i32 1, i32 0, i1 false)
88+
@llvm.dx.resource.handlefrombinding(i32 0, i32 9, i32 1, i32 0, i1 false)
9889
store target("dx.RawBuffer", i8, 1, 1) %Eight_h, ptr @Eight, align 4
9990

10091
; RWBuffer<double> Nine : register(u2);
10192
%Nine_h = call target("dx.TypedBuffer", i64, 1, 0, 0)
102-
@llvm.dx.resource.handlefrombinding.tdx.TypedBuffer_f64_1_0_0t(
103-
i32 2, i32 10, i32 1, i32 0, i1 false)
93+
@llvm.dx.resource.handlefrombinding(i32 2, i32 10, i32 1, i32 0, i1 false)
10494
store target("dx.TypedBuffer", i64, 1, 0, 0) %Nine_h, ptr @Nine, align 4
10595

10696
ret void

0 commit comments

Comments
 (0)