Update expected HIR for 3.14

Summary: On D88116848 the 3.14 runtime tests apparently didn't run... this updates the expected HIR.

Reviewed By: mpage

Differential Revision: D88280122

fbshipit-source-id: 2c3a1e73d8985a846253ceec2f392a110745ce99

Author: DinoV

cinderx/RuntimeTests/hir_tests/all_passes_static_test.txt

@@ -277,18 +277,17 @@ fun jittestmodule:test {
       }
     }
     Incref v57
-    UpdatePrevInstr<idx:36 line_no:3: no parent>
+    UpdatePrevInstr<idx:42 line_no:3: no parent>
     XDecref v34
-    v51:Nullptr = LoadConst<Nullptr>
-    v52:Object = CallMethod<3> v50 v51 v57 {
-      LiveValues<5> b:v19 s:v46 b:v50 unc:v51 o:v57
+    v58:Object = VectorCall<1> v50 v57 {
+      LiveValues<4> b:v19 s:v46 b:v50 o:v57
       FrameState {
         CurInstrOffset 84
         Locals<3> v19 v46 v57
         Stack<1> v19
       }
     }
-    Decref v52
+    Decref v58
     Branch<6>
   }
 

cinderx/RuntimeTests/hir_tests/all_passes_test.txt

@@ -240,26 +240,38 @@ fun jittestmodule:test {
         Stack<2> v20 v21
       }
     }
+    v34:Type = LoadField<ob_type@8, Type, borrowed> v14
+    v35:CBool = PrimitiveCompare<Equal> v34 v23
+    CondBranch<5, 6> v35
+  }
+
+  bb 5 (preds 3) {
+    Branch<7>
+  }
+
+  bb 6 (preds 3) {
     UpdatePrevInstr<idx:12 line_no:2: no parent>
-    v24:Bool = CallMethod<4> v20 v21 v14 v23 {
-      LiveValues<4> b:v14 b:v20 unc:v21 unc:v23
+    v36:CBool = IsInstance v14 v23 {
+      LiveValues<2> b:v14 unc:v23
       FrameState {
         CurInstrOffset 24
         Locals<1> v14
       }
     }
-    v31:ImmortalBool[True] = LoadConst<ImmortalBool[True]>
-    v32:CBool = PrimitiveCompare<Equal> v24 v31
-    Decref v24
-    CondBranch<1, 2> v32
+    Branch<7>
+  }
+
+  bb 7 (preds 5, 6) {
+    v37:CBool = Phi<5, 6> v35 v36
+    CondBranch<1, 2> v37
   }
 
-  bb 1 (preds 3) {
+  bb 1 (preds 7) {
     v29:ImmortalLongExact[1] = LoadConst<ImmortalLongExact[1]>
     Return v29
   }
 
-  bb 2 (preds 3) {
+  bb 2 (preds 7) {
     v30:ImmortalLongExact[2] = LoadConst<ImmortalLongExact[2]>
     Return v30
   }
@@ -382,14 +394,14 @@ fun jittestmodule:test {
         Stack<2> v11 v12
       }
     }
-    UpdatePrevInstr<idx:11 line_no:3: no parent>
-    v15:LongExact = CallMethod<3> v11 v12 v14 {
-      LiveValues<3> b:v11 unc:v12 b:v14
+    v18:CInt64 = LoadField<ob_size@16, CInt64, borrowed> v14
+    v19:LongExact = PrimitiveBox<CInt64> v18 {
+      LiveValues<1> s:v18
       FrameState {
         CurInstrOffset 22
       }
     }
-    Return v15
+    Return v19
   }
 }
 --- Test Name ---
@@ -492,17 +504,16 @@ fun jittestmodule:test {
         Locals<1> v8
       }
     }
-    v15:Nullptr = LoadConst<Nullptr>
     v16:MortalUnicodeExact["foo"] = LoadConst<MortalUnicodeExact["foo"]>
     UpdatePrevInstr<idx:8 line_no:2: no parent>
-    v17:Bool = CallMethod<4> v14 v15 v8 v16 {
-      LiveValues<4> b:v8 b:v14 unc:v15 b:v16
+    v18:Bool = VectorCall<2> v14 v8 v16 {
+      LiveValues<3> b:v8 b:v14 b:v16
       FrameState {
         CurInstrOffset 16
         Locals<1> v8
       }
     }
-    Return v17
+    Return v18
   }
 }
 --- Test Name ---

cinderx/RuntimeTests/hir_tests/dead_code_elimination_test.txt

