Change check

Author: DeepakRajendrakumaran

src/coreclr/jit/emit.cpp

@@ -3782,6 +3782,12 @@ const IS_INFO emitter::emitGetSchedInfo(insFormat insFmt)
     assert(!"Unsupported insFmt");
     return IS_NONE;
 }
+
+bool emitter::HasApxPpx(instruction ins)
+{
+    insFlags flags = CodeGenInterface::instInfo[ins];
+    return (flags & INS_Flags_Has_PPX) != 0;
+}
 #endif // TARGET_XARCH
 
 //------------------------------------------------------------------------

src/coreclr/jit/emit.h

@@ -1795,7 +1795,7 @@ class emitter
 
         bool idIsEvexNfContextSet() const
         {
-            return _idEvexNfContext != 0;
+            return (_idEvexNfContext != 0) && !(HasApxPpx(_idIns));
         }
 
         void idSetEvexNfContext()
@@ -2394,6 +2394,7 @@ class emitter
     int emitGetInsCDinfo(instrDesc* id);
 
     static const IS_INFO emitGetSchedInfo(insFormat f);
+    static bool          HasApxPpx(instruction ins);
 #endif // TARGET_XARCH
 
     cnsval_ssize_t emitGetInsSC(const instrDesc* id) const;

src/coreclr/jit/emitxarch.cpp

@@ -256,12 +256,6 @@ bool emitter::HasApxNf(instruction ins)
     return (flags & INS_Flags_Has_NF) != 0;
 }
 
-bool emitter::HasApxPpx(instruction ins)
-{
-    insFlags flags = CodeGenInterface::instInfo[ins];
-    return (flags & INS_Flags_Has_PPX) != 0;
-}
-
 bool emitter::IsVexEncodableInstruction(instruction ins) const
 {
     if (!UseVEXEncoding())
@@ -414,27 +408,6 @@ bool emitter::IsApxNFEncodableInstruction(instruction ins) const
     return HasApxNf(ins);
 }
 
-//------------------------------------------------------------------------
-// IsApxNFToBeSet: is idIsEvexNfContextSet() true for this instruction and not a PPX instruction.
-//
-// Arguments:
-//    id - The instruction descriptor to check.
-//
-// Returns:
-//    `true` if ins is EVEX.NF flag is to be set.
-//
-bool emitter::IsApxNFToBeSet(const instrDesc* id) const
-{
-#ifdef TARGET_AMD64
-    if (id->idIsEvexNfContextSet() && !HasApxPpx(id->idIns()))
-    {
-        return true;
-    }
-#endif
-
-    return false;
-}
-
 //------------------------------------------------------------------------
 // IsApxExtendedEvexInstruction: Answer the question - does this instruction have apx extended evex form.
 //
@@ -1842,7 +1815,7 @@ bool emitter::TakesEvexPrefix(const instrDesc* id) const
         return true;
     }
 
-    if (IsApxNFToBeSet(id) && IsBMIInstruction(ins))
+    if (id->idIsEvexNfContextSet() && IsBMIInstruction(ins))
     {
         // Only a few BMI instructions shall be promoted to APX-EVEX due to NF feature.
         // TODO-XArch-APX: convert the check into forms like Has* as above.
@@ -2003,7 +1976,7 @@ bool emitter::TakesApxExtendedEvexPrefix(const instrDesc* id) const
         return true;
     }
 
-    if (IsApxNFToBeSet(id))
+    if (id->idIsEvexNfContextSet())
     {
         return true;
     }
@@ -2121,7 +2094,7 @@ emitter::code_t emitter::AddEvexPrefix(const instrDesc* id, code_t code, emitAtt
             code |= ND_BIT_IN_BYTE_EVEX_PREFIX;
         }
 
-        if (IsApxNFToBeSet(id))
+        if (id->idIsEvexNfContextSet())
         {
             code |= NF_BIT_IN_BYTE_EVEX_PREFIX;
         }
@@ -12694,7 +12667,7 @@ void emitter::emitDispIns(
     /* Display the instruction name */
 
 #ifdef TARGET_AMD64
-    if (IsApxNFEncodableInstruction(id->idIns()) && IsApxNFToBeSet(id))
+    if (IsApxNFEncodableInstruction(id->idIns()) && id->idIsEvexNfContextSet())
     {
         // print the EVEX.NF indication in psudeo prefix style.
         printf("{nf}    ");

src/coreclr/jit/emitxarch.h

@@ -132,13 +132,11 @@ static regNumber getSseShiftRegNumber(instruction ins);
 static bool      HasRex2Encoding(instruction ins);
 static bool      HasApxNdd(instruction ins);
 static bool      HasApxNf(instruction ins);
-static bool      HasApxPpx(instruction ins);
 bool             IsVexEncodableInstruction(instruction ins) const;
 bool             IsEvexEncodableInstruction(instruction ins) const;
 bool             IsRex2EncodableInstruction(instruction ins) const;
 bool             IsApxNDDEncodableInstruction(instruction ins) const;
 bool             IsApxNFEncodableInstruction(instruction ins) const;
-bool             IsApxNFToBeSet(const instrDesc* id) const;
 bool             IsApxExtendedEvexInstruction(instruction ins) const;
 bool             IsShiftInstruction(instruction ins) const;
 bool             IsLegacyMap1(code_t code) const;