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

spirv: Implement compound assignment

Browse Source 
Use the ExpandCompoundAssignment transform to convert compound
assignments to regular assignments.

Bug: tint:1325
Change-Id: I193a09815836755bc1f7138fe1947be39f7b7206
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/85285
Reviewed-by: Ben Clayton <bclayton@google.com>
Kokoro: James Price <jrprice@google.com>
This commit is contained in:
James Price
2022-03-31 22:30:10 +00:00
parent 508a9660a5
commit 16eeff387c
33 changed files with 1550 additions and 489 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
test/tint/statements/compound_assign/scalar/and.wgsl.expected.spvasm
View File

@@ -1,14 +1,41 @@
SKIP: FAILED
struct S {
a : i32,
}
@group(0) @binding(0) var<storage, read_write> v : S;
fn foo() {
v.a &= 2;
}
Failed to generate: Unknown statement: tint::ast::CompoundAssignmentStatement
; SPIR-V
; Version: 1.3
; Generator: Google Tint Compiler; 0
; Bound: 19
; Schema: 0
OpCapability Shader
OpMemoryModel Logical GLSL450
OpEntryPoint GLCompute %unused_entry_point "unused_entry_point"
OpExecutionMode %unused_entry_point LocalSize 1 1 1
OpName %S "S"
OpMemberName %S 0 "a"
OpName %v "v"
OpName %unused_entry_point "unused_entry_point"
OpName %foo "foo"
OpDecorate %S Block
OpMemberDecorate %S 0 Offset 0
OpDecorate %v DescriptorSet 0
OpDecorate %v Binding 0
%int = OpTypeInt 32 1
%S = OpTypeStruct %int
%_ptr_StorageBuffer_S = OpTypePointer StorageBuffer %S
%v = OpVariable %_ptr_StorageBuffer_S StorageBuffer
%void = OpTypeVoid
%5 = OpTypeFunction %void
%uint = OpTypeInt 32 0
%uint_0 = OpConstant %uint 0
%_ptr_StorageBuffer_int = OpTypePointer StorageBuffer %int
%int_2 = OpConstant %int 2
%unused_entry_point = OpFunction %void None %5
%8 = OpLabel
OpReturn
OpFunctionEnd
%foo = OpFunction %void None %5
%10 = OpLabel
%14 = OpAccessChain %_ptr_StorageBuffer_int %v %uint_0
%15 = OpAccessChain %_ptr_StorageBuffer_int %v %uint_0
%16 = OpLoad %int %15
%18 = OpBitwiseAnd %int %16 %int_2
OpStore %14 %18
OpReturn
OpFunctionEnd

55
test/tint/statements/compound_assign/scalar/divide.wgsl.expected.spvasm
View File

@@ -1,14 +1,41 @@
SKIP: FAILED
struct S {
a : i32,
}
@group(0) @binding(0) var<storage, read_write> v : S;
fn foo() {
v.a /= 2;
}
Failed to generate: Unknown statement: tint::ast::CompoundAssignmentStatement
; SPIR-V
; Version: 1.3
; Generator: Google Tint Compiler; 0
; Bound: 19
; Schema: 0
OpCapability Shader
OpMemoryModel Logical GLSL450
OpEntryPoint GLCompute %unused_entry_point "unused_entry_point"
OpExecutionMode %unused_entry_point LocalSize 1 1 1
OpName %S "S"
OpMemberName %S 0 "a"
OpName %v "v"
OpName %unused_entry_point "unused_entry_point"
OpName %foo "foo"
OpDecorate %S Block
OpMemberDecorate %S 0 Offset 0
OpDecorate %v DescriptorSet 0
OpDecorate %v Binding 0
%int = OpTypeInt 32 1
%S = OpTypeStruct %int
%_ptr_StorageBuffer_S = OpTypePointer StorageBuffer %S
%v = OpVariable %_ptr_StorageBuffer_S StorageBuffer
%void = OpTypeVoid
%5 = OpTypeFunction %void
%uint = OpTypeInt 32 0
%uint_0 = OpConstant %uint 0
%_ptr_StorageBuffer_int = OpTypePointer StorageBuffer %int
%int_2 = OpConstant %int 2
%unused_entry_point = OpFunction %void None %5
%8 = OpLabel
OpReturn
OpFunctionEnd
%foo = OpFunction %void None %5
%10 = OpLabel
%14 = OpAccessChain %_ptr_StorageBuffer_int %v %uint_0
%15 = OpAccessChain %_ptr_StorageBuffer_int %v %uint_0
%16 = OpLoad %int %15
%18 = OpSDiv %int %16 %int_2
OpStore %14 %18
OpReturn
OpFunctionEnd

