encounter/dawn-cmake
1
0
Fork 0
mirror of https://github.com/encounter/dawn-cmake.git synced 2025-12-20 10:25:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

HLSL: work around FXC failures when dynamically indexing matrices

Browse Source 
This fixes errors like "error X3500: array reference cannot be used as
an l-value; not natively addressable". Note that FXC treats matrices
like arrays. We still get this error for dynamically indexed arrays in
structs.

Also improved HLSL assign tests, and add missing ones for vector
indexing.

Manually removed 20 e2e skip hlsl SKIP files that are now passing with
this change.

Bug: tint:1333
Change-Id: If23881a667857a4d4ec6881e72666af0a666ef10
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/71982
Reviewed-by: Ben Clayton <bclayton@google.com>
Kokoro: Kokoro <noreply+kokoro@google.com>
Commit-Queue: Antonio Maiorano <amaiorano@google.com>
This commit is contained in:
Antonio Maiorano
2021-12-08 23:03:33 +00:00
committed by Tint LUCI CQ
parent 3703522d41
commit a8c202b8e7
65 changed files with 1296 additions and 2594 deletions
Download Patch File Download Diff File Expand all files Collapse all files

97
test/vk-gl-cts/graphicsfuzz/cov-reinitialize-matrix-after-undefined-value/0-opt.spvasm.expected.hlsl
View File

@@ -1,97 +0,0 @@
SKIP: FAILED
void set_float2(inout float2 vec, int idx, float val) {
vec = (idx.xx == int2(0, 1)) ? val.xx : vec;
}
cbuffer cbuffer_x_5 : register(b0, space0) {
uint4 x_5[4];
};
static float4 x_GLF_color = float4(0.0f, 0.0f, 0.0f, 0.0f);
void main_1() {
float2x2 m = float2x2(0.0f, 0.0f, 0.0f, 0.0f);
float f = 0.0f;
int i = 0;
int j = 0;
const int x_36 = asint(x_5[1].x);
if ((x_36 == 1)) {
const float x_40 = f;
m = float2x2(float2(x_40, 0.0f), float2(0.0f, x_40));
}
const int x_45 = asint(x_5[1].x);
i = x_45;
[loop] while (true) {
const int x_50 = i;
const uint scalar_offset = ((16u * uint(0))) / 4;
const int x_52 = asint(x_5[scalar_offset / 4][scalar_offset % 4]);
if ((x_50 < x_52)) {
} else {
break;
}
const int x_56 = asint(x_5[1].x);
j = x_56;
[loop] while (true) {
const int x_61 = j;
const uint scalar_offset_1 = ((16u * uint(0))) / 4;
const int x_63 = asint(x_5[scalar_offset_1 / 4][scalar_offset_1 % 4]);
if ((x_61 < x_63)) {
} else {
break;
}
const int x_66 = i;
const int x_67 = j;
const int x_68 = i;
const uint scalar_offset_2 = ((16u * uint(0))) / 4;
const int x_70 = asint(x_5[scalar_offset_2 / 4][scalar_offset_2 % 4]);
set_float2(m[x_66], x_67, float(((x_68 * x_70) + j)));
{
j = (j + 1);
}
}
{
i = (i + 1);
}
}
const float2x2 x_80 = m;
const int x_82 = asint(x_5[1].x);
const int x_85 = asint(x_5[2].x);
const uint scalar_offset_3 = ((16u * uint(0))) / 4;
const int x_88 = asint(x_5[scalar_offset_3 / 4][scalar_offset_3 % 4]);
const int x_91 = asint(x_5[3].x);
const float2x2 x_95 = float2x2(float2(float(x_82), float(x_85)), float2(float(x_88), float(x_91)));
if ((all((x_80[0u] == x_95[0u])) & all((x_80[1u] == x_95[1u])))) {
const int x_109 = asint(x_5[2].x);
const int x_112 = asint(x_5[1].x);
const int x_115 = asint(x_5[1].x);
const int x_118 = asint(x_5[2].x);
x_GLF_color = float4(float(x_109), float(x_112), float(x_115), float(x_118));
} else {
const int x_122 = asint(x_5[1].x);
const float x_123 = float(x_122);
x_GLF_color = float4(x_123, x_123, x_123, x_123);
}
return;
}
struct main_out {
float4 x_GLF_color_1;
};
struct tint_symbol {
float4 x_GLF_color_1 : SV_Target0;
};
main_out main_inner() {
main_1();
const main_out tint_symbol_2 = {x_GLF_color};
return tint_symbol_2;
}
tint_symbol main() {
const main_out inner_result = main_inner();
tint_symbol wrapper_result = (tint_symbol)0;
wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
return wrapper_result;
}
C:\src\tint\test\Shader@0x0000027B69224CC0(32,12-23): error X3531: can't unroll loops marked with loop attribute

