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

Restore "MSL writer: make signed int overflow defined behaviour"

Browse Source 
This reverts commit e33b0baa08.

Added tests/expressions/literals/intmin.wgsl test.

Bug: tint:124
Change-Id: I3d46f939ff20fa377ddb5fcb52f9afe728b8e430
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/60441
Kokoro: Kokoro <noreply+kokoro@google.com>
Commit-Queue: Antonio Maiorano <amaiorano@google.com>
Reviewed-by: Ben Clayton <bclayton@google.com>
Reviewed-by: David Neto <dneto@google.com>
This commit is contained in:
Antonio Maiorano
2021-07-30 18:59:06 +00:00
committed by Tint LUCI CQ
parent 9bdf2dcc6b
commit d388bc9b36
686 changed files with 4111 additions and 3079 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
test/vk-gl-cts/graphicsfuzz/spv-double-branch-to-same-block/0-opt.spvasm.expected.msl
View File

@@ -27,7 +27,7 @@ void merge_i1_i1_i1_(thread int* const from, thread int* const mid, thread int*
int const x_255 = *(from);
i = x_255;
int const x_256 = *(mid);
j = (x_256 + 1);
j = as_type<int>((as_type<uint>(x_256) + as_type<uint>(1)));
while (true) {
int const x_262 = i;
int const x_263 = *(mid);
@@ -43,16 +43,16 @@ void merge_i1_i1_i1_(thread int* const from, thread int* const mid, thread int*
int const x_275 = (*(tint_symbol_5)).arr[x_273];
if ((x_272 < x_275)) {
int const x_280 = k;
k = (x_280 + 1);
k = as_type<int>((as_type<uint>(x_280) + as_type<uint>(1)));
int const x_282 = i;
i = (x_282 + 1);
i = as_type<int>((as_type<uint>(x_282) + as_type<uint>(1)));
int const x_285 = (*(tint_symbol_5)).arr[x_282];
(*(tint_symbol_6)).arr[x_280] = x_285;
} else {
int const x_287 = k;
k = (x_287 + 1);
k = as_type<int>((as_type<uint>(x_287) + as_type<uint>(1)));
int const x_289 = j;
j = (x_289 + 1);
j = as_type<int>((as_type<uint>(x_289) + as_type<uint>(1)));
int const x_292 = (*(tint_symbol_5)).arr[x_289];
(*(tint_symbol_6)).arr[x_287] = x_292;
}
@@ -66,9 +66,9 @@ void merge_i1_i1_i1_(thread int* const from, thread int* const mid, thread int*
break;
}
int const x_305 = k;
k = (x_305 + 1);
k = as_type<int>((as_type<uint>(x_305) + as_type<uint>(1)));
int const x_307 = i;
i = (x_307 + 1);
i = as_type<int>((as_type<uint>(x_307) + as_type<uint>(1)));
int const x_310 = (*(tint_symbol_5)).arr[x_307];
(*(tint_symbol_6)).arr[x_305] = x_310;
}
@@ -87,7 +87,7 @@ void merge_i1_i1_i1_(thread int* const from, thread int* const mid, thread int*
(*(tint_symbol_5)).arr[x_321] = x_324;
{
int const x_326 = i_1;
i_1 = (x_326 + 1);
i_1 = as_type<int>((as_type<uint>(x_326) + as_type<uint>(1)));
}
}
return;
@@ -127,11 +127,11 @@ void mergeSort_(thread tint_array_wrapper* const tint_symbol_7, thread tint_arra
from_1 = x_346;
int const x_347 = i_2;
int const x_348 = m;
mid_1 = ((x_347 + x_348) - 1);
mid_1 = as_type<int>((as_type<uint>(as_type<int>((as_type<uint>(x_347) + as_type<uint>(x_348)))) - as_type<uint>(1)));
int const x_351 = i_2;
int const x_352 = m;
int const x_356 = high;
to_1 = min(((x_351 + (2 * x_352)) - 1), x_356);
to_1 = min(as_type<int>((as_type<uint>(as_type<int>((as_type<uint>(x_351) + as_type<uint>(as_type<int>((as_type<uint>(2) * as_type<uint>(x_352))))))) - as_type<uint>(1))), x_356);
int const x_358 = from_1;
param = x_358;
int const x_359 = mid_1;
@@ -142,12 +142,12 @@ void mergeSort_(thread tint_array_wrapper* const tint_symbol_7, thread tint_arra
{
int const x_362 = m;
int const x_364 = i_2;
i_2 = (x_364 + (2 * x_362));
i_2 = as_type<int>((as_type<uint>(x_364) + as_type<uint>(as_type<int>((as_type<uint>(2) * as_type<uint>(x_362))))));
}
}
{
int const x_366 = m;
m = (2 * x_366);
m = as_type<int>((as_type<uint>(2) * as_type<uint>(x_366)));
}
}
return;
@@ -217,7 +217,7 @@ void main_1(constant buf0& x_28, thread tint_array_wrapper* const tint_symbol_9,
}
}
int const x_125 = i_3;
i_3 = (x_125 + 1);
i_3 = as_type<int>((as_type<uint>(x_125) + as_type<uint>(1)));
{
int const x_127 = i_3;
if ((x_127 < 10)) {
@@ -239,7 +239,7 @@ void main_1(constant buf0& x_28, thread tint_array_wrapper* const tint_symbol_9,
(*(tint_symbol_10)).arr[x_136] = x_139;
{
int const x_141 = j_1;
j_1 = (x_141 + 1);
j_1 = as_type<int>((as_type<uint>(x_141) + as_type<uint>(1)));
}
}
mergeSort_(tint_symbol_9, tint_symbol_10);

28
test/vk-gl-cts/graphicsfuzz/spv-double-branch-to-same-block/0-opt.wgsl.expected.msl
View File

@@ -27,7 +27,7 @@ void merge_i1_i1_i1_(thread int* const from, thread int* const mid, thread int*
int const x_255 = *(from);
i = x_255;
int const x_256 = *(mid);
j = (x_256 + 1);
j = as_type<int>((as_type<uint>(x_256) + as_type<uint>(1)));
while (true) {
int const x_262 = i;
int const x_263 = *(mid);
@@ -43,16 +43,16 @@ void merge_i1_i1_i1_(thread int* const from, thread int* const mid, thread int*
int const x_275 = (*(tint_symbol_5)).arr[x_273];
if ((x_272 < x_275)) {
int const x_280 = k;
k = (x_280 + 1);
k = as_type<int>((as_type<uint>(x_280) + as_type<uint>(1)));
int const x_282 = i;
i = (x_282 + 1);
i = as_type<int>((as_type<uint>(x_282) + as_type<uint>(1)));
int const x_285 = (*(tint_symbol_5)).arr[x_282];
(*(tint_symbol_6)).arr[x_280] = x_285;
} else {
int const x_287 = k;
k = (x_287 + 1);
k = as_type<int>((as_type<uint>(x_287) + as_type<uint>(1)));
int const x_289 = j;
j = (x_289 + 1);
j = as_type<int>((as_type<uint>(x_289) + as_type<uint>(1)));
int const x_292 = (*(tint_symbol_5)).arr[x_289];
(*(tint_symbol_6)).arr[x_287] = x_292;
}
@@ -66,9 +66,9 @@ void merge_i1_i1_i1_(thread int* const from, thread int* const mid, thread int*
break;
}
int const x_305 = k;
k = (x_305 + 1);
k = as_type<int>((as_type<uint>(x_305) + as_type<uint>(1)));
int const x_307 = i;
i = (x_307 + 1);
i = as_type<int>((as_type<uint>(x_307) + as_type<uint>(1)));
int const x_310 = (*(tint_symbol_5)).arr[x_307];
(*(tint_symbol_6)).arr[x_305] = x_310;
}
@@ -87,7 +87,7 @@ void merge_i1_i1_i1_(thread int* const from, thread int* const mid, thread int*
(*(tint_symbol_5)).arr[x_321] = x_324;
{
int const x_326 = i_1;
i_1 = (x_326 + 1);
i_1 = as_type<int>((as_type<uint>(x_326) + as_type<uint>(1)));
}
}
return;
@@ -127,11 +127,11 @@ void mergeSort_(thread tint_array_wrapper* const tint_symbol_7, thread tint_arra
from_1 = x_346;
int const x_347 = i_2;
int const x_348 = m;
mid_1 = ((x_347 + x_348) - 1);
mid_1 = as_type<int>((as_type<uint>(as_type<int>((as_type<uint>(x_347) + as_type<uint>(x_348)))) - as_type<uint>(1)));
int const x_351 = i_2;
int const x_352 = m;
int const x_356 = high;
to_1 = min(((x_351 + (2 * x_352)) - 1), x_356);
to_1 = min(as_type<int>((as_type<uint>(as_type<int>((as_type<uint>(x_351) + as_type<uint>(as_type<int>((as_type<uint>(2) * as_type<uint>(x_352))))))) - as_type<uint>(1))), x_356);
int const x_358 = from_1;
param = x_358;
int const x_359 = mid_1;
@@ -142,12 +142,12 @@ void mergeSort_(thread tint_array_wrapper* const tint_symbol_7, thread tint_arra
{
int const x_362 = m;
int const x_364 = i_2;
i_2 = (x_364 + (2 * x_362));
i_2 = as_type<int>((as_type<uint>(x_364) + as_type<uint>(as_type<int>((as_type<uint>(2) * as_type<uint>(x_362))))));
}
}
{
int const x_366 = m;
m = (2 * x_366);
m = as_type<int>((as_type<uint>(2) * as_type<uint>(x_366)));
}
}
return;
@@ -217,7 +217,7 @@ void main_1(constant buf0& x_28, thread tint_array_wrapper* const tint_symbol_9,
}
}
int const x_125 = i_3;
i_3 = (x_125 + 1);
i_3 = as_type<int>((as_type<uint>(x_125) + as_type<uint>(1)));
{
int const x_127 = i_3;
if ((x_127 < 10)) {
@@ -239,7 +239,7 @@ void main_1(constant buf0& x_28, thread tint_array_wrapper* const tint_symbol_9,
(*(tint_symbol_10)).arr[x_136] = x_139;
{
int const x_141 = j_1;
j_1 = (x_141 + 1);
j_1 = as_type<int>((as_type<uint>(x_141) + as_type<uint>(1)));
}
}
mergeSort_(tint_symbol_9, tint_symbol_10);

28
test/vk-gl-cts/graphicsfuzz/spv-double-branch-to-same-block/1.spvasm.expected.msl
View File

@@ -27,7 +27,7 @@ void merge_i1_i1_i1_(thread int* const from, thread int* const mid, thread int*
int const x_256 = *(from);
i = x_256;
int const x_257 = *(mid);
j = (x_257 + 1);
j = as_type<int>((as_type<uint>(x_257) + as_type<uint>(1)));
while (true) {
int const x_263 = i;
int const x_264 = *(mid);
@@ -43,16 +43,16 @@ void merge_i1_i1_i1_(thread int* const from, thread int* const mid, thread int*
int const x_276 = (*(tint_symbol_5)).arr[x_274];
if ((x_273 < x_276)) {
int const x_281 = k;
k = (x_281 + 1);
k = as_type<int>((as_type<uint>(x_281) + as_type<uint>(1)));
int const x_283 = i;
i = (x_283 + 1);
i = as_type<int>((as_type<uint>(x_283) + as_type<uint>(1)));
int const x_286 = (*(tint_symbol_5)).arr[x_283];
(*(tint_symbol_6)).arr[x_281] = x_286;
} else {
int const x_288 = k;
k = (x_288 + 1);
k = as_type<int>((as_type<uint>(x_288) + as_type<uint>(1)));
int const x_290 = j;
j = (x_290 + 1);
j = as_type<int>((as_type<uint>(x_290) + as_type<uint>(1)));
int const x_293 = (*(tint_symbol_5)).arr[x_290];
(*(tint_symbol_6)).arr[x_288] = x_293;
}
@@ -66,9 +66,9 @@ void merge_i1_i1_i1_(thread int* const from, thread int* const mid, thread int*
break;
}
int const x_306 = k;
k = (x_306 + 1);
k = as_type<int>((as_type<uint>(x_306) + as_type<uint>(1)));
int const x_308 = i;
i = (x_308 + 1);
i = as_type<int>((as_type<uint>(x_308) + as_type<uint>(1)));
int const x_311 = (*(tint_symbol_5)).arr[x_308];
(*(tint_symbol_6)).arr[x_306] = x_311;
}
@@ -87,7 +87,7 @@ void merge_i1_i1_i1_(thread int* const from, thread int* const mid, thread int*
(*(tint_symbol_5)).arr[x_322] = x_325;
{
int const x_327 = i_1;
i_1 = (x_327 + 1);
i_1 = as_type<int>((as_type<uint>(x_327) + as_type<uint>(1)));
}
}
return;
@@ -127,11 +127,11 @@ void mergeSort_(thread tint_array_wrapper* const tint_symbol_7, thread tint_arra
from_1 = x_347;
int const x_348 = i_2;
int const x_349 = m;
mid_1 = ((x_348 + x_349) - 1);
mid_1 = as_type<int>((as_type<uint>(as_type<int>((as_type<uint>(x_348) + as_type<uint>(x_349)))) - as_type<uint>(1)));
int const x_352 = i_2;
int const x_353 = m;
int const x_357 = high;
to_1 = min(((x_352 + (2 * x_353)) - 1), x_357);
to_1 = min(as_type<int>((as_type<uint>(as_type<int>((as_type<uint>(x_352) + as_type<uint>(as_type<int>((as_type<uint>(2) * as_type<uint>(x_353))))))) - as_type<uint>(1))), x_357);
int const x_359 = from_1;
param = x_359;
int const x_360 = mid_1;
@@ -142,12 +142,12 @@ void mergeSort_(thread tint_array_wrapper* const tint_symbol_7, thread tint_arra
{
int const x_363 = m;
int const x_365 = i_2;
i_2 = (x_365 + (2 * x_363));
i_2 = as_type<int>((as_type<uint>(x_365) + as_type<uint>(as_type<int>((as_type<uint>(2) * as_type<uint>(x_363))))));
}
}
{
int const x_367 = m;
m = (2 * x_367);
m = as_type<int>((as_type<uint>(2) * as_type<uint>(x_367)));
}
}
return;
@@ -228,7 +228,7 @@ void main_1(constant buf0& x_28, thread tint_array_wrapper* const tint_symbol_9,
}
}
int const x_126 = i_3;
i_3 = (x_126 + 1);
i_3 = as_type<int>((as_type<uint>(x_126) + as_type<uint>(1)));
{
int const x_128 = i_3;
if ((x_128 < 10)) {
@@ -250,7 +250,7 @@ void main_1(constant buf0& x_28, thread tint_array_wrapper* const tint_symbol_9,
(*(tint_symbol_10)).arr[x_137] = x_140;
{
int const x_142 = j_1;
j_1 = (x_142 + 1);
j_1 = as_type<int>((as_type<uint>(x_142) + as_type<uint>(1)));
}
}
mergeSort_(tint_symbol_9, tint_symbol_10);

28
test/vk-gl-cts/graphicsfuzz/spv-double-branch-to-same-block/1.wgsl.expected.msl
View File

@@ -27,7 +27,7 @@ void merge_i1_i1_i1_(thread int* const from, thread int* const mid, thread int*
int const x_256 = *(from);
i = x_256;
int const x_257 = *(mid);
j = (x_257 + 1);
j = as_type<int>((as_type<uint>(x_257) + as_type<uint>(1)));
while (true) {
int const x_263 = i;
int const x_264 = *(mid);
@@ -43,16 +43,16 @@ void merge_i1_i1_i1_(thread int* const from, thread int* const mid, thread int*
int const x_276 = (*(tint_symbol_5)).arr[x_274];
if ((x_273 < x_276)) {
int const x_281 = k;
k = (x_281 + 1);
k = as_type<int>((as_type<uint>(x_281) + as_type<uint>(1)));
int const x_283 = i;
i = (x_283 + 1);
i = as_type<int>((as_type<uint>(x_283) + as_type<uint>(1)));
int const x_286 = (*(tint_symbol_5)).arr[x_283];
(*(tint_symbol_6)).arr[x_281] = x_286;
} else {
int const x_288 = k;
k = (x_288 + 1);
k = as_type<int>((as_type<uint>(x_288) + as_type<uint>(1)));
int const x_290 = j;
j = (x_290 + 1);
j = as_type<int>((as_type<uint>(x_290) + as_type<uint>(1)));
int const x_293 = (*(tint_symbol_5)).arr[x_290];
(*(tint_symbol_6)).arr[x_288] = x_293;
}
@@ -66,9 +66,9 @@ void merge_i1_i1_i1_(thread int* const from, thread int* const mid, thread int*
break;
}
int const x_306 = k;
k = (x_306 + 1);
k = as_type<int>((as_type<uint>(x_306) + as_type<uint>(1)));
int const x_308 = i;
i = (x_308 + 1);
i = as_type<int>((as_type<uint>(x_308) + as_type<uint>(1)));
int const x_311 = (*(tint_symbol_5)).arr[x_308];
(*(tint_symbol_6)).arr[x_306] = x_311;
}
@@ -87,7 +87,7 @@ void merge_i1_i1_i1_(thread int* const from, thread int* const mid, thread int*
(*(tint_symbol_5)).arr[x_322] = x_325;
{
int const x_327 = i_1;
i_1 = (x_327 + 1);
i_1 = as_type<int>((as_type<uint>(x_327) + as_type<uint>(1)));
}
}
return;
@@ -127,11 +127,11 @@ void mergeSort_(thread tint_array_wrapper* const tint_symbol_7, thread tint_arra
from_1 = x_347;
int const x_348 = i_2;
int const x_349 = m;
mid_1 = ((x_348 + x_349) - 1);
mid_1 = as_type<int>((as_type<uint>(as_type<int>((as_type<uint>(x_348) + as_type<uint>(x_349)))) - as_type<uint>(1)));
int const x_352 = i_2;
int const x_353 = m;
int const x_357 = high;
to_1 = min(((x_352 + (2 * x_353)) - 1), x_357);
to_1 = min(as_type<int>((as_type<uint>(as_type<int>((as_type<uint>(x_352) + as_type<uint>(as_type<int>((as_type<uint>(2) * as_type<uint>(x_353))))))) - as_type<uint>(1))), x_357);
int const x_359 = from_1;
param = x_359;
int const x_360 = mid_1;
@@ -142,12 +142,12 @@ void mergeSort_(thread tint_array_wrapper* const tint_symbol_7, thread tint_arra
{
int const x_363 = m;
int const x_365 = i_2;
i_2 = (x_365 + (2 * x_363));
i_2 = as_type<int>((as_type<uint>(x_365) + as_type<uint>(as_type<int>((as_type<uint>(2) * as_type<uint>(x_363))))));
}
}
{
int const x_367 = m;
m = (2 * x_367);
m = as_type<int>((as_type<uint>(2) * as_type<uint>(x_367)));
}
}
return;
@@ -228,7 +228,7 @@ void main_1(constant buf0& x_28, thread tint_array_wrapper* const tint_symbol_9,
}
}
int const x_126 = i_3;
i_3 = (x_126 + 1);
i_3 = as_type<int>((as_type<uint>(x_126) + as_type<uint>(1)));
{
int const x_128 = i_3;
if ((x_128 < 10)) {
@@ -250,7 +250,7 @@ void main_1(constant buf0& x_28, thread tint_array_wrapper* const tint_symbol_9,
(*(tint_symbol_10)).arr[x_137] = x_140;
{
int const x_142 = j_1;
j_1 = (x_142 + 1);
j_1 = as_type<int>((as_type<uint>(x_142) + as_type<uint>(1)));
}
}
mergeSort_(tint_symbol_9, tint_symbol_10);