remove superfluous LowerNode calls

saucecontrol · saucecontrol · commit 6dae5989359c · 2025-03-27T16:29:10.000-07:00
diff --git a/src/coreclr/jit/lowerxarch.cpp b/src/coreclr/jit/lowerxarch.cpp
@@ -1690,7 +1690,7 @@ GenTree* Lowering::LowerHWIntrinsic(GenTreeHWIntrinsic* node)
                 assert(HWIntrinsicInfo::NeedsNormalizeSmallTypeToInt(ternaryLogicId));
                 node->NormalizeJitBaseTypeToInt(ternaryLogicId, simdBaseType);
             }
-            return LowerNode(node);
+            return node;
         }
     }
 
@@ -1929,7 +1929,7 @@ GenTree* Lowering::LowerHWIntrinsic(GenTreeHWIntrinsic* node)
                 node->Op(2) = op2;
 
                 node->ChangeHWIntrinsicId(testIntrinsicId);
-                return LowerNode(node);
+                return node;
             }
             break;
         }
@@ -2039,7 +2039,7 @@ GenTree* Lowering::LowerHWIntrinsic(GenTreeHWIntrinsic* node)
                 }
 
                 node->ChangeHWIntrinsicId(NI_Vector128_GetElement);
-                return LowerNode(node);
+                return node;
             }
             break;
         }
@@ -2706,7 +2706,7 @@ GenTree* Lowering::LowerHWIntrinsicCmpOp(GenTreeHWIntrinsic* node, genTreeOps cm
                 assert(simdSize == 16);
                 LowerHWIntrinsicCC(node, NI_SSE41_PTEST, cmpCnd);
             }
-            return LowerNode(node);
+            return node;
         }
     }
 
@@ -3343,7 +3343,7 @@ GenTree* Lowering::LowerHWIntrinsicCmpOp(GenTreeHWIntrinsic* node, genTreeOps cm
     node->gtType = TYP_VOID;
     node->ClearUnusedValue();
 
-    return LowerNode(node);
+    return node;
 }
 
 //----------------------------------------------------------------------------------------------
@@ -3443,7 +3443,7 @@ GenTree* Lowering::LowerHWIntrinsicCndSel(GenTreeHWIntrinsic* node)
             }
 
             BlockRange().Remove(node);
-            return LowerNode(binOp);
+            return binOp;
         }
         else if (simdSize == 32)
         {
@@ -3472,7 +3472,7 @@ GenTree* Lowering::LowerHWIntrinsicCndSel(GenTreeHWIntrinsic* node)
         {
             // result = BlendVariable op3 (right) op2 (left) op1 (mask)
             node->ResetHWIntrinsicId(blendVariableId, comp, op3, op2, op1);
-            return LowerNode(node);
+            return node;
         }
     }
 
@@ -3496,7 +3496,7 @@ GenTree* Lowering::LowerHWIntrinsicCndSel(GenTreeHWIntrinsic* node)
             assert(HWIntrinsicInfo::NeedsNormalizeSmallTypeToInt(ternaryLogicId));
             node->NormalizeJitBaseTypeToInt(ternaryLogicId, simdBaseType);
         }
-        return LowerNode(node);
+        return node;
     }
 
     // We cannot optimize, so produce unoptimized instructions
@@ -3552,7 +3552,7 @@ GenTree* Lowering::LowerHWIntrinsicCndSel(GenTreeHWIntrinsic* node)
     }
 
     BlockRange().Remove(node);
-    return LowerNode(tmp4);
+    return tmp4;
 }
 
 //----------------------------------------------------------------------------------------------
@@ -4075,7 +4075,7 @@ GenTree* Lowering::LowerHWIntrinsicCreate(GenTreeHWIntrinsic* node)
 
         BlockRange().Remove(node);
 
-        return LowerNode(vecCon);
+        return vecCon;
     }
     else if (argCnt == 1)
     {
@@ -4184,7 +4184,7 @@ GenTree* Lowering::LowerHWIntrinsicCreate(GenTreeHWIntrinsic* node)
                     unreached();
                 }
             }
