JIT ARM64-SVE: Always convert to mask for mask APIs (#106690)

dotnet · Aug 22, 2024 · 410c154 · 410c154
1 parent 1c3efce
commit 410c154
Showing 1 changed file with 10 additions and 12 deletions.
diff --git a/src/coreclr/jit/hwintrinsic.cpp b/src/coreclr/jit/hwintrinsic.cpp
@@ -2261,13 +2261,6 @@ GenTree* Compiler::impHWIntrinsic(NamedIntrinsic        intrinsic,
     }
 
 #if defined(FEATURE_MASKED_HW_INTRINSICS) && defined(TARGET_ARM64)
-    auto convertToMaskIfNeeded = [&](GenTree*& op) {
-        if (!varTypeIsMask(op))
-        {
-            op = gtNewSimdCvtVectorToMaskNode(TYP_MASK, op, simdBaseJitType, simdSize);
-        }
-    };
-
     if (HWIntrinsicInfo::IsExplicitMaskedOperation(intrinsic))
     {
         assert(numArgs > 0);
@@ -2278,7 +2271,8 @@ GenTree* Compiler::impHWIntrinsic(NamedIntrinsic        intrinsic,
             case NI_Sve_CreateBreakBeforePropagateMask:
             {
                 // HWInstrinsic requires a mask for op3
-                convertToMaskIfNeeded(retNode->AsHWIntrinsic()->Op(3));
+                GenTree*& op = retNode->AsHWIntrinsic()->Op(3);
+                op           = gtNewSimdCvtVectorToMaskNode(TYP_MASK, op, simdBaseJitType, simdSize);
                 FALLTHROUGH;
             }
             case NI_Sve_CreateBreakAfterMask:
@@ -2291,13 +2285,15 @@ GenTree* Compiler::impHWIntrinsic(NamedIntrinsic        intrinsic,
             case NI_Sve_TestLastTrue:
             {
                 // HWInstrinsic requires a mask for op2
-                convertToMaskIfNeeded(retNode->AsHWIntrinsic()->Op(2));
+                GenTree*& op = retNode->AsHWIntrinsic()->Op(2);
+                op           = gtNewSimdCvtVectorToMaskNode(TYP_MASK, op, simdBaseJitType, simdSize);
                 FALLTHROUGH;
             }
             default:
             {
                 // HWInstrinsic requires a mask for op1
-                convertToMaskIfNeeded(retNode->AsHWIntrinsic()->Op(1));
+                GenTree*& op = retNode->AsHWIntrinsic()->Op(1);
+                op           = gtNewSimdCvtVectorToMaskNode(TYP_MASK, op, simdBaseJitType, simdSize);
                 break;
             }
         }
@@ -2317,8 +2313,10 @@ GenTree* Compiler::impHWIntrinsic(NamedIntrinsic        intrinsic,
         {
             case NI_Sve_CreateBreakPropagateMask:
             {
-                convertToMaskIfNeeded(retNode->AsHWIntrinsic()->Op(1));
-                convertToMaskIfNeeded(retNode->AsHWIntrinsic()->Op(2));
+                GenTree*& op1 = retNode->AsHWIntrinsic()->Op(1);
+                GenTree*& op2 = retNode->AsHWIntrinsic()->Op(2);
+                op1           = gtNewSimdCvtVectorToMaskNode(TYP_MASK, op1, simdBaseJitType, simdSize);
+                op2           = gtNewSimdCvtVectorToMaskNode(TYP_MASK, op2, simdBaseJitType, simdSize);
                 break;
             }