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:
Ben Clayton
2022-07-22 17:43:27 +00:00
committed by Dawn LUCI CQ
parent 0778d9a48f
commit 7d34de88f1
5122 changed files with 73624 additions and 206 deletions

View File

@@ -0,0 +1,24 @@
SKIP: FAILED
static uint var_1 = 0u;
void main_1() {
{
[loop] for(; !(false); ) {
}
}
return;
}
void main() {
main_1();
return;
}
warning: DXIL.dll not found. Resulting DXIL will not be signed for use in release environments.
error: validation errors
/tmp/tint_ePdsZG:11: error: Loop must have break.
Validation failed.

View File

@@ -0,0 +1,25 @@
SKIP: FAILED
static uint var_1 = 0u;
void main_1() {
[loop] while (true) {
if (false) {
break;
}
}
return;
}
void main() {
main_1();
return;
}
warning: DXIL.dll not found. Resulting DXIL will not be signed for use in release environments.
error: validation errors
/tmp/tint_1aGHmE:12: error: Loop must have break.
Validation failed.

View File

@@ -0,0 +1,30 @@
SKIP: FAILED
static uint var_1 = 0u;
void main_1() {
var_1 = 0u;
[loop] while (true) {
var_1 = 1u;
{
if (false) {
break;
}
}
}
var_1 = 5u;
return;
}
void main() {
main_1();
return;
}
warning: DXIL.dll not found. Resulting DXIL will not be signed for use in release environments.
error: validation errors
/tmp/tint_M0JS53:17: error: Loop must have break.
Validation failed.

View File

@@ -0,0 +1,28 @@
SKIP: FAILED
static uint var_1 = 0u;
void main_1() {
var_1 = 0u;
[loop] while (true) {
var_1 = 1u;
if (false) {
break;
}
}
var_1 = 5u;
return;
}
void main() {
main_1();
return;
}
warning: DXIL.dll not found. Resulting DXIL will not be signed for use in release environments.
error: validation errors
/tmp/tint_9dTIlS:15: error: Loop must have break.
Validation failed.

View File

@@ -0,0 +1,40 @@
SKIP: FAILED
static uint var_1 = 0u;
void main_1() {
var_1 = 0u;
[loop] while (true) {
var_1 = 1u;
if (true) {
var_1 = 2u;
if (false) {
break;
} else {
{
var_1 = 4u;
}
continue;
}
}
var_1 = 3u;
{
var_1 = 4u;
}
}
var_1 = 5u;
return;
}
void main() {
main_1();
return;
}
warning: DXIL.dll not found. Resulting DXIL will not be signed for use in release environments.
error: validation errors
/tmp/tint_Rz6lq4:27: error: Loop must have break.
Validation failed.

View File

@@ -0,0 +1,33 @@
SKIP: FAILED
static uint var_1 = 0u;
void main_1() {
var_1 = 0u;
[loop] while (true) {
var_1 = 1u;
var_1 = 2u;
if (false) {
break;
}
var_1 = 3u;
{
var_1 = 4u;
}
}
var_1 = 5u;
return;
}
void main() {
main_1();
return;
}
warning: DXIL.dll not found. Resulting DXIL will not be signed for use in release environments.
error: validation errors
/tmp/tint_T39Xh2:20: error: Loop must have break.
Validation failed.

View File

@@ -0,0 +1,25 @@
SKIP: FAILED
static uint var_1 = 0u;
void main_1() {
[loop] while (true) {
if (false) {
break;
}
}
return;
}
void main() {
main_1();
return;
}
warning: DXIL.dll not found. Resulting DXIL will not be signed for use in release environments.
error: validation errors
/tmp/tint_lRzVSG:12: error: Loop must have break.
Validation failed.

View File

@@ -0,0 +1,29 @@
SKIP: FAILED
static uint var_1 = 0u;
void main_1() {
[loop] while (true) {
var_1 = 1u;
if (false) {
break;
}
{
var_1 = 2u;
}
}
return;
}
void main() {
main_1();
return;
}
warning: DXIL.dll not found. Resulting DXIL will not be signed for use in release environments.
error: validation errors
/tmp/tint_KRVOs8:16: error: Loop must have break.
Validation failed.

View File

@@ -0,0 +1,30 @@
SKIP: FAILED
static uint var_1 = 0u;
void main_1() {
[loop] while (true) {
var_1 = 1u;
if (false) {
break;
}
var_1 = 3u;
{
var_1 = 2u;
}
}
return;
}
void main() {
main_1();
return;
}
warning: DXIL.dll not found. Resulting DXIL will not be signed for use in release environments.
error: validation errors
/tmp/tint_tGC31y:17: error: Loop must have break.
Validation failed.

View File