-            return LowerNode(node);
+            return node;
         }
 
         // We have the following (where simd is simd16 or simd32):
@@ -4209,7 +4209,7 @@ GenTree* Lowering::LowerHWIntrinsicCreate(GenTreeHWIntrinsic* node)
                 LowerNode(tmp1);
 
                 node->ResetHWIntrinsicId(NI_AVX2_BroadcastScalarToVector256, tmp1);
-                return LowerNode(node);
+                return node;
             }
 
             assert(comp->compIsaSupportedDebugOnly(InstructionSet_AVX));
@@ -4254,7 +4254,7 @@ GenTree* Lowering::LowerHWIntrinsicCreate(GenTreeHWIntrinsic* node)
             node->ResetHWIntrinsicId(NI_Vector256_WithUpper, comp, tmp3, tmp1);
             LowerNode(tmp3);
 
-            return LowerNode(node);
+            return node;
         }
 
         assert(intrinsicId == NI_Vector128_Create);
@@ -4283,7 +4283,7 @@ GenTree* Lowering::LowerHWIntrinsicCreate(GenTreeHWIntrinsic* node)
             //   return Avx2.BroadcastScalarToVector128(tmp1);
 
             node->ChangeHWIntrinsicId(NI_AVX2_BroadcastScalarToVector128, tmp1);
-            return LowerNode(node);
+            return node;
         }
 
         switch (simdBaseType)
@@ -4522,7 +4522,7 @@ GenTree* Lowering::LowerHWIntrinsicCreate(GenTreeHWIntrinsic* node)
             }
         }
 
-        return LowerNode(node);
+        return node;
     }
 
     if (intrinsicId == NI_Vector512_Create || intrinsicId == NI_Vector256_Create)
@@ -4588,7 +4588,7 @@ GenTree* Lowering::LowerHWIntrinsicCreate(GenTreeHWIntrinsic* node)
         LowerNode(lo);
         LowerNode(hi);
 
-        return LowerNode(node);
+        return node;
     }
 
     assert(intrinsicId == NI_Vector128_Create);
@@ -4985,7 +4985,7 @@ GenTree* Lowering::LowerHWIntrinsicCreate(GenTreeHWIntrinsic* node)
         }
     }
 
-    return LowerNode(node);
+    return node;
 }
 
 //----------------------------------------------------------------------------------------------
@@ -5029,7 +5029,7 @@ GenTree* Lowering::LowerHWIntrinsicGetElement(GenTreeHWIntrinsic* node)
         }
 
         node->ResetHWIntrinsicId(intrinsicId, op1);
-        return LowerNode(node);
+        return node;
     }
 
     uint32_t count    = simdSize / genTypeSize(simdBaseType);
@@ -5196,7 +5196,7 @@ GenTree* Lowering::LowerHWIntrinsicGetElement(GenTreeHWIntrinsic* node)
         BlockRange().Remove(node);
 
         assert(newAddr->gtNext == newIndir);
-        return LowerNode(newAddr);
+        return newAddr;
     }
 
     if (!op2->OperIsConst())
@@ -5248,7 +5248,7 @@ GenTree* Lowering::LowerHWIntrinsicGetElement(GenTreeHWIntrinsic* node)
                 BlockRange().Remove(op2);
                 BlockRange().Remove(node);
 
-                return LowerNode(lclFld);
+                return lclFld;
             }
         }
 
@@ -5409,7 +5409,7 @@ GenTree* Lowering::LowerHWIntrinsicGetElement(GenTreeHWIntrinsic* node)
         node->SetSimdSize(16);
         node->ResetHWIntrinsicId(NI_Vector128_ToScalar, op1);
 
-        return LowerNode(node);
+        return node;
     }
     else
     {
@@ -6075,7 +6075,7 @@ GenTree* Lowering::LowerHWIntrinsicDot(GenTreeHWIntrinsic* node)
                 }
 
                 BlockRange().Remove(node);
