rebased, fix broken test (r2m now executed)

Signed-off-by: Nathan Gauër <[email protected]>

Author: Keenuts

llvm/test/CodeGen/SPIRV/structurizer/condition-linear.ll

@@ -1,6 +1,9 @@
 ; RUN: llc -mtriple=spirv-unknown-vulkan-compute -O0 %s -o - -verify-machineinstrs | FileCheck %s --match-full-lines
 ; RUN: %if spirv-tools %{ llc -O0 -mtriple=spirv-unknown-vulkan-compute %s -o - -filetype=obj | spirv-val %}
 
+; NOTE: Many BB have 2 reg2mem registers: one for the register usage moved
+;       to memory, and a second one just after caused by a PHI node.
+
 target datalayout = "e-i64:64-v16:16-v24:32-v32:32-v48:64-v96:128-v192:256-v256:256-v512:512-v1024:1024-G1"
 target triple = "spirv-unknown-vulkan-compute"
 
@@ -26,8 +29,8 @@ entry:
 }
 
 
-; CHECK-DAG:             OpName %[[#reg_0:]] "cond.reg2mem"
-; CHECK-DAG:             OpName %[[#reg_1:]] "cond9.reg2mem"
+; CHECK-DAG:             OpName %[[#a:]] "a"
+; CHECK-DAG:             OpName %[[#b:]] "b"
 
 define internal spir_func void @main() #0 {
 ; CHECK:                  OpSelectionMerge %[[#cond1_merge:]] None
@@ -39,21 +42,27 @@ entry:
   br i1 true, label %cond1_true, label %cond1_false
 
 ; CHECK:  %[[#cond1_true]] = OpLabel
-; CHECK:                     OpStore %[[#reg_0]] %[[#]]
+; CHECK:       %[[#tmp1:]] = OpLoad %[[#]] %[[#a]] Aligned 4
+; CHECK:                     OpStore %[[#tmp2:]] %[[#tmp1]] Aligned 4
+; CHECK:       %[[#tmp3:]] = OpLoad %[[#]] %[[#tmp2]] Aligned 4
+; CHECK:                     OpStore %[[#r2m:]] %[[#tmp3]] Aligned 4
 ; CHECK:                     OpBranch %[[#cond1_merge]]
 cond1_true:
   %2 = load i32, ptr %a, align 4
   br label %cond1_merge
 
 ; CHECK:  %[[#cond1_false]] = OpLabel
-; CHECK:                      OpStore %[[#reg_0]] %[[#]]
+; CHECK:        %[[#tmp1:]] = OpLoad %[[#]] %[[#b]] Aligned 4
+; CHECK:                      OpStore %[[#tmp2:]] %[[#tmp1]] Aligned 4
+; CHECK:        %[[#tmp3:]] = OpLoad %[[#]] %[[#tmp2]] Aligned 4
+; CHECK:                      OpStore %[[#r2m]] %[[#tmp3]] Aligned 4
 ; CHECK:                      OpBranch %[[#cond1_merge]]
 cond1_false:
   %3 = load i32, ptr %b, align 4
   br label %cond1_merge
 
 ; CHECK: %[[#cond1_merge]] = OpLabel
-; CHECK:        %[[#tmp:]] = OpLoad %[[#]] %[[#reg_0]]
+; CHECK:        %[[#tmp:]] = OpLoad %[[#]] %[[#r2m]] Aligned 4
 ; CHECK:       %[[#cond:]] = OpINotEqual %[[#]] %[[#tmp]] %[[#]]
 ; CHECK:                     OpSelectionMerge %[[#cond2_merge:]] None
 ; CHECK:                     OpBranchConditional %[[#cond]] %[[#cond2_true:]] %[[#cond2_merge]]
@@ -69,32 +78,36 @@ cond2_true:
   br label %cond2_merge
 
 ; CHECK:    %[[#cond2_merge]] = OpLabel
-; CHECK:                        OpFunctionCall
+; CHECK:               %[[#]] = OpFunctionCall %[[#]] %[[#]]
 ; CHECK:                        OpSelectionMerge %[[#cond3_merge:]] None
 ; CHECK:                        OpBranchConditional %[[#]] %[[#cond3_true:]] %[[#cond3_false:]]
 cond2_merge:
   %call2 = call spir_func noundef i32 @fn() #4 [ "convergencectrl"(token %0) ]
   br i1 true, label %cond3_true, label %cond3_false
 
 ; CHECK:  %[[#cond3_true]] = OpLabel
-; CHECK:                     OpFunctionCall
-; CHECK:                     OpStore %[[#reg_1]] %[[#]]
+; CHECK:       %[[#tmp1:]] = OpFunctionCall %[[#]] %[[#]]
+; CHECK:                     OpStore %[[#tmp2:]] %[[#tmp1]] Aligned 4
+; CHECK:       %[[#tmp3:]] = OpLoad %[[#]] %[[#tmp2]] Aligned 4
+; CHECK:                     OpStore %[[#r2m2:]] %[[#tmp3]] Aligned 4
 ; CHECK:                     OpBranch %[[#cond3_merge]]
 cond3_true:
   %call5 = call spir_func noundef i32 @fn1() #4 [ "convergencectrl"(token %0) ]
   br label %cond3_merge
 
 ; CHECK:  %[[#cond3_false]] = OpLabel
-; CHECK:                      OpFunctionCall
-; CHECK:                      OpStore %[[#reg_1]] %[[#]]
+; CHECK:        %[[#tmp1:]] = OpFunctionCall %[[#]] %[[#]]
+; CHECK:                      OpStore %[[#tmp2:]] %[[#tmp1]] Aligned 4
+; CHECK:        %[[#tmp3:]] = OpLoad %[[#]] %[[#tmp2]] Aligned 4
+; CHECK:                      OpStore %[[#r2m2]] %[[#tmp3]] Aligned 4
 ; CHECK:                      OpBranch %[[#cond3_merge]]
 cond3_false:
   %call7 = call spir_func noundef i32 @fn2() #4 [ "convergencectrl"(token %0) ]
   br label %cond3_merge
 
 ; CHECK:  %[[#cond3_merge]] = OpLabel
-; CHECK:         %[[#tmp:]] = OpLoad %[[#]] %[[#reg_1]]
-; CHECK:       %[[#cond:]] = OpINotEqual %[[#]] %[[#tmp]] %[[#]]
+; CHECK:         %[[#tmp:]] = OpLoad %[[#]] %[[#r2m2]] Aligned 4
+; CHECK:        %[[#cond:]] = OpINotEqual %[[#]] %[[#tmp]] %[[#]]
 ; CHECK:                      OpSelectionMerge %[[#cond4_merge:]] None
 ; CHECK:                      OpBranchConditional %[[#cond]] %[[#cond4_true:]] %[[#cond4_merge]]
 cond3_merge: