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 <cwallez@chromium.org>
Kokoro: Kokoro <noreply+kokoro@google.com>
Commit-Queue: Ben Clayton <bclayton@google.com>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Auto-Submit: Ben Clayton <bclayton@google.com>

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

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 {

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": {