writer/hlsl: Emit helper functions for storage class atomic intrinsics

By generating a helper function for these, we can keep the atomic expression pre-statement-free. This can help prevent for-loops from being transformed into while loops, which can upset FXC.

We can't do the same for workgroup storage atomics, as the InterlockedXXX() methods have the workgroup-storage expression as the first argument, and I'm not aware of any way to make a user-declared parameter be `groupshared`.

Change-Id: I8669127a58dc9cae95ce316523029064b5c9b5fa
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/57462
Commit-Queue: James Price <jrprice@google.com>
Auto-Submit: Ben Clayton <bclayton@google.com>
Kokoro: Kokoro <noreply+kokoro@google.com>
Reviewed-by: James Price <jrprice@google.com>
This commit is contained in:
Ben Clayton
2021-07-09 16:50:14 +00:00
committed by Tint LUCI CQ
parent e28591101c
commit e027e81bf2
23 changed files with 372 additions and 237 deletions

View File

@@ -1,3 +1,9 @@
uint atomicAdd_1(RWByteAddressBuffer buffer, uint offset, uint value) {
uint original_value = 0;
buffer.InterlockedAdd(offset, value, original_value);
return original_value;
}
RWByteAddressBuffer drawOut : register(u5, space0);
static uint cubeVerts = 0u;
@@ -8,8 +14,6 @@ struct tint_symbol_1 {
[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, cubeVerts, atomic_result);
const uint firstVertex = atomic_result;
const uint firstVertex = atomicAdd_1(drawOut, 0u, cubeVerts);
return;
}

View File

