tint/hlsl: remove [loop] attribute on all loops

I added the forcing of the "loop" attribute to all loops to address FXC
failing on uniformity errors related to gradients in loops. Since then,
Tint now implements UA and it recently became an error, so we no longer
need this hack. As a result, FXC is now better able to cope with loops
that it determines executes 0 times.

Most e2e tests are affected because so many use loops, but 27 tests that
were previously failing are now passing with this change:

tint/bug/tint/1538.wgsl.expected.fxc.hlsl
tint/bug/tint/1604.wgsl.expected.fxc.hlsl
tint/bug/tint/1605.wgsl.expected.fxc.hlsl
tint/unittest/reader/spirv/SpvParserCFGTest_ClassifyCFGEdges_LoopBreak_FromLoopHeader_SingleBlockLoop_TrueBranch.spvasm.expected.fxc.hlsl
tint/unittest/reader/spirv/SpvParserCFGTest_ComputeBlockOrder_Loop_HeaderHasBreakUnless.spvasm.expected.fxc.hlsl
tint/unittest/reader/spirv/SpvParserCFGTest_EmitBody_IfSelection_TrueBranch_LoopBreak.spvasm.expected.fxc.hlsl
tint/unittest/reader/spirv/SpvParserCFGTest_FindIfSelectionInternalHeaders_TrueBranch_LoopBreak_Ok.spvasm.expected.fxc.hlsl
tint/unittest/reader/spirv/SpvParserFunctionVarTest_EmitStatement_Phi_MultiBlockLoopIndex.spvasm.expected.fxc.hlsl
tint/unittest/reader/spirv/SpvParserFunctionVarTest_EmitStatement_Phi_SingleBlockLoopIndex.spvasm.expected.fxc.hlsl
tint/vk-gl-cts/graphicsfuzz/cov-dead-code-unreachable-merge/0-opt.spvasm.expected.fxc.hlsl
tint/vk-gl-cts/graphicsfuzz/cov-dead-code-unreachable-merge/0-opt.wgsl.expected.fxc.hlsl
tint/vk-gl-cts/graphicsfuzz/similar-nested-ifs/0-opt.spvasm.expected.fxc.hlsl
tint/vk-gl-cts/graphicsfuzz/similar-nested-ifs/0-opt.wgsl.expected.fxc.hlsl
tint/vk-gl-cts/graphicsfuzz/spv-load-from-frag-color/1.spvasm.expected.fxc.hlsl
tint/vk-gl-cts/graphicsfuzz/spv-load-from-frag-color/1.wgsl.expected.fxc.hlsl
tint/vk-gl-cts/graphicsfuzz/stable-binarysearch-tree-false-if-discard-loop/0.spvasm.expected.fxc.hlsl
tint/vk-gl-cts/graphicsfuzz/stable-binarysearch-tree-false-if-discard-loop/0.wgsl.expected.fxc.hlsl
tint/vk-gl-cts/graphicsfuzz/stable-binarysearch-tree-fragcoord-less-than-zero/0.spvasm.expected.fxc.hlsl
tint/vk-gl-cts/graphicsfuzz/stable-binarysearch-tree-fragcoord-less-than-zero/0.wgsl.expected.fxc.hlsl
tint/vk-gl-cts/graphicsfuzz/stable-binarysearch-tree-fragcoord-less-than-zero/1.spvasm.expected.fxc.hlsl
tint/vk-gl-cts/graphicsfuzz/stable-binarysearch-tree-fragcoord-less-than-zero/1.wgsl.expected.fxc.hlsl
tint/vk-gl-cts/graphicsfuzz/stable-binarysearch-tree-with-loop-read-write-global/0-opt.spvasm.expected.fxc.hlsl
tint/vk-gl-cts/graphicsfuzz/stable-binarysearch-tree-with-loop-read-write-global/0-opt.wgsl.expected.fxc.hlsl
tint/vk-gl-cts/graphicsfuzz/stable-binarysearch-tree-with-loop-read-write-global/1.spvasm.expected.fxc.hlsl
tint/vk-gl-cts/graphicsfuzz/stable-binarysearch-tree-with-loop-read-write-global/1.wgsl.expected.fxc.hlsl
tint/vk-gl-cts/graphicsfuzz/write-red-after-search/0-opt.spvasm.expected.fxc.hlsl
tint/vk-gl-cts/graphicsfuzz/write-red-after-search/0-opt.wgsl.expected.fxc.hlsl

Bug: tint:1522
Bug: tint:1538
Bug: tint:1604
Bug: tint:1605
Change-Id: I530b846b6b8df122ab351ff7b85d3e1c9ac11526
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/104121
Reviewed-by: Ben Clayton <bclayton@google.com>
Commit-Queue: Antonio Maiorano <amaiorano@google.com>
Kokoro: Kokoro <noreply+kokoro@google.com>

src/tint/writer/hlsl/generator_impl.cc

@@ -143,13 +143,6 @@ std::ostream& operator<<(std::ostream& s, const RegisterAndSpace& rs) {
     return s;
 }
 
-const char* LoopAttribute() {
-    // Force loops not to be unrolled to work around FXC compilation issues when
-    // it attempts and fails to unroll loops when it contains gradient operations.
-    // https://docs.microsoft.com/en-us/windows/win32/direct3dhlsl/dx-graphics-hlsl-while
-    return "[loop] ";
-}
-
 }  // namespace
 
 SanitizedResult::SanitizedResult() = default;
@@ -3365,7 +3358,7 @@ bool GeneratorImpl::EmitLoop(const ast::LoopStatement* stmt) {
     };
 
     TINT_SCOPED_ASSIGNMENT(emit_continuing_, emit_continuing);