55
test/tint/statements/compound_assign/scalar/minus.wgsl.expected.spvasm
View File

@@ -1,14 +1,41 @@
SKIP: FAILED
struct S {
a : i32,
}
@group(0) @binding(0) var<storage, read_write> v : S;
fn foo() {
v.a -= 2;
}
Failed to generate: Unknown statement: tint::ast::CompoundAssignmentStatement
; SPIR-V
; Version: 1.3
; Generator: Google Tint Compiler; 0
; Bound: 19
; Schema: 0
OpCapability Shader
OpMemoryModel Logical GLSL450
OpEntryPoint GLCompute %unused_entry_point "unused_entry_point"
OpExecutionMode %unused_entry_point LocalSize 1 1 1
OpName %S "S"
OpMemberName %S 0 "a"
OpName %v "v"
OpName %unused_entry_point "unused_entry_point"
OpName %foo "foo"
OpDecorate %S Block
OpMemberDecorate %S 0 Offset 0
OpDecorate %v DescriptorSet 0
OpDecorate %v Binding 0
%int = OpTypeInt 32 1
%S = OpTypeStruct %int
%_ptr_StorageBuffer_S = OpTypePointer StorageBuffer %S
%v = OpVariable %_ptr_StorageBuffer_S StorageBuffer
%void = OpTypeVoid
%5 = OpTypeFunction %void
%uint = OpTypeInt 32 0
%uint_0 = OpConstant %uint 0
%_ptr_StorageBuffer_int = OpTypePointer StorageBuffer %int
%int_2 = OpConstant %int 2
%unused_entry_point = OpFunction %void None %5
%8 = OpLabel
OpReturn
OpFunctionEnd
%foo = OpFunction %void None %5
%10 = OpLabel
%14 = OpAccessChain %_ptr_StorageBuffer_int %v %uint_0
%15 = OpAccessChain %_ptr_StorageBuffer_int %v %uint_0
%16 = OpLoad %int %15
%18 = OpISub %int %16 %int_2
OpStore %14 %18
OpReturn
OpFunctionEnd

55
test/tint/statements/compound_assign/scalar/modulo.wgsl.expected.spvasm
View File

@@ -1,14 +1,41 @@
SKIP: FAILED
struct S {
a : i32,
}
@group(0) @binding(0) var<storage, read_write> v : S;
fn foo() {
v.a %= 2;
}
Failed to generate: Unknown statement: tint::ast::CompoundAssignmentStatement
; SPIR-V
; Version: 1.3
; Generator: Google Tint Compiler; 0
; Bound: 19
; Schema: 0
OpCapability Shader
OpMemoryModel Logical GLSL450
OpEntryPoint GLCompute %unused_entry_point "unused_entry_point"
OpExecutionMode %unused_entry_point LocalSize 1 1 1
OpName %S "S"
OpMemberName %S 0 "a"
OpName %v "v"
OpName %unused_entry_point "unused_entry_point"
OpName %foo "foo"
OpDecorate %S Block
OpMemberDecorate %S 0 Offset 0
OpDecorate %v DescriptorSet 0
OpDecorate %v Binding 0
%int = OpTypeInt 32 1
%S = OpTypeStruct %int
%_ptr_StorageBuffer_S = OpTypePointer StorageBuffer %S
%v = OpVariable %_ptr_StorageBuffer_S StorageBuffer
%void = OpTypeVoid
%5 = OpTypeFunction %void
%uint = OpTypeInt 32 0
%uint_0 = OpConstant %uint 0
%_ptr_StorageBuffer_int = OpTypePointer StorageBuffer %int
%int_2 = OpConstant %int 2
%unused_entry_point = OpFunction %void None %5
%8 = OpLabel
OpReturn
OpFunctionEnd
%foo = OpFunction %void None %5
%10 = OpLabel
%14 = OpAccessChain %_ptr_StorageBuffer_int %v %uint_0
%15 = OpAccessChain %_ptr_StorageBuffer_int %v %uint_0
%16 = OpLoad %int %15
%18 = OpSMod %int %16 %int_2
OpStore %14 %18
OpReturn
OpFunctionEnd

