arm64: Add bic(s) compact encoding

Change-Id: Ief95d09c2f7bec412b2509e615f7c09e4d228986
dotnet · Jan 22, 2025 · ce3794d · ce3794d
1 parent 1f93ea7
commit ce3794d
Show file tree

Hide file tree

Showing 5 changed files with 246 additions and 1 deletion.
diff --git a/src/coreclr/jit/codegenarm64.cpp b/src/coreclr/jit/codegenarm64.cpp
@@ -2645,6 +2645,12 @@ void CodeGen::genCodeForBinary(GenTreeOp* tree)
                     break;
                 }
 
+                case GT_AND_NOT:
+                {
+                    ins = INS_bics;
+                    break;
+                }
+
                 default:
                 {
                     noway_assert(!"Unexpected BinaryOp with GTF_SET_FLAGS set");

diff --git a/src/coreclr/jit/gentree.cpp b/src/coreclr/jit/gentree.cpp
@@ -19995,7 +19995,7 @@ bool GenTree::SupportsSettingZeroFlag()
     }
 #endif
 #elif defined(TARGET_ARM64)
-    if (OperIs(GT_AND))
+    if (OperIs(GT_AND, GT_AND_NOT))
     {
         return true;
     }

diff --git a/src/coreclr/jit/lowerarmarch.cpp b/src/coreclr/jit/lowerarmarch.cpp
@@ -304,6 +304,11 @@ bool Lowering::IsContainableUnaryOrBinaryOp(GenTree* parentNode, GenTree* childN
             }
         }
 
+        if (childNode->OperIs(GT_LSH, GT_RSH, GT_RSZ) && parentNode->OperIs(GT_AND_NOT))
+        {
+            return true;
+        }
+
         // TODO: Handle CMN, NEG/NEGS, BIC/BICS, EON, MVN, ORN, TST
         return false;
     }

