mirror of
https://github.com/encounter/dawn-cmake.git
synced 2025-12-10 05:57:51 +00:00
tint/test-runner: Split expectations for FXC and DXC
Change tint's `--fxc` flag to take the path of the FXC compiler DLL. Have tint attempt to validate with both FXC and DXC if `--validate` is passed. Fix the 'dirsWithNoPassExpectations' logic which looks like it got broken with the tint -> dawn merge. It also incorrectly applied filepath.FromSlash() on windows. Change-Id: I0f46aa5c21bc48a2abc48402c41f846aff4a8633 Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/96800 Reviewed-by: Antonio Maiorano <amaiorano@google.com> Commit-Queue: Ben Clayton <bclayton@chromium.org>
This commit is contained in:
committed by
Dawn LUCI CQ
parent
0778d9a48f
commit
7d34de88f1
@@ -0,0 +1,65 @@
|
||||
cbuffer cbuffer_s : register(b0, space0) {
|
||||
uint4 s[96];
|
||||
};
|
||||
|
||||
struct tint_symbol_1 {
|
||||
uint idx : SV_GroupIndex;
|
||||
};
|
||||
|
||||
float2x3 tint_symbol_9(uint4 buffer[96], 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));
|
||||
}
|
||||
|
||||
float3x2 tint_symbol_10(uint4 buffer[96], uint offset) {
|
||||
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)));
|
||||
}
|
||||
|
||||
typedef int4 tint_symbol_12_ret[4];
|
||||
tint_symbol_12_ret tint_symbol_12(uint4 buffer[96], uint offset) {
|
||||
int4 arr_1[4] = (int4[4])0;
|
||||
{
|
||||
[loop] for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
|
||||
const uint scalar_offset_5 = ((offset + (i_1 * 16u))) / 4;
|
||||
arr_1[i_1] = asint(buffer[scalar_offset_5 / 4]);
|
||||
}
|
||||
}
|
||||
return arr_1;
|
||||
}
|
||||
|
||||
void main_inner(uint idx) {
|
||||
const uint scalar_offset_6 = ((192u * idx)) / 4;
|
||||
const int3 a = asint(s[scalar_offset_6 / 4].xyz);
|
||||
const uint scalar_offset_7 = (((192u * idx) + 12u)) / 4;
|
||||
const int b = asint(s[scalar_offset_7 / 4][scalar_offset_7 % 4]);
|
||||
const uint scalar_offset_8 = (((192u * idx) + 16u)) / 4;
|
||||
const uint3 c = s[scalar_offset_8 / 4].xyz;
|
||||
const uint scalar_offset_9 = (((192u * idx) + 28u)) / 4;
|
||||
const uint d = s[scalar_offset_9 / 4][scalar_offset_9 % 4];
|
||||
const uint scalar_offset_10 = (((192u * idx) + 32u)) / 4;
|
||||
const float3 e = asfloat(s[scalar_offset_10 / 4].xyz);
|
||||
const uint scalar_offset_11 = (((192u * idx) + 44u)) / 4;
|
||||
const float f = asfloat(s[scalar_offset_11 / 4][scalar_offset_11 % 4]);
|
||||
const uint scalar_offset_12 = (((192u * idx) + 48u)) / 4;
|
||||
uint4 ubo_load_3 = s[scalar_offset_12 / 4];
|
||||
const int2 g = asint(((scalar_offset_12 & 2) ? ubo_load_3.zw : ubo_load_3.xy));
|
||||
const uint scalar_offset_13 = (((192u * idx) + 56u)) / 4;
|
||||
uint4 ubo_load_4 = s[scalar_offset_13 / 4];
|
||||
const int2 h = asint(((scalar_offset_13 & 2) ? ubo_load_4.zw : ubo_load_4.xy));
|
||||
const float2x3 i = tint_symbol_9(s, ((192u * idx) + 64u));
|
||||
const float3x2 j = tint_symbol_10(s, ((192u * idx) + 96u));
|
||||
const int4 k[4] = tint_symbol_12(s, ((192u * idx) + 128u));
|
||||
}
|
||||
|
||||
[numthreads(1, 1, 1)]
|
||||
void main(tint_symbol_1 tint_symbol) {
|
||||
main_inner(tint_symbol.idx);
|
||||
return;
|
||||
}
|
||||
@@ -0,0 +1,57 @@
|
||||
struct Inner {
|
||||
int x;
|
||||
};
|
||||
|
||||
cbuffer cbuffer_s : register(b0, space0) {
|
||||
uint4 s[13];
|
||||
};
|
||||
|
||||
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));
|
||||
}
|
||||
|
||||
float3x2 tint_symbol_8(uint4 buffer[13], uint offset) {
|
||||
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 Inner tint_symbol_11_ret[4];
|
||||
tint_symbol_11_ret tint_symbol_11(uint4 buffer[13], uint offset) {
|
||||
Inner arr[4] = (Inner[4])0;
|
||||
{
|
||||
[loop] for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
|
||||
arr[i_1] = tint_symbol_10(buffer, (offset + (i_1 * 16u)));
|
||||
}
|
||||
}
|
||||
return arr;
|
||||
}
|
||||
|
||||
[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);
|
||||
const float3x2 j = tint_symbol_8(s, 96u);
|
||||
const Inner k = tint_symbol_10(s, 128u);
|
||||
const Inner l[4] = tint_symbol_11(s, 144u);
|
||||
return;
|
||||
}
|
||||
21
test/tint/buffer/uniform/types/array.wgsl.expected.fxc.hlsl
Normal file
21
test/tint/buffer/uniform/types/array.wgsl.expected.fxc.hlsl
Normal file
@@ -0,0 +1,21 @@
|
||||
cbuffer cbuffer_u : register(b0, space0) {
|
||||
uint4 u[4];
|
||||
};
|
||||
|
||||
typedef float4 tint_symbol_ret[4];
|
||||
tint_symbol_ret tint_symbol(uint4 buffer[4], uint offset) {
|
||||
float4 arr[4] = (float4[4])0;
|
||||
{
|
||||
[loop] for(uint i = 0u; (i < 4u); i = (i + 1u)) {
|
||||
const uint scalar_offset = ((offset + (i * 16u))) / 4;
|
||||
arr[i] = asfloat(buffer[scalar_offset / 4]);
|
||||
}
|
||||
}
|
||||
return arr;
|
||||
}
|
||||
|
||||
[numthreads(1, 1, 1)]
|
||||
void main() {
|
||||
const float4 x[4] = tint_symbol(u, 0u);
|
||||
return;
|
||||
}
|
||||
@@ -0,0 +1,9 @@
|
||||
cbuffer cbuffer_u : register(b0, space0) {
|
||||
uint4 u[1];
|
||||
};
|
||||
|
||||
[numthreads(1, 1, 1)]
|
||||
void main() {
|
||||
const float x = asfloat(u[0].x);
|
||||
return;
|
||||
}
|
||||
@@ -0,0 +1,9 @@
|
||||
cbuffer cbuffer_u : register(b0, space0) {
|
||||
uint4 u[1];
|
||||
};
|
||||
|
||||
[numthreads(1, 1, 1)]
|
||||
void main() {
|
||||
const int x = asint(u[0].x);
|
||||
return;
|
||||
}
|
||||
17
test/tint/buffer/uniform/types/mat2x2.wgsl.expected.fxc.hlsl
Normal file
17
test/tint/buffer/uniform/types/mat2x2.wgsl.expected.fxc.hlsl
Normal file
@@ -0,0 +1,17 @@
|
||||
cbuffer cbuffer_u : register(b0, space0) {
|
||||
uint4 u[1];
|
||||
};
|
||||
|
||||
float2x2 tint_symbol(uint4 buffer[1], uint offset) {
|
||||
const uint scalar_offset = ((offset + 0u)) / 4;
|
||||
uint4 ubo_load = buffer[scalar_offset / 4];
|
||||
const uint scalar_offset_1 = ((offset + 8u)) / 4;
|
||||
uint4 ubo_load_1 = buffer[scalar_offset_1 / 4];
|
||||
return float2x2(asfloat(((scalar_offset & 2) ? ubo_load.zw : ubo_load.xy)), asfloat(((scalar_offset_1 & 2) ? ubo_load_1.zw : ubo_load_1.xy)));
|
||||
}
|
||||
|
||||
[numthreads(1, 1, 1)]
|
||||
void main() {
|
||||
const float2x2 x = tint_symbol(u, 0u);
|
||||
return;
|
||||
}
|
||||
15
test/tint/buffer/uniform/types/mat2x3.wgsl.expected.fxc.hlsl
Normal file
15
test/tint/buffer/uniform/types/mat2x3.wgsl.expected.fxc.hlsl
Normal file
@@ -0,0 +1,15 @@
|
||||
cbuffer cbuffer_u : register(b0, space0) {
|
||||
uint4 u[2];
|
||||
};
|
||||
|
||||
float2x3 tint_symbol(uint4 buffer[2], 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));
|
||||
}
|
||||
|
||||
[numthreads(1, 1, 1)]
|
||||
void main() {
|
||||
const float2x3 x = tint_symbol(u, 0u);
|
||||
return;
|
||||
}
|
||||
19
test/tint/buffer/uniform/types/mat3x2.wgsl.expected.fxc.hlsl
Normal file
19
test/tint/buffer/uniform/types/mat3x2.wgsl.expected.fxc.hlsl
Normal file
@@ -0,0 +1,19 @@
|
||||
cbuffer cbuffer_u : register(b0, space0) {
|
||||
uint4 u[2];
|
||||
};
|
||||
|
||||
float3x2 tint_symbol(uint4 buffer[2], uint offset) {
|
||||
const uint scalar_offset = ((offset + 0u)) / 4;
|
||||
uint4 ubo_load = buffer[scalar_offset / 4];
|
||||
const uint scalar_offset_1 = ((offset + 8u)) / 4;
|
||||
uint4 ubo_load_1 = buffer[scalar_offset_1 / 4];
|
||||
const uint scalar_offset_2 = ((offset + 16u)) / 4;
|
||||
uint4 ubo_load_2 = buffer[scalar_offset_2 / 4];
|
||||
return float3x2(asfloat(((scalar_offset & 2) ? ubo_load.zw : ubo_load.xy)), asfloat(((scalar_offset_1 & 2) ? ubo_load_1.zw : ubo_load_1.xy)), asfloat(((scalar_offset_2 & 2) ? ubo_load_2.zw : ubo_load_2.xy)));
|
||||
}
|
||||
|
||||
[numthreads(1, 1, 1)]
|
||||
void main() {
|
||||
const float3x2 x = tint_symbol(u, 0u);
|
||||
return;
|
||||
}
|
||||
17
test/tint/buffer/uniform/types/mat4x4.wgsl.expected.fxc.hlsl
Normal file
17
test/tint/buffer/uniform/types/mat4x4.wgsl.expected.fxc.hlsl
Normal file
@@ -0,0 +1,17 @@
|
||||
cbuffer cbuffer_u : register(b0, space0) {
|
||||
uint4 u[4];
|
||||
};
|
||||
|
||||
float4x4 tint_symbol(uint4 buffer[4], uint offset) {
|
||||
const uint scalar_offset = ((offset + 0u)) / 4;
|
||||
const uint scalar_offset_1 = ((offset + 16u)) / 4;
|
||||
const uint scalar_offset_2 = ((offset + 32u)) / 4;
|
||||
const uint scalar_offset_3 = ((offset + 48u)) / 4;
|
||||
return float4x4(asfloat(buffer[scalar_offset / 4]), asfloat(buffer[scalar_offset_1 / 4]), asfloat(buffer[scalar_offset_2 / 4]), asfloat(buffer[scalar_offset_3 / 4]));
|
||||
}
|
||||
|
||||
[numthreads(1, 1, 1)]
|
||||
void main() {
|
||||
const float4x4 x = tint_symbol(u, 0u);
|
||||
return;
|
||||
}
|
||||
27
test/tint/buffer/uniform/types/struct.wgsl.expected.fxc.hlsl
Normal file
27
test/tint/buffer/uniform/types/struct.wgsl.expected.fxc.hlsl
Normal file
@@ -0,0 +1,27 @@
|
||||
struct Inner {
|
||||
float f;
|
||||
};
|
||||
struct S {
|
||||
Inner inner;
|
||||
};
|
||||
|
||||
cbuffer cbuffer_u : register(b0, space0) {
|
||||
uint4 u[1];
|
||||
};
|
||||
|
||||
Inner tint_symbol_1(uint4 buffer[1], uint offset) {
|
||||
const uint scalar_offset = ((offset + 0u)) / 4;
|
||||
const Inner tint_symbol_3 = {asfloat(buffer[scalar_offset / 4][scalar_offset % 4])};
|
||||
return tint_symbol_3;
|
||||
}
|
||||
|
||||
S tint_symbol(uint4 buffer[1], uint offset) {
|
||||
const S tint_symbol_4 = {tint_symbol_1(buffer, (offset + 0u))};
|
||||
return tint_symbol_4;
|
||||
}
|
||||
|
||||
[numthreads(1, 1, 1)]
|
||||
void main() {
|
||||
const S x = tint_symbol(u, 0u);
|
||||
return;
|
||||
}
|
||||
@@ -0,0 +1,9 @@
|
||||
cbuffer cbuffer_u : register(b0, space0) {
|
||||
uint4 u[1];
|
||||
};
|
||||
|
||||
[numthreads(1, 1, 1)]
|
||||
void main() {
|
||||
const uint x = u[0].x;
|
||||
return;
|
||||
}
|
||||
@@ -0,0 +1,9 @@
|
||||
cbuffer cbuffer_u : register(b0, space0) {
|
||||
uint4 u[1];
|
||||
};
|
||||
|
||||
[numthreads(1, 1, 1)]
|
||||
void main() {
|
||||
const int2 x = asint(u[0].xy);
|
||||
return;
|
||||
}
|
||||
@@ -0,0 +1,9 @@
|
||||
cbuffer cbuffer_u : register(b0, space0) {
|
||||
uint4 u[1];
|
||||
};
|
||||
|
||||
[numthreads(1, 1, 1)]
|
||||
void main() {
|
||||
const uint3 x = u[0].xyz;
|
||||
return;
|
||||
}
|
||||
@@ -0,0 +1,9 @@
|
||||
cbuffer cbuffer_u : register(b0, space0) {
|
||||
uint4 u[1];
|
||||
};
|
||||
|
||||
[numthreads(1, 1, 1)]
|
||||
void main() {
|
||||
const float4 x = asfloat(u[0]);
|
||||
return;
|
||||
}
|
||||
Reference in New Issue
Block a user