encounter/dawn-cmake
1
0
Fork 0
mirror of https://github.com/encounter/dawn-cmake.git synced 2025-12-10 05:57:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

writer/hlsl: Simplify UBO accesses for static indexing

Browse Source 
Use the new semantic constant value information to significantly reduce the complex indexing logic emitted for UBO accesses.
This will dramatically reduce the number of `for` loops that are decayed to `while` loops.

Change-Id: I1b0adb5edde2b4ed39c6beafc2e28106b86e0edd
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/57701
Kokoro: Kokoro <noreply+kokoro@google.com>
Reviewed-by: James Price <jrprice@google.com>
This commit is contained in:
Ben Clayton
2021-07-13 12:18:13 +00:00
parent 71f619b6f1
commit 51cfe26bb7
46 changed files with 1712 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
test/buffer/storage/static_index/read.wgsl Normal file
View File

@@ -0,0 +1,33 @@
struct Inner {
x : i32;
};
[[block]]
struct S {
a : vec3<i32>;
b : i32;
c : vec3<u32>;
d : u32;
e : vec3<f32>;
f : f32;
g : mat2x3<f32>;
h : mat3x2<f32>;
i : Inner;
j : [[stride(16)]] array<Inner, 4>;
};
[[binding(0), group(0)]] var<storage, read> s : S;
[[stage(compute), workgroup_size(1)]]
fn main() {
let a = s.a;
let b = s.b;
let c = s.c;
let d = s.d;
let e = s.e;
let f = s.f;
let g = s.g;
let h = s.h;
let i = s.i;
let j = s.j;
}

42
test/buffer/storage/static_index/read.wgsl.expected.hlsl Normal file
View File

@@ -0,0 +1,42 @@
struct Inner {
int x;
};
struct tint_padded_array_element {
Inner el;
};
float2x3 tint_symbol_6(ByteAddressBuffer buffer, uint offset) {
return float2x3(asfloat(buffer.Load3((offset + 0u))), asfloat(buffer.Load3((offset + 16u))));
}
float3x2 tint_symbol_8(ByteAddressBuffer buffer, uint offset) {
return float3x2(asfloat(buffer.Load2((offset + 0u))), asfloat(buffer.Load2((offset + 8u))), asfloat(buffer.Load2((offset + 16u))));
}
Inner tint_symbol_9(ByteAddressBuffer buffer, uint offset) {
const Inner tint_symbol_11 = {asint(buffer.Load((offset + 0u)))};
return tint_symbol_11;
}
typedef tint_padded_array_element tint_symbol_10_ret[4];
tint_symbol_10_ret tint_symbol_10(ByteAddressBuffer buffer, uint offset) {
const tint_padded_array_element tint_symbol_12[4] = {{tint_symbol_9(buffer, (offset + 0u))}, {tint_symbol_9(buffer, (offset + 16u))}, {tint_symbol_9(buffer, (offset + 32u))}, {tint_symbol_9(buffer, (offset + 48u))}};
return tint_symbol_12;
}
ByteAddressBuffer s : register(t0, space0);
[numthreads(1, 1, 1)]
void main() {
const int3 a = asint(s.Load3(0u));
const int b = asint(s.Load(12u));
const uint3 c = s.Load3(16u);
const uint d = s.Load(28u);
const float3 e = asfloat(s.Load3(32u));
const float f = asfloat(s.Load(44u));
const float2x3 g = tint_symbol_6(s, 48u);
const float3x2 h = tint_symbol_8(s, 80u);
const Inner i = tint_symbol_9(s, 104u);
const tint_padded_array_element j[4] = tint_symbol_10(s, 108u);
return;
}

41
test/buffer/storage/static_index/read.wgsl.expected.msl Normal file
View File

@@ -0,0 +1,41 @@
#include <metal_stdlib>
using namespace metal;
struct Inner {
/* 0x0000 */ int x;
};
struct tint_padded_array_element {
/* 0x0000 */ Inner el;
/* 0x0004 */ int8_t tint_pad[12];
};
struct tint_array_wrapper {
/* 0x0000 */ tint_padded_array_element arr[4];
};
struct S {
/* 0x0000 */ packed_int3 a;
/* 0x000c */ int b;
/* 0x0010 */ packed_uint3 c;
/* 0x001c */ uint d;
/* 0x0020 */ packed_float3 e;
/* 0x002c */ float f;
/* 0x0030 */ float2x3 g;
/* 0x0050 */ float3x2 h;
/* 0x0068 */ Inner i;
/* 0x006c */ tint_array_wrapper j;
/* 0x00ac */ int8_t tint_pad_1[4];
};
kernel void tint_symbol(const device S& s [[buffer(0)]]) {
int3 const a = s.a;
int const b = s.b;
uint3 const c = s.c;
uint const d = s.d;
float3 const e = s.e;
float const f = s.f;
float2x3 const g = s.g;
float3x2 const h = s.h;
Inner const i = s.i;
tint_array_wrapper const j = s.j;
return;
}

