Review edits

Author: anthonycanino

src/coreclr/jit/codegenxarch.cpp

@@ -9499,8 +9499,6 @@ void CodeGen::genAmd64EmitterUnitTestsCCMP()
     emitter* theEmitter = GetEmitter();
     genDefineTempLabel(genCreateTempLabel());
 
-    // #ifdef COMMENTOUT
-
     // ============
     // Test RR form
     // ============
@@ -9568,7 +9566,6 @@ void CodeGen::genAmd64EmitterUnitTestsCCMP()
     CORINFO_FIELD_HANDLE hnd = theEmitter->emitFltOrDblConst(1.0f, EA_4BYTE);
     theEmitter->emitIns_R_C(INS_ccmpe, EA_4BYTE, REG_RAX, hnd, 0, INS_OPTS_EVEX_dfv_cf);
     theEmitter->emitIns_R_C(INS_ccmpe, EA_4BYTE, REG_RAX, hnd, 4, INS_OPTS_EVEX_dfv_cf);
-    // #endif
 }
 
 #endif // defined(DEBUG) && defined(TARGET_AMD64)

src/coreclr/jit/emit.h

@@ -1770,6 +1770,8 @@ class emitter
             _idCustom2 = ((value >> 1) & 1);
             _idCustom3 = ((value >> 2) & 1);
             _idCustom4 = ((value >> 3) & 1);
+
+            assert(value == idGetEvexDFV());
         }
 #endif
 

src/coreclr/jit/emitxarch.h

@@ -581,12 +581,16 @@ void SetEvexNfIfNeeded(instrDesc* id, insOpts instOptions)
 //
 void SetEvexDFVIfNeeded(instrDesc* id, insOpts instOptions)
 {
+#if defined(TARGET_AMD64)
     if ((instOptions & INS_OPTS_EVEX_dfv_MASK) != 0)
     {
         assert(UsePromotedEVEXEncoding());
         assert(IsCCMP(id->idIns()));
         id->idSetEvexDFV(instOptions);
     }
+#else
+    return true;
+#endif
 }
 
 //------------------------------------------------------------------------