From 8cbfad7e5d578639e7a24de50faabbb969843472 Mon Sep 17 00:00:00 2001 From: Ben Clayton Date: Wed, 1 Jun 2022 12:15:49 +0000 Subject: [PATCH] cts: Remove use of intel-0x5912 and intel-0x3e9b tags The CTS runner can randomly pick between these two GPUs, leading to unstable expectations. Just use 'intel' for now. We might get a more targetted tag in the future, but this will do for today. Bug: dawn:1387 Bug: dawn:1444 Change-Id: I2c77ab0060976c40e34b1597b5594894867b7edd Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/92242 Commit-Queue: Corentin Wallez Kokoro: Kokoro Commit-Queue: Ben Clayton Reviewed-by: Corentin Wallez Auto-Submit: Ben Clayton --- tools/src/cmd/cts/common/config.go | 4 --- tools/src/cmd/cts/common/results.go | 18 +++------- tools/src/cmd/cts/config.json | 12 +++---- webgpu-cts/expectations.txt | 56 ++++++++++++++--------------- 4 files changed, 36 insertions(+), 54 deletions(-) diff --git a/tools/src/cmd/cts/common/config.go b/tools/src/cmd/cts/common/config.go index c37699bc26..84393c5a16 100644 --- a/tools/src/cmd/cts/common/config.go +++ b/tools/src/cmd/cts/common/config.go @@ -55,10 +55,6 @@ type Config struct { Builders map[string]buildbucket.Builder // Tags holds configuration data for cleaning result tags before processing Tag struct { - // TagAliases is a list of tags which are treated as equivalent. - // For example, some GPUs are similar enough to be considered equivalent. - // See crbug.com/dawn/1387 for more information. - Aliases [][]string // Remove holds tags that should be removed before processing. // See crbug.com/dawn/1401 for more information. Remove []string diff --git a/tools/src/cmd/cts/common/results.go b/tools/src/cmd/cts/common/results.go index e01511b3cb..934195ef8c 100644 --- a/tools/src/cmd/cts/common/results.go +++ b/tools/src/cmd/cts/common/results.go @@ -324,26 +324,16 @@ func MostRecentResultsForChange( return nil, gerrit.Patchset{}, fmt.Errorf("no builds found for change %v", change) } -// CleanTags modifies each result so that tags which are found in -// cfg.TagAliases are expanded to include all the tag aliases. -// Tags in cfg.Tag.Remove are also removed. -// Finally, duplicate results are removed by erring towards Failure. +// CleanTags modifies each result so that tags in cfg.Tag.Remove are removed and +// duplicate results are removed by erring towards Failure. // See: crbug.com/dawn/1387, crbug.com/dawn/1401 func CleanTags(cfg Config, results *result.List) { + // Remove any tags found in cfg.Tag.Remove remove := result.NewTags(cfg.Tag.Remove...) - aliases := make([]result.Tags, len(cfg.Tag.Aliases)) - for i, l := range cfg.Tag.Aliases { - aliases[i] = result.NewTags(l...) - } - // Expand the result tags for the aliased tag sets for _, r := range *results { - for _, set := range aliases { - if r.Tags.ContainsAny(set) { - r.Tags.AddAll(set) - } - } r.Tags.RemoveAll(remove) } + // Clean up duplicate results *results = results.ReplaceDuplicates(func(s result.Statuses) result.Status { // If all results have the same status, then use that. if len(s) == 1 { diff --git a/tools/src/cmd/cts/config.json b/tools/src/cmd/cts/config.json index 30a73ee610..c2b16fd4a8 100644 --- a/tools/src/cmd/cts/config.json +++ b/tools/src/cmd/cts/config.json @@ -40,16 +40,12 @@ } }, "Tag": { - "Aliases": [ - [ - // crbug.com/dawn/1387 - "intel-0x5912", - "intel-0x3e92" - ] - ], "Remove": [ // crbug.com/dawn/1401 - "release-x64" + "release-x64", + // crbug.com/dawn/1387, crbug.com/dawn/1444 + "intel-0x5912", + "intel-0x3e92" ], }, "Sheets": { diff --git a/webgpu-cts/expectations.txt b/webgpu-cts/expectations.txt index d4b9172938..31c959e6b9 100644 --- a/webgpu-cts/expectations.txt +++ b/webgpu-cts/expectations.txt @@ -66,18 +66,18 @@ # Last rolled: 2022-05-27 04:16:48PM ################################################################################ -# webgpu:shader,execution,zero_init:compute,zero_init failures on intel-0x5912 +# webgpu:shader,execution,zero_init:compute,zero_init failures on intel # KEEP ################################################################################ -crbug.com/dawn/1111 [ intel-0x5912 ] webgpu:shader,execution,zero_init:compute,zero_init:storageClass="workgroup";workgroupSize=[1,1,1];batch__=1 [ Failure ] -crbug.com/dawn/1111 [ intel-0x5912 ] webgpu:shader,execution,zero_init:compute,zero_init:storageClass="workgroup";workgroupSize=[1,1,48];batch__=1 [ Failure ] -crbug.com/dawn/1111 [ intel-0x5912 ] webgpu:shader,execution,zero_init:compute,zero_init:storageClass="workgroup";workgroupSize=[1,1,63];batch__=1 [ Failure ] -crbug.com/dawn/1111 [ intel-0x5912 ] webgpu:shader,execution,zero_init:compute,zero_init:storageClass="workgroup";workgroupSize=[1,32,1];batch__=1 [ Failure ] -crbug.com/dawn/1111 [ intel-0x5912 ] webgpu:shader,execution,zero_init:compute,zero_init:storageClass="workgroup";workgroupSize=[1,47,1];batch__=1 [ Failure ] -crbug.com/dawn/1111 [ intel-0x5912 ] webgpu:shader,execution,zero_init:compute,zero_init:storageClass="workgroup";workgroupSize=[33,1,1];batch__=1 [ Failure ] -crbug.com/dawn/1111 [ intel-0x5912 ] webgpu:shader,execution,zero_init:compute,zero_init:storageClass="workgroup";workgroupSize=[64,1,1];batch__=1 [ Failure ] -crbug.com/dawn/1111 [ intel-0x5912 ] webgpu:shader,execution,zero_init:compute,zero_init:storageClass="workgroup";workgroupSize=[7,7,3];batch__=1 [ Failure ] -crbug.com/dawn/1111 [ intel-0x5912 ] webgpu:shader,execution,zero_init:compute,zero_init:storageClass="workgroup";workgroupSize=[8,8,2];batch__=1 [ Failure ] +crbug.com/dawn/1111 [ intel ] webgpu:shader,execution,zero_init:compute,zero_init:storageClass="workgroup";workgroupSize=[1,1,1];batch__=1 [ Failure ] +crbug.com/dawn/1111 [ intel ] webgpu:shader,execution,zero_init:compute,zero_init:storageClass="workgroup";workgroupSize=[1,1,48];batch__=1 [ Failure ] +crbug.com/dawn/1111 [ intel ] webgpu:shader,execution,zero_init:compute,zero_init:storageClass="workgroup";workgroupSize=[1,1,63];batch__=1 [ Failure ] +crbug.com/dawn/1111 [ intel ] webgpu:shader,execution,zero_init:compute,zero_init:storageClass="workgroup";workgroupSize=[1,32,1];batch__=1 [ Failure ] +crbug.com/dawn/1111 [ intel ] webgpu:shader,execution,zero_init:compute,zero_init:storageClass="workgroup";workgroupSize=[1,47,1];batch__=1 [ Failure ] +crbug.com/dawn/1111 [ intel ] webgpu:shader,execution,zero_init:compute,zero_init:storageClass="workgroup";workgroupSize=[33,1,1];batch__=1 [ Failure ] +crbug.com/dawn/1111 [ intel ] webgpu:shader,execution,zero_init:compute,zero_init:storageClass="workgroup";workgroupSize=[64,1,1];batch__=1 [ Failure ] +crbug.com/dawn/1111 [ intel ] webgpu:shader,execution,zero_init:compute,zero_init:storageClass="workgroup";workgroupSize=[7,7,3];batch__=1 [ Failure ] +crbug.com/dawn/1111 [ intel ] webgpu:shader,execution,zero_init:compute,zero_init:storageClass="workgroup";workgroupSize=[8,8,2];batch__=1 [ Failure ] ################################################################################ # webgpu:api,operation,resource_init,texture_zero:uninitialized_texture_is_zero @@ -200,8 +200,8 @@ crbug.com/dawn/0000 [ monterey ] webgpu:shader,execution,robust_access:linear_me crbug.com/dawn/0000 [ monterey ] webgpu:shader,execution,robust_access:linear_memory:storageClass="function";access="write";containerType="matrix";isAtomic=false [ Failure ] crbug.com/dawn/0000 [ monterey ] webgpu:shader,execution,robust_access:linear_memory:storageClass="private";access="write";containerType="array";isAtomic=false [ Failure ] crbug.com/dawn/0000 [ monterey ] webgpu:shader,execution,robust_access:linear_memory:storageClass="private";access="write";containerType="matrix";isAtomic=false [ Failure ] -crbug.com/dawn/0000 [ intel-0x5912 ubuntu ] webgpu:shader,execution,robust_access:linear_memory:storageClass="workgroup";access="read";containerType="vector";isAtomic=false [ Failure ] -crbug.com/dawn/0000 [ intel-0x5912 ubuntu ] webgpu:shader,execution,robust_access:linear_memory:storageClass="workgroup";access="write";containerType="vector";isAtomic=false [ Failure ] +crbug.com/dawn/0000 [ intel ubuntu ] webgpu:shader,execution,robust_access:linear_memory:storageClass="workgroup";access="read";containerType="vector";isAtomic=false [ Failure ] +crbug.com/dawn/0000 [ intel ubuntu ] webgpu:shader,execution,robust_access:linear_memory:storageClass="workgroup";access="write";containerType="vector";isAtomic=false [ Failure ] ################################################################################ # stencil8 failures @@ -348,24 +348,24 @@ crbug.com/dawn/0000 [ win ] webgpu:shader,execution,expression,binary,f32_arithm crbug.com/dawn/0000 [ win ] webgpu:shader,execution,expression,binary,f32_logical:* [ Slow ] # New failures. Please triage: -crbug.com/dawn/0000 [ intel-0x5912 ubuntu ] webgpu:api,operation,adapter,requestDevice_limits:worse_than_default:limit="maxBindGroups" [ Failure ] -crbug.com/dawn/0000 [ intel-0x5912 ubuntu ] webgpu:api,operation,command_buffer,copyTextureToTexture:color_textures,compressed,array:srcFormat="astc-10x10-unorm";dstFormat="astc-10x10-unorm-srgb";dimension="2d" [ Failure ] -crbug.com/dawn/0000 [ intel-0x5912 ubuntu ] webgpu:api,operation,render_pipeline,pipeline_output_targets:color,attachments:format="r32uint" [ Failure ] -crbug.com/dawn/0000 [ intel-0x5912 win10 ] webgpu:api,operation,resource_init,texture_zero:uninitialized_texture_is_zero:dimension="2d";readMethod="CopyToBuffer";format="rg16sint" [ Failure ] -crbug.com/dawn/0000 [ intel-0x5912 win10 ] webgpu:api,operation,resource_init,texture_zero:uninitialized_texture_is_zero:dimension="2d";readMethod="CopyToBuffer";format="rg32float" [ Failure ] -crbug.com/dawn/0000 [ intel-0x5912 win10 ] webgpu:api,operation,resource_init,texture_zero:uninitialized_texture_is_zero:dimension="2d";readMethod="CopyToBuffer";format="rg32uint" [ Failure ] -crbug.com/dawn/0000 [ intel-0x5912 win10 ] webgpu:api,operation,resource_init,texture_zero:uninitialized_texture_is_zero:dimension="2d";readMethod="CopyToBuffer";format="rgba32uint" [ Failure ] -crbug.com/dawn/0000 [ intel-0x5912 win10 ] webgpu:api,operation,resource_init,texture_zero:uninitialized_texture_is_zero:dimension="2d";readMethod="CopyToBuffer";format="rgba8uint" [ Failure ] -crbug.com/dawn/0000 [ intel-0x5912 win10 ] webgpu:api,operation,resource_init,texture_zero:uninitialized_texture_is_zero:dimension="2d";readMethod="CopyToTexture";format="depth16unorm" [ Failure ] +crbug.com/dawn/0000 [ intel ubuntu ] webgpu:api,operation,adapter,requestDevice_limits:worse_than_default:limit="maxBindGroups" [ Failure ] +crbug.com/dawn/0000 [ intel ubuntu ] webgpu:api,operation,command_buffer,copyTextureToTexture:color_textures,compressed,array:srcFormat="astc-10x10-unorm";dstFormat="astc-10x10-unorm-srgb";dimension="2d" [ Failure ] +crbug.com/dawn/0000 [ intel ubuntu ] webgpu:api,operation,render_pipeline,pipeline_output_targets:color,attachments:format="r32uint" [ Failure ] +crbug.com/dawn/0000 [ intel win10 ] webgpu:api,operation,resource_init,texture_zero:uninitialized_texture_is_zero:dimension="2d";readMethod="CopyToBuffer";format="rg16sint" [ Failure ] +crbug.com/dawn/0000 [ intel win10 ] webgpu:api,operation,resource_init,texture_zero:uninitialized_texture_is_zero:dimension="2d";readMethod="CopyToBuffer";format="rg32float" [ Failure ] +crbug.com/dawn/0000 [ intel win10 ] webgpu:api,operation,resource_init,texture_zero:uninitialized_texture_is_zero:dimension="2d";readMethod="CopyToBuffer";format="rg32uint" [ Failure ] +crbug.com/dawn/0000 [ intel win10 ] webgpu:api,operation,resource_init,texture_zero:uninitialized_texture_is_zero:dimension="2d";readMethod="CopyToBuffer";format="rgba32uint" [ Failure ] +crbug.com/dawn/0000 [ intel win10 ] webgpu:api,operation,resource_init,texture_zero:uninitialized_texture_is_zero:dimension="2d";readMethod="CopyToBuffer";format="rgba8uint" [ Failure ] +crbug.com/dawn/0000 [ intel win10 ] webgpu:api,operation,resource_init,texture_zero:uninitialized_texture_is_zero:dimension="2d";readMethod="CopyToTexture";format="depth16unorm" [ Failure ] crbug.com/dawn/0000 [ dawn-no-backend-validation nvidia-0x2184 win10 ] webgpu:api,operation,resource_init,texture_zero:uninitialized_texture_is_zero:dimension="2d";readMethod="CopyToTexture";format="rg11b10ufloat" [ Failure ] -crbug.com/dawn/0000 [ intel-0x5912 win10 ] webgpu:api,operation,resource_init,texture_zero:uninitialized_texture_is_zero:dimension="2d";readMethod="CopyToTexture";format="rgba16sint" [ Failure ] -crbug.com/dawn/0000 [ intel-0x5912 win10 ] webgpu:api,operation,resource_init,texture_zero:uninitialized_texture_is_zero:dimension="2d";readMethod="CopyToTexture";format="rgba32sint" [ Failure ] -crbug.com/dawn/0000 [ intel-0x5912 win10 ] webgpu:api,operation,resource_init,texture_zero:uninitialized_texture_is_zero:dimension="2d";readMethod="DepthTest";format="depth16unorm" [ Failure ] -crbug.com/dawn/0000 [ intel-0x5912 win10 ] webgpu:api,operation,resource_init,texture_zero:uninitialized_texture_is_zero:dimension="2d";readMethod="Sample";format="rg11b10ufloat" [ Failure ] -crbug.com/dawn/0000 [ intel-0x5912 win10 ] webgpu:api,operation,resource_init,texture_zero:uninitialized_texture_is_zero:dimension="2d";readMethod="Sample";format="rg16uint" [ Failure ] +crbug.com/dawn/0000 [ intel win10 ] webgpu:api,operation,resource_init,texture_zero:uninitialized_texture_is_zero:dimension="2d";readMethod="CopyToTexture";format="rgba16sint" [ Failure ] +crbug.com/dawn/0000 [ intel win10 ] webgpu:api,operation,resource_init,texture_zero:uninitialized_texture_is_zero:dimension="2d";readMethod="CopyToTexture";format="rgba32sint" [ Failure ] +crbug.com/dawn/0000 [ intel win10 ] webgpu:api,operation,resource_init,texture_zero:uninitialized_texture_is_zero:dimension="2d";readMethod="DepthTest";format="depth16unorm" [ Failure ] +crbug.com/dawn/0000 [ intel win10 ] webgpu:api,operation,resource_init,texture_zero:uninitialized_texture_is_zero:dimension="2d";readMethod="Sample";format="rg11b10ufloat" [ Failure ] +crbug.com/dawn/0000 [ intel win10 ] webgpu:api,operation,resource_init,texture_zero:uninitialized_texture_is_zero:dimension="2d";readMethod="Sample";format="rg16uint" [ Failure ] crbug.com/dawn/0000 [ dawn-no-backend-validation nvidia-0x2184 win10 ] webgpu:api,operation,resource_init,texture_zero:uninitialized_texture_is_zero:dimension="2d";readMethod="Sample";format="rg32sint" [ Failure ] crbug.com/dawn/0000 [ dawn-backend-validation win10 ] webgpu:api,operation,resource_init,texture_zero:uninitialized_texture_is_zero:dimension="2d";readMethod="Sample";format="rgb9e5ufloat" [ Failure ] -crbug.com/dawn/0000 [ intel-0x5912 win10 ] webgpu:api,operation,resource_init,texture_zero:uninitialized_texture_is_zero:dimension="2d";readMethod="Sample";format="rgba8uint" [ Failure ] +crbug.com/dawn/0000 [ intel win10 ] webgpu:api,operation,resource_init,texture_zero:uninitialized_texture_is_zero:dimension="2d";readMethod="Sample";format="rgba8uint" [ Failure ] crbug.com/dawn/0000 [ dawn-backend-validation win10 ] webgpu:api,validation,resource_usages,texture,in_render_common:subresources,depth_stencil_texture_in_bind_groups:view0Levels={"base":1,"count":2};view0Layers={"base":1,"count":1};view1Levels={"base":1,"count":1};view1Layers={"base":0,"count":1};aspect0="stencil-only";aspect1="depth-only";inSamePass=false [ Failure ] crbug.com/dawn/0000 [ dawn-backend-validation win10 ] webgpu:api,validation,vertex_state:vertex_attribute_contained_in_stride:format="uint32x2" [ Failure ] -crbug.com/dawn/0000 [ dawn-backend-validation intel-0x3e9b ] webgpu:shader,execution,zero_init:compute,zero_init:storageClass="workgroup";workgroupSize=[1,47,1];batch__=12 [ Failure ] +crbug.com/dawn/0000 [ dawn-backend-validation intel ] webgpu:shader,execution,zero_init:compute,zero_init:storageClass="workgroup";workgroupSize=[1,47,1];batch__=12 [ Failure ]