104
test/buffer/storage/static_index/read.wgsl.expected.spvasm Normal file
View File

@@ -0,0 +1,104 @@
; SPIR-V
; Version: 1.3
; Generator: Google Tint Compiler; 0
; Bound: 59
; Schema: 0
OpCapability Shader
OpMemoryModel Logical GLSL450
OpEntryPoint GLCompute %main "main"
OpExecutionMode %main LocalSize 1 1 1
OpName %S "S"
OpMemberName %S 0 "a"
OpMemberName %S 1 "b"
OpMemberName %S 2 "c"
OpMemberName %S 3 "d"
OpMemberName %S 4 "e"
OpMemberName %S 5 "f"
OpMemberName %S 6 "g"
OpMemberName %S 7 "h"
OpMemberName %S 8 "i"
OpName %Inner "Inner"
OpMemberName %Inner 0 "x"
OpMemberName %S 9 "j"
OpName %s "s"
OpName %main "main"
OpDecorate %S Block
OpMemberDecorate %S 0 Offset 0
OpMemberDecorate %S 1 Offset 12
OpMemberDecorate %S 2 Offset 16
OpMemberDecorate %S 3 Offset 28
OpMemberDecorate %S 4 Offset 32
OpMemberDecorate %S 5 Offset 44
OpMemberDecorate %S 6 Offset 48
OpMemberDecorate %S 6 ColMajor
OpMemberDecorate %S 6 MatrixStride 16
OpMemberDecorate %S 7 Offset 80
OpMemberDecorate %S 7 ColMajor
OpMemberDecorate %S 7 MatrixStride 8
OpMemberDecorate %S 8 Offset 104
OpMemberDecorate %Inner 0 Offset 0
OpMemberDecorate %S 9 Offset 108
OpDecorate %_arr_Inner_uint_4 ArrayStride 16
OpDecorate %s NonWritable
OpDecorate %s Binding 0
OpDecorate %s DescriptorSet 0
%int = OpTypeInt 32 1
%v3int = OpTypeVector %int 3
%uint = OpTypeInt 32 0
%v3uint = OpTypeVector %uint 3
%float = OpTypeFloat 32
%v3float = OpTypeVector %float 3
%mat2v3float = OpTypeMatrix %v3float 2
%v2float = OpTypeVector %float 2
%mat3v2float = OpTypeMatrix %v2float 3
%Inner = OpTypeStruct %int
%uint_4 = OpConstant %uint 4
%_arr_Inner_uint_4 = OpTypeArray %Inner %uint_4
%S = OpTypeStruct %v3int %int %v3uint %uint %v3float %float %mat2v3float %mat3v2float %Inner %_arr_Inner_uint_4
%_ptr_StorageBuffer_S = OpTypePointer StorageBuffer %S
%s = OpVariable %_ptr_StorageBuffer_S StorageBuffer
%void = OpTypeVoid
%16 = OpTypeFunction %void
%uint_0 = OpConstant %uint 0
%_ptr_StorageBuffer_v3int = OpTypePointer StorageBuffer %v3int
%uint_1 = OpConstant %uint 1
%_ptr_StorageBuffer_int = OpTypePointer StorageBuffer %int
%uint_2 = OpConstant %uint 2
%_ptr_StorageBuffer_v3uint = OpTypePointer StorageBuffer %v3uint
%uint_3 = OpConstant %uint 3
%_ptr_StorageBuffer_uint = OpTypePointer StorageBuffer %uint
%_ptr_StorageBuffer_v3float = OpTypePointer StorageBuffer %v3float
%uint_5 = OpConstant %uint 5
%_ptr_StorageBuffer_float = OpTypePointer StorageBuffer %float
%uint_6 = OpConstant %uint 6
%_ptr_StorageBuffer_mat2v3float = OpTypePointer StorageBuffer %mat2v3float
%uint_7 = OpConstant %uint 7
%_ptr_StorageBuffer_mat3v2float = OpTypePointer StorageBuffer %mat3v2float
%uint_8 = OpConstant %uint 8
%_ptr_StorageBuffer_Inner = OpTypePointer StorageBuffer %Inner
%uint_9 = OpConstant %uint 9
%_ptr_StorageBuffer__arr_Inner_uint_4 = OpTypePointer StorageBuffer %_arr_Inner_uint_4
%main = OpFunction %void None %16
%19 = OpLabel
%22 = OpAccessChain %_ptr_StorageBuffer_v3int %s %uint_0
%23 = OpLoad %v3int %22
%26 = OpAccessChain %_ptr_StorageBuffer_int %s %uint_1
%27 = OpLoad %int %26
%30 = OpAccessChain %_ptr_StorageBuffer_v3uint %s %uint_2
%31 = OpLoad %v3uint %30
%34 = OpAccessChain %_ptr_StorageBuffer_uint %s %uint_3
%35 = OpLoad %uint %34
%37 = OpAccessChain %_ptr_StorageBuffer_v3float %s %uint_4
%38 = OpLoad %v3float %37
%41 = OpAccessChain %_ptr_StorageBuffer_float %s %uint_5
%42 = OpLoad %float %41
%45 = OpAccessChain %_ptr_StorageBuffer_mat2v3float %s %uint_6
%46 = OpLoad %mat2v3float %45
%49 = OpAccessChain %_ptr_StorageBuffer_mat3v2float %s %uint_7
%50 = OpLoad %mat3v2float %49
%53 = OpAccessChain %_ptr_StorageBuffer_Inner %s %uint_8
%54 = OpLoad %Inner %53
%57 = OpAccessChain %_ptr_StorageBuffer__arr_Inner_uint_4 %s %uint_9
%58 = OpLoad %_arr_Inner_uint_4 %57
OpReturn
OpFunctionEnd