@@ -1,9 +1,13 @@
uint atomicAdd_1(RWByteAddressBuffer buffer, uint offset, uint value) {
uint original_value = 0;
buffer.InterlockedAdd(offset, value, original_value);
return original_value;
}
RWByteAddressBuffer sb_rw : register(u0, space0);
void atomicAdd_8a199a() {
uint atomic_result = 0u;
sb_rw.InterlockedAdd(0u, 1u, atomic_result);
uint res = atomic_result;
uint res = atomicAdd_1(sb_rw, 0u, 1u);
}
void fragment_main() {

View File

@@ -1,9 +1,13 @@
int atomicAdd_1(RWByteAddressBuffer buffer, uint offset, int value) {
int original_value = 0;
buffer.InterlockedAdd(offset, value, original_value);
return original_value;
}
RWByteAddressBuffer sb_rw : register(u0, space0);
void atomicAdd_d32fe4() {
int atomic_result = 0;
sb_rw.InterlockedAdd(0u, 1, atomic_result);
int res = atomic_result;
int res = atomicAdd_1(sb_rw, 0u, 1);
}
void fragment_main() {

View File

@@ -1,9 +1,13 @@
int atomicAnd_1(RWByteAddressBuffer buffer, uint offset, int value) {
int original_value = 0;
buffer.InterlockedAnd(offset, value, original_value);
return original_value;
}
RWByteAddressBuffer sb_rw : register(u0, space0);
void atomicAnd_152966() {
int atomic_result = 0;
sb_rw.InterlockedAnd(0u, 1, atomic_result);
int res = atomic_result;
int res = atomicAnd_1(sb_rw, 0u, 1);
}
void fragment_main() {

View File

@@ -1,9 +1,13 @@
uint atomicAnd_1(RWByteAddressBuffer buffer, uint offset, uint value) {
uint original_value = 0;
buffer.InterlockedAnd(offset, value, original_value);
return original_value;
}
RWByteAddressBuffer sb_rw : register(u0, space0);
void atomicAnd_85a8d9() {
uint atomic_result = 0u;
sb_rw.InterlockedAnd(0u, 1u, atomic_result);
uint res = atomic_result;
uint res = atomicAnd_1(sb_rw, 0u, 1u);
}
void fragment_main() {

View File

@@ -1,11 +1,14 @@
int2 atomicCompareExchangeWeak_1(RWByteAddressBuffer buffer, uint offset, int compare, int value) {
int2 result = {0, 0};
buffer.InterlockedCompareExchange(offset, compare, value, result.x);
result.y = result.x == compare;
return result;
}
RWByteAddressBuffer sb_rw : register(u0, space0);
void atomicCompareExchangeWeak_12871c() {
int2 atomic_result = int2(0, 0);
int atomic_compare_value = 1;
sb_rw.InterlockedCompareExchange(0u, atomic_compare_value, 1, atomic_result.x);
atomic_result.y = atomic_result.x == atomic_compare_value;
int2 res = atomic_result;
int2 res = atomicCompareExchangeWeak_1(sb_rw, 0u, 1, 1);
}
void fragment_main() {

View File

@@ -1,11 +1,14 @@
uint2 atomicCompareExchangeWeak_1(RWByteAddressBuffer buffer, uint offset, uint compare, uint value) {
uint2 result = {0, 0};
buffer.InterlockedCompareExchange(offset, compare, value, result.x);
result.y = result.x == compare;
return result;
}
RWByteAddressBuffer sb_rw : register(u0, space0);
void atomicCompareExchangeWeak_6673da() {
uint2 atomic_result = uint2(0u, 0u);
uint atomic_compare_value = 1u;
sb_rw.InterlockedCompareExchange(0u, atomic_compare_value, 1u, atomic_result.x);
atomic_result.y = atomic_result.x == atomic_compare_value;
uint2 res = atomic_result;
uint2 res = atomicCompareExchangeWeak_1(sb_rw, 0u, 1u, 1u);
}
void fragment_main() {

View File

@@ -1,9 +1,13 @@
uint atomicExchange_1(RWByteAddressBuffer buffer, uint offset, uint value) {
uint original_value = 0;
buffer.InterlockedExchange(offset, value, original_value);
return original_value;
}
RWByteAddressBuffer sb_rw : register(u0, space0);
void atomicExchange_d59712() {
uint atomic_result = 0u;
sb_rw.InterlockedExchange(0u, 1u, atomic_result);
uint res = atomic_result;
uint res = atomicExchange_1(sb_rw, 0u, 1u);
}
void fragment_main() {

View File

@@ -1,9 +1,13 @@
int atomicExchange_1(RWByteAddressBuffer buffer, uint offset, int value) {
int original_value = 0;
buffer.InterlockedExchange(offset, value, original_value);
return original_value;
}
RWByteAddressBuffer sb_rw : register(u0, space0);
void atomicExchange_f2e22f() {
int atomic_result = 0;
sb_rw.InterlockedExchange(0u, 1, atomic_result);
int res = atomic_result;
int res = atomicExchange_1(sb_rw, 0u, 1);
}
void fragment_main() {

View File

@@ -1,9 +1,13 @@
int atomicLoad_1(RWByteAddressBuffer buffer, uint offset) {
int value = 0;
buffer.InterlockedOr(offset, 0, value);
return value;
}
RWByteAddressBuffer sb_rw : register(u0, space0);
void atomicLoad_0806ad() {
int atomic_result = 0;
sb_rw.InterlockedOr(0u, 0, atomic_result);
int res = atomic_result;
int res = atomicLoad_1(sb_rw, 0u);
}
void fragment_main() {

View File

@@ -1,9 +1,13 @@
uint atomicLoad_1(RWByteAddressBuffer buffer, uint offset) {
uint value = 0;
buffer.InterlockedOr(offset, 0, value);
return value;
}
RWByteAddressBuffer sb_rw : register(u0, space0);
void atomicLoad_fe6cc3() {
uint atomic_result = 0u;
sb_rw.InterlockedOr(0u, 0, atomic_result);
uint res = atomic_result;
uint res = atomicLoad_1(sb_rw, 0u);
}
void fragment_main() {

View File

@@ -1,9 +1,13 @@
uint atomicMax_1(RWByteAddressBuffer buffer, uint offset, uint value) {
uint original_value = 0;
buffer.InterlockedMax(offset, value, original_value);
return original_value;
}
RWByteAddressBuffer sb_rw : register(u0, space0);
void atomicMax_51b9be() {
uint atomic_result = 0u;
sb_rw.InterlockedMax(0u, 1u, atomic_result);
uint res = atomic_result;
uint res = atomicMax_1(sb_rw, 0u, 1u);
}
void fragment_main() {

View File

@@ -1,9 +1,13 @@
int atomicMax_1(RWByteAddressBuffer buffer, uint offset, int value) {
int original_value = 0;
buffer.InterlockedMax(offset, value, original_value);
return original_value;
}
RWByteAddressBuffer sb_rw : register(u0, space0);
void atomicMax_92aa72() {
int atomic_result = 0;
sb_rw.InterlockedMax(0u, 1, atomic_result);
int res = atomic_result;
int res = atomicMax_1(sb_rw, 0u, 1);
}
void fragment_main() {

View File

@@ -1,9 +1,13 @@
int atomicMin_1(RWByteAddressBuffer buffer, uint offset, int value) {
int original_value = 0;
buffer.InterlockedMin(offset, value, original_value);
return original_value;
}
RWByteAddressBuffer sb_rw : register(u0, space0);
void atomicMin_8e38dc() {
int atomic_result = 0;
sb_rw.InterlockedMin(0u, 1, atomic_result);
int res = atomic_result;
int res = atomicMin_1(sb_rw, 0u, 1);
}
void fragment_main() {

View File

@@ -1,9 +1,13 @@
uint atomicMin_1(RWByteAddressBuffer buffer, uint offset, uint value) {
uint original_value = 0;
buffer.InterlockedMin(offset, value, original_value);
return original_value;
}
RWByteAddressBuffer sb_rw : register(u0, space0);
void atomicMin_c67a74() {
uint atomic_result = 0u;
sb_rw.InterlockedMin(0u, 1u, atomic_result);
uint res = atomic_result;
uint res = atomicMin_1(sb_rw, 0u, 1u);
}
void fragment_main() {

View File

@@ -1,9 +1,13 @@
uint atomicOr_1(RWByteAddressBuffer buffer, uint offset, uint value) {
uint original_value = 0;
buffer.InterlockedOr(offset, value, original_value);
return original_value;
}
RWByteAddressBuffer sb_rw : register(u0, space0);
void atomicOr_5e95d4() {
uint atomic_result = 0u;
sb_rw.InterlockedOr(0u, 1u, atomic_result);
uint res = atomic_result;
uint res = atomicOr_1(sb_rw, 0u, 1u);
}
void fragment_main() {

View File

@@ -1,9 +1,13 @@
int atomicOr_1(RWByteAddressBuffer buffer, uint offset, int value) {
int original_value = 0;
buffer.InterlockedOr(offset, value, original_value);
return original_value;
}
RWByteAddressBuffer sb_rw : register(u0, space0);
void atomicOr_8d96a0() {
int atomic_result = 0;
sb_rw.InterlockedOr(0u, 1, atomic_result);
int res = atomic_result;
int res = atomicOr_1(sb_rw, 0u, 1);
}
void fragment_main() {

View File

@@ -1,8 +1,12 @@
void atomicStore_1(RWByteAddressBuffer buffer, uint offset, uint value) {
uint ignored;
buffer.InterlockedExchange(offset, value, ignored);
}
RWByteAddressBuffer sb_rw : register(u0, space0);
void atomicStore_cdc29e() {
uint atomic_result = 0u;
sb_rw.InterlockedExchange(0u, 1u, atomic_result);
atomicStore_1(sb_rw, 0u, 1u);
}
void fragment_main() {

View File

@@ -1,8 +1,12 @@
void atomicStore_1(RWByteAddressBuffer buffer, uint offset, int value) {
int ignored;
buffer.InterlockedExchange(offset, value, ignored);
}
RWByteAddressBuffer sb_rw : register(u0, space0);
void atomicStore_d1e9a6() {
int atomic_result = 0;
sb_rw.InterlockedExchange(0u, 1, atomic_result);
atomicStore_1(sb_rw, 0u, 1);
}
void fragment_main() {

View File

@@ -1,9 +1,13 @@
uint atomicXor_1(RWByteAddressBuffer buffer, uint offset, uint value) {
uint original_value = 0;
buffer.InterlockedXor(offset, value, original_value);
return original_value;
}
RWByteAddressBuffer sb_rw : register(u0, space0);
void atomicXor_54510e() {
uint atomic_result = 0u;
sb_rw.InterlockedXor(0u, 1u, atomic_result);
uint res = atomic_result;
uint res = atomicXor_1(sb_rw, 0u, 1u);
}
void fragment_main() {

View File

@@ -1,9 +1,13 @@
int atomicXor_1(RWByteAddressBuffer buffer, uint offset, int value) {
int original_value = 0;
buffer.InterlockedXor(offset, value, original_value);
return original_value;
}
RWByteAddressBuffer sb_rw : register(u0, space0);
void atomicXor_c1b78c() {
int atomic_result = 0;
sb_rw.InterlockedXor(0u, 1, atomic_result);
int res = atomic_result;
int res = atomicXor_1(sb_rw, 0u, 1);
}
void fragment_main() {