-                return LowerNode(tmp1);
+                return tmp1;
             }
 
             case TYP_DOUBLE:
@@ -6169,7 +6169,7 @@ GenTree* Lowering::LowerHWIntrinsicDot(GenTreeHWIntrinsic* node)
                         node->ResetHWIntrinsicId(NI_Vector128_ToScalar, tmp3);
                     }
 
-                    return LowerNode(node);
+                    return node;
                 }
 
                 horizontalAdd = NI_SSE3_HorizontalAdd;
@@ -6222,7 +6222,7 @@ GenTree* Lowering::LowerHWIntrinsicDot(GenTreeHWIntrinsic* node)
                         node->ResetHWIntrinsicId(NI_Vector128_ToScalar, tmp3);
                     }
 
-                    return LowerNode(node);
+                    return node;
                 }
 
                 horizontalAdd = NI_SSE3_HorizontalAdd;
@@ -6663,7 +6663,7 @@ GenTree* Lowering::LowerHWIntrinsicToScalar(GenTreeHWIntrinsic* node)
             BlockRange().Remove(op1);
             BlockRange().Remove(node);
 
-            return LowerNode(newIndir);
+            return newIndir;
         }
 
         if (op1->OperIs(GT_LCL_VAR, GT_LCL_FLD))
@@ -6693,7 +6693,7 @@ GenTree* Lowering::LowerHWIntrinsicToScalar(GenTreeHWIntrinsic* node)
                 BlockRange().Remove(op1);
                 BlockRange().Remove(node);
 
-                return LowerNode(lclFld);
+                return lclFld;
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -1690,7 +1690,7 @@ GenTree* Lowering::LowerHWIntrinsic(GenTreeHWIntrinsic* node)`
`1690`	`1690`	`assert(HWIntrinsicInfo::NeedsNormalizeSmallTypeToInt(ternaryLogicId));`
`1691`	`1691`	`node->NormalizeJitBaseTypeToInt(ternaryLogicId, simdBaseType);`
`1692`	`1692`	`}`
`1693`		`- return LowerNode(node);`
	`1693`	`+ return node;`
`1694`	`1694`	`}`
`1695`	`1695`	`}`
`1696`	`1696`
`@@ -1929,7 +1929,7 @@ GenTree* Lowering::LowerHWIntrinsic(GenTreeHWIntrinsic* node)`
`1929`	`1929`	`node->Op(2) = op2;`
`1930`	`1930`
`1931`	`1931`	`node->ChangeHWIntrinsicId(testIntrinsicId);`
`1932`		`- return LowerNode(node);`
	`1932`	`+ return node;`
`1933`	`1933`	`}`
`1934`	`1934`	`break;`
`1935`	`1935`	`}`
`@@ -2039,7 +2039,7 @@ GenTree* Lowering::LowerHWIntrinsic(GenTreeHWIntrinsic* node)`
`2039`	`2039`	`}`
`2040`	`2040`
`2041`	`2041`	`node->ChangeHWIntrinsicId(NI_Vector128_GetElement);`
`2042`		`- return LowerNode(node);`
	`2042`	`+ return node;`
`2043`	`2043`	`}`
`2044`	`2044`	`break;`
`2045`	`2045`	`}`
`@@ -2706,7 +2706,7 @@ GenTree* Lowering::LowerHWIntrinsicCmpOp(GenTreeHWIntrinsic* node, genTreeOps cm`
`2706`	`2706`	`assert(simdSize == 16);`
`2707`	`2707`	`LowerHWIntrinsicCC(node, NI_SSE41_PTEST, cmpCnd);`
`2708`	`2708`	`}`
`2709`		`- return LowerNode(node);`
	`2709`	`+ return node;`
`2710`	`2710`	`}`
`2711`	`2711`	`}`
`2712`	`2712`
`@@ -3343,7 +3343,7 @@ GenTree* Lowering::LowerHWIntrinsicCmpOp(GenTreeHWIntrinsic* node, genTreeOps cm`
`3343`	`3343`	`node->gtType = TYP_VOID;`
`3344`	`3344`	`node->ClearUnusedValue();`
`3345`	`3345`
`3346`		`- return LowerNode(node);`
	`3346`	`+ return node;`
`3347`	`3347`	`}`
`3348`	`3348`
`3349`	`3349`	`//----------------------------------------------------------------------------------------------`
`@@ -3443,7 +3443,7 @@ GenTree* Lowering::LowerHWIntrinsicCndSel(GenTreeHWIntrinsic* node)`
`3443`	`3443`	`}`
`3444`	`3444`
`3445`	`3445`	`BlockRange().Remove(node);`
`3446`		`- return LowerNode(binOp);`
	`3446`	`+ return binOp;`
