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,42 @@
|
||||
ByteAddressBuffer s : register(t0, space0);
|
||||
|
||||
struct tint_symbol_1 {
|
||||
uint idx : SV_GroupIndex;
|
||||
};
|
||||
|
||||
float2x3 tint_symbol_8(ByteAddressBuffer buffer, uint offset) {
|
||||
return float2x3(asfloat(buffer.Load3((offset + 0u))), asfloat(buffer.Load3((offset + 16u))));
|
||||
}
|
||||
|
||||
float3x2 tint_symbol_9(ByteAddressBuffer buffer, uint offset) {
|
||||
return float3x2(asfloat(buffer.Load2((offset + 0u))), asfloat(buffer.Load2((offset + 8u))), asfloat(buffer.Load2((offset + 16u))));
|
||||
}
|
||||
|
||||
typedef int4 tint_symbol_11_ret[4];
|
||||
tint_symbol_11_ret tint_symbol_11(ByteAddressBuffer buffer, uint offset) {
|
||||
int4 arr_1[4] = (int4[4])0;
|
||||
{
|
||||
[loop] for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
|
||||
arr_1[i_1] = asint(buffer.Load4((offset + (i_1 * 16u))));
|
||||
}
|
||||
}
|
||||
return arr_1;
|
||||
}
|
||||
|
||||
void main_inner(uint idx) {
|
||||
const int3 a = asint(s.Load3((176u * idx)));
|
||||
const int b = asint(s.Load(((176u * idx) + 12u)));
|
||||
const uint3 c = s.Load3(((176u * idx) + 16u));
|
||||
const uint d = s.Load(((176u * idx) + 28u));
|
||||
const float3 e = asfloat(s.Load3(((176u * idx) + 32u)));
|
||||
const float f = asfloat(s.Load(((176u * idx) + 44u)));
|
||||
const float2x3 g = tint_symbol_8(s, ((176u * idx) + 48u));
|
||||
const float3x2 h = tint_symbol_9(s, ((176u * idx) + 80u));
|
||||
const int4 i[4] = tint_symbol_11(s, ((176u * idx) + 112u));
|
||||
}
|
||||
|
||||
[numthreads(1, 1, 1)]
|
||||
void main(tint_symbol_1 tint_symbol) {
|
||||
main_inner(tint_symbol.idx);
|
||||
return;
|
||||
}
|
||||
@@ -0,0 +1,44 @@
|
||||
RWByteAddressBuffer s : register(u0, space0);
|
||||
|
||||
struct tint_symbol_1 {
|
||||
uint idx : SV_GroupIndex;
|
||||
};
|
||||
|
||||
void tint_symbol_8(RWByteAddressBuffer buffer, uint offset, float2x3 value) {
|
||||
buffer.Store3((offset + 0u), asuint(value[0u]));
|
||||
buffer.Store3((offset + 16u), asuint(value[1u]));
|
||||
}
|
||||
|
||||
void tint_symbol_9(RWByteAddressBuffer buffer, uint offset, float3x2 value) {
|
||||
buffer.Store2((offset + 0u), asuint(value[0u]));
|
||||
buffer.Store2((offset + 8u), asuint(value[1u]));
|
||||
buffer.Store2((offset + 16u), asuint(value[2u]));
|
||||
}
|
||||
|
||||
void tint_symbol_11(RWByteAddressBuffer buffer, uint offset, int4 value[4]) {
|
||||
int4 array[4] = value;
|
||||
{
|
||||
[loop] for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
|
||||
buffer.Store4((offset + (i_1 * 16u)), asuint(array[i_1]));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void main_inner(uint idx) {
|
||||
s.Store3((176u * idx), asuint((0).xxx));
|
||||
s.Store(((176u * idx) + 12u), asuint(0));
|
||||
s.Store3(((176u * idx) + 16u), asuint((0u).xxx));
|
||||
s.Store(((176u * idx) + 28u), asuint(0u));
|
||||
s.Store3(((176u * idx) + 32u), asuint((0.0f).xxx));
|
||||
s.Store(((176u * idx) + 44u), asuint(0.0f));
|
||||
tint_symbol_8(s, ((176u * idx) + 48u), float2x3((0.0f).xxx, (0.0f).xxx));
|
||||
tint_symbol_9(s, ((176u * idx) + 80u), float3x2((0.0f).xx, (0.0f).xx, (0.0f).xx));
|
||||
const int4 tint_symbol_13[4] = (int4[4])0;
|
||||
tint_symbol_11(s, ((176u * idx) + 112u), tint_symbol_13);
|
||||
}
|
||||
|
||||
[numthreads(1, 1, 1)]
|
||||
void main(tint_symbol_1 tint_symbol) {
|
||||
main_inner(tint_symbol.idx);
|
||||
return;
|
||||
}
|
||||
@@ -0,0 +1,44 @@
|
||||
struct Inner {
|
||||
int x;
|
||||
};
|
||||
|
||||
ByteAddressBuffer s : register(t0, space0);
|
||||
|
||||
float2x3 tint_symbol_6(ByteAddressBuffer buffer, uint offset) {
|
||||
return float2x3(asfloat(buffer.Load3((offset + 0u))), asfloat(buffer.Load3((offset + 16u))));
|
||||
}
|
||||
|
||||
float3x2 tint_symbol_7(ByteAddressBuffer buffer, uint offset) {
|
||||
return float3x2(asfloat(buffer.Load2((offset + 0u))), asfloat(buffer.Load2((offset + 8u))), asfloat(buffer.Load2((offset + 16u))));
|
||||
}
|
||||
|
||||
Inner tint_symbol_9(ByteAddressBuffer buffer, uint offset) {
|
||||
const Inner tint_symbol_11 = {asint(buffer.Load((offset + 0u)))};
|
||||
return tint_symbol_11;
|
||||
}
|
||||
|
||||
typedef Inner tint_symbol_10_ret[4];
|
||||
tint_symbol_10_ret tint_symbol_10(ByteAddressBuffer buffer, 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_9(buffer, (offset + (i_1 * 4u)));
|
||||
}
|
||||
}
|
||||
return arr;
|
||||
}
|
||||
|
||||
[numthreads(1, 1, 1)]
|
||||
void main() {
|
||||
const int3 a = asint(s.Load3(0u));
|
||||
const int b = asint(s.Load(12u));
|
||||
const uint3 c = s.Load3(16u);
|
||||
const uint d = s.Load(28u);
|
||||
const float3 e = asfloat(s.Load3(32u));
|
||||
const float f = asfloat(s.Load(44u));
|
||||
const float2x3 g = tint_symbol_6(s, 48u);
|
||||
const float3x2 h = tint_symbol_7(s, 80u);
|
||||
const Inner i = tint_symbol_9(s, 104u);
|
||||
const Inner j[4] = tint_symbol_10(s, 108u);
|
||||
return;
|
||||
}
|
||||
@@ -0,0 +1,46 @@
|
||||
struct Inner {
|
||||
int x;
|
||||
};
|
||||
|
||||
RWByteAddressBuffer s : register(u0, space0);
|
||||
|
||||
void tint_symbol_6(RWByteAddressBuffer buffer, uint offset, float2x3 value) {
|
||||
buffer.Store3((offset + 0u), asuint(value[0u]));
|
||||
buffer.Store3((offset + 16u), asuint(value[1u]));
|
||||
}
|
||||
|
||||
void tint_symbol_7(RWByteAddressBuffer buffer, uint offset, float3x2 value) {
|
||||
buffer.Store2((offset + 0u), asuint(value[0u]));
|
||||
buffer.Store2((offset + 8u), asuint(value[1u]));
|
||||
buffer.Store2((offset + 16u), asuint(value[2u]));
|
||||
}
|
||||
|
||||
void tint_symbol_9(RWByteAddressBuffer buffer, uint offset, Inner value) {
|
||||
buffer.Store((offset + 0u), asuint(value.x));
|
||||
}
|
||||
|
||||
void tint_symbol_10(RWByteAddressBuffer buffer, uint offset, Inner value[4]) {
|
||||
Inner array[4] = value;
|
||||
{
|
||||
[loop] for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
|
||||
tint_symbol_9(buffer, (offset + (i_1 * 4u)), array[i_1]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
[numthreads(1, 1, 1)]
|
||||
void main() {
|
||||
s.Store3(0u, asuint((0).xxx));
|
||||
s.Store(12u, asuint(0));
|
||||
s.Store3(16u, asuint((0u).xxx));
|
||||
s.Store(28u, asuint(0u));
|
||||
s.Store3(32u, asuint((0.0f).xxx));
|
||||
s.Store(44u, asuint(0.0f));
|
||||
tint_symbol_6(s, 48u, float2x3((0.0f).xxx, (0.0f).xxx));
|
||||
tint_symbol_7(s, 80u, float3x2((0.0f).xx, (0.0f).xx, (0.0f).xx));
|
||||
const Inner tint_symbol_11 = (Inner)0;
|
||||
tint_symbol_9(s, 104u, tint_symbol_11);
|
||||
const Inner tint_symbol_12[4] = (Inner[4])0;
|
||||
tint_symbol_10(s, 108u, tint_symbol_12);
|
||||
return;
|
||||
}
|
||||
28
test/tint/buffer/storage/types/array.wgsl.expected.fxc.hlsl
Normal file
28
test/tint/buffer/storage/types/array.wgsl.expected.fxc.hlsl
Normal file
@@ -0,0 +1,28 @@
|
||||
ByteAddressBuffer tint_symbol : register(t0, space0);
|
||||
RWByteAddressBuffer tint_symbol_1 : register(u1, space0);
|
||||
|
||||
void tint_symbol_2(RWByteAddressBuffer buffer, uint offset, float value[4]) {
|
||||
float array[4] = value;
|
||||
{
|
||||
[loop] for(uint i = 0u; (i < 4u); i = (i + 1u)) {
|
||||
buffer.Store((offset + (i * 4u)), asuint(array[i]));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
typedef float tint_symbol_4_ret[4];
|
||||
tint_symbol_4_ret tint_symbol_4(ByteAddressBuffer buffer, uint offset) {
|
||||
float arr[4] = (float[4])0;
|
||||
{
|
||||
[loop] for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
|
||||
arr[i_1] = asfloat(buffer.Load((offset + (i_1 * 4u))));
|
||||
}
|
||||
}
|
||||
return arr;
|
||||
}
|
||||
|
||||
[numthreads(1, 1, 1)]
|
||||
void main() {
|
||||
tint_symbol_2(tint_symbol_1, 0u, tint_symbol_4(tint_symbol, 0u));
|
||||
return;
|
||||
}
|
||||
@@ -0,0 +1,8 @@
|
||||
ByteAddressBuffer tint_symbol : register(t0, space0);
|
||||
RWByteAddressBuffer tint_symbol_1 : register(u1, space0);
|
||||
|
||||
[numthreads(1, 1, 1)]
|
||||
void main() {
|
||||
tint_symbol_1.Store(0u, asuint(asfloat(tint_symbol.Load(0u))));
|
||||
return;
|
||||
}
|
||||
@@ -0,0 +1,8 @@
|
||||
ByteAddressBuffer tint_symbol : register(t0, space0);
|
||||
RWByteAddressBuffer tint_symbol_1 : register(u1, space0);
|
||||
|
||||
[numthreads(1, 1, 1)]
|
||||
void main() {
|
||||
tint_symbol_1.Store(0u, asuint(asint(tint_symbol.Load(0u))));
|
||||
return;
|
||||
}
|
||||
17
test/tint/buffer/storage/types/mat2x2.wgsl.expected.fxc.hlsl
Normal file
17
test/tint/buffer/storage/types/mat2x2.wgsl.expected.fxc.hlsl
Normal file
@@ -0,0 +1,17 @@
|
||||
ByteAddressBuffer tint_symbol : register(t0, space0);
|
||||
RWByteAddressBuffer tint_symbol_1 : register(u1, space0);
|
||||
|
||||
void tint_symbol_2(RWByteAddressBuffer buffer, uint offset, float2x2 value) {
|
||||
buffer.Store2((offset + 0u), asuint(value[0u]));
|
||||
buffer.Store2((offset + 8u), asuint(value[1u]));
|
||||
}
|
||||
|
||||
float2x2 tint_symbol_4(ByteAddressBuffer buffer, uint offset) {
|
||||
return float2x2(asfloat(buffer.Load2((offset + 0u))), asfloat(buffer.Load2((offset + 8u))));
|
||||
}
|
||||
|
||||
[numthreads(1, 1, 1)]
|
||||
void main() {
|
||||
tint_symbol_2(tint_symbol_1, 0u, tint_symbol_4(tint_symbol, 0u));
|
||||
return;
|
||||
}
|
||||
17
test/tint/buffer/storage/types/mat2x3.wgsl.expected.fxc.hlsl
Normal file
17
test/tint/buffer/storage/types/mat2x3.wgsl.expected.fxc.hlsl
Normal file
@@ -0,0 +1,17 @@
|
||||
ByteAddressBuffer tint_symbol : register(t0, space0);
|
||||
RWByteAddressBuffer tint_symbol_1 : register(u1, space0);
|
||||
|
||||
void tint_symbol_2(RWByteAddressBuffer buffer, uint offset, float2x3 value) {
|
||||
buffer.Store3((offset + 0u), asuint(value[0u]));
|
||||
buffer.Store3((offset + 16u), asuint(value[1u]));
|
||||
}
|
||||
|
||||
float2x3 tint_symbol_4(ByteAddressBuffer buffer, uint offset) {
|
||||
return float2x3(asfloat(buffer.Load3((offset + 0u))), asfloat(buffer.Load3((offset + 16u))));
|
||||
}
|
||||
|
||||
[numthreads(1, 1, 1)]
|
||||
void main() {
|
||||
tint_symbol_2(tint_symbol_1, 0u, tint_symbol_4(tint_symbol, 0u));
|
||||
return;
|
||||
}
|
||||
18
test/tint/buffer/storage/types/mat3x2.wgsl.expected.fxc.hlsl
Normal file
18
test/tint/buffer/storage/types/mat3x2.wgsl.expected.fxc.hlsl
Normal file
@@ -0,0 +1,18 @@
|
||||
ByteAddressBuffer tint_symbol : register(t0, space0);
|
||||
RWByteAddressBuffer tint_symbol_1 : register(u1, space0);
|
||||
|
||||
void tint_symbol_2(RWByteAddressBuffer buffer, uint offset, float3x2 value) {
|
||||
buffer.Store2((offset + 0u), asuint(value[0u]));
|
||||
buffer.Store2((offset + 8u), asuint(value[1u]));
|
||||
buffer.Store2((offset + 16u), asuint(value[2u]));
|
||||
}
|
||||
|
||||
float3x2 tint_symbol_4(ByteAddressBuffer buffer, uint offset) {
|
||||
return float3x2(asfloat(buffer.Load2((offset + 0u))), asfloat(buffer.Load2((offset + 8u))), asfloat(buffer.Load2((offset + 16u))));
|
||||
}
|
||||
|
||||
[numthreads(1, 1, 1)]
|
||||
void main() {
|
||||
tint_symbol_2(tint_symbol_1, 0u, tint_symbol_4(tint_symbol, 0u));
|
||||
return;
|
||||
}
|
||||
19
test/tint/buffer/storage/types/mat4x4.wgsl.expected.fxc.hlsl
Normal file
19
test/tint/buffer/storage/types/mat4x4.wgsl.expected.fxc.hlsl
Normal file
@@ -0,0 +1,19 @@
|
||||
ByteAddressBuffer tint_symbol : register(t0, space0);
|
||||
RWByteAddressBuffer tint_symbol_1 : register(u1, space0);
|
||||
|
||||
void tint_symbol_2(RWByteAddressBuffer buffer, uint offset, float4x4 value) {
|
||||
buffer.Store4((offset + 0u), asuint(value[0u]));
|
||||
buffer.Store4((offset + 16u), asuint(value[1u]));
|
||||
buffer.Store4((offset + 32u), asuint(value[2u]));
|
||||
buffer.Store4((offset + 48u), asuint(value[3u]));
|
||||
}
|
||||
|
||||
float4x4 tint_symbol_4(ByteAddressBuffer buffer, uint offset) {
|
||||
return float4x4(asfloat(buffer.Load4((offset + 0u))), asfloat(buffer.Load4((offset + 16u))), asfloat(buffer.Load4((offset + 32u))), asfloat(buffer.Load4((offset + 48u))));
|
||||
}
|
||||
|
||||
[numthreads(1, 1, 1)]
|
||||
void main() {
|
||||
tint_symbol_2(tint_symbol_1, 0u, tint_symbol_4(tint_symbol, 0u));
|
||||
return;
|
||||
}
|
||||
@@ -0,0 +1,21 @@
|
||||
struct S {
|
||||
float f;
|
||||
};
|
||||
|
||||
ByteAddressBuffer tint_symbol : register(t0, space0);
|
||||
RWByteAddressBuffer tint_symbol_1 : register(u1, space0);
|
||||
|
||||
void tint_symbol_2(RWByteAddressBuffer buffer, uint offset, S value) {
|
||||
buffer.Store((offset + 0u), asuint(value.f));
|
||||
}
|
||||
|
||||
S tint_symbol_4(ByteAddressBuffer buffer, uint offset) {
|
||||
const S tint_symbol_6 = {asfloat(buffer.Load((offset + 0u)))};
|
||||
return tint_symbol_6;
|
||||
}
|
||||
|
||||
[numthreads(1, 1, 1)]
|
||||
void main() {
|
||||
tint_symbol_2(tint_symbol_1, (4u * 0u), tint_symbol_4(tint_symbol, (4u * 0u)));
|
||||
return;
|
||||
}
|
||||
33
test/tint/buffer/storage/types/struct.wgsl.expected.fxc.hlsl
Normal file
33
test/tint/buffer/storage/types/struct.wgsl.expected.fxc.hlsl
Normal file
@@ -0,0 +1,33 @@
|
||||
struct Inner {
|
||||
float f;
|
||||
};
|
||||
struct S {
|
||||
Inner inner;
|
||||
};
|
||||
|
||||
ByteAddressBuffer tint_symbol : register(t0, space0);
|
||||
RWByteAddressBuffer tint_symbol_1 : register(u1, space0);
|
||||
|
||||
void tint_symbol_3(RWByteAddressBuffer buffer, uint offset, Inner value) {
|
||||
buffer.Store((offset + 0u), asuint(value.f));
|
||||
}
|
||||
|
||||
void tint_symbol_2(RWByteAddressBuffer buffer, uint offset, S value) {
|
||||
tint_symbol_3(buffer, (offset + 0u), value.inner);
|
||||
}
|
||||
|
||||
Inner tint_symbol_6(ByteAddressBuffer buffer, uint offset) {
|
||||
const Inner tint_symbol_8 = {asfloat(buffer.Load((offset + 0u)))};
|
||||
return tint_symbol_8;
|
||||
}
|
||||
|
||||
S tint_symbol_5(ByteAddressBuffer buffer, uint offset) {
|
||||
const S tint_symbol_9 = {tint_symbol_6(buffer, (offset + 0u))};
|
||||
return tint_symbol_9;
|
||||
}
|
||||
|
||||
[numthreads(1, 1, 1)]
|
||||
void main() {
|
||||
tint_symbol_2(tint_symbol_1, 0u, tint_symbol_5(tint_symbol, 0u));
|
||||
return;
|
||||
}
|
||||
@@ -0,0 +1,8 @@
|
||||
ByteAddressBuffer tint_symbol : register(t0, space0);
|
||||
RWByteAddressBuffer tint_symbol_1 : register(u1, space0);
|
||||
|
||||
[numthreads(1, 1, 1)]
|
||||
void main() {
|
||||
tint_symbol_1.Store(0u, asuint(tint_symbol.Load(0u)));
|
||||
return;
|
||||
}
|
||||
@@ -0,0 +1,8 @@
|
||||
ByteAddressBuffer tint_symbol : register(t0, space0);
|
||||
RWByteAddressBuffer tint_symbol_1 : register(u1, space0);
|
||||
|
||||
[numthreads(1, 1, 1)]
|
||||
void main() {
|
||||
tint_symbol_1.Store2(0u, asuint(asint(tint_symbol.Load2(0u))));
|
||||
return;
|
||||
}
|
||||
@@ -0,0 +1,8 @@
|
||||
ByteAddressBuffer tint_symbol : register(t0, space0);
|
||||
RWByteAddressBuffer tint_symbol_1 : register(u1, space0);
|
||||
|
||||
[numthreads(1, 1, 1)]
|
||||
void main() {
|
||||
tint_symbol_1.Store3(0u, asuint(tint_symbol.Load3(0u)));
|
||||
return;
|
||||
}
|
||||
@@ -0,0 +1,8 @@
|
||||
ByteAddressBuffer tint_symbol : register(t0, space0);
|
||||
RWByteAddressBuffer tint_symbol_1 : register(u1, space0);
|
||||
|
||||
[numthreads(1, 1, 1)]
|
||||
void main() {
|
||||
tint_symbol_1.Store4(0u, asuint(asfloat(tint_symbol.Load4(0u))));
|
||||
return;
|
||||
}
|
||||
Reference in New Issue
Block a user