diff --git a/llvm/lib/Target/SPIRV/SPIRVTargetMachine.cpp b/llvm/lib/Target/SPIRV/SPIRVTargetMachine.cpp
index 5ba035682238b..8d5fd2620027e 100644
--- a/llvm/lib/Target/SPIRV/SPIRVTargetMachine.cpp
+++ b/llvm/lib/Target/SPIRV/SPIRVTargetMachine.cpp
@@ -181,30 +181,30 @@ void SPIRVPassConfig::addISelPrepare() {
     // If an address space cast is not removed while targeting Vulkan, lowering
     // will fail during MIR lowering.
     addPass(createInferAddressSpacesPass());
+  }
 
-    // 1.  Simplify loop for subsequent transformations. After this steps, loops
-    // have the following properties:
-    //  - loops have a single entry edge (pre-header to loop header).
-    //  - all loop exits are dominated by the loop pre-header.
-    //  - loops have a single back-edge.
-    addPass(createLoopSimplifyPass());
+  // 1.  Simplify loop for subsequent transformations. After this steps, loops
+  // have the following properties:
+  //  - loops have a single entry edge (pre-header to loop header).
+  //  - all loop exits are dominated by the loop pre-header.
+  //  - loops have a single back-edge.
+  addPass(createLoopSimplifyPass());
 
-    // 2. Removes registers whose lifetime spans across basic blocks. Also
-    // removes phi nodes. This will greatly simplify the next steps.
-    addPass(createRegToMemWrapperPass());
+  // 2. Removes registers whose lifetime spans across basic blocks. Also
+  // removes phi nodes. This will greatly simplify the next steps.
+  addPass(createRegToMemWrapperPass());
 
-    // 3. Merge the convergence region exit nodes into one. After this step,
-    // regions are single-entry, single-exit. This will help determine the
-    // correct merge block.
-    addPass(createSPIRVMergeRegionExitTargetsPass());
+  // 3. Merge the convergence region exit nodes into one. After this step,
+  // regions are single-entry, single-exit. This will help determine the
+  // correct merge block.
+  addPass(createSPIRVMergeRegionExitTargetsPass());
 
-    // 4. Structurize.
-    addPass(createSPIRVStructurizerPass());
+  // 4. Structurize.
+  addPass(createSPIRVStructurizerPass());
 
-    // 5. Reduce the amount of variables required by pushing some operations
-    // back to virtual registers.
-    addPass(createPromoteMemoryToRegisterPass());
-  }
+  // 5. Reduce the amount of variables required by pushing some operations
+  // back to virtual registers.
+  addPass(createPromoteMemoryToRegisterPass());
 
   addPass(createSPIRVStripConvergenceIntrinsicsPass());
   addPass(createSPIRVLegalizeImplicitBindingPass());
diff --git a/llvm/test/CodeGen/SPIRV/structurizer/kernel-loop.ll b/llvm/test/CodeGen/SPIRV/structurizer/kernel-loop.ll
new file mode 100644
index 0000000000000..56dc916ac7bd3
--- /dev/null
+++ b/llvm/test/CodeGen/SPIRV/structurizer/kernel-loop.ll
@@ -0,0 +1,80 @@
+; RUN: llc -mtriple=spirv64-unknown-opencl -O0 %s -o - | FileCheck %s
+; RUN: %if spirv-tools %{ llc -O0 -mtriple=spirv64-unknown-opencl %s -o - -filetype=obj | spirv-val %}
+
+; This test verifies that the structurizer pass runs for OpenCL kernels,
+; generating structured control flow with OpLoopMerge instructions and
+; translating loop metadata to appropriate LoopControl operands.
+
+; CHECK: OpEntryPoint Kernel %[[#kernel_unroll:]] "test_kernel_unroll"
+; CHECK: OpEntryPoint Kernel %[[#kernel_dontunroll:]] "test_kernel_dontunroll"
+
+; Verify unroll metadata is translated to Unroll LoopControl
+; CHECK: %[[#kernel_unroll]] = OpFunction
+; CHECK: OpLabel
+; CHECK: OpLoopMerge %[[#]] %[[#]] Unroll
+; CHECK: OpFunctionEnd
+
+; Verify dont_unroll metadata is translated to DontUnroll LoopControl
+; CHECK: %[[#kernel_dontunroll]] = OpFunction
+; CHECK: OpLabel
+; CHECK: OpLoopMerge %[[#]] %[[#]] DontUnroll
+; CHECK: OpFunctionEnd
+
+define spir_kernel void @test_kernel_unroll(ptr addrspace(1) %out) {
+entry:
+  %i = alloca i32, align 4
+  store i32 0, ptr %i, align 4
+  br label %for.cond
+
+for.cond:
+  %0 = load i32, ptr %i, align 4
+  %cmp = icmp slt i32 %0, 10
+  br i1 %cmp, label %for.body, label %for.end
+
+for.body:
+  %1 = load i32, ptr %i, align 4
+  %arrayidx = getelementptr inbounds i32, ptr addrspace(1) %out, i64 0
+  store i32 %1, ptr addrspace(1) %arrayidx, align 4
+  br label %for.inc
+
+for.inc:
+  %2 = load i32, ptr %i, align 4
+  %inc = add nsw i32 %2, 1
+  store i32 %inc, ptr %i, align 4
+  br label %for.cond, !llvm.loop !0
+
+for.end:
+  ret void
+}
+
+define spir_kernel void @test_kernel_dontunroll(ptr addrspace(1) %out) {
+entry:
+  %i = alloca i32, align 4
+  store i32 0, ptr %i, align 4
+  br label %for.cond
+
+for.cond:
+  %0 = load i32, ptr %i, align 4
+  %cmp = icmp slt i32 %0, 10
+  br i1 %cmp, label %for.body, label %for.end
+
+for.body:
+  %1 = load i32, ptr %i, align 4
+  %arrayidx = getelementptr inbounds i32, ptr addrspace(1) %out, i64 0
+  store i32 %1, ptr addrspace(1) %arrayidx, align 4
+  br label %for.inc
+
+for.inc:
+  %2 = load i32, ptr %i, align 4
+  %inc = add nsw i32 %2, 1
+  store i32 %inc, ptr %i, align 4
+  br label %for.cond, !llvm.loop !2
+
+for.end:
+  ret void
+}
+
+!0 = distinct !{!0, !1}
+!1 = !{!"llvm.loop.unroll.full"}
+!2 = distinct !{!2, !3}
+!3 = !{!"llvm.loop.unroll.disable"}