@@ -0,0 +1,28 @@
SKIP: FAILED
static uint var_1 = 0u;
void main_1() {
var_1 = 0u;
[loop] while (true) {
var_1 = 1u;
if (false) {
break;
}
}
var_1 = 999u;
return;
}
void main() {
main_1();
return;
}
warning: DXIL.dll not found. Resulting DXIL will not be signed for use in release environments.
error: validation errors
/tmp/tint_Iz92Ch:15: error: Loop must have break.
Validation failed.

View File

@@ -0,0 +1,25 @@
SKIP: FAILED
static uint var_1 = 0u;
void main_1() {
[loop] while (true) {
if (false) {
break;
}
}
return;
}
void main() {
main_1();
return;
}
warning: DXIL.dll not found. Resulting DXIL will not be signed for use in release environments.
error: validation errors
/tmp/tint_ABIRu4:12: error: Loop must have break.
Validation failed.

View File

@@ -0,0 +1,42 @@
SKIP: FAILED
static uint x_1 = 0u;
void main_1() {
x_1 = 0u;
[loop] while (true) {
uint x_2 = 0u;
x_1 = 1u;
if (false) {
break;
}
x_1 = 3u;
if (true) {
x_2 = (1u + 1u);
} else {
return;
}
x_1 = x_2;
{
x_1 = 4u;
if (false) {
break;
}
}
}
x_1 = 5u;
return;
}
void main() {
main_1();
return;
}
warning: DXIL.dll not found. Resulting DXIL will not be signed for use in release environments.
error: validation errors
/tmp/tint_LpDCMy:29: error: Loop must have break.
Validation failed.

View File

@@ -0,0 +1,48 @@
SKIP: FAILED
warning: code is unreachable
static uint x_1 = 0u;
static bool x_7 = false;
static bool x_8 = false;
void main_1() {
const bool x_101 = x_7;
const bool x_102 = x_8;
[loop] while (true) {
uint x_2_phi = 0u;
if (x_101) {
break;
}
if (x_102) {
x_2_phi = 0u;
{
x_1 = x_2_phi;
}
continue;
} else {
x_2_phi = 1u;
{
x_1 = x_2_phi;
}
continue;
}
x_2_phi = 0u;
{
x_1 = x_2_phi;
}
}
return;
}
void main() {
main_1();
return;
}
warning: DXIL.dll not found. Resulting DXIL will not be signed for use in release environments.
error: validation errors
/tmp/tint_l2mEof:34: error: Loop must have break.
Validation failed.

View File

@@ -0,0 +1,48 @@
SKIP: FAILED
warning: code is unreachable
static uint x_1 = 0u;
static bool x_7 = false;
static bool x_8 = false;
void main_1() {
const bool x_101 = x_7;
const bool x_102 = x_8;
[loop] while (true) {
uint x_2_phi = 0u;
if (x_101) {
break;
}
x_2_phi = 0u;
if (x_102) {
x_2_phi = 1u;
{
x_1 = x_2_phi;
}
continue;
} else {
{
x_1 = x_2_phi;
}
continue;
}
return;
{
x_1 = x_2_phi;
}
}
return;
}
void main() {
main_1();
return;
}
warning: DXIL.dll not found. Resulting DXIL will not be signed for use in release environments.
error: validation errors
/tmp/tint_nu4hkX:34: error: Loop must have break.
Validation failed.

View File

@@ -0,0 +1,46 @@
SKIP: FAILED
static uint x_1 = 0u;
static bool x_7 = false;
static bool x_8 = false;
void main_1() {
[loop] while (true) {
uint x_2_phi = 0u;
uint x_3_phi = 0u;
const bool x_101 = x_7;
const bool x_102 = x_8;
x_2_phi = 0u;
x_3_phi = 1u;
if (x_101) {
break;
}
[loop] while (true) {
uint x_4 = 0u;
const uint x_2 = x_2_phi;
const uint x_3 = x_3_phi;
if (x_102) {
break;
}
{
x_4 = (x_2 + 1u);
x_2_phi = x_4;
x_3_phi = x_3;
}
}
}
return;
}
void main() {
main_1();
return;
}
warning: DXIL.dll not found. Resulting DXIL will not be signed for use in release environments.
error: validation errors
/tmp/tint_zJdet0:33: error: Loop must have break.
Validation failed.

View File

@@ -0,0 +1,41 @@
SKIP: FAILED
static uint x_1 = 0u;
static bool x_7 = false;
static bool x_8 = false;
void main_1() {
[loop] while (true) {
uint x_2_phi = 0u;
uint x_3_phi = 0u;
const bool x_101 = x_7;
const bool x_102 = x_8;
x_2_phi = 0u;
x_3_phi = 1u;
if (x_101) {
break;
}
[loop] while (true) {
const uint x_3 = x_3_phi;
x_2_phi = (x_2_phi + 1u);
x_3_phi = x_3;
if (x_102) {
break;
}
}
}
return;
}
void main() {
main_1();
return;
}
warning: DXIL.dll not found. Resulting DXIL will not be signed for use in release environments.
error: validation errors
/tmp/tint_XDVFVA:28: error: Loop must have break.
Validation failed.