`3447`	`3447`	`}`
`3448`	`3448`	`else if (simdSize == 32)`
`3449`	`3449`	`{`
`@@ -3472,7 +3472,7 @@ GenTree* Lowering::LowerHWIntrinsicCndSel(GenTreeHWIntrinsic* node)`
`3472`	`3472`	`{`
`3473`	`3473`	`// result = BlendVariable op3 (right) op2 (left) op1 (mask)`
`3474`	`3474`	`node->ResetHWIntrinsicId(blendVariableId, comp, op3, op2, op1);`
`3475`		`- return LowerNode(node);`
	`3475`	`+ return node;`
`3476`	`3476`	`}`
`3477`	`3477`	`}`
`3478`	`3478`
`@@ -3496,7 +3496,7 @@ GenTree* Lowering::LowerHWIntrinsicCndSel(GenTreeHWIntrinsic* node)`
`3496`	`3496`	`assert(HWIntrinsicInfo::NeedsNormalizeSmallTypeToInt(ternaryLogicId));`
`3497`	`3497`	`node->NormalizeJitBaseTypeToInt(ternaryLogicId, simdBaseType);`
`3498`	`3498`	`}`
`3499`		`- return LowerNode(node);`
	`3499`	`+ return node;`
`3500`	`3500`	`}`
`3501`	`3501`
`3502`	`3502`	`// We cannot optimize, so produce unoptimized instructions`
`@@ -3552,7 +3552,7 @@ GenTree* Lowering::LowerHWIntrinsicCndSel(GenTreeHWIntrinsic* node)`
`3552`	`3552`	`}`
`3553`	`3553`
`3554`	`3554`	`BlockRange().Remove(node);`
`3555`		`- return LowerNode(tmp4);`
	`3555`	`+ return tmp4;`
`3556`	`3556`	`}`
`3557`	`3557`
`3558`	`3558`	`//----------------------------------------------------------------------------------------------`
`@@ -4075,7 +4075,7 @@ GenTree* Lowering::LowerHWIntrinsicCreate(GenTreeHWIntrinsic* node)`
`4075`	`4075`
`4076`	`4076`	`BlockRange().Remove(node);`
`4077`	`4077`
`4078`		`- return LowerNode(vecCon);`
	`4078`	`+ return vecCon;`
`4079`	`4079`	`}`
`4080`	`4080`	`else if (argCnt == 1)`
`4081`	`4081`	`{`
`@@ -4184,7 +4184,7 @@ GenTree* Lowering::LowerHWIntrinsicCreate(GenTreeHWIntrinsic* node)`
`4184`	`4184`	`unreached();`
`4185`	`4185`	`}`
`4186`	`4186`	`}`
`4187`		`- return LowerNode(node);`
	`4187`	`+ return node;`
`4188`	`4188`	`}`
`4189`	`4189`
`4190`	`4190`	`// We have the following (where simd is simd16 or simd32):`
`@@ -4209,7 +4209,7 @@ GenTree* Lowering::LowerHWIntrinsicCreate(GenTreeHWIntrinsic* node)`
`4209`	`4209`	`LowerNode(tmp1);`
`4210`	`4210`
`4211`	`4211`	`node->ResetHWIntrinsicId(NI_AVX2_BroadcastScalarToVector256, tmp1);`
`4212`		`- return LowerNode(node);`
	`4212`	`+ return node;`