diff --git a/src/tests/JIT/opt/InstructionCombining/BitwiseClearShift.cs b/src/tests/JIT/opt/InstructionCombining/BitwiseClearShift.cs
@@ -0,0 +1,217 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+using System.Runtime.CompilerServices;
+using Xunit;
+
+namespace TestBitwiseClearShift
+{
+    public class Program
+    {
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        [Fact]
+        public static int CheckBitwiseClearShift()
+        {
+            bool fail = false;
+
+            if (!Bic(0xFFFFFFFF, 0x12345678, 0xEDCBA987))
+            {
+                fail = true;
+            }
+
+            if (!BicLSL(0xFFFFFFFF, 0x12345678, 0xDCBA987F))
+            {
+                fail = true;
+            }
+
+            if (!BicLSR(0xFFFFFFFF, 0x12345678, 0xFFFEDCBA))
+            {
+                fail = true;
+            }
+
+            if (!BicASR(0xFFFF, 0x8765, 0xFEF1))
+            {
+                fail = true;
+            }
+
+            if (!BicLargeShift(0xFEFEFEFE, 1, 0xFEFCFEFE))
+            {
+                fail = true;
+            }
+
+            if (!BicLargeShift64Bit(0xFEFEFEFEFEFEFE, 0xFEDCBA98765432, 0xFEFEFEFEF01234))
+            {
+                fail = true;
+            }
+
+            if (Bics(0xFFFFFFFF, 0x100) != -1)
+            {
+                fail = true;
+            }
+
+            if (BicsLSL(0xFFFFFFFF, 1) != -1)
+            {
+                fail = true;
+            }
+
+            if (BicsLSR(0xFFFFFFFF, 0x87654321) != -1)
+            {
+                fail = true;
+            }
+
+            if (BicsASR(0xFFFF, 0x8F6E) != -1)
+            {
+                fail = true;
+            }
+
+            if (BicsLargeShift(0xFFFFFFFF, 0x87654321) != -1)
+            {
+                fail = true;
+            }
+
+            if (BicsLargeShift64Bit(0xFFFFFFFFFFFFFFFF, 0xFEDCBA9876543210) != -1)
+            {
+                fail = true;
+            }
+
+            if (fail)
+            {
+                return 101;
+            }
+            return 100;
+        }
+
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        static bool Bic(uint a, uint b, uint c)
+        {
+            //ARM64-FULL-LINE: bic {{w[0-9]+}}, {{w[0-9]+}}, {{w[0-9]+}}
+            if ((a & ~b) == c)
+            {
+                return true;
+            }
+            return false;
+        }
+
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        static bool BicLSL(uint a, uint b, uint c)
+        {
+            //ARM64-FULL-LINE: bic {{w[0-9]+}}, {{w[0-9]+}}, {{w[0-9]+}}, LSL #4
+            if ((a & ~(b<<4)) == c)
+            {
+                return true;
+            }
+            return false;
+        }
+
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        static bool BicLSR(uint a, uint b, uint c)
+        {
+            //ARM64-FULL-LINE: bic {{w[0-9]+}}, {{w[0-9]+}}, {{w[0-9]+}}, LSR #12
+            if ((a & ~(b>>12)) == c)
+            {
+                return true;
+            }
+            return false;
+        }
+
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        static bool BicASR(int a, int b, int c)
+        {
+            //ARM64-FULL-LINE: bic {{w[0-9]+}}, {{w[0-9]+}}, {{w[0-9]+}}, ASR #7
+            if ((a & ~(b>>7)) == c)
+            {
+                return true;
+            }
+            return false;
+        }
+
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        static bool BicLargeShift(uint a, uint b, uint c)
+        {
+            //ARM64-FULL-LINE: bic {{w[0-9]+}}, {{w[0-9]+}}, {{w[0-9]+}}, LSL #17
+            if ((a & ~(b<<145)) == c)
+            {
+                return true;
+            }
+            return false;
+        }
+
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        static bool BicLargeShift64Bit(long a, long b, long c)
+        {
+            //ARM64-FULL-LINE: bic {{x[0-9]+}}, {{x[0-9]+}}, {{x[0-9]+}}, ASR #36
+            if ((a & ~(b>>292)) == c)
+            {
+                return true;
+            }
+            return false;
+        }
+
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        static int Bics(uint a, uint b)
+        {
+            //ARM64-FULL-LINE: bics {{w[0-9]+}}, {{w[0-9]+}}, {{w[0-9]+}}
+            if ((a & ~b) == 0)
+            {
+                return 1;
+            }
+            return -1;
+        }
+
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        static int BicsLSL(uint a, uint b)
+        {
+            //ARM64-FULL-LINE: bics {{w[0-9]+}}, {{w[0-9]+}}, {{w[0-9]+}}, LSL #31
+            if ((a & ~(b<<31)) == 0)
+            {
+                return 1;
+            }
+            return -1;
+        }
+
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        static int BicsLSR(uint a, uint b)
+        {
+            //ARM64-FULL-LINE: bics {{w[0-9]+}}, {{w[0-9]+}}, {{w[0-9]+}}, LSR #20
+            if ((a & ~(b>>20)) == 0)
+            {
+                return 1;
+            }
+            return -1;
+        }
+
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        static int BicsASR(int a, int b)
+        {
+            //ARM64-FULL-LINE: bics {{w[0-9]+}}, {{w[0-9]+}}, {{w[0-9]+}}, ASR #9
+            if ((a & ~(b>>9)) == 0)
+            {
+                return 1;
+            }
+            return -1;
+        }
+
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        static int BicsLargeShift(uint a, uint b)
+        {
+            //ARM64-FULL-LINE: bics {{w[0-9]+}}, {{w[0-9]+}}, {{w[0-9]+}}, LSR #3
+            if ((a & ~(b>>99)) == 0)
+            {
+                return 1;
+            }
+            return -1;
+        }
+
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        static int BicsLargeShift64Bit(ulong a, ulong b)
+        {
+            //ARM64-FULL-LINE: bics {{x[0-9]+}}, {{x[0-9]+}}, {{x[0-9]+}}, LSL #51
+            if ((a & ~(b<<179)) == 0)
+            {
+                return 1;
+            }
+            return -1;
+        }
+    }
+}
diff --git a/src/tests/JIT/opt/InstructionCombining/BitwiseClearShift.csproj b/src/tests/JIT/opt/InstructionCombining/BitwiseClearShift.csproj
@@ -0,0 +1,17 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <!-- Needed for CLRTestEnvironmentVariable -->
+    <RequiresProcessIsolation>true</RequiresProcessIsolation>
+  </PropertyGroup>
+  <PropertyGroup>
+    <DebugType>None</DebugType>
+    <Optimize>True</Optimize>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="BitwiseClearShift.cs">
+      <HasDisasmCheck>true</HasDisasmCheck>
+    </Compile>
+    <CLRTestEnvironmentVariable Include="DOTNET_TieredCompilation" Value="0" />
+    <CLRTestEnvironmentVariable Include="DOTNET_JITMinOpts" Value="0" />
+  </ItemGroup>
+</Project>