101
test/vk-gl-cts/graphicsfuzz/cov-reinitialize-matrix-after-undefined-value/0-opt.wgsl.expected.hlsl
View File

@@ -1,101 +0,0 @@
SKIP: FAILED
void set_float2(inout float2 vec, int idx, float val) {
vec = (idx.xx == int2(0, 1)) ? val.xx : vec;
}
cbuffer cbuffer_x_5 : register(b0, space0) {
uint4 x_5[4];
};
static float4 x_GLF_color = float4(0.0f, 0.0f, 0.0f, 0.0f);
void main_1() {
float2x2 m = float2x2(0.0f, 0.0f, 0.0f, 0.0f);
float f = 0.0f;
int i = 0;
int j = 0;
const int x_36 = asint(x_5[1].x);
if ((x_36 == 1)) {
const float x_40 = f;
m = float2x2(float2(x_40, 0.0f), float2(0.0f, x_40));
}
const int x_45 = asint(x_5[1].x);
i = x_45;
[loop] while (true) {
const int x_50 = i;
const uint scalar_offset = ((16u * uint(0))) / 4;
const int x_52 = asint(x_5[scalar_offset / 4][scalar_offset % 4]);
if ((x_50 < x_52)) {
} else {
break;
}
const int x_56 = asint(x_5[1].x);
j = x_56;
[loop] while (true) {
const int x_61 = j;
const uint scalar_offset_1 = ((16u * uint(0))) / 4;
const int x_63 = asint(x_5[scalar_offset_1 / 4][scalar_offset_1 % 4]);
if ((x_61 < x_63)) {
} else {
break;
}
const int x_66 = i;
const int x_67 = j;
const int x_68 = i;
const uint scalar_offset_2 = ((16u * uint(0))) / 4;
const int x_70 = asint(x_5[scalar_offset_2 / 4][scalar_offset_2 % 4]);
set_float2(m[x_66], x_67, float(((x_68 * x_70) + j)));
{
j = (j + 1);
}
}
{
i = (i + 1);
}
}
const float2x2 x_80 = m;
const int x_82 = asint(x_5[1].x);
const int x_85 = asint(x_5[2].x);
const uint scalar_offset_3 = ((16u * uint(0))) / 4;
const int x_88 = asint(x_5[scalar_offset_3 / 4][scalar_offset_3 % 4]);
const int x_91 = asint(x_5[3].x);
const float2x2 x_95 = float2x2(float2(float(x_82), float(x_85)), float2(float(x_88), float(x_91)));
bool tint_tmp = all((x_80[0u] == x_95[0u]));
if (tint_tmp) {
tint_tmp = all((x_80[1u] == x_95[1u]));
}
if ((tint_tmp)) {
const int x_109 = asint(x_5[2].x);
const int x_112 = asint(x_5[1].x);
const int x_115 = asint(x_5[1].x);
const int x_118 = asint(x_5[2].x);
x_GLF_color = float4(float(x_109), float(x_112), float(x_115), float(x_118));
} else {
const int x_122 = asint(x_5[1].x);
const float x_123 = float(x_122);
x_GLF_color = float4(x_123, x_123, x_123, x_123);
}
return;
}
struct main_out {
float4 x_GLF_color_1;
};
struct tint_symbol {
float4 x_GLF_color_1 : SV_Target0;
};
main_out main_inner() {
main_1();
const main_out tint_symbol_2 = {x_GLF_color};
return tint_symbol_2;
}
tint_symbol main() {
const main_out inner_result = main_inner();
tint_symbol wrapper_result = (tint_symbol)0;
wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
return wrapper_result;
}
C:\src\tint\test\Shader@0x0000019F4EA2D3B0(32,12-23): error X3531: can't unroll loops marked with loop attribute