55
test/tint/statements/compound_assign/scalar/or.wgsl.expected.spvasm
View File

@@ -1,14 +1,41 @@
SKIP: FAILED
struct S {
a : i32,
}
@group(0) @binding(0) var<storage, read_write> v : S;
fn foo() {
v.a |= 2;
}
Failed to generate: Unknown statement: tint::ast::CompoundAssignmentStatement
; SPIR-V
; Version: 1.3
; Generator: Google Tint Compiler; 0
; Bound: 19
; Schema: 0
OpCapability Shader
OpMemoryModel Logical GLSL450
OpEntryPoint GLCompute %unused_entry_point "unused_entry_point"
OpExecutionMode %unused_entry_point LocalSize 1 1 1
OpName %S "S"
OpMemberName %S 0 "a"
OpName %v "v"
OpName %unused_entry_point "unused_entry_point"
OpName %foo "foo"
OpDecorate %S Block
OpMemberDecorate %S 0 Offset 0
OpDecorate %v DescriptorSet 0
OpDecorate %v Binding 0
%int = OpTypeInt 32 1
%S = OpTypeStruct %int
%_ptr_StorageBuffer_S = OpTypePointer StorageBuffer %S
%v = OpVariable %_ptr_StorageBuffer_S StorageBuffer
%void = OpTypeVoid
%5 = OpTypeFunction %void
%uint = OpTypeInt 32 0
%uint_0 = OpConstant %uint 0
%_ptr_StorageBuffer_int = OpTypePointer StorageBuffer %int
%int_2 = OpConstant %int 2
%unused_entry_point = OpFunction %void None %5
%8 = OpLabel
OpReturn
OpFunctionEnd
%foo = OpFunction %void None %5
%10 = OpLabel
%14 = OpAccessChain %_ptr_StorageBuffer_int %v %uint_0
%15 = OpAccessChain %_ptr_StorageBuffer_int %v %uint_0
%16 = OpLoad %int %15
%18 = OpBitwiseOr %int %16 %int_2
OpStore %14 %18
OpReturn
OpFunctionEnd

55
test/tint/statements/compound_assign/scalar/plus.wgsl.expected.spvasm
View File

@@ -1,14 +1,41 @@
SKIP: FAILED
struct S {
a : i32,
}
@group(0) @binding(0) var<storage, read_write> v : S;
fn foo() {
v.a += 2;
}
Failed to generate: Unknown statement: tint::ast::CompoundAssignmentStatement
; SPIR-V
; Version: 1.3
; Generator: Google Tint Compiler; 0
; Bound: 19
; Schema: 0
OpCapability Shader
OpMemoryModel Logical GLSL450
OpEntryPoint GLCompute %unused_entry_point "unused_entry_point"
OpExecutionMode %unused_entry_point LocalSize 1 1 1
OpName %S "S"
OpMemberName %S 0 "a"
OpName %v "v"
OpName %unused_entry_point "unused_entry_point"
OpName %foo "foo"
OpDecorate %S Block
OpMemberDecorate %S 0 Offset 0
OpDecorate %v DescriptorSet 0
OpDecorate %v Binding 0
%int = OpTypeInt 32 1
%S = OpTypeStruct %int
%_ptr_StorageBuffer_S = OpTypePointer StorageBuffer %S
%v = OpVariable %_ptr_StorageBuffer_S StorageBuffer
%void = OpTypeVoid
%5 = OpTypeFunction %void
%uint = OpTypeInt 32 0
%uint_0 = OpConstant %uint 0
%_ptr_StorageBuffer_int = OpTypePointer StorageBuffer %int
%int_2 = OpConstant %int 2
%unused_entry_point = OpFunction %void None %5
%8 = OpLabel
OpReturn
OpFunctionEnd
%foo = OpFunction %void None %5
%10 = OpLabel
%14 = OpAccessChain %_ptr_StorageBuffer_int %v %uint_0
%15 = OpAccessChain %_ptr_StorageBuffer_int %v %uint_0
%16 = OpLoad %int %15
%18 = OpIAdd %int %16 %int_2
OpStore %14 %18
OpReturn
OpFunctionEnd