33
test/buffer/storage/static_index/read.wgsl.expected.wgsl Normal file
View File

@@ -0,0 +1,33 @@
struct Inner {
x : i32;
};
[[block]]
struct S {
a : vec3<i32>;
b : i32;
c : vec3<u32>;
d : u32;
e : vec3<f32>;
f : f32;
g : mat2x3<f32>;
h : mat3x2<f32>;
i : Inner;
j : [[stride(16)]] array<Inner, 4>;
};
[[binding(0), group(0)]] var<storage, read> s : S;
[[stage(compute), workgroup_size(1)]]
fn main() {
let a = s.a;
let b = s.b;
let c = s.c;
let d = s.d;
let e = s.e;
let f = s.f;
let g = s.g;
let h = s.h;
let i = s.i;
let j = s.j;
}

33
test/buffer/storage/static_index/write.wgsl Normal file
View File

@@ -0,0 +1,33 @@
struct Inner {
x : i32;
};
[[block]]
struct S {
a : vec3<i32>;
b : i32;
c : vec3<u32>;
d : u32;
e : vec3<f32>;
f : f32;
g : mat2x3<f32>;
h : mat3x2<f32>;
i : Inner;
j : [[stride(16)]] array<Inner, 4>;
};
[[binding(0), group(0)]] var<storage, write> s : S;
[[stage(compute), workgroup_size(1)]]
fn main() {
s.a = vec3<i32>();
s.b = i32();
s.c = vec3<u32>();
s.d = u32();
s.e = vec3<f32>();
s.f = f32();
s.g = mat2x3<f32>();
s.h = mat3x2<f32>();
s.i = Inner();
s.j = [[stride(16)]] array<Inner, 4>();
}

47
test/buffer/storage/static_index/write.wgsl.expected.hlsl Normal file
View File

@@ -0,0 +1,47 @@
struct Inner {
int x;
};
struct tint_padded_array_element {
Inner el;
};
void tint_symbol_6(RWByteAddressBuffer buffer, uint offset, float2x3 value) {
buffer.Store3((offset + 0u), asuint(value[0u]));
buffer.Store3((offset + 16u), asuint(value[1u]));
}
void tint_symbol_8(RWByteAddressBuffer buffer, uint offset, float3x2 value) {
buffer.Store2((offset + 0u), asuint(value[0u]));
buffer.Store2((offset + 8u), asuint(value[1u]));
buffer.Store2((offset + 16u), asuint(value[2u]));
}
void tint_symbol_9(RWByteAddressBuffer buffer, uint offset, Inner value) {
buffer.Store((offset + 0u), asuint(value.x));
}
void tint_symbol_10(RWByteAddressBuffer buffer, uint offset, tint_padded_array_element value[4]) {
tint_symbol_9(buffer, (offset + 0u), value[0u].el);
tint_symbol_9(buffer, (offset + 16u), value[1u].el);
tint_symbol_9(buffer, (offset + 32u), value[2u].el);
tint_symbol_9(buffer, (offset + 48u), value[3u].el);
}
RWByteAddressBuffer s : register(u0, space0);
[numthreads(1, 1, 1)]
void main() {
s.Store3(0u, asuint(int3(0, 0, 0)));
s.Store(12u, asuint(0));
s.Store3(16u, asuint(uint3(0u, 0u, 0u)));
s.Store(28u, asuint(0u));
s.Store3(32u, asuint(float3(0.0f, 0.0f, 0.0f)));
s.Store(44u, asuint(0.0f));
tint_symbol_6(s, 48u, float2x3(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f));
tint_symbol_8(s, 80u, float3x2(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f));
const Inner tint_symbol_11 = (Inner)0;
tint_symbol_9(s, 104u, tint_symbol_11);
const tint_padded_array_element tint_symbol_12[4] = (tint_padded_array_element[4])0;
tint_symbol_10(s, 108u, tint_symbol_12);
return;
}

