encounter
/
dawn-cmake
mirror of https://github.com/encounter/dawn-cmake.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

writer/spirv: Generate load of atomic value arguments 

Fixed: tint:926
Change-Id: Ia27abe605ebfb46a7524b50500ecebd6e4656d1d
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/55883
Reviewed-by: David Neto <dneto@google.com>
Commit-Queue: David Neto <dneto@google.com>
Auto-Submit: Ben Clayton <bclayton@google.com>
Kokoro: Kokoro <noreply+kokoro@google.com>
This commit is contained in:
Ben Clayton 2021-06-24 19:01:06 +00:00 committed by Tint LUCI CQ
parent 9d3e2acd35
commit 07b59ca230
7 changed files with 190 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/writer/spirv/builder.cc
View File

@ -2970,6 +2970,10 @@ bool Builder::GenerateAtomicIntrinsic(ast::CallExpression* call,
if (value_id == 0) { if (value_id == 0) {
return false; return false;
} }
value_id = GenerateLoadIfNeeded(TypeOf(call->params().back()), value_id);
if (value_id == 0) {
return false;
}
} }
Operand pointer = Operand::Int(pointer_id); Operand pointer = Operand::Int(pointer_id);

134
src/writer/spirv/builder_intrinsic_test.cc
View File

@ -1849,8 +1849,10 @@ TEST_F(IntrinsicBuilderTest, Call_AtomicStore) {
// [[binding(1), group(2)]] var<storage, read_write> b : S; // [[binding(1), group(2)]] var<storage, read_write> b : S;
// //
// fn a_func() { // fn a_func() {
// let u : u32 = atomicStore(&b.u, 1u); // var u = 1u;
// let i : i32 = atomicStore(&b.i, 2); // var i = 2;
// atomicStore(&b.u, u);
// atomicStore(&b.i, i);
// } // }
auto* s = Structure("S", auto* s = Structure("S",
{ {
@ -1866,10 +1868,12 @@ TEST_F(IntrinsicBuilderTest, Call_AtomicStore) {
Func("a_func", ast::VariableList{}, ty.void_(), Func("a_func", ast::VariableList{}, ty.void_(),
ast::StatementList{ ast::StatementList{
Decl(Var("u", nullptr, Expr(1u))),
Decl(Var("i", nullptr, Expr(2))),
create<ast::CallStatement>( create<ast::CallStatement>(
Call("atomicStore", AddressOf(MemberAccessor("b", "u")), 1u)), Call("atomicStore", AddressOf(MemberAccessor("b", "u")), "u")),
create<ast::CallStatement>( create<ast::CallStatement>(
Call("atomicStore", AddressOf(MemberAccessor("b", "i")), 2)), Call("atomicStore", AddressOf(MemberAccessor("b", "i")), "i")),
}, },
ast::DecorationList{Stage(ast::PipelineStage::kFragment)}); ast::DecorationList{Stage(ast::PipelineStage::kFragment)});
@ -1886,19 +1890,27 @@ TEST_F(IntrinsicBuilderTest, Call_AtomicStore) {
%1 = OpVariable %2 StorageBuffer %1 = OpVariable %2 StorageBuffer
%7 = OpTypeVoid %7 = OpTypeVoid
%6 = OpTypeFunction %7 %6 = OpTypeFunction %7
%11 = OpConstant %4 1 %10 = OpConstant %4 1
%12 = OpConstant %4 0 %12 = OpTypePointer Function %4
%14 = OpTypePointer StorageBuffer %4 %13 = OpConstantNull %4
%18 = OpTypePointer StorageBuffer %5 %14 = OpConstant %5 2
%20 = OpConstant %5 2 %16 = OpTypePointer Function %5
%17 = OpConstantNull %5
%19 = OpConstant %4 0
%21 = OpTypePointer StorageBuffer %4
%26 = OpTypePointer StorageBuffer %5
)"; )";
auto got_types = DumpInstructions(b.types()); auto got_types = DumpInstructions(b.types());
EXPECT_EQ(expected_types, got_types); EXPECT_EQ(expected_types, got_types);
auto* expected_instructions = R"(%15 = OpAccessChain %14 %1 %12 auto* expected_instructions = R"(OpStore %11 %10
OpAtomicStore %15 %11 %12 %11 OpStore %15 %14
%19 = OpAccessChain %18 %1 %11 %22 = OpAccessChain %21 %1 %19
OpAtomicStore %19 %11 %12 %20 %23 = OpLoad %4 %11
OpAtomicStore %22 %10 %19 %23
%27 = OpAccessChain %26 %1 %10
%28 = OpLoad %5 %15
OpAtomicStore %27 %10 %19 %28
)"; )";
auto got_instructions = DumpInstructions(b.functions()[0].instructions()); auto got_instructions = DumpInstructions(b.functions()[0].instructions());
EXPECT_EQ(expected_instructions, got_instructions); EXPECT_EQ(expected_instructions, got_instructions);
@ -1916,7 +1928,8 @@ TEST_P(Intrinsic_Builtin_AtomicRMW_i32, Test) {
// [[binding(1), group(2)]] var<storage, read_write> b : S; // [[binding(1), group(2)]] var<storage, read_write> b : S;
// //
// fn a_func() { // fn a_func() {
// let x : i32 = atomicOP(&b.v); // var v = 10;
// let x : i32 = atomicOP(&b.v, v);
// } // }
auto* s = Structure("S", auto* s = Structure("S",
{ {
@ -1931,9 +1944,10 @@ TEST_P(Intrinsic_Builtin_AtomicRMW_i32, Test) {
Func("a_func", ast::VariableList{}, ty.void_(), Func("a_func", ast::VariableList{}, ty.void_(),
ast::StatementList{ ast::StatementList{
Decl(Const( Decl(Var("v", nullptr, Expr(10))),
"x", ty.i32(), Decl(Const("x", ty.i32(),
Call(GetParam().name, AddressOf(MemberAccessor("b", "v")), 10))), Call(GetParam().name, AddressOf(MemberAccessor("b", "v")),
"v"))),
}, },
ast::DecorationList{Stage(ast::PipelineStage::kFragment)}); ast::DecorationList{Stage(ast::PipelineStage::kFragment)});
@ -1949,17 +1963,22 @@ TEST_P(Intrinsic_Builtin_AtomicRMW_i32, Test) {
%1 = OpVariable %2 StorageBuffer %1 = OpVariable %2 StorageBuffer
%6 = OpTypeVoid %6 = OpTypeVoid
%5 = OpTypeFunction %6 %5 = OpTypeFunction %6
%10 = OpTypeInt 32 0 %9 = OpConstant %4 10
%11 = OpConstant %10 1 %11 = OpTypePointer Function %4
%12 = OpConstant %10 0 %12 = OpConstantNull %4
%14 = OpTypePointer StorageBuffer %4 %14 = OpTypeInt 32 0
%16 = OpConstant %4 10 %15 = OpConstant %14 1
%16 = OpConstant %14 0
%18 = OpTypePointer StorageBuffer %4
)"; )";
auto got_types = DumpInstructions(b.types()); auto got_types = DumpInstructions(b.types());
EXPECT_EQ(expected_types, got_types); EXPECT_EQ(expected_types, got_types);
std::string expected_instructions = "%15 = OpAccessChain %14 %1 %12\n"; std::string expected_instructions = R"(OpStore %10 %9
expected_instructions += "%9 = " + GetParam().op + " %4 %15 %11 %12 %16\n"; %19 = OpAccessChain %18 %1 %16
%20 = OpLoad %4 %10
)";
expected_instructions += "%13 = " + GetParam().op + " %4 %19 %15 %16 %20\n";
auto got_instructions = DumpInstructions(b.functions()[0].instructions()); auto got_instructions = DumpInstructions(b.functions()[0].instructions());
EXPECT_EQ(expected_instructions, got_instructions); EXPECT_EQ(expected_instructions, got_instructions);
@ -1986,7 +2005,8 @@ TEST_P(Intrinsic_Builtin_AtomicRMW_u32, Test) {
// [[binding(1), group(2)]] var<storage, read_write> b : S; // [[binding(1), group(2)]] var<storage, read_write> b : S;
// //
// fn a_func() { // fn a_func() {
// let x : u32 = atomicOP(&b.v); // var v = 10u;
// let x : u32 = atomicOP(&b.v, v);
// } // }
auto* s = Structure("S", auto* s = Structure("S",
{ {
@ -2001,9 +2021,10 @@ TEST_P(Intrinsic_Builtin_AtomicRMW_u32, Test) {
Func("a_func", ast::VariableList{}, ty.void_(), Func("a_func", ast::VariableList{}, ty.void_(),
ast::StatementList{ ast::StatementList{
Decl(Var("v", nullptr, Expr(10u))),
Decl(Const("x", ty.u32(), Decl(Const("x", ty.u32(),
Call(GetParam().name, AddressOf(MemberAccessor("b", "v")), Call(GetParam().name, AddressOf(MemberAccessor("b", "v")),
10u))), "v"))),
}, },
ast::DecorationList{Stage(ast::PipelineStage::kFragment)}); ast::DecorationList{Stage(ast::PipelineStage::kFragment)});
@ -2019,16 +2040,21 @@ TEST_P(Intrinsic_Builtin_AtomicRMW_u32, Test) {
%1 = OpVariable %2 StorageBuffer %1 = OpVariable %2 StorageBuffer
%6 = OpTypeVoid %6 = OpTypeVoid
%5 = OpTypeFunction %6 %5 = OpTypeFunction %6
%10 = OpConstant %4 1 %9 = OpConstant %4 10
%11 = OpConstant %4 0 %11 = OpTypePointer Function %4
%13 = OpTypePointer StorageBuffer %4 %12 = OpConstantNull %4
%15 = OpConstant %4 10 %14 = OpConstant %4 1
%15 = OpConstant %4 0
%17 = OpTypePointer StorageBuffer %4
)"; )";
auto got_types = DumpInstructions(b.types()); auto got_types = DumpInstructions(b.types());
EXPECT_EQ(expected_types, got_types); EXPECT_EQ(expected_types, got_types);
std::string expected_instructions = "%14 = OpAccessChain %13 %1 %11\n"; std::string expected_instructions = R"(OpStore %10 %9
expected_instructions += "%9 = " + GetParam().op + " %4 %14 %10 %11 %15\n"; %18 = OpAccessChain %17 %1 %15
%19 = OpLoad %4 %10
)";
expected_instructions += "%13 = " + GetParam().op + " %4 %18 %14 %15 %19\n";
auto got_instructions = DumpInstructions(b.functions()[0].instructions()); auto got_instructions = DumpInstructions(b.functions()[0].instructions());
EXPECT_EQ(expected_instructions, got_instructions); EXPECT_EQ(expected_instructions, got_instructions);
@ -2054,8 +2080,10 @@ TEST_F(IntrinsicBuilderTest, Call_AtomicExchange) {
// [[binding(1), group(2)]] var<storage, read_write> b : S; // [[binding(1), group(2)]] var<storage, read_write> b : S;
// //
// fn a_func() { // fn a_func() {
// let u : u32 = atomicExchange(&b.u, 10u); // var u = 10u;
// let i : i32 = atomicExchange(&b.i, 10); // var i = 10;
// let r : u32 = atomicExchange(&b.u, u);
// let s : i32 = atomicExchange(&b.i, i);
// } // }
auto* s = Structure("S", auto* s = Structure("S",
{ {
@ -2071,12 +2099,14 @@ TEST_F(IntrinsicBuilderTest, Call_AtomicExchange) {
Func("a_func", ast::VariableList{}, ty.void_(), Func("a_func", ast::VariableList{}, ty.void_(),
ast::StatementList{ ast::StatementList{
Decl(Const("u", ty.u32(), Decl(Var("u", nullptr, Expr(10u))),
Decl(Var("i", nullptr, Expr(10))),
Decl(Const("r", ty.u32(),
Call("atomicExchange", Call("atomicExchange",
AddressOf(MemberAccessor("b", "u")), 10u))), AddressOf(MemberAccessor("b", "u")), "u"))),
Decl(Const("i", ty.i32(), Decl(Const("s", ty.i32(),
Call("atomicExchange", Call("atomicExchange",
AddressOf(MemberAccessor("b", "i")), 10))), AddressOf(MemberAccessor("b", "i")), "i"))),
}, },
ast::DecorationList{Stage(ast::PipelineStage::kFragment)}); ast::DecorationList{Stage(ast::PipelineStage::kFragment)});
@ -2093,20 +2123,28 @@ TEST_F(IntrinsicBuilderTest, Call_AtomicExchange) {
%1 = OpVariable %2 StorageBuffer %1 = OpVariable %2 StorageBuffer
%7 = OpTypeVoid %7 = OpTypeVoid
%6 = OpTypeFunction %7 %6 = OpTypeFunction %7
%11 = OpConstant %4 1 %10 = OpConstant %4 10
%12 = OpConstant %4 0 %12 = OpTypePointer Function %4
%14 = OpTypePointer StorageBuffer %4 %13 = OpConstantNull %4
%16 = OpConstant %4 10 %14 = OpConstant %5 10
%19 = OpTypePointer StorageBuffer %5 %16 = OpTypePointer Function %5
%21 = OpConstant %5 10 %17 = OpConstantNull %5
%19 = OpConstant %4 1
%20 = OpConstant %4 0
%22 = OpTypePointer StorageBuffer %4
%27 = OpTypePointer StorageBuffer %5
)"; )";
auto got_types = DumpInstructions(b.types()); auto got_types = DumpInstructions(b.types());
EXPECT_EQ(expected_types, got_types); EXPECT_EQ(expected_types, got_types);
auto* expected_instructions = R"(%15 = OpAccessChain %14 %1 %12 auto* expected_instructions = R"(OpStore %11 %10
%10 = OpAtomicExchange %4 %15 %11 %12 %16 OpStore %15 %14
%20 = OpAccessChain %19 %1 %11 %23 = OpAccessChain %22 %1 %20
%17 = OpAtomicExchange %5 %20 %11 %12 %21 %24 = OpLoad %4 %11
%18 = OpAtomicExchange %4 %23 %19 %20 %24
%28 = OpAccessChain %27 %1 %19
%29 = OpLoad %5 %15
%25 = OpAtomicExchange %5 %28 %19 %20 %29
)"; )";
auto got_instructions = DumpInstructions(b.functions()[0].instructions()); auto got_instructions = DumpInstructions(b.functions()[0].instructions());
EXPECT_EQ(expected_instructions, got_instructions); EXPECT_EQ(expected_instructions, got_instructions);

14
test/bug/tint/926.wgsl Normal file
View File

@ -0,0 +1,14 @@
[[block]] struct DrawIndirectArgs {
vertexCount : atomic<u32>;
};
[[group(0), binding(5)]] var<storage, read_write> drawOut : DrawIndirectArgs;
var<private> cubeVerts : u32 = 0u;
[[stage(compute)]]
fn computeMain([[builtin(global_invocation_id)]] global_id : vec3<u32>) {
// Increment cubeVerts based on some criteria...
// This fails SPIR-V validation
let firstVertex : u32 = atomicAdd(&drawOut.vertexCount, cubeVerts);
}

15
test/bug/tint/926.wgsl.expected.hlsl Normal file
View File

@ -0,0 +1,15 @@
RWByteAddressBuffer drawOut : register(u5, space0);
static uint cubeVerts = 0u;
struct tint_symbol_1 {
uint3 global_id : SV_DispatchThreadID;
};
[numthreads(1, 1, 1)]
void computeMain(tint_symbol_1 tint_symbol) {
const uint3 global_id = tint_symbol.global_id;
uint atomic_result = 0u;
drawOut.InterlockedAdd(0u, 0u, atomic_result);
const uint firstVertex = atomic_result;
return;
}

17
test/bug/tint/926.wgsl.expected.msl Normal file
View File

@ -0,0 +1,17 @@
SKIP: FAILED
[[block]]
struct DrawIndirectArgs {
vertexCount : atomic<u32>;
};
[[group(0), binding(5)]] var<storage, read_write> drawOut : DrawIndirectArgs;
[[stage(compute)]]
fn computeMain([[builtin(global_invocation_id)]] global_id : vec3<u32>) {
[[internal(disable_validation__function_var_storage_class)]] var<private> tint_symbol_1 : u32 = 0u;
let firstVertex : u32 = atomicAdd(&(drawOut.vertexCount), tint_symbol_1);
}
Failed to generate: error: unknown type in EmitType: __atomic__u32

41
test/bug/tint/926.wgsl.expected.spvasm Normal file
View File

@ -0,0 +1,41 @@
; SPIR-V
; Version: 1.3
; Generator: Google Tint Compiler; 0
; Bound: 21
; Schema: 0
OpCapability Shader
OpMemoryModel Logical GLSL450
OpEntryPoint GLCompute %computeMain "computeMain"
OpExecutionMode %computeMain LocalSize 1 1 1
OpName %DrawIndirectArgs "DrawIndirectArgs"
OpMemberName %DrawIndirectArgs 0 "vertexCount"
OpName %drawOut "drawOut"
OpName %cubeVerts "cubeVerts"
OpName %tint_symbol "tint_symbol"
OpName %computeMain "computeMain"
OpDecorate %DrawIndirectArgs Block
OpMemberDecorate %DrawIndirectArgs 0 Offset 0
OpDecorate %drawOut DescriptorSet 0
OpDecorate %drawOut Binding 5
OpDecorate %tint_symbol BuiltIn GlobalInvocationId
%uint = OpTypeInt 32 0
%DrawIndirectArgs = OpTypeStruct %uint
%_ptr_StorageBuffer_DrawIndirectArgs = OpTypePointer StorageBuffer %DrawIndirectArgs
%drawOut = OpVariable %_ptr_StorageBuffer_DrawIndirectArgs StorageBuffer
%uint_0 = OpConstant %uint 0
%_ptr_Private_uint = OpTypePointer Private %uint
%cubeVerts = OpVariable %_ptr_Private_uint Private %uint_0
%v3uint = OpTypeVector %uint 3
%_ptr_Input_v3uint = OpTypePointer Input %v3uint
%tint_symbol = OpVariable %_ptr_Input_v3uint Input
%void = OpTypeVoid
%11 = OpTypeFunction %void
%uint_1 = OpConstant %uint 1
%_ptr_StorageBuffer_uint = OpTypePointer StorageBuffer %uint
%computeMain = OpFunction %void None %11
%14 = OpLabel
%19 = OpAccessChain %_ptr_StorageBuffer_uint %drawOut %uint_0
%20 = OpLoad %uint %cubeVerts
%15 = OpAtomicIAdd %uint %19 %uint_1 %uint_0 %20
OpReturn
OpFunctionEnd

13
test/bug/tint/926.wgsl.expected.wgsl Normal file
View File

@ -0,0 +1,13 @@
[[block]]
struct DrawIndirectArgs {
vertexCount : atomic<u32>;
};
[[group(0), binding(5)]] var<storage, read_write> drawOut : DrawIndirectArgs;
var<private> cubeVerts : u32 = 0u;
[[stage(compute)]]
fn computeMain([[builtin(global_invocation_id)]] global_id : vec3<u32>) {
let firstVertex : u32 = atomicAdd(&(drawOut.vertexCount), cubeVerts);
}