From 0fa7321cb5d574ccbad56edb8e7f0609628f34c2 Mon Sep 17 00:00:00 2001
From: Aman Khalid <amankhalid@microsoft.com>
Date: Fri, 6 Sep 2024 21:02:37 +0000
Subject: [PATCH] JIT ARM64: Don't emit `mov` for zero case in jump tables for
 shift intrinsics (#107322)

---
 src/coreclr/jit/gentree.cpp                   | 10 +++++
 src/coreclr/jit/hwintrinsiccodegenarm64.cpp   | 14 +-----
 .../JitBlue/Runtime_107173/Runtime_107173.cs  | 45 +++++++++++++++++++
 .../Runtime_107173/Runtime_107173.csproj      |  8 ++++
 4 files changed, 65 insertions(+), 12 deletions(-)
 create mode 100644 src/tests/JIT/Regression/JitBlue/Runtime_107173/Runtime_107173.cs
 create mode 100644 src/tests/JIT/Regression/JitBlue/Runtime_107173/Runtime_107173.csproj

diff --git a/src/coreclr/jit/gentree.cpp b/src/coreclr/jit/gentree.cpp
index c60bff8c10202..e021613381de5 100644
--- a/src/coreclr/jit/gentree.cpp
+++ b/src/coreclr/jit/gentree.cpp
@@ -20824,6 +20824,16 @@ GenTree* Compiler::gtNewSimdBinOpNode(
             if (op2->IsCnsIntOrI())
             {
                 op2->AsIntCon()->gtIconVal &= shiftCountMask;
+#ifdef TARGET_ARM64
+                // On ARM64, ShiftRight* intrinsics cannot encode a shift value of zero,
+                // so use the generic Shift* fallback intrinsic.
+                // GenTreeHWIntrinsic::GetHWIntrinsicIdForBinOp will see that the immediate node is not const,
+                // and return the correct fallback intrinsic.
+                if ((op != GT_LSH) && (op2->AsIntCon()->IconValue() == 0))
+                {
+                    op2 = gtNewZeroConNode(type);
+                }
+#endif // TARGET_ARM64
             }
             else
             {
diff --git a/src/coreclr/jit/hwintrinsiccodegenarm64.cpp b/src/coreclr/jit/hwintrinsiccodegenarm64.cpp
index bd5027cd4e02d..d2a4bb4d2caf1 100644
--- a/src/coreclr/jit/hwintrinsiccodegenarm64.cpp
+++ b/src/coreclr/jit/hwintrinsiccodegenarm64.cpp
@@ -434,18 +434,8 @@ void CodeGen::genHWIntrinsic(GenTreeHWIntrinsic* node)
                 for (helper.EmitBegin(); !helper.Done(); helper.EmitCaseEnd())
                 {
                     const int shiftAmount = helper.ImmValue();
-
-                    if (shiftAmount == 0)
-                    {
-                        // TODO: Use emitIns_Mov instead.
-                        //       We do not use it currently because it will still elide the 'mov'
-                        //       even if 'canSkip' is false. We cannot elide the 'mov' here.
-                        GetEmitter()->emitIns_R_R_R(INS_mov, emitTypeSize(node), targetReg, reg, reg);
-                    }
-                    else
-                    {
-                        GetEmitter()->emitIns_R_R_I(ins, emitSize, targetReg, reg, shiftAmount, opt);
-                    }
+                    assert((shiftAmount != 0) || (intrin.category == HW_Category_ShiftLeftByImmediate));
+                    GetEmitter()->emitIns_R_R_I(ins, emitSize, targetReg, reg, shiftAmount, opt);
                 }
             };
 
diff --git a/src/tests/JIT/Regression/JitBlue/Runtime_107173/Runtime_107173.cs b/src/tests/JIT/Regression/JitBlue/Runtime_107173/Runtime_107173.cs
new file mode 100644
index 0000000000000..147b25e47c49d
--- /dev/null
+++ b/src/tests/JIT/Regression/JitBlue/Runtime_107173/Runtime_107173.cs
@@ -0,0 +1,45 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+// Generated by Fuzzlyn v2.4 on 2024-08-26 23:38:13
+// Run on Arm64 Linux
+// Seed: 8716802894387291290-vectort,vector64,vector128,armadvsimd,armadvsimdarm64,armaes,armarmbase,armarmbasearm64,armcrc32,armcrc32arm64,armdp,armrdm,armrdmarm64,armsha1,armsha256
+// Reduced from 19.5 KiB to 0.5 KiB in 00:00:27
+// Debug: Outputs <0, 0, 0, 0>
+// Release: Outputs <0, 0, 4457472, 0>
+using System;
+using System.Numerics;
+using System.Runtime.Intrinsics;
+using System.Runtime.Intrinsics.Arm;
+using Xunit;
+
+public class C0
+{
+    public ushort F2;
+    public ushort F8;
+}
+
+public class Runtime_107173
+{
+    public static C0 s_8 = new C0();
+
+    [Fact]
+    public static void TestLeftShift()
+    {
+        if (AdvSimd.IsSupported)
+        {
+            var vr6 = s_8.F8;
+            var vr7 = s_8.F2;
+            var vr8 = Vector64.Create(vr6, vr7, 0, 0);
+            Vector128<uint> vr9 = AdvSimd.ShiftLeftLogicalWideningLower(vr8, 0);
+            Assert.Equal(vr9, Vector128<uint>.Zero);
+        }
+    }
+
+    [Fact]
+    public static void TestRightShift()
+    {
+        var result = Vector128<byte>.AllBitsSet >> 8;
+        Assert.Equal(result, Vector128<byte>.AllBitsSet);
+    }
+}
\ No newline at end of file
diff --git a/src/tests/JIT/Regression/JitBlue/Runtime_107173/Runtime_107173.csproj b/src/tests/JIT/Regression/JitBlue/Runtime_107173/Runtime_107173.csproj
new file mode 100644
index 0000000000000..de6d5e08882e8
--- /dev/null
+++ b/src/tests/JIT/Regression/JitBlue/Runtime_107173/Runtime_107173.csproj
@@ -0,0 +1,8 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <Optimize>True</Optimize>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="$(MSBuildProjectName).cs" />
+  </ItemGroup>
+</Project>