`4213`	`4213`	`}`
`4214`	`4214`
`4215`	`4215`	`assert(comp->compIsaSupportedDebugOnly(InstructionSet_AVX));`
`@@ -4254,7 +4254,7 @@ GenTree* Lowering::LowerHWIntrinsicCreate(GenTreeHWIntrinsic* node)`
`4254`	`4254`	`node->ResetHWIntrinsicId(NI_Vector256_WithUpper, comp, tmp3, tmp1);`
`4255`	`4255`	`LowerNode(tmp3);`
`4256`	`4256`
`4257`		`- return LowerNode(node);`
	`4257`	`+ return node;`
`4258`	`4258`	`}`
`4259`	`4259`
`4260`	`4260`	`assert(intrinsicId == NI_Vector128_Create);`
`@@ -4283,7 +4283,7 @@ GenTree* Lowering::LowerHWIntrinsicCreate(GenTreeHWIntrinsic* node)`
`4283`	`4283`	`// return Avx2.BroadcastScalarToVector128(tmp1);`
`4284`	`4284`
`4285`	`4285`	`node->ChangeHWIntrinsicId(NI_AVX2_BroadcastScalarToVector128, tmp1);`
`4286`		`- return LowerNode(node);`
	`4286`	`+ return node;`
`4287`	`4287`	`}`
`4288`	`4288`
`4289`	`4289`	`switch (simdBaseType)`
`@@ -4522,7 +4522,7 @@ GenTree* Lowering::LowerHWIntrinsicCreate(GenTreeHWIntrinsic* node)`
`4522`	`4522`	`}`
`4523`	`4523`	`}`
`4524`	`4524`
`4525`		`- return LowerNode(node);`
	`4525`	`+ return node;`
`4526`	`4526`	`}`
`4527`	`4527`
`4528`	`4528`	`if (intrinsicId == NI_Vector512_Create \|\| intrinsicId == NI_Vector256_Create)`
`@@ -4588,7 +4588,7 @@ GenTree* Lowering::LowerHWIntrinsicCreate(GenTreeHWIntrinsic* node)`
`4588`	`4588`	`LowerNode(lo);`
`4589`	`4589`	`LowerNode(hi);`
`4590`	`4590`
`4591`		`- return LowerNode(node);`
	`4591`	`+ return node;`
`4592`	`4592`	`}`
`4593`	`4593`
`4594`	`4594`	`assert(intrinsicId == NI_Vector128_Create);`
`@@ -4985,7 +4985,7 @@ GenTree* Lowering::LowerHWIntrinsicCreate(GenTreeHWIntrinsic* node)`
`4985`	`4985`	`}`
`4986`	`4986`	`}`
`4987`	`4987`
`4988`		`- return LowerNode(node);`
	`4988`	`+ return node;`
`4989`	`4989`	`}`
`4990`	`4990`
`4991`	`4991`	`//----------------------------------------------------------------------------------------------`
`@@ -5029,7 +5029,7 @@ GenTree* Lowering::LowerHWIntrinsicGetElement(GenTreeHWIntrinsic* node)`
`5029`	`5029`	`}`
`5030`	`5030`
`5031`	`5031`	`node->ResetHWIntrinsicId(intrinsicId, op1);`
`5032`		`- return LowerNode(node);`
	`5032`	`+ return node;`
`5033`	`5033`	`}`
`5034`	`5034`
`5035`	`5035`	`uint32_t count = simdSize / genTypeSize(simdBaseType);`
`@@ -5196,7 +5196,7 @@ GenTree* Lowering::LowerHWIntrinsicGetElement(GenTreeHWIntrinsic* node)`
`5196`	`5196`	`BlockRange().Remove(node);`
`5197`	`5197`
`5198`	`5198`	`assert(newAddr->gtNext == newIndir);`
`5199`		`- return LowerNode(newAddr);`
	`5199`	`+ return newAddr;`
