Ensure negation for mask producing compares can kick in

Author: tannergooding

src/coreclr/jit/morph.cpp

@@ -9428,14 +9428,6 @@ GenTree* Compiler::fgOptimizeHWIntrinsic(GenTreeHWIntrinsic* node)
 
         default:
         {
-#if defined(FEATURE_MASKED_HW_INTRINSICS)
-            GenTreeHWIntrinsic* maskedIntrinsic = fgOptimizeForMaskedIntrinsic(node);
-            if (maskedIntrinsic != nullptr)
-            {
-                node = maskedIntrinsic;
-                node->SetMorphed(this);
-            }
-#endif // FEATURE_MASKED_HW_INTRINSICS
             break;
         }
     }
@@ -9870,14 +9862,14 @@ GenTree* Compiler::fgOptimizeHWIntrinsic(GenTreeHWIntrinsic* node)
                 return result;
             }
 
-            if (GenTree::OperIsCompare(oper))
+            if (GenTree::OperIsCompare(op1Oper))
             {
                 assert(op1Intrin->GetOperandCount() == 2);
 
                 GenTree* cmpOp1 = op1Intrin->Op(1);
                 GenTree* cmpOp2 = op1Intrin->Op(2);
 
-                genTreeOps newOper = GenTree::ReverseRelop(oper);
+                genTreeOps newOper = GenTree::ReverseRelop(op1Oper);
                 var_types  lookupType =
                     GenTreeHWIntrinsic::GetLookupTypeForCmpOp(this, newOper, op1RetType, op1SimdBaseType, op1SimdSize);
                 NamedIntrinsic newId =
@@ -9981,6 +9973,16 @@ GenTree* Compiler::fgOptimizeHWIntrinsic(GenTreeHWIntrinsic* node)
         }
     }
 
+#if defined(FEATURE_MASKED_HW_INTRINSICS)
+    GenTreeHWIntrinsic* maskedIntrinsic = fgOptimizeForMaskedIntrinsic(node);
+
+    if (maskedIntrinsic != nullptr)
+    {
+        node = maskedIntrinsic;
+        node->SetMorphed(this);
+    }
+#endif // FEATURE_MASKED_HW_INTRINSICS
+
     return node;
 }