43
test/buffer/storage/static_index/write.wgsl.expected.msl Normal file
View File

@@ -0,0 +1,43 @@
#include <metal_stdlib>
using namespace metal;
struct Inner {
/* 0x0000 */ int x;
};
struct tint_padded_array_element {
/* 0x0000 */ Inner el;
/* 0x0004 */ int8_t tint_pad[12];
};
struct tint_array_wrapper {
/* 0x0000 */ tint_padded_array_element arr[4];
};
struct S {
/* 0x0000 */ packed_int3 a;
/* 0x000c */ int b;
/* 0x0010 */ packed_uint3 c;
/* 0x001c */ uint d;
/* 0x0020 */ packed_float3 e;
/* 0x002c */ float f;
/* 0x0030 */ float2x3 g;
/* 0x0050 */ float3x2 h;
/* 0x0068 */ Inner i;
/* 0x006c */ tint_array_wrapper j;
/* 0x00ac */ int8_t tint_pad_1[4];
};
kernel void tint_symbol(device S& s [[buffer(0)]]) {
s.a = int3();
s.b = int();
s.c = uint3();
s.d = uint();
s.e = float3();
s.f = float();
s.g = float2x3();
s.h = float3x2();
Inner const tint_symbol_1 = {};
s.i = tint_symbol_1;
tint_array_wrapper const tint_symbol_2 = {.arr={}};
s.j = tint_symbol_2;
return;
}

114
test/buffer/storage/static_index/write.wgsl.expected.spvasm Normal file
View File