-    line() << LoopAttribute() << "while (true) {";
+    line() << "while (true) {";
     {
         ScopedIndent si(this);
         if (!EmitStatements(stmt->body->statements)) {
@@ -3435,7 +3428,7 @@ bool GeneratorImpl::EmitForLoop(const ast::ForLoopStatement* stmt) {
         };
 
         TINT_SCOPED_ASSIGNMENT(emit_continuing_, emit_continuing);
-        line() << LoopAttribute() << "while (true) {";
+        line() << "while (true) {";
         increment_indent();
         TINT_DEFER({
             decrement_indent();
@@ -3458,7 +3451,7 @@ bool GeneratorImpl::EmitForLoop(const ast::ForLoopStatement* stmt) {
         // For-loop can be generated.
         {
             auto out = line();
-            out << LoopAttribute() << "for";
+            out << "for";
             {
                 ScopedParen sp(out);
 
@@ -3507,7 +3500,7 @@ bool GeneratorImpl::EmitWhile(const ast::WhileStatement* stmt) {
     // as a regular while in HLSL. Instead we need to generate a `while(true)` loop.
     bool emit_as_loop = cond_pre.lines.size() > 0;
     if (emit_as_loop) {
-        line() << LoopAttribute() << "while (true) {";
+        line() << "while (true) {";
         increment_indent();
         TINT_DEFER({
             decrement_indent();
@@ -3523,7 +3516,7 @@ bool GeneratorImpl::EmitWhile(const ast::WhileStatement* stmt) {
         // While can be generated.
         {
             auto out = line();
-            out << LoopAttribute() << "while";
+            out << "while";
             {
                 ScopedParen sp(out);
                 out << cond_buf.str();

src/tint/writer/hlsl/generator_impl_continue_test.cc

@@ -29,7 +29,7 @@ TEST_F(HlslGeneratorImplTest_Continue, Emit_Continue) {
     gen.increment_indent();
 
     ASSERT_TRUE(gen.EmitStatement(loop)) << gen.error();
-    EXPECT_EQ(gen.result(), R"(  [loop] while (true) {
+    EXPECT_EQ(gen.result(), R"(  while (true) {
     if (false) {
       break;
     }

src/tint/writer/hlsl/generator_impl_loop_test.cc

@@ -34,7 +34,7 @@ TEST_F(HlslGeneratorImplTest_Loop, Emit_Loop) {
     gen.increment_indent();
 
     ASSERT_TRUE(gen.EmitStatement(l)) << gen.error();
-    EXPECT_EQ(gen.result(), R"(  [loop] while (true) {
+    EXPECT_EQ(gen.result(), R"(  while (true) {
     discard;
   }
 )");
@@ -54,7 +54,7 @@ TEST_F(HlslGeneratorImplTest_Loop, Emit_LoopWithContinuing) {
     gen.increment_indent();
 
     ASSERT_TRUE(gen.EmitStatement(l)) << gen.error();
-    EXPECT_EQ(gen.result(), R"(  [loop] while (true) {
+    EXPECT_EQ(gen.result(), R"(  while (true) {
     discard;
     {
       a_statement();
@@ -88,8 +88,8 @@ TEST_F(HlslGeneratorImplTest_Loop, Emit_LoopNestedWithContinuing) {
     gen.increment_indent();
 
     ASSERT_TRUE(gen.EmitStatement(outer)) << gen.error();
-    EXPECT_EQ(gen.result(), R"(  [loop] while (true) {
+    EXPECT_EQ(gen.result(), R"(  while (true) {
-    [loop] while (true) {
+    while (true) {
       discard;
       {
         a_statement();
@@ -127,7 +127,7 @@ TEST_F(HlslGeneratorImplTest_Loop, Emit_LoopWithVarUsedInContinuing) {
     gen.increment_indent();
 
     ASSERT_TRUE(gen.EmitStatement(outer)) << gen.error();
-    EXPECT_EQ(gen.result(), R"(  [loop] while (true) {
+    EXPECT_EQ(gen.result(), R"(  while (true) {
     float lhs = 2.400000095f;
     float other = 0.0f;
     break;
@@ -152,7 +152,7 @@ TEST_F(HlslGeneratorImplTest_Loop, Emit_ForLoop) {
 
     ASSERT_TRUE(gen.EmitStatement(f)) << gen.error();
     EXPECT_EQ(gen.result(), R"(  {
-    [loop] for(; ; ) {
+    for(; ; ) {
       return;
     }
   }
@@ -173,7 +173,7 @@ TEST_F(HlslGeneratorImplTest_Loop, Emit_ForLoopWithSimpleInit) {
 
     ASSERT_TRUE(gen.EmitStatement(f)) << gen.error();
     EXPECT_EQ(gen.result(), R"(  {
-    [loop] for(int i = 0; ; ) {
+    for(int i = 0; ; ) {
       return;
     }
   }
@@ -201,7 +201,7 @@ TEST_F(HlslGeneratorImplTest_Loop, Emit_ForLoopWithMultiStmtInit) {
       tint_tmp = false;
     }
     bool b = (tint_tmp);
-    [loop] for(; ; ) {
+    for(; ; ) {
       return;
     }
   }
@@ -222,7 +222,7 @@ TEST_F(HlslGeneratorImplTest_Loop, Emit_ForLoopWithSimpleCond) {
 
     ASSERT_TRUE(gen.EmitStatement(f)) << gen.error();
     EXPECT_EQ(gen.result(), R"(  {
-    [loop] for(; true; ) {
+    for(; true; ) {
       return;
     }
   }
@@ -245,7 +245,7 @@ TEST_F(HlslGeneratorImplTest_Loop, Emit_ForLoopWithMultiStmtCond) {
 
     ASSERT_TRUE(gen.EmitStatement(f)) << gen.error();
     EXPECT_EQ(gen.result(), R"(  {
-    [loop] while (true) {
+    while (true) {
       bool tint_tmp = true;
       if (tint_tmp) {
         tint_tmp = false;
@@ -272,7 +272,7 @@ TEST_F(HlslGeneratorImplTest_Loop, Emit_ForLoopWithSimpleCont) {
 
     ASSERT_TRUE(gen.EmitStatement(f)) << gen.error();
     EXPECT_EQ(gen.result(), R"(  {
-    [loop] for(; ; i = (i + 1)) {
+    for(; ; i = (i + 1)) {
       return;
     }
   }
@@ -296,7 +296,7 @@ TEST_F(HlslGeneratorImplTest_Loop, Emit_ForLoopWithMultiStmtCont) {
 
     ASSERT_TRUE(gen.EmitStatement(f)) << gen.error();
     EXPECT_EQ(gen.result(), R"(  {
-    [loop] while (true) {
+    while (true) {
       return;
       bool tint_tmp = true;
       if (tint_tmp) {
@@ -322,7 +322,7 @@ TEST_F(HlslGeneratorImplTest_Loop, Emit_ForLoopWithSimpleInitCondCont) {
 
     ASSERT_TRUE(gen.EmitStatement(f)) << gen.error();
     EXPECT_EQ(gen.result(), R"(  {
-    [loop] for(int i = 0; true; i = (i + 1)) {
+    for(int i = 0; true; i = (i + 1)) {
       return;
     }
   }
@@ -356,7 +356,7 @@ TEST_F(HlslGeneratorImplTest_Loop, Emit_ForLoopWithMultiStmtInitCondCont) {
       tint_tmp = false;
     }
     bool i = (tint_tmp);
-    [loop] while (true) {
+    while (true) {
       bool tint_tmp_1 = true;
       if (tint_tmp_1) {
         tint_tmp_1 = false;
@@ -386,7 +386,7 @@ TEST_F(HlslGeneratorImplTest_Loop, Emit_While) {
     gen.increment_indent();
 
     ASSERT_TRUE(gen.EmitStatement(f)) << gen.error();
-    EXPECT_EQ(gen.result(), R"(  [loop] while(true) {
+    EXPECT_EQ(gen.result(), R"(  while(true) {
     return;
   }
 )");
@@ -405,7 +405,7 @@ TEST_F(HlslGeneratorImplTest_Loop, Emit_While_WithContinue) {
     gen.increment_indent();
 
     ASSERT_TRUE(gen.EmitStatement(f)) << gen.error();
-    EXPECT_EQ(gen.result(), R"(  [loop] while(true) {
+    EXPECT_EQ(gen.result(), R"(  while(true) {
     continue;
   }
 )");
@@ -426,7 +426,7 @@ TEST_F(HlslGeneratorImplTest_Loop, Emit_WhileWithMultiStmtCond) {
     gen.increment_indent();
 
     ASSERT_TRUE(gen.EmitStatement(f)) << gen.error();
-    EXPECT_EQ(gen.result(), R"(  [loop] while (true) {
+    EXPECT_EQ(gen.result(), R"(  while (true) {
     bool tint_tmp = true;
     if (tint_tmp) {
       tint_tmp = false;

test/tint/array/assign_to_function_var.wgsl.expected.dxc.hlsl

@@ -29,7 +29,7 @@ typedef int4 tint_symbol_2_ret[4];
 tint_symbol_2_ret tint_symbol_2(uint4 buffer[4], uint offset) {
   int4 arr_1[4] = (int4[4])0;
   {
-    [loop] for(uint i = 0u; (i < 4u); i = (i + 1u)) {
+    for(uint i = 0u; (i < 4u); i = (i + 1u)) {
       const uint scalar_offset = ((offset + (i * 16u))) / 4;
       arr_1[i] = asint(buffer[scalar_offset / 4]);
     }
@@ -41,7 +41,7 @@ typedef int4 tint_symbol_4_ret[4];
 tint_symbol_4_ret tint_symbol_4(RWByteAddressBuffer buffer, uint offset) {
   int4 arr_2[4] = (int4[4])0;
   {
-    [loop] for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
+    for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
       arr_2[i_1] = asint(buffer.Load4((offset + (i_1 * 16u))));
     }
   }

test/tint/array/assign_to_function_var.wgsl.expected.fxc.hlsl

@@ -29,7 +29,7 @@ typedef int4 tint_symbol_2_ret[4];
 tint_symbol_2_ret tint_symbol_2(uint4 buffer[4], uint offset) {
   int4 arr_1[4] = (int4[4])0;
   {
-    [loop] for(uint i = 0u; (i < 4u); i = (i + 1u)) {
+    for(uint i = 0u; (i < 4u); i = (i + 1u)) {
       const uint scalar_offset = ((offset + (i * 16u))) / 4;
       arr_1[i] = asint(buffer[scalar_offset / 4]);
     }
@@ -41,7 +41,7 @@ typedef int4 tint_symbol_4_ret[4];
 tint_symbol_4_ret tint_symbol_4(RWByteAddressBuffer buffer, uint offset) {
   int4 arr_2[4] = (int4[4])0;
   {
-    [loop] for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
+    for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
       arr_2[i_1] = asint(buffer.Load4((offset + (i_1 * 16u))));
     }
   }

test/tint/array/assign_to_private_var.wgsl.expected.dxc.hlsl

@@ -31,7 +31,7 @@ typedef int4 tint_symbol_2_ret[4];
 tint_symbol_2_ret tint_symbol_2(uint4 buffer[4], uint offset) {
   int4 arr_1[4] = (int4[4])0;
   {
-    [loop] for(uint i = 0u; (i < 4u); i = (i + 1u)) {
+    for(uint i = 0u; (i < 4u); i = (i + 1u)) {
       const uint scalar_offset = ((offset + (i * 16u))) / 4;
       arr_1[i] = asint(buffer[scalar_offset / 4]);
     }
@@ -43,7 +43,7 @@ typedef int4 tint_symbol_4_ret[4];
 tint_symbol_4_ret tint_symbol_4(RWByteAddressBuffer buffer, uint offset) {
   int4 arr_2[4] = (int4[4])0;
   {
-    [loop] for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
+    for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
       arr_2[i_1] = asint(buffer.Load4((offset + (i_1 * 16u))));
     }
   }

test/tint/array/assign_to_private_var.wgsl.expected.fxc.hlsl

@@ -31,7 +31,7 @@ typedef int4 tint_symbol_2_ret[4];
 tint_symbol_2_ret tint_symbol_2(uint4 buffer[4], uint offset) {
   int4 arr_1[4] = (int4[4])0;
   {
-    [loop] for(uint i = 0u; (i < 4u); i = (i + 1u)) {
+    for(uint i = 0u; (i < 4u); i = (i + 1u)) {
       const uint scalar_offset = ((offset + (i * 16u))) / 4;
       arr_1[i] = asint(buffer[scalar_offset / 4]);
     }
@@ -43,7 +43,7 @@ typedef int4 tint_symbol_4_ret[4];
 tint_symbol_4_ret tint_symbol_4(RWByteAddressBuffer buffer, uint offset) {
   int4 arr_2[4] = (int4[4])0;
   {
-    [loop] for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
+    for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
       arr_2[i_1] = asint(buffer.Load4((offset + (i_1 * 16u))));
     }
   }

test/tint/array/assign_to_storage_var.wgsl.expected.dxc.hlsl

@@ -30,7 +30,7 @@ S ret_struct_arr() {
 void tint_symbol_3(RWByteAddressBuffer buffer, uint offset, int4 value[4]) {
   int4 array[4] = value;
   {
-    [loop] for(uint i = 0u; (i < 4u); i = (i + 1u)) {
+    for(uint i = 0u; (i < 4u); i = (i + 1u)) {
       buffer.Store4((offset + (i * 16u)), asuint(array[i]));
     }
   }
@@ -40,7 +40,7 @@ typedef int4 tint_symbol_5_ret[4];
 tint_symbol_5_ret tint_symbol_5(uint4 buffer[4], uint offset) {
   int4 arr_1[4] = (int4[4])0;
   {
-    [loop] for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
+    for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
       const uint scalar_offset = ((offset + (i_1 * 16u))) / 4;
       arr_1[i_1] = asint(buffer[scalar_offset / 4]);
     }
@@ -52,7 +52,7 @@ typedef int4 tint_symbol_7_ret[4];
 tint_symbol_7_ret tint_symbol_7(RWByteAddressBuffer buffer, uint offset) {
   int4 arr_2[4] = (int4[4])0;
   {
-    [loop] for(uint i_2 = 0u; (i_2 < 4u); i_2 = (i_2 + 1u)) {
+    for(uint i_2 = 0u; (i_2 < 4u); i_2 = (i_2 + 1u)) {
       arr_2[i_2] = asint(buffer.Load4((offset + (i_2 * 16u))));
     }
   }
@@ -62,7 +62,7 @@ tint_symbol_7_ret tint_symbol_7(RWByteAddressBuffer buffer, uint offset) {
 void tint_symbol_11(RWByteAddressBuffer buffer, uint offset, int value[2]) {
   int array_3[2] = value;
   {
-    [loop] for(uint i_3 = 0u; (i_3 < 2u); i_3 = (i_3 + 1u)) {
+    for(uint i_3 = 0u; (i_3 < 2u); i_3 = (i_3 + 1u)) {
       buffer.Store((offset + (i_3 * 4u)), asuint(array_3[i_3]));
     }
   }
@@ -71,7 +71,7 @@ void tint_symbol_11(RWByteAddressBuffer buffer, uint offset, int value[2]) {
 void tint_symbol_10(RWByteAddressBuffer buffer, uint offset, int value[3][2]) {
   int array_2[3][2] = value;
   {
-    [loop] for(uint i_4 = 0u; (i_4 < 3u); i_4 = (i_4 + 1u)) {
+    for(uint i_4 = 0u; (i_4 < 3u); i_4 = (i_4 + 1u)) {
       tint_symbol_11(buffer, (offset + (i_4 * 8u)), array_2[i_4]);
     }
   }
@@ -80,7 +80,7 @@ void tint_symbol_10(RWByteAddressBuffer buffer, uint offset, int value[3][2]) {
 void tint_symbol_9(RWByteAddressBuffer buffer, uint offset, int value[4][3][2]) {
   int array_1[4][3][2] = value;
   {
-    [loop] for(uint i_5 = 0u; (i_5 < 4u); i_5 = (i_5 + 1u)) {
+    for(uint i_5 = 0u; (i_5 < 4u); i_5 = (i_5 + 1u)) {
       tint_symbol_10(buffer, (offset + (i_5 * 24u)), array_1[i_5]);
     }
   }

test/tint/array/assign_to_storage_var.wgsl.expected.fxc.hlsl

@@ -30,7 +30,7 @@ S ret_struct_arr() {
 void tint_symbol_3(RWByteAddressBuffer buffer, uint offset, int4 value[4]) {
   int4 array[4] = value;
   {
-    [loop] for(uint i = 0u; (i < 4u); i = (i + 1u)) {
+    for(uint i = 0u; (i < 4u); i = (i + 1u)) {
       buffer.Store4((offset + (i * 16u)), asuint(array[i]));
     }
   }
@@ -40,7 +40,7 @@ typedef int4 tint_symbol_5_ret[4];
 tint_symbol_5_ret tint_symbol_5(uint4 buffer[4], uint offset) {
   int4 arr_1[4] = (int4[4])0;
   {
-    [loop] for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
+    for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
       const uint scalar_offset = ((offset + (i_1 * 16u))) / 4;
       arr_1[i_1] = asint(buffer[scalar_offset / 4]);
     }
@@ -52,7 +52,7 @@ typedef int4 tint_symbol_7_ret[4];
 tint_symbol_7_ret tint_symbol_7(RWByteAddressBuffer buffer, uint offset) {
   int4 arr_2[4] = (int4[4])0;
   {
-    [loop] for(uint i_2 = 0u; (i_2 < 4u); i_2 = (i_2 + 1u)) {
+    for(uint i_2 = 0u; (i_2 < 4u); i_2 = (i_2 + 1u)) {
       arr_2[i_2] = asint(buffer.Load4((offset + (i_2 * 16u))));
     }
   }
@@ -62,7 +62,7 @@ tint_symbol_7_ret tint_symbol_7(RWByteAddressBuffer buffer, uint offset) {
 void tint_symbol_11(RWByteAddressBuffer buffer, uint offset, int value[2]) {
   int array_3[2] = value;
   {
-    [loop] for(uint i_3 = 0u; (i_3 < 2u); i_3 = (i_3 + 1u)) {
+    for(uint i_3 = 0u; (i_3 < 2u); i_3 = (i_3 + 1u)) {
       buffer.Store((offset + (i_3 * 4u)), asuint(array_3[i_3]));
     }
   }
@@ -71,7 +71,7 @@ void tint_symbol_11(RWByteAddressBuffer buffer, uint offset, int value[2]) {
 void tint_symbol_10(RWByteAddressBuffer buffer, uint offset, int value[3][2]) {
   int array_2[3][2] = value;
   {
-    [loop] for(uint i_4 = 0u; (i_4 < 3u); i_4 = (i_4 + 1u)) {
+    for(uint i_4 = 0u; (i_4 < 3u); i_4 = (i_4 + 1u)) {
       tint_symbol_11(buffer, (offset + (i_4 * 8u)), array_2[i_4]);
     }
   }
@@ -80,7 +80,7 @@ void tint_symbol_10(RWByteAddressBuffer buffer, uint offset, int value[3][2]) {
 void tint_symbol_9(RWByteAddressBuffer buffer, uint offset, int value[4][3][2]) {
   int array_1[4][3][2] = value;
   {
-    [loop] for(uint i_5 = 0u; (i_5 < 4u); i_5 = (i_5 + 1u)) {
+    for(uint i_5 = 0u; (i_5 < 4u); i_5 = (i_5 + 1u)) {
       tint_symbol_10(buffer, (offset + (i_5 * 24u)), array_1[i_5]);
     }
   }

test/tint/array/assign_to_workgroup_var.wgsl.expected.dxc.hlsl

@@ -31,7 +31,7 @@ typedef int4 tint_symbol_2_ret[4];
 tint_symbol_2_ret tint_symbol_2(uint4 buffer[4], uint offset) {
   int4 arr_1[4] = (int4[4])0;
   {
-    [loop] for(uint i = 0u; (i < 4u); i = (i + 1u)) {
+    for(uint i = 0u; (i < 4u); i = (i + 1u)) {
       const uint scalar_offset = ((offset + (i * 16u))) / 4;
       arr_1[i] = asint(buffer[scalar_offset / 4]);
     }
@@ -43,7 +43,7 @@ typedef int4 tint_symbol_4_ret[4];
 tint_symbol_4_ret tint_symbol_4(RWByteAddressBuffer buffer, uint offset) {
   int4 arr_2[4] = (int4[4])0;
   {
-    [loop] for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
+    for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
       arr_2[i_1] = asint(buffer.Load4((offset + (i_1 * 16u))));
     }
   }

test/tint/array/assign_to_workgroup_var.wgsl.expected.fxc.hlsl

@@ -31,7 +31,7 @@ typedef int4 tint_symbol_2_ret[4];
 tint_symbol_2_ret tint_symbol_2(uint4 buffer[4], uint offset) {
   int4 arr_1[4] = (int4[4])0;
   {
-    [loop] for(uint i = 0u; (i < 4u); i = (i + 1u)) {
+    for(uint i = 0u; (i < 4u); i = (i + 1u)) {
       const uint scalar_offset = ((offset + (i * 16u))) / 4;
       arr_1[i] = asint(buffer[scalar_offset / 4]);
     }
@@ -43,7 +43,7 @@ typedef int4 tint_symbol_4_ret[4];
 tint_symbol_4_ret tint_symbol_4(RWByteAddressBuffer buffer, uint offset) {
   int4 arr_2[4] = (int4[4])0;
   {
-    [loop] for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
+    for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
       arr_2[i_1] = asint(buffer.Load4((offset + (i_1 * 16u))));
     }
   }

test/tint/array/strides.spvasm.expected.dxc.hlsl

@@ -16,7 +16,7 @@ typedef strided_arr tint_symbol_3_ret[2];
 tint_symbol_3_ret tint_symbol_3(RWByteAddressBuffer buffer, uint offset) {
   strided_arr arr[2] = (strided_arr[2])0;
   {
-    [loop] for(uint i = 0u; (i < 2u); i = (i + 1u)) {
+    for(uint i = 0u; (i < 2u); i = (i + 1u)) {
       arr[i] = tint_symbol_4(buffer, (offset + (i * 8u)));
     }
   }
@@ -27,7 +27,7 @@ typedef strided_arr tint_symbol_2_ret[3][2];
 tint_symbol_2_ret tint_symbol_2(RWByteAddressBuffer buffer, uint offset) {
   strided_arr arr_1[3][2] = (strided_arr[3][2])0;
   {
-    [loop] for(uint i_1 = 0u; (i_1 < 3u); i_1 = (i_1 + 1u)) {
+    for(uint i_1 = 0u; (i_1 < 3u); i_1 = (i_1 + 1u)) {
       arr_1[i_1] = tint_symbol_3(buffer, (offset + (i_1 * 16u)));
     }
   }
@@ -43,7 +43,7 @@ typedef strided_arr_1 tint_symbol_ret[4];
 tint_symbol_ret tint_symbol(RWByteAddressBuffer buffer, uint offset) {
   strided_arr_1 arr_2[4] = (strided_arr_1[4])0;
   {
-    [loop] for(uint i_2 = 0u; (i_2 < 4u); i_2 = (i_2 + 1u)) {
+    for(uint i_2 = 0u; (i_2 < 4u); i_2 = (i_2 + 1u)) {
       arr_2[i_2] = tint_symbol_1(buffer, (offset + (i_2 * 128u)));
     }
   }
@@ -57,7 +57,7 @@ void tint_symbol_10(RWByteAddressBuffer buffer, uint offset, strided_arr value)
 void tint_symbol_9(RWByteAddressBuffer buffer, uint offset, strided_arr value[2]) {
   strided_arr array_2[2] = value;
   {
-    [loop] for(uint i_3 = 0u; (i_3 < 2u); i_3 = (i_3 + 1u)) {
+    for(uint i_3 = 0u; (i_3 < 2u); i_3 = (i_3 + 1u)) {
       tint_symbol_10(buffer, (offset + (i_3 * 8u)), array_2[i_3]);
     }
   }
@@ -66,7 +66,7 @@ void tint_symbol_9(RWByteAddressBuffer buffer, uint offset, strided_arr value[2]
 void tint_symbol_8(RWByteAddressBuffer buffer, uint offset, strided_arr value[3][2]) {
   strided_arr array_1[3][2] = value;
   {
-    [loop] for(uint i_4 = 0u; (i_4 < 3u); i_4 = (i_4 + 1u)) {
+    for(uint i_4 = 0u; (i_4 < 3u); i_4 = (i_4 + 1u)) {
       tint_symbol_9(buffer, (offset + (i_4 * 16u)), array_1[i_4]);
     }
   }
@@ -79,7 +79,7 @@ void tint_symbol_7(RWByteAddressBuffer buffer, uint offset, strided_arr_1 value)
 void tint_symbol_6(RWByteAddressBuffer buffer, uint offset, strided_arr_1 value[4]) {
   strided_arr_1 array[4] = value;
   {
-    [loop] for(uint i_5 = 0u; (i_5 < 4u); i_5 = (i_5 + 1u)) {
+    for(uint i_5 = 0u; (i_5 < 4u); i_5 = (i_5 + 1u)) {
       tint_symbol_7(buffer, (offset + (i_5 * 128u)), array[i_5]);
     }
   }

test/tint/array/strides.spvasm.expected.fxc.hlsl

@@ -16,7 +16,7 @@ typedef strided_arr tint_symbol_3_ret[2];
 tint_symbol_3_ret tint_symbol_3(RWByteAddressBuffer buffer, uint offset) {
   strided_arr arr[2] = (strided_arr[2])0;
   {
-    [loop] for(uint i = 0u; (i < 2u); i = (i + 1u)) {
+    for(uint i = 0u; (i < 2u); i = (i + 1u)) {
       arr[i] = tint_symbol_4(buffer, (offset + (i * 8u)));
     }
   }
@@ -27,7 +27,7 @@ typedef strided_arr tint_symbol_2_ret[3][2];
 tint_symbol_2_ret tint_symbol_2(RWByteAddressBuffer buffer, uint offset) {
   strided_arr arr_1[3][2] = (strided_arr[3][2])0;
   {
-    [loop] for(uint i_1 = 0u; (i_1 < 3u); i_1 = (i_1 + 1u)) {
+    for(uint i_1 = 0u; (i_1 < 3u); i_1 = (i_1 + 1u)) {
       arr_1[i_1] = tint_symbol_3(buffer, (offset + (i_1 * 16u)));
     }
   }
@@ -43,7 +43,7 @@ typedef strided_arr_1 tint_symbol_ret[4];
 tint_symbol_ret tint_symbol(RWByteAddressBuffer buffer, uint offset) {
   strided_arr_1 arr_2[4] = (strided_arr_1[4])0;
   {
-    [loop] for(uint i_2 = 0u; (i_2 < 4u); i_2 = (i_2 + 1u)) {
+    for(uint i_2 = 0u; (i_2 < 4u); i_2 = (i_2 + 1u)) {
       arr_2[i_2] = tint_symbol_1(buffer, (offset + (i_2 * 128u)));
     }
   }
@@ -57,7 +57,7 @@ void tint_symbol_10(RWByteAddressBuffer buffer, uint offset, strided_arr value)
 void tint_symbol_9(RWByteAddressBuffer buffer, uint offset, strided_arr value[2]) {
   strided_arr array_2[2] = value;
   {
-    [loop] for(uint i_3 = 0u; (i_3 < 2u); i_3 = (i_3 + 1u)) {
+    for(uint i_3 = 0u; (i_3 < 2u); i_3 = (i_3 + 1u)) {
       tint_symbol_10(buffer, (offset + (i_3 * 8u)), array_2[i_3]);
     }
   }
@@ -66,7 +66,7 @@ void tint_symbol_9(RWByteAddressBuffer buffer, uint offset, strided_arr value[2]
 void tint_symbol_8(RWByteAddressBuffer buffer, uint offset, strided_arr value[3][2]) {
   strided_arr array_1[3][2] = value;
   {
-    [loop] for(uint i_4 = 0u; (i_4 < 3u); i_4 = (i_4 + 1u)) {
+    for(uint i_4 = 0u; (i_4 < 3u); i_4 = (i_4 + 1u)) {
       tint_symbol_9(buffer, (offset + (i_4 * 16u)), array_1[i_4]);
     }
   }
@@ -79,7 +79,7 @@ void tint_symbol_7(RWByteAddressBuffer buffer, uint offset, strided_arr_1 value)
 void tint_symbol_6(RWByteAddressBuffer buffer, uint offset, strided_arr_1 value[4]) {
   strided_arr_1 array[4] = value;
   {
-    [loop] for(uint i_5 = 0u; (i_5 < 4u); i_5 = (i_5 + 1u)) {
+    for(uint i_5 = 0u; (i_5 < 4u); i_5 = (i_5 + 1u)) {
       tint_symbol_7(buffer, (offset + (i_5 * 128u)), array[i_5]);
     }
   }

test/tint/buffer/storage/dynamic_index/read.wgsl.expected.dxc.hlsl

@@ -16,7 +16,7 @@ typedef int4 tint_symbol_11_ret[4];
 tint_symbol_11_ret tint_symbol_11(ByteAddressBuffer buffer, uint offset) {
   int4 arr_1[4] = (int4[4])0;
   {
-    [loop] for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
+    for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
       arr_1[i_1] = asint(buffer.Load4((offset + (i_1 * 16u))));
     }
   }

test/tint/buffer/storage/dynamic_index/read.wgsl.expected.fxc.hlsl

@@ -16,7 +16,7 @@ typedef int4 tint_symbol_11_ret[4];
 tint_symbol_11_ret tint_symbol_11(ByteAddressBuffer buffer, uint offset) {
   int4 arr_1[4] = (int4[4])0;
   {
-    [loop] for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
+    for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
       arr_1[i_1] = asint(buffer.Load4((offset + (i_1 * 16u))));
     }
   }

test/tint/buffer/storage/dynamic_index/write.wgsl.expected.dxc.hlsl

@@ -18,7 +18,7 @@ void tint_symbol_9(RWByteAddressBuffer buffer, uint offset, float3x2 value) {
 void tint_symbol_11(RWByteAddressBuffer buffer, uint offset, int4 value[4]) {
   int4 array[4] = value;
   {
-    [loop] for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
+    for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
       buffer.Store4((offset + (i_1 * 16u)), asuint(array[i_1]));
     }
   }

test/tint/buffer/storage/dynamic_index/write.wgsl.expected.fxc.hlsl

@@ -18,7 +18,7 @@ void tint_symbol_9(RWByteAddressBuffer buffer, uint offset, float3x2 value) {
 void tint_symbol_11(RWByteAddressBuffer buffer, uint offset, int4 value[4]) {
   int4 array[4] = value;
   {
-    [loop] for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
+    for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
       buffer.Store4((offset + (i_1 * 16u)), asuint(array[i_1]));
     }
   }

test/tint/buffer/storage/static_index/read.wgsl.expected.dxc.hlsl

@@ -21,7 +21,7 @@ typedef Inner tint_symbol_10_ret[4];
 tint_symbol_10_ret tint_symbol_10(ByteAddressBuffer buffer, uint offset) {
   Inner arr[4] = (Inner[4])0;
   {
-    [loop] for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
+    for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
       arr[i_1] = tint_symbol_9(buffer, (offset + (i_1 * 4u)));
     }
   }

test/tint/buffer/storage/static_index/read.wgsl.expected.fxc.hlsl

@@ -21,7 +21,7 @@ typedef Inner tint_symbol_10_ret[4];
 tint_symbol_10_ret tint_symbol_10(ByteAddressBuffer buffer, uint offset) {
   Inner arr[4] = (Inner[4])0;
   {
-    [loop] for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
+    for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
       arr[i_1] = tint_symbol_9(buffer, (offset + (i_1 * 4u)));
     }
   }

test/tint/buffer/storage/static_index/write.wgsl.expected.dxc.hlsl

@@ -22,7 +22,7 @@ void tint_symbol_9(RWByteAddressBuffer buffer, uint offset, Inner value) {
 void tint_symbol_10(RWByteAddressBuffer buffer, uint offset, Inner value[4]) {
   Inner array[4] = value;
   {
-    [loop] for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
+    for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
       tint_symbol_9(buffer, (offset + (i_1 * 4u)), array[i_1]);
     }
   }

test/tint/buffer/storage/static_index/write.wgsl.expected.fxc.hlsl

@@ -22,7 +22,7 @@ void tint_symbol_9(RWByteAddressBuffer buffer, uint offset, Inner value) {
 void tint_symbol_10(RWByteAddressBuffer buffer, uint offset, Inner value[4]) {
   Inner array[4] = value;
   {
-    [loop] for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
+    for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
       tint_symbol_9(buffer, (offset + (i_1 * 4u)), array[i_1]);
     }
   }

test/tint/buffer/storage/types/array.wgsl.expected.dxc.hlsl

@@ -4,7 +4,7 @@ RWByteAddressBuffer tint_symbol_1 : register(u1, space0);
 void tint_symbol_2(RWByteAddressBuffer buffer, uint offset, float value[4]) {
   float array[4] = value;
   {
-    [loop] for(uint i = 0u; (i < 4u); i = (i + 1u)) {
+    for(uint i = 0u; (i < 4u); i = (i + 1u)) {
       buffer.Store((offset + (i * 4u)), asuint(array[i]));
     }
   }
@@ -14,7 +14,7 @@ typedef float tint_symbol_4_ret[4];
 tint_symbol_4_ret tint_symbol_4(ByteAddressBuffer buffer, uint offset) {
   float arr[4] = (float[4])0;
   {
-    [loop] for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
+    for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
       arr[i_1] = asfloat(buffer.Load((offset + (i_1 * 4u))));
     }
   }

test/tint/buffer/storage/types/array.wgsl.expected.fxc.hlsl

@@ -4,7 +4,7 @@ RWByteAddressBuffer tint_symbol_1 : register(u1, space0);
 void tint_symbol_2(RWByteAddressBuffer buffer, uint offset, float value[4]) {
   float array[4] = value;
   {
-    [loop] for(uint i = 0u; (i < 4u); i = (i + 1u)) {
+    for(uint i = 0u; (i < 4u); i = (i + 1u)) {
       buffer.Store((offset + (i * 4u)), asuint(array[i]));
     }
   }
@@ -14,7 +14,7 @@ typedef float tint_symbol_4_ret[4];
 tint_symbol_4_ret tint_symbol_4(ByteAddressBuffer buffer, uint offset) {
   float arr[4] = (float[4])0;
   {
-    [loop] for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
+    for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
       arr[i_1] = asfloat(buffer.Load((offset + (i_1 * 4u))));
     }
   }

test/tint/buffer/uniform/dynamic_index/read.wgsl.expected.dxc.hlsl

@@ -26,7 +26,7 @@ typedef int4 tint_symbol_12_ret[4];
 tint_symbol_12_ret tint_symbol_12(uint4 buffer[96], uint offset) {
   int4 arr_1[4] = (int4[4])0;
   {
-    [loop] for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
+    for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
       const uint scalar_offset_5 = ((offset + (i_1 * 16u))) / 4;
       arr_1[i_1] = asint(buffer[scalar_offset_5 / 4]);
     }

test/tint/buffer/uniform/dynamic_index/read.wgsl.expected.fxc.hlsl

@@ -26,7 +26,7 @@ typedef int4 tint_symbol_12_ret[4];
 tint_symbol_12_ret tint_symbol_12(uint4 buffer[96], uint offset) {
   int4 arr_1[4] = (int4[4])0;
   {
-    [loop] for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
+    for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
       const uint scalar_offset_5 = ((offset + (i_1 * 16u))) / 4;
       arr_1[i_1] = asint(buffer[scalar_offset_5 / 4]);
     }

test/tint/buffer/uniform/static_index/read.wgsl.expected.dxc.hlsl

@@ -32,7 +32,7 @@ typedef Inner tint_symbol_11_ret[4];
 tint_symbol_11_ret tint_symbol_11(uint4 buffer[13], uint offset) {
   Inner arr[4] = (Inner[4])0;
   {
-    [loop] for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
+    for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
       arr[i_1] = tint_symbol_10(buffer, (offset + (i_1 * 16u)));
     }
   }

test/tint/buffer/uniform/static_index/read.wgsl.expected.fxc.hlsl

@@ -32,7 +32,7 @@ typedef Inner tint_symbol_11_ret[4];
 tint_symbol_11_ret tint_symbol_11(uint4 buffer[13], uint offset) {
   Inner arr[4] = (Inner[4])0;
   {
-    [loop] for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
+    for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
       arr[i_1] = tint_symbol_10(buffer, (offset + (i_1 * 16u)));
     }
   }

test/tint/buffer/uniform/std140/array/mat2x2/dynamic_index_via_ptr.wgsl.expected.dxc.hlsl

@@ -20,7 +20,7 @@ typedef float2x2 tint_symbol_ret[4];
 tint_symbol_ret tint_symbol(uint4 buffer[4], uint offset) {
   float2x2 arr[4] = (float2x2[4])0;
   {
-    [loop] for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
+    for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
       arr[i_1] = tint_symbol_1(buffer, (offset + (i_1 * 16u)));
     }
   }

test/tint/buffer/uniform/std140/array/mat2x2/dynamic_index_via_ptr.wgsl.expected.fxc.hlsl

@@ -20,7 +20,7 @@ typedef float2x2 tint_symbol_ret[4];
 tint_symbol_ret tint_symbol(uint4 buffer[4], uint offset) {
   float2x2 arr[4] = (float2x2[4])0;
   {
-    [loop] for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
+    for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
       arr[i_1] = tint_symbol_1(buffer, (offset + (i_1 * 16u)));
     }
   }

test/tint/buffer/uniform/std140/array/mat2x2/static_index_via_ptr.wgsl.expected.dxc.hlsl

@@ -14,7 +14,7 @@ typedef float2x2 tint_symbol_ret[4];
 tint_symbol_ret tint_symbol(uint4 buffer[4], uint offset) {
   float2x2 arr[4] = (float2x2[4])0;
   {
-    [loop] for(uint i = 0u; (i < 4u); i = (i + 1u)) {
+    for(uint i = 0u; (i < 4u); i = (i + 1u)) {
       arr[i] = tint_symbol_1(buffer, (offset + (i * 16u)));
     }
   }

test/tint/buffer/uniform/std140/array/mat2x2/static_index_via_ptr.wgsl.expected.fxc.hlsl

@@ -14,7 +14,7 @@ typedef float2x2 tint_symbol_ret[4];
 tint_symbol_ret tint_symbol(uint4 buffer[4], uint offset) {
   float2x2 arr[4] = (float2x2[4])0;
   {
-    [loop] for(uint i = 0u; (i < 4u); i = (i + 1u)) {
+    for(uint i = 0u; (i < 4u); i = (i + 1u)) {
       arr[i] = tint_symbol_1(buffer, (offset + (i * 16u)));
     }
   }

test/tint/buffer/uniform/std140/array/mat2x2/to_fn.wgsl.expected.dxc.hlsl

@@ -26,7 +26,7 @@ typedef float2x2 tint_symbol_ret[4];
 tint_symbol_ret tint_symbol(uint4 buffer[4], uint offset) {
   float2x2 arr[4] = (float2x2[4])0;
   {
-    [loop] for(uint i = 0u; (i < 4u); i = (i + 1u)) {
+    for(uint i = 0u; (i < 4u); i = (i + 1u)) {
       arr[i] = tint_symbol_1(buffer, (offset + (i * 16u)));
     }
   }

test/tint/buffer/uniform/std140/array/mat2x2/to_fn.wgsl.expected.fxc.hlsl

@@ -26,7 +26,7 @@ typedef float2x2 tint_symbol_ret[4];
 tint_symbol_ret tint_symbol(uint4 buffer[4], uint offset) {
   float2x2 arr[4] = (float2x2[4])0;
   {
-    [loop] for(uint i = 0u; (i < 4u); i = (i + 1u)) {
+    for(uint i = 0u; (i < 4u); i = (i + 1u)) {
       arr[i] = tint_symbol_1(buffer, (offset + (i * 16u)));
     }
   }

test/tint/buffer/uniform/std140/array/mat2x2/to_private.wgsl.expected.dxc.hlsl

@@ -15,7 +15,7 @@ typedef float2x2 tint_symbol_ret[4];
 tint_symbol_ret tint_symbol(uint4 buffer[4], uint offset) {
   float2x2 arr[4] = (float2x2[4])0;
   {
-    [loop] for(uint i = 0u; (i < 4u); i = (i + 1u)) {
+    for(uint i = 0u; (i < 4u); i = (i + 1u)) {
       arr[i] = tint_symbol_1(buffer, (offset + (i * 16u)));
     }
   }

test/tint/buffer/uniform/std140/array/mat2x2/to_private.wgsl.expected.fxc.hlsl

@@ -15,7 +15,7 @@ typedef float2x2 tint_symbol_ret[4];
 tint_symbol_ret tint_symbol(uint4 buffer[4], uint offset) {
   float2x2 arr[4] = (float2x2[4])0;
   {
-    [loop] for(uint i = 0u; (i < 4u); i = (i + 1u)) {
+    for(uint i = 0u; (i < 4u); i = (i + 1u)) {
       arr[i] = tint_symbol_1(buffer, (offset + (i * 16u)));
     }
   }

test/tint/buffer/uniform/std140/array/mat2x2/to_storage.wgsl.expected.dxc.hlsl

@@ -11,7 +11,7 @@ void tint_symbol_1(RWByteAddressBuffer buffer, uint offset, float2x2 value) {
 void tint_symbol(RWByteAddressBuffer buffer, uint offset, float2x2 value[4]) {
   float2x2 array[4] = value;
   {
-    [loop] for(uint i = 0u; (i < 4u); i = (i + 1u)) {
+    for(uint i = 0u; (i < 4u); i = (i + 1u)) {
       tint_symbol_1(buffer, (offset + (i * 16u)), array[i]);
     }
   }
@@ -29,7 +29,7 @@ typedef float2x2 tint_symbol_3_ret[4];
 tint_symbol_3_ret tint_symbol_3(uint4 buffer[4], uint offset) {
   float2x2 arr[4] = (float2x2[4])0;
   {
-    [loop] for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
+    for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
       arr[i_1] = tint_symbol_4(buffer, (offset + (i_1 * 16u)));
     }
   }

test/tint/buffer/uniform/std140/array/mat2x2/to_storage.wgsl.expected.fxc.hlsl

@@ -11,7 +11,7 @@ void tint_symbol_1(RWByteAddressBuffer buffer, uint offset, float2x2 value) {
 void tint_symbol(RWByteAddressBuffer buffer, uint offset, float2x2 value[4]) {
   float2x2 array[4] = value;
   {
-    [loop] for(uint i = 0u; (i < 4u); i = (i + 1u)) {
+    for(uint i = 0u; (i < 4u); i = (i + 1u)) {
       tint_symbol_1(buffer, (offset + (i * 16u)), array[i]);
     }
   }
@@ -29,7 +29,7 @@ typedef float2x2 tint_symbol_3_ret[4];
 tint_symbol_3_ret tint_symbol_3(uint4 buffer[4], uint offset) {
   float2x2 arr[4] = (float2x2[4])0;
   {
-    [loop] for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
+    for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
       arr[i_1] = tint_symbol_4(buffer, (offset + (i_1 * 16u)));
     }
   }

test/tint/buffer/uniform/std140/array/mat2x2/to_workgroup.wgsl.expected.dxc.hlsl

@@ -19,7 +19,7 @@ typedef float2x2 tint_symbol_2_ret[4];
 tint_symbol_2_ret tint_symbol_2(uint4 buffer[4], uint offset) {
   float2x2 arr[4] = (float2x2[4])0;
   {
-    [loop] for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
+    for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
       arr[i_1] = tint_symbol_3(buffer, (offset + (i_1 * 16u)));
     }
   }
@@ -28,7 +28,7 @@ tint_symbol_2_ret tint_symbol_2(uint4 buffer[4], uint offset) {
 
 void f_inner(uint local_invocation_index) {
   {
-    [loop] for(uint idx = local_invocation_index; (idx < 4u); idx = (idx + 1u)) {
+    for(uint idx = local_invocation_index; (idx < 4u); idx = (idx + 1u)) {
       const uint i = idx;
       w[i] = float2x2((0.0f).xx, (0.0f).xx);
     }

test/tint/buffer/uniform/std140/array/mat2x2/to_workgroup.wgsl.expected.fxc.hlsl

@@ -19,7 +19,7 @@ typedef float2x2 tint_symbol_2_ret[4];
 tint_symbol_2_ret tint_symbol_2(uint4 buffer[4], uint offset) {
   float2x2 arr[4] = (float2x2[4])0;
   {
-    [loop] for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
+    for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
       arr[i_1] = tint_symbol_3(buffer, (offset + (i_1 * 16u)));
     }
   }
@@ -28,7 +28,7 @@ tint_symbol_2_ret tint_symbol_2(uint4 buffer[4], uint offset) {
 
 void f_inner(uint local_invocation_index) {
   {
-    [loop] for(uint idx = local_invocation_index; (idx < 4u); idx = (idx + 1u)) {
+    for(uint idx = local_invocation_index; (idx < 4u); idx = (idx + 1u)) {
       const uint i = idx;
       w[i] = float2x2((0.0f).xx, (0.0f).xx);
     }

test/tint/buffer/uniform/std140/array/mat4x2/dynamic_index_via_ptr.wgsl.expected.dxc.hlsl

@@ -24,7 +24,7 @@ typedef float4x2 tint_symbol_ret[4];
 tint_symbol_ret tint_symbol(uint4 buffer[8], uint offset) {
   float4x2 arr[4] = (float4x2[4])0;
   {
-    [loop] for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
+    for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
       arr[i_1] = tint_symbol_1(buffer, (offset + (i_1 * 32u)));
     }
   }

test/tint/buffer/uniform/std140/array/mat4x2/dynamic_index_via_ptr.wgsl.expected.fxc.hlsl

@@ -24,7 +24,7 @@ typedef float4x2 tint_symbol_ret[4];
 tint_symbol_ret tint_symbol(uint4 buffer[8], uint offset) {
   float4x2 arr[4] = (float4x2[4])0;
   {
-    [loop] for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
+    for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
       arr[i_1] = tint_symbol_1(buffer, (offset + (i_1 * 32u)));
     }
   }

test/tint/buffer/uniform/std140/array/mat4x2/static_index_via_ptr.wgsl.expected.dxc.hlsl

@@ -18,7 +18,7 @@ typedef float4x2 tint_symbol_ret[4];
 tint_symbol_ret tint_symbol(uint4 buffer[8], uint offset) {
   float4x2 arr[4] = (float4x2[4])0;
   {
-    [loop] for(uint i = 0u; (i < 4u); i = (i + 1u)) {
+    for(uint i = 0u; (i < 4u); i = (i + 1u)) {
       arr[i] = tint_symbol_1(buffer, (offset + (i * 32u)));
     }
   }

test/tint/buffer/uniform/std140/array/mat4x2/static_index_via_ptr.wgsl.expected.fxc.hlsl

@@ -18,7 +18,7 @@ typedef float4x2 tint_symbol_ret[4];
 tint_symbol_ret tint_symbol(uint4 buffer[8], uint offset) {
   float4x2 arr[4] = (float4x2[4])0;
   {
-    [loop] for(uint i = 0u; (i < 4u); i = (i + 1u)) {
+    for(uint i = 0u; (i < 4u); i = (i + 1u)) {
       arr[i] = tint_symbol_1(buffer, (offset + (i * 32u)));
     }
   }

test/tint/buffer/uniform/std140/array/mat4x2/to_fn.wgsl.expected.dxc.hlsl

@@ -30,7 +30,7 @@ typedef float4x2 tint_symbol_ret[4];
 tint_symbol_ret tint_symbol(uint4 buffer[8], uint offset) {
   float4x2 arr[4] = (float4x2[4])0;
   {
-    [loop] for(uint i = 0u; (i < 4u); i = (i + 1u)) {
+    for(uint i = 0u; (i < 4u); i = (i + 1u)) {
       arr[i] = tint_symbol_1(buffer, (offset + (i * 32u)));
     }
   }

test/tint/buffer/uniform/std140/array/mat4x2/to_fn.wgsl.expected.fxc.hlsl

@@ -30,7 +30,7 @@ typedef float4x2 tint_symbol_ret[4];
 tint_symbol_ret tint_symbol(uint4 buffer[8], uint offset) {
   float4x2 arr[4] = (float4x2[4])0;
   {
-    [loop] for(uint i = 0u; (i < 4u); i = (i + 1u)) {
+    for(uint i = 0u; (i < 4u); i = (i + 1u)) {
       arr[i] = tint_symbol_1(buffer, (offset + (i * 32u)));
     }
   }

test/tint/buffer/uniform/std140/array/mat4x2/to_private.wgsl.expected.dxc.hlsl

@@ -19,7 +19,7 @@ typedef float4x2 tint_symbol_ret[4];
 tint_symbol_ret tint_symbol(uint4 buffer[8], uint offset) {
   float4x2 arr[4] = (float4x2[4])0;
   {
-    [loop] for(uint i = 0u; (i < 4u); i = (i + 1u)) {
+    for(uint i = 0u; (i < 4u); i = (i + 1u)) {
       arr[i] = tint_symbol_1(buffer, (offset + (i * 32u)));
     }
   }

test/tint/buffer/uniform/std140/array/mat4x2/to_private.wgsl.expected.fxc.hlsl

@@ -19,7 +19,7 @@ typedef float4x2 tint_symbol_ret[4];
 tint_symbol_ret tint_symbol(uint4 buffer[8], uint offset) {
   float4x2 arr[4] = (float4x2[4])0;
   {
-    [loop] for(uint i = 0u; (i < 4u); i = (i + 1u)) {
+    for(uint i = 0u; (i < 4u); i = (i + 1u)) {
       arr[i] = tint_symbol_1(buffer, (offset + (i * 32u)));
     }
   }

test/tint/buffer/uniform/std140/array/mat4x2/to_storage.wgsl.expected.dxc.hlsl

@@ -13,7 +13,7 @@ void tint_symbol_1(RWByteAddressBuffer buffer, uint offset, float4x2 value) {
 void tint_symbol(RWByteAddressBuffer buffer, uint offset, float4x2 value[4]) {
   float4x2 array[4] = value;
   {
-    [loop] for(uint i = 0u; (i < 4u); i = (i + 1u)) {
+    for(uint i = 0u; (i < 4u); i = (i + 1u)) {
       tint_symbol_1(buffer, (offset + (i * 32u)), array[i]);
     }
   }
@@ -35,7 +35,7 @@ typedef float4x2 tint_symbol_3_ret[4];
 tint_symbol_3_ret tint_symbol_3(uint4 buffer[8], uint offset) {
   float4x2 arr[4] = (float4x2[4])0;
   {
-    [loop] for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
+    for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
       arr[i_1] = tint_symbol_4(buffer, (offset + (i_1 * 32u)));
     }
   }

test/tint/buffer/uniform/std140/array/mat4x2/to_storage.wgsl.expected.fxc.hlsl

@@ -13,7 +13,7 @@ void tint_symbol_1(RWByteAddressBuffer buffer, uint offset, float4x2 value) {
 void tint_symbol(RWByteAddressBuffer buffer, uint offset, float4x2 value[4]) {
   float4x2 array[4] = value;
   {
-    [loop] for(uint i = 0u; (i < 4u); i = (i + 1u)) {
+    for(uint i = 0u; (i < 4u); i = (i + 1u)) {
       tint_symbol_1(buffer, (offset + (i * 32u)), array[i]);
     }
   }
@@ -35,7 +35,7 @@ typedef float4x2 tint_symbol_3_ret[4];
 tint_symbol_3_ret tint_symbol_3(uint4 buffer[8], uint offset) {
   float4x2 arr[4] = (float4x2[4])0;
   {
-    [loop] for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
+    for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
       arr[i_1] = tint_symbol_4(buffer, (offset + (i_1 * 32u)));
     }
   }

test/tint/buffer/uniform/std140/array/mat4x2/to_workgroup.wgsl.expected.dxc.hlsl

@@ -23,7 +23,7 @@ typedef float4x2 tint_symbol_2_ret[4];
 tint_symbol_2_ret tint_symbol_2(uint4 buffer[8], uint offset) {
   float4x2 arr[4] = (float4x2[4])0;
   {
-    [loop] for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
+    for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
       arr[i_1] = tint_symbol_3(buffer, (offset + (i_1 * 32u)));
     }
   }
@@ -32,7 +32,7 @@ tint_symbol_2_ret tint_symbol_2(uint4 buffer[8], uint offset) {
 
 void f_inner(uint local_invocation_index) {
   {
-    [loop] for(uint idx = local_invocation_index; (idx < 4u); idx = (idx + 1u)) {
+    for(uint idx = local_invocation_index; (idx < 4u); idx = (idx + 1u)) {
       const uint i = idx;
       w[i] = float4x2((0.0f).xx, (0.0f).xx, (0.0f).xx, (0.0f).xx);
     }

test/tint/buffer/uniform/std140/array/mat4x2/to_workgroup.wgsl.expected.fxc.hlsl

@@ -23,7 +23,7 @@ typedef float4x2 tint_symbol_2_ret[4];
 tint_symbol_2_ret tint_symbol_2(uint4 buffer[8], uint offset) {
   float4x2 arr[4] = (float4x2[4])0;
   {
-    [loop] for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
+    for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
       arr[i_1] = tint_symbol_3(buffer, (offset + (i_1 * 32u)));
     }
   }
@@ -32,7 +32,7 @@ tint_symbol_2_ret tint_symbol_2(uint4 buffer[8], uint offset) {
 
 void f_inner(uint local_invocation_index) {
   {
-    [loop] for(uint idx = local_invocation_index; (idx < 4u); idx = (idx + 1u)) {
+    for(uint idx = local_invocation_index; (idx < 4u); idx = (idx + 1u)) {
       const uint i = idx;
       w[i] = float4x2((0.0f).xx, (0.0f).xx, (0.0f).xx, (0.0f).xx);
     }

test/tint/buffer/uniform/std140/struct/mat2x2/dynamic_index_via_ptr.wgsl.expected.dxc.hlsl

@@ -32,7 +32,7 @@ typedef Inner tint_symbol_6_ret[4];
 tint_symbol_6_ret tint_symbol_6(uint4 buffer[16], uint offset) {
   Inner arr[4] = (Inner[4])0;
   {
-    [loop] for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
+    for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
       arr[i_1] = tint_symbol_7(buffer, (offset + (i_1 * 16u)));
     }
   }
@@ -48,7 +48,7 @@ typedef Outer tint_symbol_4_ret[4];
 tint_symbol_4_ret tint_symbol_4(uint4 buffer[16], uint offset) {
   Outer arr_1[4] = (Outer[4])0;
   {
-    [loop] for(uint i_2 = 0u; (i_2 < 4u); i_2 = (i_2 + 1u)) {
+    for(uint i_2 = 0u; (i_2 < 4u); i_2 = (i_2 + 1u)) {
       arr_1[i_2] = tint_symbol_5(buffer, (offset + (i_2 * 64u)));
     }
   }

test/tint/buffer/uniform/std140/struct/mat2x2/dynamic_index_via_ptr.wgsl.expected.fxc.hlsl

@@ -32,7 +32,7 @@ typedef Inner tint_symbol_6_ret[4];
 tint_symbol_6_ret tint_symbol_6(uint4 buffer[16], uint offset) {
   Inner arr[4] = (Inner[4])0;
   {
-    [loop] for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
+    for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
       arr[i_1] = tint_symbol_7(buffer, (offset + (i_1 * 16u)));
     }
   }
@@ -48,7 +48,7 @@ typedef Outer tint_symbol_4_ret[4];
 tint_symbol_4_ret tint_symbol_4(uint4 buffer[16], uint offset) {
   Outer arr_1[4] = (Outer[4])0;
   {
-    [loop] for(uint i_2 = 0u; (i_2 < 4u); i_2 = (i_2 + 1u)) {
+    for(uint i_2 = 0u; (i_2 < 4u); i_2 = (i_2 + 1u)) {
       arr_1[i_2] = tint_symbol_5(buffer, (offset + (i_2 * 64u)));
     }
   }

test/tint/buffer/uniform/std140/struct/mat2x2/static_index_via_ptr.wgsl.expected.dxc.hlsl

@@ -26,7 +26,7 @@ typedef Inner tint_symbol_2_ret[4];
 tint_symbol_2_ret tint_symbol_2(uint4 buffer[16], uint offset) {
   Inner arr[4] = (Inner[4])0;
   {
-    [loop] for(uint i = 0u; (i < 4u); i = (i + 1u)) {
+    for(uint i = 0u; (i < 4u); i = (i + 1u)) {
       arr[i] = tint_symbol_3(buffer, (offset + (i * 16u)));
     }
   }
@@ -42,7 +42,7 @@ typedef Outer tint_symbol_ret[4];
 tint_symbol_ret tint_symbol(uint4 buffer[16], uint offset) {
   Outer arr_1[4] = (Outer[4])0;
   {
-    [loop] for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
+    for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
       arr_1[i_1] = tint_symbol_1(buffer, (offset + (i_1 * 64u)));
     }
   }

test/tint/buffer/uniform/std140/struct/mat2x2/static_index_via_ptr.wgsl.expected.fxc.hlsl

@@ -26,7 +26,7 @@ typedef Inner tint_symbol_2_ret[4];
 tint_symbol_2_ret tint_symbol_2(uint4 buffer[16], uint offset) {
   Inner arr[4] = (Inner[4])0;
   {
-    [loop] for(uint i = 0u; (i < 4u); i = (i + 1u)) {
+    for(uint i = 0u; (i < 4u); i = (i + 1u)) {
       arr[i] = tint_symbol_3(buffer, (offset + (i * 16u)));
     }
   }
@@ -42,7 +42,7 @@ typedef Outer tint_symbol_ret[4];
 tint_symbol_ret tint_symbol(uint4 buffer[16], uint offset) {
   Outer arr_1[4] = (Outer[4])0;
   {
-    [loop] for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
+    for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
       arr_1[i_1] = tint_symbol_1(buffer, (offset + (i_1 * 64u)));
     }
   }

test/tint/buffer/uniform/std140/struct/mat2x2/to_fn.wgsl.expected.dxc.hlsl

@@ -42,7 +42,7 @@ typedef S tint_symbol_ret[4];
 tint_symbol_ret tint_symbol(uint4 buffer[8], uint offset) {
   S arr[4] = (S[4])0;
   {
-    [loop] for(uint i = 0u; (i < 4u); i = (i + 1u)) {
+    for(uint i = 0u; (i < 4u); i = (i + 1u)) {
       arr[i] = tint_symbol_1(buffer, (offset + (i * 32u)));
     }
   }

test/tint/buffer/uniform/std140/struct/mat2x2/to_fn.wgsl.expected.fxc.hlsl

@@ -42,7 +42,7 @@ typedef S tint_symbol_ret[4];
 tint_symbol_ret tint_symbol(uint4 buffer[8], uint offset) {
   S arr[4] = (S[4])0;
   {
-    [loop] for(uint i = 0u; (i < 4u); i = (i + 1u)) {
+    for(uint i = 0u; (i < 4u); i = (i + 1u)) {
       arr[i] = tint_symbol_1(buffer, (offset + (i * 32u)));
     }
   }

test/tint/buffer/uniform/std140/struct/mat2x2/to_private.wgsl.expected.dxc.hlsl

@@ -28,7 +28,7 @@ typedef S tint_symbol_ret[4];
 tint_symbol_ret tint_symbol(uint4 buffer[8], uint offset) {
   S arr[4] = (S[4])0;
   {
-    [loop] for(uint i = 0u; (i < 4u); i = (i + 1u)) {
+    for(uint i = 0u; (i < 4u); i = (i + 1u)) {
       arr[i] = tint_symbol_1(buffer, (offset + (i * 32u)));
     }
   }

test/tint/buffer/uniform/std140/struct/mat2x2/to_private.wgsl.expected.fxc.hlsl

@@ -28,7 +28,7 @@ typedef S tint_symbol_ret[4];
 tint_symbol_ret tint_symbol(uint4 buffer[8], uint offset) {
   S arr[4] = (S[4])0;
   {
-    [loop] for(uint i = 0u; (i < 4u); i = (i + 1u)) {
+    for(uint i = 0u; (i < 4u); i = (i + 1u)) {
       arr[i] = tint_symbol_1(buffer, (offset + (i * 32u)));
     }
   }

test/tint/buffer/uniform/std140/struct/mat2x2/to_storage.wgsl.expected.dxc.hlsl

@@ -23,7 +23,7 @@ void tint_symbol_1(RWByteAddressBuffer buffer, uint offset, S value) {
 void tint_symbol(RWByteAddressBuffer buffer, uint offset, S value[4]) {
   S array[4] = value;
   {
-    [loop] for(uint i = 0u; (i < 4u); i = (i + 1u)) {
+    for(uint i = 0u; (i < 4u); i = (i + 1u)) {
       tint_symbol_1(buffer, (offset + (i * 32u)), array[i]);
     }
   }
@@ -48,7 +48,7 @@ typedef S tint_symbol_5_ret[4];
 tint_symbol_5_ret tint_symbol_5(uint4 buffer[8], uint offset) {
   S arr[4] = (S[4])0;
   {
-    [loop] for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
+    for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
       arr[i_1] = tint_symbol_6(buffer, (offset + (i_1 * 32u)));
     }
   }

test/tint/buffer/uniform/std140/struct/mat2x2/to_storage.wgsl.expected.fxc.hlsl

@@ -23,7 +23,7 @@ void tint_symbol_1(RWByteAddressBuffer buffer, uint offset, S value) {
 void tint_symbol(RWByteAddressBuffer buffer, uint offset, S value[4]) {
   S array[4] = value;
   {
-    [loop] for(uint i = 0u; (i < 4u); i = (i + 1u)) {
+    for(uint i = 0u; (i < 4u); i = (i + 1u)) {
       tint_symbol_1(buffer, (offset + (i * 32u)), array[i]);
     }
   }
@@ -48,7 +48,7 @@ typedef S tint_symbol_5_ret[4];
 tint_symbol_5_ret tint_symbol_5(uint4 buffer[8], uint offset) {
   S arr[4] = (S[4])0;
   {
-    [loop] for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
+    for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
       arr[i_1] = tint_symbol_6(buffer, (offset + (i_1 * 32u)));
     }
   }

test/tint/buffer/uniform/std140/struct/mat2x2/to_workgroup.wgsl.expected.dxc.hlsl

@@ -32,7 +32,7 @@ typedef S tint_symbol_2_ret[4];
 tint_symbol_2_ret tint_symbol_2(uint4 buffer[8], uint offset) {
   S arr[4] = (S[4])0;
   {
-    [loop] for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
+    for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
       arr[i_1] = tint_symbol_3(buffer, (offset + (i_1 * 32u)));
     }
   }
@@ -41,7 +41,7 @@ tint_symbol_2_ret tint_symbol_2(uint4 buffer[8], uint offset) {
 
 void f_inner(uint local_invocation_index) {
   {
-    [loop] for(uint idx = local_invocation_index; (idx < 4u); idx = (idx + 1u)) {
+    for(uint idx = local_invocation_index; (idx < 4u); idx = (idx + 1u)) {
       const uint i = idx;
       const S tint_symbol_7 = (S)0;
       w[i] = tint_symbol_7;

test/tint/buffer/uniform/std140/struct/mat2x2/to_workgroup.wgsl.expected.fxc.hlsl

@@ -32,7 +32,7 @@ typedef S tint_symbol_2_ret[4];
 tint_symbol_2_ret tint_symbol_2(uint4 buffer[8], uint offset) {
   S arr[4] = (S[4])0;
   {
-    [loop] for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
+    for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
       arr[i_1] = tint_symbol_3(buffer, (offset + (i_1 * 32u)));
     }
   }
@@ -41,7 +41,7 @@ tint_symbol_2_ret tint_symbol_2(uint4 buffer[8], uint offset) {
 
 void f_inner(uint local_invocation_index) {
   {
-    [loop] for(uint idx = local_invocation_index; (idx < 4u); idx = (idx + 1u)) {
+    for(uint idx = local_invocation_index; (idx < 4u); idx = (idx + 1u)) {
       const uint i = idx;
       const S tint_symbol_7 = (S)0;
       w[i] = tint_symbol_7;

test/tint/buffer/uniform/std140/struct/mat3x2/dynamic_index_via_ptr.wgsl.expected.dxc.hlsl

@@ -34,7 +34,7 @@ typedef Inner tint_symbol_6_ret[4];
 tint_symbol_6_ret tint_symbol_6(uint4 buffer[64], uint offset) {
   Inner arr[4] = (Inner[4])0;
   {
-    [loop] for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
+    for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
       arr[i_1] = tint_symbol_7(buffer, (offset + (i_1 * 64u)));
     }
   }
@@ -50,7 +50,7 @@ typedef Outer tint_symbol_4_ret[4];
 tint_symbol_4_ret tint_symbol_4(uint4 buffer[64], uint offset) {
   Outer arr_1[4] = (Outer[4])0;
   {
-    [loop] for(uint i_2 = 0u; (i_2 < 4u); i_2 = (i_2 + 1u)) {
+    for(uint i_2 = 0u; (i_2 < 4u); i_2 = (i_2 + 1u)) {
       arr_1[i_2] = tint_symbol_5(buffer, (offset + (i_2 * 256u)));
     }
   }

test/tint/buffer/uniform/std140/struct/mat3x2/dynamic_index_via_ptr.wgsl.expected.fxc.hlsl

@@ -34,7 +34,7 @@ typedef Inner tint_symbol_6_ret[4];
 tint_symbol_6_ret tint_symbol_6(uint4 buffer[64], uint offset) {
   Inner arr[4] = (Inner[4])0;
   {
-    [loop] for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
+    for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
       arr[i_1] = tint_symbol_7(buffer, (offset + (i_1 * 64u)));
     }
   }
@@ -50,7 +50,7 @@ typedef Outer tint_symbol_4_ret[4];
 tint_symbol_4_ret tint_symbol_4(uint4 buffer[64], uint offset) {
   Outer arr_1[4] = (Outer[4])0;
   {
-    [loop] for(uint i_2 = 0u; (i_2 < 4u); i_2 = (i_2 + 1u)) {
+    for(uint i_2 = 0u; (i_2 < 4u); i_2 = (i_2 + 1u)) {
       arr_1[i_2] = tint_symbol_5(buffer, (offset + (i_2 * 256u)));
     }
   }

test/tint/buffer/uniform/std140/struct/mat3x2/static_index_via_ptr.wgsl.expected.dxc.hlsl

@@ -28,7 +28,7 @@ typedef Inner tint_symbol_2_ret[4];
 tint_symbol_2_ret tint_symbol_2(uint4 buffer[64], uint offset) {
   Inner arr[4] = (Inner[4])0;
   {
-    [loop] for(uint i = 0u; (i < 4u); i = (i + 1u)) {
+    for(uint i = 0u; (i < 4u); i = (i + 1u)) {
       arr[i] = tint_symbol_3(buffer, (offset + (i * 64u)));
     }
   }
@@ -44,7 +44,7 @@ typedef Outer tint_symbol_ret[4];
 tint_symbol_ret tint_symbol(uint4 buffer[64], uint offset) {
   Outer arr_1[4] = (Outer[4])0;
   {
-    [loop] for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
+    for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
       arr_1[i_1] = tint_symbol_1(buffer, (offset + (i_1 * 256u)));
     }
   }

test/tint/buffer/uniform/std140/struct/mat3x2/static_index_via_ptr.wgsl.expected.fxc.hlsl

@@ -28,7 +28,7 @@ typedef Inner tint_symbol_2_ret[4];
 tint_symbol_2_ret tint_symbol_2(uint4 buffer[64], uint offset) {
   Inner arr[4] = (Inner[4])0;
   {
-    [loop] for(uint i = 0u; (i < 4u); i = (i + 1u)) {
+    for(uint i = 0u; (i < 4u); i = (i + 1u)) {
       arr[i] = tint_symbol_3(buffer, (offset + (i * 64u)));
     }
   }
@@ -44,7 +44,7 @@ typedef Outer tint_symbol_ret[4];
 tint_symbol_ret tint_symbol(uint4 buffer[64], uint offset) {
   Outer arr_1[4] = (Outer[4])0;
   {
-    [loop] for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
+    for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
       arr_1[i_1] = tint_symbol_1(buffer, (offset + (i_1 * 256u)));
     }
   }

test/tint/buffer/uniform/std140/struct/mat3x2/to_fn.wgsl.expected.dxc.hlsl

@@ -44,7 +44,7 @@ typedef S tint_symbol_ret[4];
 tint_symbol_ret tint_symbol(uint4 buffer[20], uint offset) {
   S arr[4] = (S[4])0;
   {
-    [loop] for(uint i = 0u; (i < 4u); i = (i + 1u)) {
+    for(uint i = 0u; (i < 4u); i = (i + 1u)) {
       arr[i] = tint_symbol_1(buffer, (offset + (i * 80u)));
     }
   }

test/tint/buffer/uniform/std140/struct/mat3x2/to_fn.wgsl.expected.fxc.hlsl

@@ -44,7 +44,7 @@ typedef S tint_symbol_ret[4];
 tint_symbol_ret tint_symbol(uint4 buffer[20], uint offset) {
   S arr[4] = (S[4])0;
   {
-    [loop] for(uint i = 0u; (i < 4u); i = (i + 1u)) {
+    for(uint i = 0u; (i < 4u); i = (i + 1u)) {
       arr[i] = tint_symbol_1(buffer, (offset + (i * 80u)));
     }
   }

test/tint/buffer/uniform/std140/struct/mat3x2/to_private.wgsl.expected.dxc.hlsl

@@ -30,7 +30,7 @@ typedef S tint_symbol_ret[4];
 tint_symbol_ret tint_symbol(uint4 buffer[20], uint offset) {
   S arr[4] = (S[4])0;
   {
-    [loop] for(uint i = 0u; (i < 4u); i = (i + 1u)) {
+    for(uint i = 0u; (i < 4u); i = (i + 1u)) {
       arr[i] = tint_symbol_1(buffer, (offset + (i * 80u)));
     }
   }

test/tint/buffer/uniform/std140/struct/mat3x2/to_private.wgsl.expected.fxc.hlsl

@@ -30,7 +30,7 @@ typedef S tint_symbol_ret[4];
 tint_symbol_ret tint_symbol(uint4 buffer[20], uint offset) {
   S arr[4] = (S[4])0;
   {
-    [loop] for(uint i = 0u; (i < 4u); i = (i + 1u)) {
+    for(uint i = 0u; (i < 4u); i = (i + 1u)) {
       arr[i] = tint_symbol_1(buffer, (offset + (i * 80u)));
     }
   }

test/tint/buffer/uniform/std140/struct/mat3x2/to_storage.wgsl.expected.dxc.hlsl

@@ -24,7 +24,7 @@ void tint_symbol_1(RWByteAddressBuffer buffer, uint offset, S value) {
 void tint_symbol(RWByteAddressBuffer buffer, uint offset, S value[4]) {
   S array[4] = value;
   {
-    [loop] for(uint i = 0u; (i < 4u); i = (i + 1u)) {
+    for(uint i = 0u; (i < 4u); i = (i + 1u)) {
       tint_symbol_1(buffer, (offset + (i * 80u)), array[i]);
     }
   }
@@ -51,7 +51,7 @@ typedef S tint_symbol_5_ret[4];
 tint_symbol_5_ret tint_symbol_5(uint4 buffer[20], uint offset) {
   S arr[4] = (S[4])0;
   {
-    [loop] for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
+    for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
       arr[i_1] = tint_symbol_6(buffer, (offset + (i_1 * 80u)));
     }
   }

test/tint/buffer/uniform/std140/struct/mat3x2/to_storage.wgsl.expected.fxc.hlsl

@@ -24,7 +24,7 @@ void tint_symbol_1(RWByteAddressBuffer buffer, uint offset, S value) {
 void tint_symbol(RWByteAddressBuffer buffer, uint offset, S value[4]) {
   S array[4] = value;
   {
-    [loop] for(uint i = 0u; (i < 4u); i = (i + 1u)) {
+    for(uint i = 0u; (i < 4u); i = (i + 1u)) {
       tint_symbol_1(buffer, (offset + (i * 80u)), array[i]);
     }
   }
@@ -51,7 +51,7 @@ typedef S tint_symbol_5_ret[4];
 tint_symbol_5_ret tint_symbol_5(uint4 buffer[20], uint offset) {
   S arr[4] = (S[4])0;
   {
-    [loop] for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
+    for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
       arr[i_1] = tint_symbol_6(buffer, (offset + (i_1 * 80u)));
     }
   }

test/tint/buffer/uniform/std140/struct/mat3x2/to_workgroup.wgsl.expected.dxc.hlsl

@@ -34,7 +34,7 @@ typedef S tint_symbol_2_ret[4];
 tint_symbol_2_ret tint_symbol_2(uint4 buffer[20], uint offset) {
   S arr[4] = (S[4])0;
   {
-    [loop] for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
+    for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
       arr[i_1] = tint_symbol_3(buffer, (offset + (i_1 * 80u)));
     }
   }
@@ -43,7 +43,7 @@ tint_symbol_2_ret tint_symbol_2(uint4 buffer[20], uint offset) {
 
 void f_inner(uint local_invocation_index) {
   {
-    [loop] for(uint idx = local_invocation_index; (idx < 4u); idx = (idx + 1u)) {
+    for(uint idx = local_invocation_index; (idx < 4u); idx = (idx + 1u)) {
       const uint i = idx;
       const S tint_symbol_7 = (S)0;
       w[i] = tint_symbol_7;

test/tint/buffer/uniform/std140/struct/mat3x2/to_workgroup.wgsl.expected.fxc.hlsl

@@ -34,7 +34,7 @@ typedef S tint_symbol_2_ret[4];
 tint_symbol_2_ret tint_symbol_2(uint4 buffer[20], uint offset) {
   S arr[4] = (S[4])0;
   {
-    [loop] for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
+    for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
       arr[i_1] = tint_symbol_3(buffer, (offset + (i_1 * 80u)));
     }
   }
@@ -43,7 +43,7 @@ tint_symbol_2_ret tint_symbol_2(uint4 buffer[20], uint offset) {
 
 void f_inner(uint local_invocation_index) {
   {
-    [loop] for(uint idx = local_invocation_index; (idx < 4u); idx = (idx + 1u)) {
+    for(uint idx = local_invocation_index; (idx < 4u); idx = (idx + 1u)) {
       const uint i = idx;
       const S tint_symbol_7 = (S)0;
       w[i] = tint_symbol_7;

test/tint/buffer/uniform/std140/struct/mat4x2/dynamic_index_via_ptr.wgsl.expected.dxc.hlsl

@@ -36,7 +36,7 @@ typedef Inner tint_symbol_6_ret[4];
 tint_symbol_6_ret tint_symbol_6(uint4 buffer[32], uint offset) {
   Inner arr[4] = (Inner[4])0;
   {
-    [loop] for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
+    for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
       arr[i_1] = tint_symbol_7(buffer, (offset + (i_1 * 32u)));
     }
   }
@@ -52,7 +52,7 @@ typedef Outer tint_symbol_4_ret[4];
 tint_symbol_4_ret tint_symbol_4(uint4 buffer[32], uint offset) {
   Outer arr_1[4] = (Outer[4])0;
   {
-    [loop] for(uint i_2 = 0u; (i_2 < 4u); i_2 = (i_2 + 1u)) {
+    for(uint i_2 = 0u; (i_2 < 4u); i_2 = (i_2 + 1u)) {
       arr_1[i_2] = tint_symbol_5(buffer, (offset + (i_2 * 128u)));
     }
   }

test/tint/buffer/uniform/std140/struct/mat4x2/dynamic_index_via_ptr.wgsl.expected.fxc.hlsl

@@ -36,7 +36,7 @@ typedef Inner tint_symbol_6_ret[4];
 tint_symbol_6_ret tint_symbol_6(uint4 buffer[32], uint offset) {
   Inner arr[4] = (Inner[4])0;
   {
-    [loop] for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
+    for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
       arr[i_1] = tint_symbol_7(buffer, (offset + (i_1 * 32u)));
     }
   }
@@ -52,7 +52,7 @@ typedef Outer tint_symbol_4_ret[4];
 tint_symbol_4_ret tint_symbol_4(uint4 buffer[32], uint offset) {
   Outer arr_1[4] = (Outer[4])0;
   {
-    [loop] for(uint i_2 = 0u; (i_2 < 4u); i_2 = (i_2 + 1u)) {
+    for(uint i_2 = 0u; (i_2 < 4u); i_2 = (i_2 + 1u)) {
       arr_1[i_2] = tint_symbol_5(buffer, (offset + (i_2 * 128u)));
     }
   }

test/tint/buffer/uniform/std140/struct/mat4x2/static_index_via_ptr.wgsl.expected.dxc.hlsl

@@ -30,7 +30,7 @@ typedef Inner tint_symbol_2_ret[4];
 tint_symbol_2_ret tint_symbol_2(uint4 buffer[32], uint offset) {
   Inner arr[4] = (Inner[4])0;
   {
-    [loop] for(uint i = 0u; (i < 4u); i = (i + 1u)) {
+    for(uint i = 0u; (i < 4u); i = (i + 1u)) {
       arr[i] = tint_symbol_3(buffer, (offset + (i * 32u)));
     }
   }
@@ -46,7 +46,7 @@ typedef Outer tint_symbol_ret[4];
 tint_symbol_ret tint_symbol(uint4 buffer[32], uint offset) {
   Outer arr_1[4] = (Outer[4])0;
   {
-    [loop] for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
+    for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
       arr_1[i_1] = tint_symbol_1(buffer, (offset + (i_1 * 128u)));
     }
   }

test/tint/buffer/uniform/std140/struct/mat4x2/static_index_via_ptr.wgsl.expected.fxc.hlsl

@@ -30,7 +30,7 @@ typedef Inner tint_symbol_2_ret[4];
 tint_symbol_2_ret tint_symbol_2(uint4 buffer[32], uint offset) {
   Inner arr[4] = (Inner[4])0;
   {
-    [loop] for(uint i = 0u; (i < 4u); i = (i + 1u)) {
+    for(uint i = 0u; (i < 4u); i = (i + 1u)) {
       arr[i] = tint_symbol_3(buffer, (offset + (i * 32u)));
     }
   }
@@ -46,7 +46,7 @@ typedef Outer tint_symbol_ret[4];
 tint_symbol_ret tint_symbol(uint4 buffer[32], uint offset) {
   Outer arr_1[4] = (Outer[4])0;
   {
-    [loop] for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
+    for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
       arr_1[i_1] = tint_symbol_1(buffer, (offset + (i_1 * 128u)));
     }
   }

test/tint/buffer/uniform/std140/struct/mat4x2/to_fn.wgsl.expected.dxc.hlsl

@@ -46,7 +46,7 @@ typedef S tint_symbol_ret[4];
 tint_symbol_ret tint_symbol(uint4 buffer[12], uint offset) {
   S arr[4] = (S[4])0;
   {
-    [loop] for(uint i = 0u; (i < 4u); i = (i + 1u)) {
+    for(uint i = 0u; (i < 4u); i = (i + 1u)) {
       arr[i] = tint_symbol_1(buffer, (offset + (i * 48u)));
     }
   }

test/tint/buffer/uniform/std140/struct/mat4x2/to_fn.wgsl.expected.fxc.hlsl

@@ -46,7 +46,7 @@ typedef S tint_symbol_ret[4];
 tint_symbol_ret tint_symbol(uint4 buffer[12], uint offset) {
   S arr[4] = (S[4])0;
   {
-    [loop] for(uint i = 0u; (i < 4u); i = (i + 1u)) {
+    for(uint i = 0u; (i < 4u); i = (i + 1u)) {
       arr[i] = tint_symbol_1(buffer, (offset + (i * 48u)));
     }
   }

test/tint/buffer/uniform/std140/struct/mat4x2/to_private.wgsl.expected.dxc.hlsl

@@ -32,7 +32,7 @@ typedef S tint_symbol_ret[4];
 tint_symbol_ret tint_symbol(uint4 buffer[12], uint offset) {
   S arr[4] = (S[4])0;
   {
-    [loop] for(uint i = 0u; (i < 4u); i = (i + 1u)) {
+    for(uint i = 0u; (i < 4u); i = (i + 1u)) {
       arr[i] = tint_symbol_1(buffer, (offset + (i * 48u)));
     }
   }

test/tint/buffer/uniform/std140/struct/mat4x2/to_private.wgsl.expected.fxc.hlsl

@@ -32,7 +32,7 @@ typedef S tint_symbol_ret[4];
 tint_symbol_ret tint_symbol(uint4 buffer[12], uint offset) {
   S arr[4] = (S[4])0;
   {
-    [loop] for(uint i = 0u; (i < 4u); i = (i + 1u)) {
+    for(uint i = 0u; (i < 4u); i = (i + 1u)) {
       arr[i] = tint_symbol_1(buffer, (offset + (i * 48u)));
     }
   }

test/tint/buffer/uniform/std140/struct/mat4x2/to_storage.wgsl.expected.dxc.hlsl

@@ -25,7 +25,7 @@ void tint_symbol_1(RWByteAddressBuffer buffer, uint offset, S value) {
 void tint_symbol(RWByteAddressBuffer buffer, uint offset, S value[4]) {
   S array[4] = value;
   {
-    [loop] for(uint i = 0u; (i < 4u); i = (i + 1u)) {
+    for(uint i = 0u; (i < 4u); i = (i + 1u)) {
       tint_symbol_1(buffer, (offset + (i * 48u)), array[i]);
     }
   }
@@ -54,7 +54,7 @@ typedef S tint_symbol_5_ret[4];
 tint_symbol_5_ret tint_symbol_5(uint4 buffer[12], uint offset) {
   S arr[4] = (S[4])0;
   {
-    [loop] for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
+    for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
       arr[i_1] = tint_symbol_6(buffer, (offset + (i_1 * 48u)));
     }
   }

test/tint/buffer/uniform/std140/struct/mat4x2/to_storage.wgsl.expected.fxc.hlsl

@@ -25,7 +25,7 @@ void tint_symbol_1(RWByteAddressBuffer buffer, uint offset, S value) {
 void tint_symbol(RWByteAddressBuffer buffer, uint offset, S value[4]) {
   S array[4] = value;
   {
-    [loop] for(uint i = 0u; (i < 4u); i = (i + 1u)) {
+    for(uint i = 0u; (i < 4u); i = (i + 1u)) {
       tint_symbol_1(buffer, (offset + (i * 48u)), array[i]);
     }
   }
@@ -54,7 +54,7 @@ typedef S tint_symbol_5_ret[4];
 tint_symbol_5_ret tint_symbol_5(uint4 buffer[12], uint offset) {
   S arr[4] = (S[4])0;
   {
-    [loop] for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
+    for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
       arr[i_1] = tint_symbol_6(buffer, (offset + (i_1 * 48u)));
     }
   }

test/tint/buffer/uniform/std140/struct/mat4x2/to_workgroup.wgsl.expected.dxc.hlsl

@@ -36,7 +36,7 @@ typedef S tint_symbol_2_ret[4];
 tint_symbol_2_ret tint_symbol_2(uint4 buffer[12], uint offset) {
   S arr[4] = (S[4])0;
   {
-    [loop] for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
+    for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
       arr[i_1] = tint_symbol_3(buffer, (offset + (i_1 * 48u)));
     }
   }
@@ -45,7 +45,7 @@ tint_symbol_2_ret tint_symbol_2(uint4 buffer[12], uint offset) {
 
 void f_inner(uint local_invocation_index) {
   {
-    [loop] for(uint idx = local_invocation_index; (idx < 4u); idx = (idx + 1u)) {
+    for(uint idx = local_invocation_index; (idx < 4u); idx = (idx + 1u)) {
       const uint i = idx;
       const S tint_symbol_7 = (S)0;
       w[i] = tint_symbol_7;

test/tint/buffer/uniform/std140/struct/mat4x2/to_workgroup.wgsl.expected.fxc.hlsl

@@ -36,7 +36,7 @@ typedef S tint_symbol_2_ret[4];
 tint_symbol_2_ret tint_symbol_2(uint4 buffer[12], uint offset) {
   S arr[4] = (S[4])0;
   {
-    [loop] for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
+    for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
       arr[i_1] = tint_symbol_3(buffer, (offset + (i_1 * 48u)));
     }
   }
@@ -45,7 +45,7 @@ tint_symbol_2_ret tint_symbol_2(uint4 buffer[12], uint offset) {
 
 void f_inner(uint local_invocation_index) {
   {
-    [loop] for(uint idx = local_invocation_index; (idx < 4u); idx = (idx + 1u)) {
+    for(uint idx = local_invocation_index; (idx < 4u); idx = (idx + 1u)) {
       const uint i = idx;
       const S tint_symbol_7 = (S)0;
       w[i] = tint_symbol_7;

test/tint/buffer/uniform/types/array.wgsl.expected.dxc.hlsl

@@ -6,7 +6,7 @@ typedef float4 tint_symbol_ret[4];
 tint_symbol_ret tint_symbol(uint4 buffer[4], uint offset) {
   float4 arr[4] = (float4[4])0;
   {
-    [loop] for(uint i = 0u; (i < 4u); i = (i + 1u)) {
+    for(uint i = 0u; (i < 4u); i = (i + 1u)) {
       const uint scalar_offset = ((offset + (i * 16u))) / 4;
       arr[i] = asfloat(buffer[scalar_offset / 4]);
     }

test/tint/buffer/uniform/types/array.wgsl.expected.fxc.hlsl

@@ -6,7 +6,7 @@ typedef float4 tint_symbol_ret[4];
 tint_symbol_ret tint_symbol(uint4 buffer[4], uint offset) {
   float4 arr[4] = (float4[4])0;
   {
-    [loop] for(uint i = 0u; (i < 4u); i = (i + 1u)) {
+    for(uint i = 0u; (i < 4u); i = (i + 1u)) {
       const uint scalar_offset = ((offset + (i * 16u))) / 4;
       arr[i] = asfloat(buffer[scalar_offset / 4]);
     }

test/tint/bug/fxc/dyn_array_idx/read/workgroup.wgsl.expected.dxc.hlsl

@@ -15,7 +15,7 @@ struct tint_symbol_2 {
 
 void f_inner(uint local_invocation_index) {
   {
-    [loop] for(uint idx = local_invocation_index; (idx < 64u); idx = (idx + 1u)) {
+    for(uint idx = local_invocation_index; (idx < 64u); idx = (idx + 1u)) {
       const uint i = idx;
       s.data[i] = 0;
     }

test/tint/bug/fxc/dyn_array_idx/read/workgroup.wgsl.expected.fxc.hlsl

@@ -15,7 +15,7 @@ struct tint_symbol_2 {
 
 void f_inner(uint local_invocation_index) {
   {
-    [loop] for(uint idx = local_invocation_index; (idx < 64u); idx = (idx + 1u)) {
+    for(uint idx = local_invocation_index; (idx < 64u); idx = (idx + 1u)) {
       const uint i = idx;
       s.data[i] = 0;
     }

test/tint/bug/fxc/dyn_array_idx/write/workgroup.wgsl.expected.dxc.hlsl

@@ -15,7 +15,7 @@ struct tint_symbol_2 {
 
 void f_inner(uint local_invocation_index) {
   {
-    [loop] for(uint idx = local_invocation_index; (idx < 64u); idx = (idx + 1u)) {
+    for(uint idx = local_invocation_index; (idx < 64u); idx = (idx + 1u)) {
       const uint i = idx;
       s.data[i] = 0;
     }

test/tint/bug/fxc/dyn_array_idx/write/workgroup.wgsl.expected.fxc.hlsl

@@ -15,7 +15,7 @@ struct tint_symbol_2 {
 
 void f_inner(uint local_invocation_index) {
   {
-    [loop] for(uint idx = local_invocation_index; (idx < 64u); idx = (idx + 1u)) {
+    for(uint idx = local_invocation_index; (idx < 64u); idx = (idx + 1u)) {
       const uint i = idx;
       s.data[i] = 0;
     }

test/tint/bug/fxc/gradient_in_varying_loop/1112.wgsl.expected.dxc.hlsl

@@ -12,7 +12,7 @@ struct tint_symbol_3 {
 float4 main_inner(float2 vUV) {
   const float3 random = randomTexture.Sample(tint_symbol, vUV).rgb;
   int i = 0;
-  [loop] while (true) {
+  while (true) {
     if ((i < 1)) {
     } else {
       break;

test/tint/bug/fxc/gradient_in_varying_loop/1112.wgsl.expected.fxc.hlsl

@@ -12,7 +12,7 @@ struct tint_symbol_3 {
 float4 main_inner(float2 vUV) {
   const float3 random = randomTexture.Sample(tint_symbol, vUV).rgb;
   int i = 0;
-  [loop] while (true) {
+  while (true) {
     if ((i < 1)) {
     } else {
       break;

test/tint/bug/fxc/indexed_assign_to_array_in_struct/1206.wgsl.expected.dxc.hlsl

@@ -14,7 +14,7 @@ typedef float3 tint_symbol_3_ret[8];
 tint_symbol_3_ret tint_symbol_3(ByteAddressBuffer buffer, uint offset) {
   float3 arr[8] = (float3[8])0;
   {
-    [loop] for(uint i_1 = 0u; (i_1 < 8u); i_1 = (i_1 + 1u)) {
+    for(uint i_1 = 0u; (i_1 < 8u); i_1 = (i_1 + 1u)) {
       arr[i_1] = asfloat(buffer.Load3((offset + (i_1 * 16u))));
     }
   }

test/tint/bug/fxc/indexed_assign_to_array_in_struct/1206.wgsl.expected.fxc.hlsl

@@ -14,7 +14,7 @@ typedef float3 tint_symbol_3_ret[8];
 tint_symbol_3_ret tint_symbol_3(ByteAddressBuffer buffer, uint offset) {
   float3 arr[8] = (float3[8])0;
   {
-    [loop] for(uint i_1 = 0u; (i_1 < 8u); i_1 = (i_1 + 1u)) {
+    for(uint i_1 = 0u; (i_1 < 8u); i_1 = (i_1 + 1u)) {
       arr[i_1] = asfloat(buffer.Load3((offset + (i_1 * 16u))));
     }
   }

test/tint/bug/fxc/vector_assignment_in_loop/loop_call_with_loop.wgsl.expected.dxc.hlsl

@@ -21,7 +21,7 @@ static bool2 v2b = bool2(false, false);
 
 void foo() {
   {
-    [loop] for(int i = 0; (i < 2); i = (i + 1)) {
+    for(int i = 0; (i < 2); i = (i + 1)) {
       set_float2(v2f, i, 1.0f);
       set_int3(v3i, i, 1);
       set_uint4(v4u, i, 1u);
@@ -33,7 +33,7 @@ void foo() {
 [numthreads(1, 1, 1)]
 void main() {
   {
-    [loop] for(int i = 0; (i < 2); i = (i + 1)) {
+    for(int i = 0; (i < 2); i = (i + 1)) {
       foo();
     }
   }

test/tint/bug/fxc/vector_assignment_in_loop/loop_call_with_loop.wgsl.expected.fxc.hlsl

@@ -21,7 +21,7 @@ static bool2 v2b = bool2(false, false);
 
 void foo() {
   {
-    [loop] for(int i = 0; (i < 2); i = (i + 1)) {
+    for(int i = 0; (i < 2); i = (i + 1)) {
       set_float2(v2f, i, 1.0f);
       set_int3(v3i, i, 1);
       set_uint4(v4u, i, 1u);
@@ -33,7 +33,7 @@ void foo() {
 [numthreads(1, 1, 1)]
 void main() {
   {
-    [loop] for(int i = 0; (i < 2); i = (i + 1)) {
+    for(int i = 0; (i < 2); i = (i + 1)) {
       foo();
     }
   }

test/tint/bug/fxc/vector_assignment_in_loop/loop_call_with_no_loop.wgsl.expected.dxc.hlsl

@@ -30,7 +30,7 @@ void foo() {
 [numthreads(1, 1, 1)]
 void main() {
   {
-    [loop] for(int i = 0; (i < 2); i = (i + 1)) {
+    for(int i = 0; (i < 2); i = (i + 1)) {
       foo();
     }
   }