`5200`	`5200`	`}`
`5201`	`5201`
`5202`	`5202`	`if (!op2->OperIsConst())`
`@@ -5248,7 +5248,7 @@ GenTree* Lowering::LowerHWIntrinsicGetElement(GenTreeHWIntrinsic* node)`
`5248`	`5248`	`BlockRange().Remove(op2);`
`5249`	`5249`	`BlockRange().Remove(node);`
`5250`	`5250`
`5251`		`- return LowerNode(lclFld);`
	`5251`	`+ return lclFld;`
`5252`	`5252`	`}`
`5253`	`5253`	`}`
`5254`	`5254`
`@@ -5409,7 +5409,7 @@ GenTree* Lowering::LowerHWIntrinsicGetElement(GenTreeHWIntrinsic* node)`
`5409`	`5409`	`node->SetSimdSize(16);`
`5410`	`5410`	`node->ResetHWIntrinsicId(NI_Vector128_ToScalar, op1);`
`5411`	`5411`
`5412`		`- return LowerNode(node);`
	`5412`	`+ return node;`
`5413`	`5413`	`}`
`5414`	`5414`	`else`
`5415`	`5415`	`{`
`@@ -6075,7 +6075,7 @@ GenTree* Lowering::LowerHWIntrinsicDot(GenTreeHWIntrinsic* node)`
`6075`	`6075`	`}`
`6076`	`6076`
`6077`	`6077`	`BlockRange().Remove(node);`
`6078`		`- return LowerNode(tmp1);`
	`6078`	`+ return tmp1;`
`6079`	`6079`	`}`
`6080`	`6080`
`6081`	`6081`	`case TYP_DOUBLE:`
`@@ -6169,7 +6169,7 @@ GenTree* Lowering::LowerHWIntrinsicDot(GenTreeHWIntrinsic* node)`
`6169`	`6169`	`node->ResetHWIntrinsicId(NI_Vector128_ToScalar, tmp3);`
`6170`	`6170`	`}`
`6171`	`6171`
`6172`		`- return LowerNode(node);`
	`6172`	`+ return node;`
`6173`	`6173`	`}`
`6174`	`6174`
`6175`	`6175`	`horizontalAdd = NI_SSE3_HorizontalAdd;`
`@@ -6222,7 +6222,7 @@ GenTree* Lowering::LowerHWIntrinsicDot(GenTreeHWIntrinsic* node)`
`6222`	`6222`	`node->ResetHWIntrinsicId(NI_Vector128_ToScalar, tmp3);`
`6223`	`6223`	`}`
`6224`	`6224`
`6225`		`- return LowerNode(node);`
	`6225`	`+ return node;`
`6226`	`6226`	`}`
`6227`	`6227`
`6228`	`6228`	`horizontalAdd = NI_SSE3_HorizontalAdd;`
`@@ -6663,7 +6663,7 @@ GenTree* Lowering::LowerHWIntrinsicToScalar(GenTreeHWIntrinsic* node)`
`6663`	`6663`	`BlockRange().Remove(op1);`
`6664`	`6664`	`BlockRange().Remove(node);`
`6665`	`6665`
`6666`		`- return LowerNode(newIndir);`
	`6666`	`+ return newIndir;`
`6667`	`6667`	`}`
`6668`	`6668`
`6669`	`6669`	`if (op1->OperIs(GT_LCL_VAR, GT_LCL_FLD))`
`@@ -6693,7 +6693,7 @@ GenTree* Lowering::LowerHWIntrinsicToScalar(GenTreeHWIntrinsic* node)`
`6693`	`6693`	`BlockRange().Remove(op1);`
`6694`	`6694`	`BlockRange().Remove(node);`
`6695`	`6695`
`6696`		`- return LowerNode(lclFld);`
	`6696`	`+ return lclFld;`
`6697`	`6697`	`}`
`6698`	`6698`	`}`
`6699`	`6699`	`}`