@@ -0,0 +1,114 @@
; SPIR-V
; Version: 1.3
; Generator: Google Tint Compiler; 0
; Bound: 59
; Schema: 0
OpCapability Shader
OpMemoryModel Logical GLSL450
OpEntryPoint GLCompute %main "main"
OpExecutionMode %main LocalSize 1 1 1
OpName %S "S"
OpMemberName %S 0 "a"
OpMemberName %S 1 "b"
OpMemberName %S 2 "c"
OpMemberName %S 3 "d"
OpMemberName %S 4 "e"
OpMemberName %S 5 "f"
OpMemberName %S 6 "g"
OpMemberName %S 7 "h"
OpMemberName %S 8 "i"
OpName %Inner "Inner"
OpMemberName %Inner 0 "x"
OpMemberName %S 9 "j"
OpName %s "s"
OpName %main "main"
OpDecorate %S Block
OpMemberDecorate %S 0 Offset 0
OpMemberDecorate %S 1 Offset 12
OpMemberDecorate %S 2 Offset 16
OpMemberDecorate %S 3 Offset 28
OpMemberDecorate %S 4 Offset 32
OpMemberDecorate %S 5 Offset 44
OpMemberDecorate %S 6 Offset 48
OpMemberDecorate %S 6 ColMajor
OpMemberDecorate %S 6 MatrixStride 16
OpMemberDecorate %S 7 Offset 80
OpMemberDecorate %S 7 ColMajor
OpMemberDecorate %S 7 MatrixStride 8
OpMemberDecorate %S 8 Offset 104
OpMemberDecorate %Inner 0 Offset 0
OpMemberDecorate %S 9 Offset 108
OpDecorate %_arr_Inner_uint_4 ArrayStride 16
OpDecorate %s NonReadable
OpDecorate %s Binding 0
OpDecorate %s DescriptorSet 0
%int = OpTypeInt 32 1
%v3int = OpTypeVector %int 3
%uint = OpTypeInt 32 0
%v3uint = OpTypeVector %uint 3
%float = OpTypeFloat 32
%v3float = OpTypeVector %float 3
%mat2v3float = OpTypeMatrix %v3float 2
%v2float = OpTypeVector %float 2
%mat3v2float = OpTypeMatrix %v2float 3
%Inner = OpTypeStruct %int
%uint_4 = OpConstant %uint 4
%_arr_Inner_uint_4 = OpTypeArray %Inner %uint_4
%S = OpTypeStruct %v3int %int %v3uint %uint %v3float %float %mat2v3float %mat3v2float %Inner %_arr_Inner_uint_4
%_ptr_StorageBuffer_S = OpTypePointer StorageBuffer %S
%s = OpVariable %_ptr_StorageBuffer_S StorageBuffer
%void = OpTypeVoid
%16 = OpTypeFunction %void
%uint_0 = OpConstant %uint 0
%_ptr_StorageBuffer_v3int = OpTypePointer StorageBuffer %v3int
%23 = OpConstantNull %v3int
%uint_1 = OpConstant %uint 1
%_ptr_StorageBuffer_int = OpTypePointer StorageBuffer %int
%27 = OpConstantNull %int
%uint_2 = OpConstant %uint 2
%_ptr_StorageBuffer_v3uint = OpTypePointer StorageBuffer %v3uint
%31 = OpConstantNull %v3uint
%uint_3 = OpConstant %uint 3
%_ptr_StorageBuffer_uint = OpTypePointer StorageBuffer %uint
%35 = OpConstantNull %uint
%_ptr_StorageBuffer_v3float = OpTypePointer StorageBuffer %v3float
%38 = OpConstantNull %v3float
%uint_5 = OpConstant %uint 5
%_ptr_StorageBuffer_float = OpTypePointer StorageBuffer %float
%42 = OpConstantNull %float
%uint_6 = OpConstant %uint 6
%_ptr_StorageBuffer_mat2v3float = OpTypePointer StorageBuffer %mat2v3float
%46 = OpConstantNull %mat2v3float
%uint_7 = OpConstant %uint 7
%_ptr_StorageBuffer_mat3v2float = OpTypePointer StorageBuffer %mat3v2float
%50 = OpConstantNull %mat3v2float
%uint_8 = OpConstant %uint 8
%_ptr_StorageBuffer_Inner = OpTypePointer StorageBuffer %Inner
%54 = OpConstantNull %Inner
%uint_9 = OpConstant %uint 9
%_ptr_StorageBuffer__arr_Inner_uint_4 = OpTypePointer StorageBuffer %_arr_Inner_uint_4
%58 = OpConstantNull %_arr_Inner_uint_4
%main = OpFunction %void None %16
%19 = OpLabel
%22 = OpAccessChain %_ptr_StorageBuffer_v3int %s %uint_0
OpStore %22 %23
%26 = OpAccessChain %_ptr_StorageBuffer_int %s %uint_1
OpStore %26 %27
%30 = OpAccessChain %_ptr_StorageBuffer_v3uint %s %uint_2
OpStore %30 %31
%34 = OpAccessChain %_ptr_StorageBuffer_uint %s %uint_3
OpStore %34 %35
%37 = OpAccessChain %_ptr_StorageBuffer_v3float %s %uint_4
OpStore %37 %38
%41 = OpAccessChain %_ptr_StorageBuffer_float %s %uint_5
OpStore %41 %42
%45 = OpAccessChain %_ptr_StorageBuffer_mat2v3float %s %uint_6
OpStore %45 %46
%49 = OpAccessChain %_ptr_StorageBuffer_mat3v2float %s %uint_7
OpStore %49 %50
%53 = OpAccessChain %_ptr_StorageBuffer_Inner %s %uint_8
OpStore %53 %54
%57 = OpAccessChain %_ptr_StorageBuffer__arr_Inner_uint_4 %s %uint_9
OpStore %57 %58
OpReturn
OpFunctionEnd

33
test/buffer/storage/static_index/write.wgsl.expected.wgsl Normal file
View File

@@ -0,0 +1,33 @@
struct Inner {
x : i32;
};
[[block]]
struct S {
a : vec3<i32>;
b : i32;
c : vec3<u32>;
d : u32;
e : vec3<f32>;
f : f32;
g : mat2x3<f32>;
h : mat3x2<f32>;
i : Inner;
j : [[stride(16)]] array<Inner, 4>;
};
[[binding(0), group(0)]] var<storage, write> s : S;
[[stage(compute), workgroup_size(1)]]
fn main() {
s.a = vec3<i32>();
s.b = i32();
s.c = vec3<u32>();
s.d = u32();
s.e = vec3<f32>();
s.f = f32();
s.g = mat2x3<f32>();
s.h = mat3x2<f32>();
s.i = Inner();
s.j = [[stride(16)]] array<Inner, 4>();
}