2021-07-13 12:18:13 +00:00
|
|
|
struct Inner {
|
|
|
|
int x;
|
|
|
|
};
|
|
|
|
struct tint_padded_array_element {
|
|
|
|
Inner el;
|
|
|
|
};
|
|
|
|
|
transform: Fixes for DecomposeMemoryAccess
CloneContext::Replace(T* what, T* with) is bug-prone, as complex transforms may want to clone `what` multiple times, or not at all. In both cases, this will likely result in an ICE as either the replacement will be reachable multiple times, or not at all.
The CTS test: webgpu:shader,execution,robust_access:linear_memory:storageClass="storage";storageMode="read_write";access="read";atomic=true;baseType="i32"
Was triggering this brokenness with DecomposeMemoryAccess's use of CloneContext::Replace(T*, T*).
Switch the usage of CloneContext::Replace(T*, T*) to the new function form.
As std::function is copyable, it cannot hold a captured std::unique_ptr.
This prevented the Replace() lambdas from capturing the necessary `BufferAccess` data, as this held a `std::unique_ptr<Offset>`.
To fix this, use a `BlockAllocator` for Offsets, and use raw pointers instead.
Because the function passed to Replace() is called just before the node is cloned, insertion of new functions will occur just before the currently evaluated module-scope entity.
This allows us to remove the "insert_after" arguments to LoadFunc(), StoreFunc(), and AtomicFunc().
We can also kill the icky InsertGlobal() and TypeDeclOf() helpers.
Bug: tint:993
Change-Id: I60972bc13a2fa819a163ee2671f61e82d0e68d2a
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/58222
Kokoro: Kokoro <noreply+kokoro@google.com>
Reviewed-by: James Price <jrprice@google.com>
Commit-Queue: Ben Clayton <bclayton@google.com>
2021-07-15 20:29:09 +00:00
|
|
|
cbuffer cbuffer_s : register(b0, space0) {
|
|
|
|
uint4 s[13];
|
|
|
|
};
|
|
|
|
|
2021-07-13 12:18:13 +00:00
|
|
|
float2x3 tint_symbol_7(uint4 buffer[13], uint offset) {
|
|
|
|
const uint scalar_offset = ((offset + 0u)) / 4;
|
|
|
|
const uint scalar_offset_1 = ((offset + 16u)) / 4;
|
|
|
|
return float2x3(asfloat(buffer[scalar_offset / 4].xyz), asfloat(buffer[scalar_offset_1 / 4].xyz));
|
|
|
|
}
|
|
|
|
|
2021-07-16 19:47:44 +00:00
|
|
|
float3x2 tint_symbol_8(uint4 buffer[13], uint offset) {
|
2021-07-13 12:18:13 +00:00
|
|
|
const uint scalar_offset_2 = ((offset + 0u)) / 4;
|
|
|
|
uint4 ubo_load = buffer[scalar_offset_2 / 4];
|
|
|
|
const uint scalar_offset_3 = ((offset + 8u)) / 4;
|
|
|
|
uint4 ubo_load_1 = buffer[scalar_offset_3 / 4];
|
|
|
|
const uint scalar_offset_4 = ((offset + 16u)) / 4;
|
|
|
|
uint4 ubo_load_2 = buffer[scalar_offset_4 / 4];
|
|
|
|
return float3x2(asfloat(((scalar_offset_2 & 2) ? ubo_load.zw : ubo_load.xy)), asfloat(((scalar_offset_3 & 2) ? ubo_load_1.zw : ubo_load_1.xy)), asfloat(((scalar_offset_4 & 2) ? ubo_load_2.zw : ubo_load_2.xy)));
|
|
|
|
}
|
|
|
|
|
|
|
|
Inner tint_symbol_10(uint4 buffer[13], uint offset) {
|
|
|
|
const uint scalar_offset_5 = ((offset + 0u)) / 4;
|
|
|
|
const Inner tint_symbol_12 = {asint(buffer[scalar_offset_5 / 4][scalar_offset_5 % 4])};
|
|
|
|
return tint_symbol_12;
|
|
|
|
}
|
|
|
|
|
|
|
|
typedef tint_padded_array_element tint_symbol_11_ret[4];
|
|
|
|
tint_symbol_11_ret tint_symbol_11(uint4 buffer[13], uint offset) {
|
2021-07-16 19:47:44 +00:00
|
|
|
tint_padded_array_element arr[4] = (tint_padded_array_element[4])0;
|
|
|
|
{
|
|
|
|
for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
|
|
|
|
arr[i_1].el = tint_symbol_10(buffer, (offset + (i_1 * 16u)));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return arr;
|
2021-07-13 12:18:13 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
[numthreads(1, 1, 1)]
|
|
|
|
void main() {
|
|
|
|
const int3 a = asint(s[0].xyz);
|
|
|
|
const int b = asint(s[0].w);
|
|
|
|
const uint3 c = s[1].xyz;
|
|
|
|
const uint d = s[1].w;
|
|
|
|
const float3 e = asfloat(s[2].xyz);
|
|
|
|
const float f = asfloat(s[2].w);
|
|
|
|
const int2 g = asint(s[3].xy);
|
|
|
|
const int2 h = asint(s[3].zw);
|
|
|
|
const float2x3 i = tint_symbol_7(s, 64u);
|
2021-07-16 19:47:44 +00:00
|
|
|
const float3x2 j = tint_symbol_8(s, 96u);
|
2021-07-13 12:18:13 +00:00
|
|
|
const Inner k = tint_symbol_10(s, 128u);
|
|
|
|
const tint_padded_array_element l[4] = tint_symbol_11(s, 144u);
|
|
|
|
return;
|
|
|
|
}
|