encounter/dawn-cmake
1
0
Fork 0
mirror of https://github.com/encounter/dawn-cmake.git synced 2025-12-17 00:47:13 +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

83
test/vk-gl-cts/graphicsfuzz/write-red-in-loop-nest/0-opt.spvasm.expected.hlsl
View File

@@ -1,83 +0,0 @@
SKIP: FAILED
void set_float3(inout float3 vec, int idx, float val) {
vec = (idx.xxx == int3(0, 1, 2)) ? val.xxx : vec;
}
static float4 x_GLF_color = float4(0.0f, 0.0f, 0.0f, 0.0f);
void main_1() {
float4x3 m43 = float4x3(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f);
int ll1 = 0;
int rows = 0;
int ll4 = 0;
int ll2 = 0;
int c = 0;
float4x3 tempm43 = float4x3(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f);
int ll3 = 0;
int d = 0;
int r = 0;
float sums[9] = (float[9])0;
int idx = 0;
m43 = float4x3(float3(1.0f, 0.0f, 0.0f), float3(0.0f, 1.0f, 0.0f), float3(0.0f, 0.0f, 1.0f), float3(0.0f, 0.0f, 0.0f));
ll1 = 0;
rows = 2;
[loop] while (true) {
if (true) {
} else {
break;
}
x_GLF_color = float4(1.0f, 0.0f, 0.0f, 1.0f);
if ((ll1 >= 5)) {
break;
}
ll1 = (ll1 + 1);
ll4 = 10;
ll2 = 0;
c = 0;
{
[loop] for(; (c < 1); c = (c + 1)) {
if ((ll2 >= 0)) {
break;
}
ll2 = (ll2 + 1);
tempm43 = m43;
ll3 = 0;
d = 0;
{
[loop] for(; (1 < ll4); d = (d + 1)) {
set_float3(tempm43[(((d >= 0) & (d < 4)) ? d : 0)], (((r >= 0) & (r < 3)) ? r : 0), 1.0f);
}
}
const int x_111 = (((idx >= 0) & (idx < 9)) ? idx : 0);
const float x_113 = m43[c].y;
const float x_115 = sums[x_111];
sums[x_111] = (x_115 + x_113);
}
}
idx = (idx + 1);
}
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_1 = {x_GLF_color};
return tint_symbol_1;
}
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@0x000001DA1CD04F80(46,18-46): error X3531: can't unroll loops marked with loop attribute

95
test/vk-gl-cts/graphicsfuzz/write-red-in-loop-nest/0-opt.wgsl.expected.hlsl
View File

@@ -1,95 +0,0 @@
SKIP: FAILED
void set_float3(inout float3 vec, int idx, float val) {
vec = (idx.xxx == int3(0, 1, 2)) ? val.xxx : vec;
}
static float4 x_GLF_color = float4(0.0f, 0.0f, 0.0f, 0.0f);
void main_1() {
float4x3 m43 = float4x3(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f);
int ll1 = 0;
int rows = 0;
int ll4 = 0;
int ll2 = 0;
int c = 0;
float4x3 tempm43 = float4x3(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f);
int ll3 = 0;
int d = 0;
int r = 0;
float sums[9] = (float[9])0;
int idx = 0;
m43 = float4x3(float3(1.0f, 0.0f, 0.0f), float3(0.0f, 1.0f, 0.0f), float3(0.0f, 0.0f, 1.0f), float3(0.0f, 0.0f, 0.0f));
ll1 = 0;
rows = 2;
[loop] while (true) {
if (true) {
} else {
break;
}
x_GLF_color = float4(1.0f, 0.0f, 0.0f, 1.0f);
if ((ll1 >= 5)) {
break;
}
ll1 = (ll1 + 1);
ll4 = 10;
ll2 = 0;
c = 0;
{
[loop] for(; (c < 1); c = (c + 1)) {
if ((ll2 >= 0)) {
break;
}
ll2 = (ll2 + 1);
tempm43 = m43;
ll3 = 0;
d = 0;
{
[loop] for(; (1 < ll4); d = (d + 1)) {
bool tint_tmp = (d >= 0);
if (tint_tmp) {
tint_tmp = (d < 4);
}
bool tint_tmp_1 = (r >= 0);
if (tint_tmp_1) {
tint_tmp_1 = (r < 3);
}
set_float3(tempm43[((tint_tmp) ? d : 0)], ((tint_tmp_1) ? r : 0), 1.0f);
}
}
bool tint_tmp_2 = (idx >= 0);
if (tint_tmp_2) {
tint_tmp_2 = (idx < 9);
}
const int x_111 = ((tint_tmp_2) ? idx : 0);
const float x_113 = m43[c].y;
const float x_115 = sums[x_111];
sums[x_111] = (x_115 + x_113);
}
}
idx = (idx + 1);
}
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_1 = {x_GLF_color};
return tint_symbol_1;
}
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@0x0000026405D97AD0(46,18-46): error X3531: can't unroll loops marked with loop attribute