@@ -397,8 +397,7 @@ fun jittestmodule:test {
       }
     }
     Snapshot
-    v19:Nullptr = LoadConst<Nullptr>
-    v20:Object = CallMethod<2> v17 v19 {
+    v22:Object = VectorCall<0> v17 {
       FrameState {
         CurInstrOffset 12
         Locals<1> v17

cinderx/RuntimeTests/hir_tests/dynamic_comparison_elimination_test.txt

@@ -341,30 +341,45 @@ fun jittestmodule:test {
       Descr 'LOAD_GLOBAL: str'
     }
     Snapshot
-    v24:Bool = CallMethod<4> v20 v21 v14 v23 {
+    v34:Type = LoadField<ob_type@8, Type, borrowed> v14
+    v35:CBool = PrimitiveCompare<Equal> v34 v23
+    CondBranch<5, 6> v35
+  }
+
+  bb 5 (preds 3) {
+    Branch<7>
+  }
+
+  bb 6 (preds 3) {
+    v36:CBool = IsInstance v14 v23 {
       FrameState {
         CurInstrOffset 24
         Locals<1> v14
       }
     }
+    Branch<7>
+  }
+
+  bb 7 (preds 5, 6) {
+    v37:CBool = Phi<5, 6> v35 v36
+    v38:Bool = PrimitiveBoxBool v37
     Snapshot
-    UseType<Bool> v24
-    v31:ImmortalBool[True] = LoadConst<ImmortalBool[True]>
-    v32:CBool = PrimitiveCompare<Equal> v24 v31
-    v26:Bool = PrimitiveBoxBool v32
+    UseType<Bool> v38
+    v32:ImmortalBool[True] = LoadConst<ImmortalBool[True]>
+    v26:Bool = PrimitiveBoxBool v37
     Snapshot
     v27:ImmortalBool[True] = LoadConst<ImmortalBool[True]>
-    CondBranch<1, 2> v32
+    CondBranch<1, 2> v37
   }
 
-  bb 1 (preds 3) {
+  bb 1 (preds 7) {
     Snapshot
     v29:ImmortalLongExact[1] = LoadConst<ImmortalLongExact[1]>
     Snapshot
     Return v29
   }
 
-  bb 2 (preds 3) {
+  bb 2 (preds 7) {
     Snapshot
     v30:ImmortalNoneType = LoadConst<ImmortalNoneType>
     Return v30

cinderx/RuntimeTests/hir_tests/inliner_elimination_test.txt

@@ -113,13 +113,34 @@ fun jittestmodule:test {
     }
     v11:Nullptr = LoadConst<Nullptr>
     Snapshot
-    v12:Object = CallMethod<2> v10 v11 {
+    v22:Object = LoadField<func_code@48, Object, borrowed> v10
+    v23:MortalCode["foo"] = GuardIs<0xdeadbeef> v22 {
+    }
+    BeginInlinedFunction<jittestmodule:foo> {
+      CurInstrOffset 12
+    }
+    Snapshot
+    v18:CInt64 = LoadEvalBreaker
+    CondBranch<5, 4> v18
+  }
+
+  bb 5 (preds 1) {
+    Snapshot
+    v19:CInt32 = RunPeriodicTasks {
       FrameState {
-        CurInstrOffset 12
+        CurInstrOffset 0
       }
     }
+    Branch<4>
+  }
+
+  bb 4 (preds 1, 5) {
+    Snapshot
+    v20:ImmortalLongExact[4] = LoadConst<ImmortalLongExact[4]>
     Snapshot
-    Return v12
+    EndInlinedFunction
+    Snapshot
+    Return v20
   }
 }
 --- Test Name ---
@@ -288,32 +309,74 @@ fun jittestmodule:test {
     }
     v15:Nullptr = LoadConst<Nullptr>
     Snapshot
-    v16:Object = CallMethod<2> v14 v15 {
+    v32:Object = LoadField<func_code@48, Object, borrowed> v14
+    v33:MortalCode["foo"] = GuardIs<0xdeadbeef> v32 {
+    }
+    BeginInlinedFunction<jittestmodule:foo> {
+      CurInstrOffset 12
+    }
+    Snapshot
+    v28:CInt64 = LoadEvalBreaker
+    CondBranch<5, 4> v28
+  }
+
+  bb 5 (preds 1) {
+    Snapshot
+    v29:CInt32 = RunPeriodicTasks {
       FrameState {
-        CurInstrOffset 12
+        CurInstrOffset 0
       }
     }
+    Branch<4>
+  }
+
+  bb 4 (preds 1, 5) {
+    Snapshot
+    v30:ImmortalLongExact[3] = LoadConst<ImmortalLongExact[3]>
+    Snapshot
+    EndInlinedFunction
     Snapshot
     v17:OptObject = LoadGlobalCached<1; "bar">
     v18:MortalFunc[function:0xdeadbeef] = GuardIs<0xdeadbeef> v17 {
       Descr 'LOAD_GLOBAL: bar'
     }
     v19:Nullptr = LoadConst<Nullptr>
     Snapshot
-    v20:Object = CallMethod<2> v18 v19 {
-      FrameState {
-        CurInstrOffset 30
-        Stack<1> v16
-      }
+    v42:Object = LoadField<func_code@48, Object, borrowed> v18
+    v43:MortalCode["bar"] = GuardIs<0xdeadbeef> v42 {
+    }
+    BeginInlinedFunction<jittestmodule:bar> {
+      CurInstrOffset 30
+      Stack<1> v30
     }
     Snapshot
-    v21:Object = BinaryOp<Add> v16 v20 {
+    v38:CInt64 = LoadEvalBreaker
+    CondBranch<10, 9> v38
+  }
+
+  bb 10 (preds 4) {
+    Snapshot
+    v39:CInt32 = RunPeriodicTasks {
       FrameState {
-        CurInstrOffset 38
+        CurInstrOffset 0
       }
     }
+    Branch<9>
+  }
+
+  bb 9 (preds 4, 10) {
+    Snapshot
+    v40:ImmortalLongExact[4] = LoadConst<ImmortalLongExact[4]>
     Snapshot
-    Return v21
+    EndInlinedFunction
+    Snapshot
+    UseType<LongExact> v30
+    UseType<LongExact> v40
+    UseType<ImmortalLongExact[3]> v30
+    UseType<ImmortalLongExact[4]> v40
+    v45:ImmortalLongExact[7] = LoadConst<ImmortalLongExact[7]>
+    Snapshot
+    Return v45
   }
 }
 --- Test Name ---
@@ -449,13 +512,40 @@ fun jittestmodule:test {
     v14:ImmortalLongExact[3] = LoadConst<ImmortalLongExact[3]>
     Snapshot
     v15:ImmortalUnicodeExact["x"] = LoadConst<ImmortalUnicodeExact["x"]>
-    v16:Object = CallMethod<4> v12 v13 v14 v15 {
+    v32:Object = LoadField<func_code@48, Object, borrowed> v12
+    v33:MortalCode["add"] = GuardIs<0xdeadbeef> v32 {
+    }
+    BeginInlinedFunction<jittestmodule:add> {
+      CurInstrOffset 16
+    }
+    Snapshot
+    v26:CInt64 = LoadEvalBreaker
+    CondBranch<5, 4> v26
+  }
+
+  bb 5 (preds 1) {
+    Snapshot
+    v27:CInt32 = RunPeriodicTasks {
+      FrameState {
+        CurInstrOffset 0
+        Locals<2> v14 v15
+      }
+    }
+    Branch<4>
+  }
+
+  bb 4 (preds 1, 5) {
+    Snapshot
+    v30:Object = BinaryOp<Add> v14 v15 {
       FrameState {
-        CurInstrOffset 16
+        CurInstrOffset 4
+        Locals<2> v14 v15
       }
     }
     Snapshot
-    Return v16
+    EndInlinedFunction
+    Snapshot
+    Return v30
   }
 }
 --- End ---

cinderx/RuntimeTests/hir_tests/inliner_static_test.txt

@@ -595,16 +595,32 @@ fun jittestmodule:test {
       Descr 'LOAD_GLOBAL: bool'
     }
     Snapshot
-    v30:Bool = CallMethod<4> v26 v27 v6 v29 {
+    v34:Type = LoadField<ob_type@8, Type, borrowed> v6
+    v35:CBool = PrimitiveCompare<Equal> v34 v29
+    CondBranch<8, 9> v35
+  }
+
+  bb 8 (preds 4) {
+    Branch<10>
+  }
+
+  bb 9 (preds 4) {
+    v36:CBool = IsInstance v6 v29 {
       FrameState {
         CurInstrOffset 24
         Locals<1> v6
       }
     }
+    Branch<10>
+  }
+
+  bb 10 (preds 8, 9) {
+    v37:CBool = Phi<8, 9> v35 v36
+    v38:Bool = PrimitiveBoxBool v37
     Snapshot
     EndInlinedFunction
     Snapshot
-    Return v30
+    Return v38
   }
 }
 --- End ---