[tint] Use new subgroups extensions in E2E tests
Bug: 349125464
Change-Id: Ie1e97674443638f9ab8ea50c8ae8d0db99e2dc3c
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/195801
Reviewed-by: dan sinclair <dsinclair@chromium.org>
diff --git a/test/tint/builtins/gen/gen.wgsl.tmpl b/test/tint/builtins/gen/gen.wgsl.tmpl
index d7919cd..bef377c 100644
--- a/test/tint/builtins/gen/gen.wgsl.tmpl
+++ b/test/tint/builtins/gen/gen.wgsl.tmpl
@@ -267,9 +267,12 @@
{{- $overload := $permutation.Overload -}}
{{- $builtin_name := $permutation.Intrinsic.Name -}}
-{{- /* Emit 'enable chromium_experimental_subgroups' if required */ -}}
+{{- /* Emit 'enable subgroups' and 'enable subgroups_f16' if required */ -}}
{{- if or (eq "subgroupBallot" $builtin_name) (eq "subgroupBroadcast" $builtin_name)}}
-enable chromium_experimental_subgroups;
+enable subgroups;
+{{- if OverloadUsesType $overload "f16"}}
+enable subgroups_f16;
+{{ end -}}
{{ end -}}
diff --git a/test/tint/builtins/gen/literal/subgroupBallot/7e6d0e.wgsl b/test/tint/builtins/gen/literal/subgroupBallot/7e6d0e.wgsl
index ea092be..551c706 100644
--- a/test/tint/builtins/gen/literal/subgroupBallot/7e6d0e.wgsl
+++ b/test/tint/builtins/gen/literal/subgroupBallot/7e6d0e.wgsl
@@ -35,8 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-enable chromium_experimental_subgroups;
-
+enable subgroups;
@group(0) @binding(0) var<storage, read_write> prevent_dce : vec4<u32>;
diff --git a/test/tint/builtins/gen/literal/subgroupBallot/7e6d0e.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/subgroupBallot/7e6d0e.wgsl.expected.wgsl
index 7fa2b9b..5b41259 100644
--- a/test/tint/builtins/gen/literal/subgroupBallot/7e6d0e.wgsl.expected.wgsl
+++ b/test/tint/builtins/gen/literal/subgroupBallot/7e6d0e.wgsl.expected.wgsl
@@ -1,4 +1,4 @@
-enable chromium_experimental_subgroups;
+enable subgroups;
@group(0) @binding(0) var<storage, read_write> prevent_dce : vec4<u32>;
diff --git a/test/tint/builtins/gen/literal/subgroupBroadcast/07e2d8.wgsl b/test/tint/builtins/gen/literal/subgroupBroadcast/07e2d8.wgsl
index b13e020..d42c725 100644
--- a/test/tint/builtins/gen/literal/subgroupBroadcast/07e2d8.wgsl
+++ b/test/tint/builtins/gen/literal/subgroupBroadcast/07e2d8.wgsl
@@ -38,7 +38,8 @@
// flags: --hlsl_shader_model 62
-enable chromium_experimental_subgroups;
+enable subgroups;
+enable subgroups_f16;
enable f16;
diff --git a/test/tint/builtins/gen/literal/subgroupBroadcast/07e2d8.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/subgroupBroadcast/07e2d8.wgsl.expected.wgsl
index 95d6f1f..74a68d2 100644
--- a/test/tint/builtins/gen/literal/subgroupBroadcast/07e2d8.wgsl.expected.wgsl
+++ b/test/tint/builtins/gen/literal/subgroupBroadcast/07e2d8.wgsl.expected.wgsl
@@ -1,4 +1,5 @@
-enable chromium_experimental_subgroups;
+enable subgroups;
+enable subgroups_f16;
enable f16;
@group(0) @binding(0) var<storage, read_write> prevent_dce : f16;
diff --git a/test/tint/builtins/gen/literal/subgroupBroadcast/08beca.wgsl b/test/tint/builtins/gen/literal/subgroupBroadcast/08beca.wgsl
index 1697700..3a30aaf 100644
--- a/test/tint/builtins/gen/literal/subgroupBroadcast/08beca.wgsl
+++ b/test/tint/builtins/gen/literal/subgroupBroadcast/08beca.wgsl
@@ -35,8 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-enable chromium_experimental_subgroups;
-
+enable subgroups;
@group(0) @binding(0) var<storage, read_write> prevent_dce : f32;
diff --git a/test/tint/builtins/gen/literal/subgroupBroadcast/08beca.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/subgroupBroadcast/08beca.wgsl.expected.wgsl
index 9fd18e9..6d3567b 100644
--- a/test/tint/builtins/gen/literal/subgroupBroadcast/08beca.wgsl.expected.wgsl
+++ b/test/tint/builtins/gen/literal/subgroupBroadcast/08beca.wgsl.expected.wgsl
@@ -1,4 +1,4 @@
-enable chromium_experimental_subgroups;
+enable subgroups;
@group(0) @binding(0) var<storage, read_write> prevent_dce : f32;
diff --git a/test/tint/builtins/gen/literal/subgroupBroadcast/0f44e2.wgsl b/test/tint/builtins/gen/literal/subgroupBroadcast/0f44e2.wgsl
index a45acf6..b17e238 100644
--- a/test/tint/builtins/gen/literal/subgroupBroadcast/0f44e2.wgsl
+++ b/test/tint/builtins/gen/literal/subgroupBroadcast/0f44e2.wgsl
@@ -38,7 +38,8 @@
// flags: --hlsl_shader_model 62
-enable chromium_experimental_subgroups;
+enable subgroups;
+enable subgroups_f16;
enable f16;
diff --git a/test/tint/builtins/gen/literal/subgroupBroadcast/0f44e2.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/subgroupBroadcast/0f44e2.wgsl.expected.wgsl
index f91b82c..3275683 100644
--- a/test/tint/builtins/gen/literal/subgroupBroadcast/0f44e2.wgsl.expected.wgsl
+++ b/test/tint/builtins/gen/literal/subgroupBroadcast/0f44e2.wgsl.expected.wgsl
@@ -1,4 +1,5 @@
-enable chromium_experimental_subgroups;
+enable subgroups;
+enable subgroups_f16;
enable f16;
@group(0) @binding(0) var<storage, read_write> prevent_dce : vec4<f16>;
diff --git a/test/tint/builtins/gen/literal/subgroupBroadcast/13f36c.wgsl b/test/tint/builtins/gen/literal/subgroupBroadcast/13f36c.wgsl
index 0537b0b..48ef8eb 100644
--- a/test/tint/builtins/gen/literal/subgroupBroadcast/13f36c.wgsl
+++ b/test/tint/builtins/gen/literal/subgroupBroadcast/13f36c.wgsl
@@ -38,7 +38,8 @@
// flags: --hlsl_shader_model 62
-enable chromium_experimental_subgroups;
+enable subgroups;
+enable subgroups_f16;
enable f16;
diff --git a/test/tint/builtins/gen/literal/subgroupBroadcast/13f36c.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/subgroupBroadcast/13f36c.wgsl.expected.wgsl
index 7da1c36..4db8ca7 100644
--- a/test/tint/builtins/gen/literal/subgroupBroadcast/13f36c.wgsl.expected.wgsl
+++ b/test/tint/builtins/gen/literal/subgroupBroadcast/13f36c.wgsl.expected.wgsl
@@ -1,4 +1,5 @@
-enable chromium_experimental_subgroups;
+enable subgroups;
+enable subgroups_f16;
enable f16;
@group(0) @binding(0) var<storage, read_write> prevent_dce : vec2<f16>;
diff --git a/test/tint/builtins/gen/literal/subgroupBroadcast/1d79c7.wgsl b/test/tint/builtins/gen/literal/subgroupBroadcast/1d79c7.wgsl
index 22c5c51..37deea1 100644
--- a/test/tint/builtins/gen/literal/subgroupBroadcast/1d79c7.wgsl
+++ b/test/tint/builtins/gen/literal/subgroupBroadcast/1d79c7.wgsl
@@ -35,8 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-enable chromium_experimental_subgroups;
-
+enable subgroups;
@group(0) @binding(0) var<storage, read_write> prevent_dce : i32;
diff --git a/test/tint/builtins/gen/literal/subgroupBroadcast/1d79c7.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/subgroupBroadcast/1d79c7.wgsl.expected.wgsl
index 535671f..3f5f2e6 100644
--- a/test/tint/builtins/gen/literal/subgroupBroadcast/1d79c7.wgsl.expected.wgsl
+++ b/test/tint/builtins/gen/literal/subgroupBroadcast/1d79c7.wgsl.expected.wgsl
@@ -1,4 +1,4 @@
-enable chromium_experimental_subgroups;
+enable subgroups;
@group(0) @binding(0) var<storage, read_write> prevent_dce : i32;
diff --git a/test/tint/builtins/gen/literal/subgroupBroadcast/279027.wgsl b/test/tint/builtins/gen/literal/subgroupBroadcast/279027.wgsl
index 1c0a9b3..719d368 100644
--- a/test/tint/builtins/gen/literal/subgroupBroadcast/279027.wgsl
+++ b/test/tint/builtins/gen/literal/subgroupBroadcast/279027.wgsl
@@ -35,8 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-enable chromium_experimental_subgroups;
-
+enable subgroups;
@group(0) @binding(0) var<storage, read_write> prevent_dce : vec4<u32>;
diff --git a/test/tint/builtins/gen/literal/subgroupBroadcast/279027.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/subgroupBroadcast/279027.wgsl.expected.wgsl
index 259e860..43fed65 100644
--- a/test/tint/builtins/gen/literal/subgroupBroadcast/279027.wgsl.expected.wgsl
+++ b/test/tint/builtins/gen/literal/subgroupBroadcast/279027.wgsl.expected.wgsl
@@ -1,4 +1,4 @@
-enable chromium_experimental_subgroups;
+enable subgroups;
@group(0) @binding(0) var<storage, read_write> prevent_dce : vec4<u32>;
diff --git a/test/tint/builtins/gen/literal/subgroupBroadcast/34fa3d.wgsl b/test/tint/builtins/gen/literal/subgroupBroadcast/34fa3d.wgsl
index 40ca927..1bc3f5e 100644
--- a/test/tint/builtins/gen/literal/subgroupBroadcast/34fa3d.wgsl
+++ b/test/tint/builtins/gen/literal/subgroupBroadcast/34fa3d.wgsl
@@ -35,8 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-enable chromium_experimental_subgroups;
-
+enable subgroups;
@group(0) @binding(0) var<storage, read_write> prevent_dce : vec3<u32>;
diff --git a/test/tint/builtins/gen/literal/subgroupBroadcast/34fa3d.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/subgroupBroadcast/34fa3d.wgsl.expected.wgsl
index 2400885..4dcd134 100644
--- a/test/tint/builtins/gen/literal/subgroupBroadcast/34fa3d.wgsl.expected.wgsl
+++ b/test/tint/builtins/gen/literal/subgroupBroadcast/34fa3d.wgsl.expected.wgsl
@@ -1,4 +1,4 @@
-enable chromium_experimental_subgroups;
+enable subgroups;
@group(0) @binding(0) var<storage, read_write> prevent_dce : vec3<u32>;
diff --git a/test/tint/builtins/gen/literal/subgroupBroadcast/3e6879.wgsl b/test/tint/builtins/gen/literal/subgroupBroadcast/3e6879.wgsl
index 9ae3413..4530831 100644
--- a/test/tint/builtins/gen/literal/subgroupBroadcast/3e6879.wgsl
+++ b/test/tint/builtins/gen/literal/subgroupBroadcast/3e6879.wgsl
@@ -35,8 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-enable chromium_experimental_subgroups;
-
+enable subgroups;
@group(0) @binding(0) var<storage, read_write> prevent_dce : vec2<i32>;
diff --git a/test/tint/builtins/gen/literal/subgroupBroadcast/3e6879.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/subgroupBroadcast/3e6879.wgsl.expected.wgsl
index 0452ead..1f5a7c3 100644
--- a/test/tint/builtins/gen/literal/subgroupBroadcast/3e6879.wgsl.expected.wgsl
+++ b/test/tint/builtins/gen/literal/subgroupBroadcast/3e6879.wgsl.expected.wgsl
@@ -1,4 +1,4 @@
-enable chromium_experimental_subgroups;
+enable subgroups;
@group(0) @binding(0) var<storage, read_write> prevent_dce : vec2<i32>;
diff --git a/test/tint/builtins/gen/literal/subgroupBroadcast/41e5d7.wgsl b/test/tint/builtins/gen/literal/subgroupBroadcast/41e5d7.wgsl
index 80e61fa..84a65e4 100644
--- a/test/tint/builtins/gen/literal/subgroupBroadcast/41e5d7.wgsl
+++ b/test/tint/builtins/gen/literal/subgroupBroadcast/41e5d7.wgsl
@@ -38,7 +38,8 @@
// flags: --hlsl_shader_model 62
-enable chromium_experimental_subgroups;
+enable subgroups;
+enable subgroups_f16;
enable f16;
diff --git a/test/tint/builtins/gen/literal/subgroupBroadcast/41e5d7.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/subgroupBroadcast/41e5d7.wgsl.expected.wgsl
index 76698c9..60a2171 100644
--- a/test/tint/builtins/gen/literal/subgroupBroadcast/41e5d7.wgsl.expected.wgsl
+++ b/test/tint/builtins/gen/literal/subgroupBroadcast/41e5d7.wgsl.expected.wgsl
@@ -1,4 +1,5 @@
-enable chromium_experimental_subgroups;
+enable subgroups;
+enable subgroups_f16;
enable f16;
@group(0) @binding(0) var<storage, read_write> prevent_dce : vec3<f16>;
diff --git a/test/tint/builtins/gen/literal/subgroupBroadcast/4a4334.wgsl b/test/tint/builtins/gen/literal/subgroupBroadcast/4a4334.wgsl
index cdd1efd..009f46b 100644
--- a/test/tint/builtins/gen/literal/subgroupBroadcast/4a4334.wgsl
+++ b/test/tint/builtins/gen/literal/subgroupBroadcast/4a4334.wgsl
@@ -35,8 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-enable chromium_experimental_subgroups;
-
+enable subgroups;
@group(0) @binding(0) var<storage, read_write> prevent_dce : vec2<u32>;
diff --git a/test/tint/builtins/gen/literal/subgroupBroadcast/4a4334.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/subgroupBroadcast/4a4334.wgsl.expected.wgsl
index 7b9f9b3..8277ca6 100644
--- a/test/tint/builtins/gen/literal/subgroupBroadcast/4a4334.wgsl.expected.wgsl
+++ b/test/tint/builtins/gen/literal/subgroupBroadcast/4a4334.wgsl.expected.wgsl
@@ -1,4 +1,4 @@
-enable chromium_experimental_subgroups;
+enable subgroups;
@group(0) @binding(0) var<storage, read_write> prevent_dce : vec2<u32>;
diff --git a/test/tint/builtins/gen/literal/subgroupBroadcast/5196c8.wgsl b/test/tint/builtins/gen/literal/subgroupBroadcast/5196c8.wgsl
index 026e88f..cf6c3aa 100644
--- a/test/tint/builtins/gen/literal/subgroupBroadcast/5196c8.wgsl
+++ b/test/tint/builtins/gen/literal/subgroupBroadcast/5196c8.wgsl
@@ -35,8 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-enable chromium_experimental_subgroups;
-
+enable subgroups;
@group(0) @binding(0) var<storage, read_write> prevent_dce : vec2<f32>;
diff --git a/test/tint/builtins/gen/literal/subgroupBroadcast/5196c8.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/subgroupBroadcast/5196c8.wgsl.expected.wgsl
index 5a0bc70..370fe4e 100644
--- a/test/tint/builtins/gen/literal/subgroupBroadcast/5196c8.wgsl.expected.wgsl
+++ b/test/tint/builtins/gen/literal/subgroupBroadcast/5196c8.wgsl.expected.wgsl
@@ -1,4 +1,4 @@
-enable chromium_experimental_subgroups;
+enable subgroups;
@group(0) @binding(0) var<storage, read_write> prevent_dce : vec2<f32>;
diff --git a/test/tint/builtins/gen/literal/subgroupBroadcast/912ff5.wgsl b/test/tint/builtins/gen/literal/subgroupBroadcast/912ff5.wgsl
index 4fe25c8..cb4a0ca 100644
--- a/test/tint/builtins/gen/literal/subgroupBroadcast/912ff5.wgsl
+++ b/test/tint/builtins/gen/literal/subgroupBroadcast/912ff5.wgsl
@@ -35,8 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-enable chromium_experimental_subgroups;
-
+enable subgroups;
@group(0) @binding(0) var<storage, read_write> prevent_dce : vec3<f32>;
diff --git a/test/tint/builtins/gen/literal/subgroupBroadcast/912ff5.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/subgroupBroadcast/912ff5.wgsl.expected.wgsl
index 2579ab6..aa23328 100644
--- a/test/tint/builtins/gen/literal/subgroupBroadcast/912ff5.wgsl.expected.wgsl
+++ b/test/tint/builtins/gen/literal/subgroupBroadcast/912ff5.wgsl.expected.wgsl
@@ -1,4 +1,4 @@
-enable chromium_experimental_subgroups;
+enable subgroups;
@group(0) @binding(0) var<storage, read_write> prevent_dce : vec3<f32>;
diff --git a/test/tint/builtins/gen/literal/subgroupBroadcast/b7e93b.wgsl b/test/tint/builtins/gen/literal/subgroupBroadcast/b7e93b.wgsl
index 3844519..3cc6e0c 100644
--- a/test/tint/builtins/gen/literal/subgroupBroadcast/b7e93b.wgsl
+++ b/test/tint/builtins/gen/literal/subgroupBroadcast/b7e93b.wgsl
@@ -35,8 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-enable chromium_experimental_subgroups;
-
+enable subgroups;
@group(0) @binding(0) var<storage, read_write> prevent_dce : vec4<f32>;
diff --git a/test/tint/builtins/gen/literal/subgroupBroadcast/b7e93b.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/subgroupBroadcast/b7e93b.wgsl.expected.wgsl
index d78a536..91f7718 100644
--- a/test/tint/builtins/gen/literal/subgroupBroadcast/b7e93b.wgsl.expected.wgsl
+++ b/test/tint/builtins/gen/literal/subgroupBroadcast/b7e93b.wgsl.expected.wgsl
@@ -1,4 +1,4 @@
-enable chromium_experimental_subgroups;
+enable subgroups;
@group(0) @binding(0) var<storage, read_write> prevent_dce : vec4<f32>;
diff --git a/test/tint/builtins/gen/literal/subgroupBroadcast/c36fe1.wgsl b/test/tint/builtins/gen/literal/subgroupBroadcast/c36fe1.wgsl
index ca6ef8d..09e76b2 100644
--- a/test/tint/builtins/gen/literal/subgroupBroadcast/c36fe1.wgsl
+++ b/test/tint/builtins/gen/literal/subgroupBroadcast/c36fe1.wgsl
@@ -35,8 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-enable chromium_experimental_subgroups;
-
+enable subgroups;
@group(0) @binding(0) var<storage, read_write> prevent_dce : u32;
diff --git a/test/tint/builtins/gen/literal/subgroupBroadcast/c36fe1.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/subgroupBroadcast/c36fe1.wgsl.expected.wgsl
index c4998644..45c5d4b 100644
--- a/test/tint/builtins/gen/literal/subgroupBroadcast/c36fe1.wgsl.expected.wgsl
+++ b/test/tint/builtins/gen/literal/subgroupBroadcast/c36fe1.wgsl.expected.wgsl
@@ -1,4 +1,4 @@
-enable chromium_experimental_subgroups;
+enable subgroups;
@group(0) @binding(0) var<storage, read_write> prevent_dce : u32;
diff --git a/test/tint/builtins/gen/literal/subgroupBroadcast/e275c8.wgsl b/test/tint/builtins/gen/literal/subgroupBroadcast/e275c8.wgsl
index b1ad80f..e4c8305 100644
--- a/test/tint/builtins/gen/literal/subgroupBroadcast/e275c8.wgsl
+++ b/test/tint/builtins/gen/literal/subgroupBroadcast/e275c8.wgsl
@@ -35,8 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-enable chromium_experimental_subgroups;
-
+enable subgroups;
@group(0) @binding(0) var<storage, read_write> prevent_dce : vec3<i32>;
diff --git a/test/tint/builtins/gen/literal/subgroupBroadcast/e275c8.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/subgroupBroadcast/e275c8.wgsl.expected.wgsl
index 0128689..716489a 100644
--- a/test/tint/builtins/gen/literal/subgroupBroadcast/e275c8.wgsl.expected.wgsl
+++ b/test/tint/builtins/gen/literal/subgroupBroadcast/e275c8.wgsl.expected.wgsl
@@ -1,4 +1,4 @@
-enable chromium_experimental_subgroups;
+enable subgroups;
@group(0) @binding(0) var<storage, read_write> prevent_dce : vec3<i32>;
diff --git a/test/tint/builtins/gen/literal/subgroupBroadcast/f637f9.wgsl b/test/tint/builtins/gen/literal/subgroupBroadcast/f637f9.wgsl
index a88c568..b3cce7d 100644
--- a/test/tint/builtins/gen/literal/subgroupBroadcast/f637f9.wgsl
+++ b/test/tint/builtins/gen/literal/subgroupBroadcast/f637f9.wgsl
@@ -35,8 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-enable chromium_experimental_subgroups;
-
+enable subgroups;
@group(0) @binding(0) var<storage, read_write> prevent_dce : vec4<i32>;
diff --git a/test/tint/builtins/gen/literal/subgroupBroadcast/f637f9.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/subgroupBroadcast/f637f9.wgsl.expected.wgsl
index a2bded1..5c639e3 100644
--- a/test/tint/builtins/gen/literal/subgroupBroadcast/f637f9.wgsl.expected.wgsl
+++ b/test/tint/builtins/gen/literal/subgroupBroadcast/f637f9.wgsl.expected.wgsl
@@ -1,4 +1,4 @@
-enable chromium_experimental_subgroups;
+enable subgroups;
@group(0) @binding(0) var<storage, read_write> prevent_dce : vec4<i32>;
diff --git a/test/tint/builtins/gen/var/subgroupBallot/7e6d0e.wgsl b/test/tint/builtins/gen/var/subgroupBallot/7e6d0e.wgsl
index ea092be..551c706 100644
--- a/test/tint/builtins/gen/var/subgroupBallot/7e6d0e.wgsl
+++ b/test/tint/builtins/gen/var/subgroupBallot/7e6d0e.wgsl
@@ -35,8 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-enable chromium_experimental_subgroups;
-
+enable subgroups;
@group(0) @binding(0) var<storage, read_write> prevent_dce : vec4<u32>;
diff --git a/test/tint/builtins/gen/var/subgroupBallot/7e6d0e.wgsl.expected.wgsl b/test/tint/builtins/gen/var/subgroupBallot/7e6d0e.wgsl.expected.wgsl
index 7fa2b9b..5b41259 100644
--- a/test/tint/builtins/gen/var/subgroupBallot/7e6d0e.wgsl.expected.wgsl
+++ b/test/tint/builtins/gen/var/subgroupBallot/7e6d0e.wgsl.expected.wgsl
@@ -1,4 +1,4 @@
-enable chromium_experimental_subgroups;
+enable subgroups;
@group(0) @binding(0) var<storage, read_write> prevent_dce : vec4<u32>;
diff --git a/test/tint/builtins/gen/var/subgroupBroadcast/07e2d8.wgsl b/test/tint/builtins/gen/var/subgroupBroadcast/07e2d8.wgsl
index 573005c..7a78057 100644
--- a/test/tint/builtins/gen/var/subgroupBroadcast/07e2d8.wgsl
+++ b/test/tint/builtins/gen/var/subgroupBroadcast/07e2d8.wgsl
@@ -38,7 +38,8 @@
// flags: --hlsl_shader_model 62
-enable chromium_experimental_subgroups;
+enable subgroups;
+enable subgroups_f16;
enable f16;
diff --git a/test/tint/builtins/gen/var/subgroupBroadcast/07e2d8.wgsl.expected.wgsl b/test/tint/builtins/gen/var/subgroupBroadcast/07e2d8.wgsl.expected.wgsl
index e05a085..cf3cac5 100644
--- a/test/tint/builtins/gen/var/subgroupBroadcast/07e2d8.wgsl.expected.wgsl
+++ b/test/tint/builtins/gen/var/subgroupBroadcast/07e2d8.wgsl.expected.wgsl
@@ -1,4 +1,5 @@
-enable chromium_experimental_subgroups;
+enable subgroups;
+enable subgroups_f16;
enable f16;
@group(0) @binding(0) var<storage, read_write> prevent_dce : f16;
diff --git a/test/tint/builtins/gen/var/subgroupBroadcast/08beca.wgsl b/test/tint/builtins/gen/var/subgroupBroadcast/08beca.wgsl
index 47a5bb3..d44de91 100644
--- a/test/tint/builtins/gen/var/subgroupBroadcast/08beca.wgsl
+++ b/test/tint/builtins/gen/var/subgroupBroadcast/08beca.wgsl
@@ -35,8 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-enable chromium_experimental_subgroups;
-
+enable subgroups;
@group(0) @binding(0) var<storage, read_write> prevent_dce : f32;
diff --git a/test/tint/builtins/gen/var/subgroupBroadcast/08beca.wgsl.expected.wgsl b/test/tint/builtins/gen/var/subgroupBroadcast/08beca.wgsl.expected.wgsl
index 1cea6d2..168e18d 100644
--- a/test/tint/builtins/gen/var/subgroupBroadcast/08beca.wgsl.expected.wgsl
+++ b/test/tint/builtins/gen/var/subgroupBroadcast/08beca.wgsl.expected.wgsl
@@ -1,4 +1,4 @@
-enable chromium_experimental_subgroups;
+enable subgroups;
@group(0) @binding(0) var<storage, read_write> prevent_dce : f32;
diff --git a/test/tint/builtins/gen/var/subgroupBroadcast/0f44e2.wgsl b/test/tint/builtins/gen/var/subgroupBroadcast/0f44e2.wgsl
index 98c2abb..2bfbf72 100644
--- a/test/tint/builtins/gen/var/subgroupBroadcast/0f44e2.wgsl
+++ b/test/tint/builtins/gen/var/subgroupBroadcast/0f44e2.wgsl
@@ -38,7 +38,8 @@
// flags: --hlsl_shader_model 62
-enable chromium_experimental_subgroups;
+enable subgroups;
+enable subgroups_f16;
enable f16;
diff --git a/test/tint/builtins/gen/var/subgroupBroadcast/0f44e2.wgsl.expected.wgsl b/test/tint/builtins/gen/var/subgroupBroadcast/0f44e2.wgsl.expected.wgsl
index 30c143a..919267e 100644
--- a/test/tint/builtins/gen/var/subgroupBroadcast/0f44e2.wgsl.expected.wgsl
+++ b/test/tint/builtins/gen/var/subgroupBroadcast/0f44e2.wgsl.expected.wgsl
@@ -1,4 +1,5 @@
-enable chromium_experimental_subgroups;
+enable subgroups;
+enable subgroups_f16;
enable f16;
@group(0) @binding(0) var<storage, read_write> prevent_dce : vec4<f16>;
diff --git a/test/tint/builtins/gen/var/subgroupBroadcast/13f36c.wgsl b/test/tint/builtins/gen/var/subgroupBroadcast/13f36c.wgsl
index d589b38..23b66f4 100644
--- a/test/tint/builtins/gen/var/subgroupBroadcast/13f36c.wgsl
+++ b/test/tint/builtins/gen/var/subgroupBroadcast/13f36c.wgsl
@@ -38,7 +38,8 @@
// flags: --hlsl_shader_model 62
-enable chromium_experimental_subgroups;
+enable subgroups;
+enable subgroups_f16;
enable f16;
diff --git a/test/tint/builtins/gen/var/subgroupBroadcast/13f36c.wgsl.expected.wgsl b/test/tint/builtins/gen/var/subgroupBroadcast/13f36c.wgsl.expected.wgsl
index 7c5d3d2..5953cd9 100644
--- a/test/tint/builtins/gen/var/subgroupBroadcast/13f36c.wgsl.expected.wgsl
+++ b/test/tint/builtins/gen/var/subgroupBroadcast/13f36c.wgsl.expected.wgsl
@@ -1,4 +1,5 @@
-enable chromium_experimental_subgroups;
+enable subgroups;
+enable subgroups_f16;
enable f16;
@group(0) @binding(0) var<storage, read_write> prevent_dce : vec2<f16>;
diff --git a/test/tint/builtins/gen/var/subgroupBroadcast/1d79c7.wgsl b/test/tint/builtins/gen/var/subgroupBroadcast/1d79c7.wgsl
index 0a8f9b1..935cd58 100644
--- a/test/tint/builtins/gen/var/subgroupBroadcast/1d79c7.wgsl
+++ b/test/tint/builtins/gen/var/subgroupBroadcast/1d79c7.wgsl
@@ -35,8 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-enable chromium_experimental_subgroups;
-
+enable subgroups;
@group(0) @binding(0) var<storage, read_write> prevent_dce : i32;
diff --git a/test/tint/builtins/gen/var/subgroupBroadcast/1d79c7.wgsl.expected.wgsl b/test/tint/builtins/gen/var/subgroupBroadcast/1d79c7.wgsl.expected.wgsl
index b4461f2..692bb22 100644
--- a/test/tint/builtins/gen/var/subgroupBroadcast/1d79c7.wgsl.expected.wgsl
+++ b/test/tint/builtins/gen/var/subgroupBroadcast/1d79c7.wgsl.expected.wgsl
@@ -1,4 +1,4 @@
-enable chromium_experimental_subgroups;
+enable subgroups;
@group(0) @binding(0) var<storage, read_write> prevent_dce : i32;
diff --git a/test/tint/builtins/gen/var/subgroupBroadcast/279027.wgsl b/test/tint/builtins/gen/var/subgroupBroadcast/279027.wgsl
index 68fff3c..a4a45ba 100644
--- a/test/tint/builtins/gen/var/subgroupBroadcast/279027.wgsl
+++ b/test/tint/builtins/gen/var/subgroupBroadcast/279027.wgsl
@@ -35,8 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-enable chromium_experimental_subgroups;
-
+enable subgroups;
@group(0) @binding(0) var<storage, read_write> prevent_dce : vec4<u32>;
diff --git a/test/tint/builtins/gen/var/subgroupBroadcast/279027.wgsl.expected.wgsl b/test/tint/builtins/gen/var/subgroupBroadcast/279027.wgsl.expected.wgsl
index 16edec3..34205fb 100644
--- a/test/tint/builtins/gen/var/subgroupBroadcast/279027.wgsl.expected.wgsl
+++ b/test/tint/builtins/gen/var/subgroupBroadcast/279027.wgsl.expected.wgsl
@@ -1,4 +1,4 @@
-enable chromium_experimental_subgroups;
+enable subgroups;
@group(0) @binding(0) var<storage, read_write> prevent_dce : vec4<u32>;
diff --git a/test/tint/builtins/gen/var/subgroupBroadcast/34fa3d.wgsl b/test/tint/builtins/gen/var/subgroupBroadcast/34fa3d.wgsl
index 0f8727d..57939cb 100644
--- a/test/tint/builtins/gen/var/subgroupBroadcast/34fa3d.wgsl
+++ b/test/tint/builtins/gen/var/subgroupBroadcast/34fa3d.wgsl
@@ -35,8 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-enable chromium_experimental_subgroups;
-
+enable subgroups;
@group(0) @binding(0) var<storage, read_write> prevent_dce : vec3<u32>;
diff --git a/test/tint/builtins/gen/var/subgroupBroadcast/34fa3d.wgsl.expected.wgsl b/test/tint/builtins/gen/var/subgroupBroadcast/34fa3d.wgsl.expected.wgsl
index 995d687..f238c05 100644
--- a/test/tint/builtins/gen/var/subgroupBroadcast/34fa3d.wgsl.expected.wgsl
+++ b/test/tint/builtins/gen/var/subgroupBroadcast/34fa3d.wgsl.expected.wgsl
@@ -1,4 +1,4 @@
-enable chromium_experimental_subgroups;
+enable subgroups;
@group(0) @binding(0) var<storage, read_write> prevent_dce : vec3<u32>;
diff --git a/test/tint/builtins/gen/var/subgroupBroadcast/3e6879.wgsl b/test/tint/builtins/gen/var/subgroupBroadcast/3e6879.wgsl
index 5ff9063..1182aee 100644
--- a/test/tint/builtins/gen/var/subgroupBroadcast/3e6879.wgsl
+++ b/test/tint/builtins/gen/var/subgroupBroadcast/3e6879.wgsl
@@ -35,8 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-enable chromium_experimental_subgroups;
-
+enable subgroups;
@group(0) @binding(0) var<storage, read_write> prevent_dce : vec2<i32>;
diff --git a/test/tint/builtins/gen/var/subgroupBroadcast/3e6879.wgsl.expected.wgsl b/test/tint/builtins/gen/var/subgroupBroadcast/3e6879.wgsl.expected.wgsl
index 1eb315a..99aad70 100644
--- a/test/tint/builtins/gen/var/subgroupBroadcast/3e6879.wgsl.expected.wgsl
+++ b/test/tint/builtins/gen/var/subgroupBroadcast/3e6879.wgsl.expected.wgsl
@@ -1,4 +1,4 @@
-enable chromium_experimental_subgroups;
+enable subgroups;
@group(0) @binding(0) var<storage, read_write> prevent_dce : vec2<i32>;
diff --git a/test/tint/builtins/gen/var/subgroupBroadcast/41e5d7.wgsl b/test/tint/builtins/gen/var/subgroupBroadcast/41e5d7.wgsl
index 514462c..b136436 100644
--- a/test/tint/builtins/gen/var/subgroupBroadcast/41e5d7.wgsl
+++ b/test/tint/builtins/gen/var/subgroupBroadcast/41e5d7.wgsl
@@ -38,7 +38,8 @@
// flags: --hlsl_shader_model 62
-enable chromium_experimental_subgroups;
+enable subgroups;
+enable subgroups_f16;
enable f16;
diff --git a/test/tint/builtins/gen/var/subgroupBroadcast/41e5d7.wgsl.expected.wgsl b/test/tint/builtins/gen/var/subgroupBroadcast/41e5d7.wgsl.expected.wgsl
index 23d1db3..42f672c 100644
--- a/test/tint/builtins/gen/var/subgroupBroadcast/41e5d7.wgsl.expected.wgsl
+++ b/test/tint/builtins/gen/var/subgroupBroadcast/41e5d7.wgsl.expected.wgsl
@@ -1,4 +1,5 @@
-enable chromium_experimental_subgroups;
+enable subgroups;
+enable subgroups_f16;
enable f16;
@group(0) @binding(0) var<storage, read_write> prevent_dce : vec3<f16>;
diff --git a/test/tint/builtins/gen/var/subgroupBroadcast/4a4334.wgsl b/test/tint/builtins/gen/var/subgroupBroadcast/4a4334.wgsl
index 1b279ab..48c7d7d 100644
--- a/test/tint/builtins/gen/var/subgroupBroadcast/4a4334.wgsl
+++ b/test/tint/builtins/gen/var/subgroupBroadcast/4a4334.wgsl
@@ -35,8 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-enable chromium_experimental_subgroups;
-
+enable subgroups;
@group(0) @binding(0) var<storage, read_write> prevent_dce : vec2<u32>;
diff --git a/test/tint/builtins/gen/var/subgroupBroadcast/4a4334.wgsl.expected.wgsl b/test/tint/builtins/gen/var/subgroupBroadcast/4a4334.wgsl.expected.wgsl
index a3a9ab8..ca242c1 100644
--- a/test/tint/builtins/gen/var/subgroupBroadcast/4a4334.wgsl.expected.wgsl
+++ b/test/tint/builtins/gen/var/subgroupBroadcast/4a4334.wgsl.expected.wgsl
@@ -1,4 +1,4 @@
-enable chromium_experimental_subgroups;
+enable subgroups;
@group(0) @binding(0) var<storage, read_write> prevent_dce : vec2<u32>;
diff --git a/test/tint/builtins/gen/var/subgroupBroadcast/5196c8.wgsl b/test/tint/builtins/gen/var/subgroupBroadcast/5196c8.wgsl
index 31a5fc8..5c97937 100644
--- a/test/tint/builtins/gen/var/subgroupBroadcast/5196c8.wgsl
+++ b/test/tint/builtins/gen/var/subgroupBroadcast/5196c8.wgsl
@@ -35,8 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-enable chromium_experimental_subgroups;
-
+enable subgroups;
@group(0) @binding(0) var<storage, read_write> prevent_dce : vec2<f32>;
diff --git a/test/tint/builtins/gen/var/subgroupBroadcast/5196c8.wgsl.expected.wgsl b/test/tint/builtins/gen/var/subgroupBroadcast/5196c8.wgsl.expected.wgsl
index 4918901..df76e03 100644
--- a/test/tint/builtins/gen/var/subgroupBroadcast/5196c8.wgsl.expected.wgsl
+++ b/test/tint/builtins/gen/var/subgroupBroadcast/5196c8.wgsl.expected.wgsl
@@ -1,4 +1,4 @@
-enable chromium_experimental_subgroups;
+enable subgroups;
@group(0) @binding(0) var<storage, read_write> prevent_dce : vec2<f32>;
diff --git a/test/tint/builtins/gen/var/subgroupBroadcast/912ff5.wgsl b/test/tint/builtins/gen/var/subgroupBroadcast/912ff5.wgsl
index 86d4abd..1341873 100644
--- a/test/tint/builtins/gen/var/subgroupBroadcast/912ff5.wgsl
+++ b/test/tint/builtins/gen/var/subgroupBroadcast/912ff5.wgsl
@@ -35,8 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-enable chromium_experimental_subgroups;
-
+enable subgroups;
@group(0) @binding(0) var<storage, read_write> prevent_dce : vec3<f32>;
diff --git a/test/tint/builtins/gen/var/subgroupBroadcast/912ff5.wgsl.expected.wgsl b/test/tint/builtins/gen/var/subgroupBroadcast/912ff5.wgsl.expected.wgsl
index c725a33..c210b2a 100644
--- a/test/tint/builtins/gen/var/subgroupBroadcast/912ff5.wgsl.expected.wgsl
+++ b/test/tint/builtins/gen/var/subgroupBroadcast/912ff5.wgsl.expected.wgsl
@@ -1,4 +1,4 @@
-enable chromium_experimental_subgroups;
+enable subgroups;
@group(0) @binding(0) var<storage, read_write> prevent_dce : vec3<f32>;
diff --git a/test/tint/builtins/gen/var/subgroupBroadcast/b7e93b.wgsl b/test/tint/builtins/gen/var/subgroupBroadcast/b7e93b.wgsl
index 127e970..b1bd6ec 100644
--- a/test/tint/builtins/gen/var/subgroupBroadcast/b7e93b.wgsl
+++ b/test/tint/builtins/gen/var/subgroupBroadcast/b7e93b.wgsl
@@ -35,8 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-enable chromium_experimental_subgroups;
-
+enable subgroups;
@group(0) @binding(0) var<storage, read_write> prevent_dce : vec4<f32>;
diff --git a/test/tint/builtins/gen/var/subgroupBroadcast/b7e93b.wgsl.expected.wgsl b/test/tint/builtins/gen/var/subgroupBroadcast/b7e93b.wgsl.expected.wgsl
index c5be68c..8721ef3 100644
--- a/test/tint/builtins/gen/var/subgroupBroadcast/b7e93b.wgsl.expected.wgsl
+++ b/test/tint/builtins/gen/var/subgroupBroadcast/b7e93b.wgsl.expected.wgsl
@@ -1,4 +1,4 @@
-enable chromium_experimental_subgroups;
+enable subgroups;
@group(0) @binding(0) var<storage, read_write> prevent_dce : vec4<f32>;
diff --git a/test/tint/builtins/gen/var/subgroupBroadcast/c36fe1.wgsl b/test/tint/builtins/gen/var/subgroupBroadcast/c36fe1.wgsl
index 7d3e499..d021444 100644
--- a/test/tint/builtins/gen/var/subgroupBroadcast/c36fe1.wgsl
+++ b/test/tint/builtins/gen/var/subgroupBroadcast/c36fe1.wgsl
@@ -35,8 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-enable chromium_experimental_subgroups;
-
+enable subgroups;
@group(0) @binding(0) var<storage, read_write> prevent_dce : u32;
diff --git a/test/tint/builtins/gen/var/subgroupBroadcast/c36fe1.wgsl.expected.wgsl b/test/tint/builtins/gen/var/subgroupBroadcast/c36fe1.wgsl.expected.wgsl
index 63f0900..5610aa2 100644
--- a/test/tint/builtins/gen/var/subgroupBroadcast/c36fe1.wgsl.expected.wgsl
+++ b/test/tint/builtins/gen/var/subgroupBroadcast/c36fe1.wgsl.expected.wgsl
@@ -1,4 +1,4 @@
-enable chromium_experimental_subgroups;
+enable subgroups;
@group(0) @binding(0) var<storage, read_write> prevent_dce : u32;
diff --git a/test/tint/builtins/gen/var/subgroupBroadcast/e275c8.wgsl b/test/tint/builtins/gen/var/subgroupBroadcast/e275c8.wgsl
index f4aa87b..1893c9f 100644
--- a/test/tint/builtins/gen/var/subgroupBroadcast/e275c8.wgsl
+++ b/test/tint/builtins/gen/var/subgroupBroadcast/e275c8.wgsl
@@ -35,8 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-enable chromium_experimental_subgroups;
-
+enable subgroups;
@group(0) @binding(0) var<storage, read_write> prevent_dce : vec3<i32>;
diff --git a/test/tint/builtins/gen/var/subgroupBroadcast/e275c8.wgsl.expected.wgsl b/test/tint/builtins/gen/var/subgroupBroadcast/e275c8.wgsl.expected.wgsl
index 2df2b15..1c9c598 100644
--- a/test/tint/builtins/gen/var/subgroupBroadcast/e275c8.wgsl.expected.wgsl
+++ b/test/tint/builtins/gen/var/subgroupBroadcast/e275c8.wgsl.expected.wgsl
@@ -1,4 +1,4 @@
-enable chromium_experimental_subgroups;
+enable subgroups;
@group(0) @binding(0) var<storage, read_write> prevent_dce : vec3<i32>;
diff --git a/test/tint/builtins/gen/var/subgroupBroadcast/f637f9.wgsl b/test/tint/builtins/gen/var/subgroupBroadcast/f637f9.wgsl
index f327c55..61d4d1a 100644
--- a/test/tint/builtins/gen/var/subgroupBroadcast/f637f9.wgsl
+++ b/test/tint/builtins/gen/var/subgroupBroadcast/f637f9.wgsl
@@ -35,8 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-enable chromium_experimental_subgroups;
-
+enable subgroups;
@group(0) @binding(0) var<storage, read_write> prevent_dce : vec4<i32>;
diff --git a/test/tint/builtins/gen/var/subgroupBroadcast/f637f9.wgsl.expected.wgsl b/test/tint/builtins/gen/var/subgroupBroadcast/f637f9.wgsl.expected.wgsl
index 1d8d4f4..25d122d 100644
--- a/test/tint/builtins/gen/var/subgroupBroadcast/f637f9.wgsl.expected.wgsl
+++ b/test/tint/builtins/gen/var/subgroupBroadcast/f637f9.wgsl.expected.wgsl
@@ -1,4 +1,4 @@
-enable chromium_experimental_subgroups;
+enable subgroups;
@group(0) @binding(0) var<storage, read_write> prevent_dce : vec4<i32>;
