dotnet · TIHan · Jan 31, 2023 · Nov 4, 2022 · Nov 4, 2022 · Nov 4, 2022
diff --git a/src/tests/JIT/opt/And/IntAnd.cs b/src/tests/JIT/opt/And/IntAnd.cs
@@ -18,8 +18,8 @@ static bool Test_UInt32_UInt32_And(uint x, uint y)
         {
             // X64-NOT: movzx
 
-            // We expect 'and r8, r8'.
-            // X64: and [[REG0:[^x]+]], [[REG1:[^x]+]]
+            // We expect 'and reg8, reg8'.
+            // X64: and {{[a-z]+[l|b]}}, {{[a-z]+[l|b]}}
 
             if ((byte)(x & y) == 0)
             {
@@ -34,8 +34,8 @@ static bool Test_UInt32_UInt32_CastByte_And(uint x, uint y)
         {
             // X64-NOT: movzx
 
-            // We expect 'and r8, r8'.
-            // X64: and [[REG0:[^x]+]], [[REG1:[^x]+]]
+            // We expect 'and reg8, reg8'.
+            // X64: and {{[a-z]+[l|b]}}, {{[a-z]+[l|b]}}
 
             if ((byte)((byte)x & y) == 0)
             {
@@ -50,8 +50,8 @@ static bool Test_UInt32_UInt32_CastByte_CastByte_And(uint x, uint y)
         {
             // X64-NOT: movzx
 
-            // We expect 'and r8, r8'.
-            // X64: and [[REG0:[^x]+]], [[REG1:[^x]+]]
+            // We expect 'and reg8, reg8'.
+            // X64: and {{[a-z]+[l|b]}}, {{[a-z]+[l|b]}}
 
             if ((byte)((byte)x & (byte)y) == 0)
             {
@@ -165,9 +165,7 @@ static int Main()
             if (Test_UInt32_UInt32_CastByte_CastByte_And(0b10000000000000000000000000000010, 0b00100000000000000000000000000010))
                 return 0;
 
-            Console.Write("Succeeded");
-
             return 100;
         }
     }
-}
+}
diff --git a/src/tests/JIT/opt/Or/IntOr.cs b/src/tests/JIT/opt/Or/IntOr.cs
@@ -18,8 +18,8 @@ public static bool Test_UInt32_UInt32_CastByte_Or(uint x, uint y)
         {
             // X64-NOT: movzx
 
-            // We expect 'or r8, r8'.
-            // X64: or [[REG0:[a-z]+[l|b]]], [[REG1:[a-z]+[l|b]]]
+            // We expect 'or reg8, reg8'.
+            // X64: or {{[a-z]+[l|b]}}, {{[a-z]+[l|b]}}
 
             if ((byte)((byte)x | y) == 0)
             {
@@ -34,8 +34,8 @@ public static bool Test_UInt32_ByRef_CastByte_CastByte_Or(uint x, ref uint y)
         {
             // X64-NOT: movzx
 
-            // We expect 'or r8, m8'.
-            // X64: or [[REG0:[a-z]+[l|b]]], byte ptr
+            // We expect 'or reg8, mem8'.
+            // X64: or {{[a-z]+[l|b]}}, byte ptr
 
             if ((byte)((byte)x | (byte)y) == 0)
             {
@@ -109,4 +109,4 @@ static int Main()
             return 100;
         }
     }
-}
+}
diff --git a/src/tests/JIT/opt/Subtract/IntSubtract.cs b/src/tests/JIT/opt/Subtract/IntSubtract.cs
@@ -57,35 +57,47 @@ static ushort UInt16_Subtract(ushort x, ushort y)
         [MethodImpl(MethodImplOptions.NoInlining)]
         static int Int32_Subtract(int x, int y)
         {
-            // X64: mov
+            // X64-NOT: movsx
+
             // X64: sub
+
+            // X64-NOT: movsx
 
             return x - y;
         }
 
         [MethodImpl(MethodImplOptions.NoInlining)]
         static uint UInt32_Subtract(uint x, uint y)
         {
-            // X64: mov
+            // X64-NOT: movzx
+
             // X64: sub
+
+            // X64-NOT: movzx
 
             return x - y;
         }
 
         [MethodImpl(MethodImplOptions.NoInlining)]
         static long Int64_Subtract(long x, long y)
         {
-            // X64: mov
+            // X64-NOT: movsx
+
             // X64: sub
+
+            // X64-NOT: movsx
 
             return x - y;
         }
 
         [MethodImpl(MethodImplOptions.NoInlining)]
         static ulong UInt64_Subtract(ulong x, ulong y)
         {
-            // X64: mov
+            // X64-NOT: movzx
+
             // X64: sub
+
+            // X64-NOT: movzx
 
             return x - y;
         }
@@ -151,4 +163,4 @@ static int Main()
             return 100;
         }
     }
-}
+}