55
test/tint/statements/compound_assign/scalar/times.wgsl.expected.spvasm
View File

@@ -1,14 +1,41 @@
SKIP: FAILED
struct S {
a : i32,
}
@group(0) @binding(0) var<storage, read_write> v : S;
fn foo() {
v.a *= 2;
}
Failed to generate: Unknown statement: tint::ast::CompoundAssignmentStatement
; SPIR-V
; Version: 1.3
; Generator: Google Tint Compiler; 0
; Bound: 19
; Schema: 0
OpCapability Shader
OpMemoryModel Logical GLSL450
OpEntryPoint GLCompute %unused_entry_point "unused_entry_point"
OpExecutionMode %unused_entry_point LocalSize 1 1 1
OpName %S "S"
OpMemberName %S 0 "a"
OpName %v "v"
OpName %unused_entry_point "unused_entry_point"
OpName %foo "foo"
OpDecorate %S Block
OpMemberDecorate %S 0 Offset 0
OpDecorate %v DescriptorSet 0
OpDecorate %v Binding 0
%int = OpTypeInt 32 1
%S = OpTypeStruct %int
%_ptr_StorageBuffer_S = OpTypePointer StorageBuffer %S
%v = OpVariable %_ptr_StorageBuffer_S StorageBuffer
%void = OpTypeVoid
%5 = OpTypeFunction %void
%uint = OpTypeInt 32 0
%uint_0 = OpConstant %uint 0
%_ptr_StorageBuffer_int = OpTypePointer StorageBuffer %int
%int_2 = OpConstant %int 2
%unused_entry_point = OpFunction %void None %5
%8 = OpLabel
OpReturn
OpFunctionEnd
%foo = OpFunction %void None %5
%10 = OpLabel
%14 = OpAccessChain %_ptr_StorageBuffer_int %v %uint_0
%15 = OpAccessChain %_ptr_StorageBuffer_int %v %uint_0
%16 = OpLoad %int %15
%18 = OpIMul %int %16 %int_2
OpStore %14 %18
OpReturn
OpFunctionEnd

55
test/tint/statements/compound_assign/scalar/xor.wgsl.expected.spvasm
View File

@@ -1,14 +1,41 @@
SKIP: FAILED
struct S {
a : i32,
}
@group(0) @binding(0) var<storage, read_write> v : S;
fn foo() {
v.a ^= 2;
}
Failed to generate: Unknown statement: tint::ast::CompoundAssignmentStatement
; SPIR-V
; Version: 1.3
; Generator: Google Tint Compiler; 0
; Bound: 19
; Schema: 0
OpCapability Shader
OpMemoryModel Logical GLSL450
OpEntryPoint GLCompute %unused_entry_point "unused_entry_point"
OpExecutionMode %unused_entry_point LocalSize 1 1 1
OpName %S "S"
OpMemberName %S 0 "a"
OpName %v "v"
OpName %unused_entry_point "unused_entry_point"
OpName %foo "foo"
OpDecorate %S Block
OpMemberDecorate %S 0 Offset 0
OpDecorate %v DescriptorSet 0
OpDecorate %v Binding 0
%int = OpTypeInt 32 1
%S = OpTypeStruct %int
%_ptr_StorageBuffer_S = OpTypePointer StorageBuffer %S
%v = OpVariable %_ptr_StorageBuffer_S StorageBuffer
%void = OpTypeVoid
%5 = OpTypeFunction %void
%uint = OpTypeInt 32 0
%uint_0 = OpConstant %uint 0
%_ptr_StorageBuffer_int = OpTypePointer StorageBuffer %int
%int_2 = OpConstant %int 2
%unused_entry_point = OpFunction %void None %5
%8 = OpLabel
OpReturn
OpFunctionEnd
%foo = OpFunction %void None %5
%10 = OpLabel
%14 = OpAccessChain %_ptr_StorageBuffer_int %v %uint_0
%15 = OpAccessChain %_ptr_StorageBuffer_int %v %uint_0
%16 = OpLoad %int %15
%18 = OpBitwiseXor %int %16 %int_2
OpStore %14 %18
OpReturn
OpFunctionEnd