Clean up + Revert "Add APX knob"

DeepakRajendrakumaran · DeepakRajendrakumaran · commit bc308aa4f12d · 2025-06-16T11:08:20.000-07:00
diff --git a/src/coreclr/jit/compiler.h b/src/coreclr/jit/compiler.h
@@ -9729,12 +9729,6 @@ class Compiler
     //
     bool canUseApxEncoding() const
     {
-#ifdef DEBUG
-        if (JitConfig.JitBypassApxCheck())
-        {
-            return true;
-        }
-#endif
         return compOpportunisticallyDependsOn(InstructionSet_APX);
     }
 
diff --git a/src/coreclr/jit/emitxarch.cpp b/src/coreclr/jit/emitxarch.cpp
@@ -3599,10 +3599,6 @@ unsigned emitter::emitGetAdjustedSize(instrDesc* id, code_t code) const
         {
             prefixAdjustedSize = emitGetEvexPrefixSize(id);
             assert(prefixAdjustedSize == 4);
-            /*if (IsApxOnlyInstruction(ins))
-            {
-                return prefixAdjustedSize;
-            }*/
         }
         else
         {
diff --git a/src/coreclr/jit/jitconfigvalues.h b/src/coreclr/jit/jitconfigvalues.h
@@ -372,7 +372,6 @@ RELEASE_CONFIG_INTEGER(JitNoInline, "JitNoInline", 0)
 
 #if defined(DEBUG)
 CONFIG_INTEGER(JitStressRex2Encoding, "JitStressRex2Encoding", 0) // Enable rex2 encoding for compatible instructions.
-CONFIG_INTEGER(JitBypassApxCheck, "JitBypassApxCheck", 0)
 CONFIG_INTEGER(JitStressPromotedEvexEncoding, "JitStressPromotedEvexEncoding", 0) // Enable promoted EVEX encoding for
                                                                                   // compatible instructions.
 #endif

Original file line number	Diff line number	Diff line change
`@@ -9729,12 +9729,6 @@ class Compiler`
`9729`	`9729`	`//`
`9730`	`9730`	`bool canUseApxEncoding() const`
`9731`	`9731`	`{`
`9732`		`-#ifdef DEBUG`
`9733`		`- if (JitConfig.JitBypassApxCheck())`
`9734`		`- {`
`9735`		`- return true;`
`9736`		`- }`
`9737`		`-#endif`
`9738`	`9732`	`return compOpportunisticallyDependsOn(InstructionSet_APX);`
`9739`	`9733`	`}`
`9740`	`9734`
Original file line number	Diff line number	Diff line change
`@@ -3599,10 +3599,6 @@ unsigned emitter::emitGetAdjustedSize(instrDesc* id, code_t code) const`
`3599`	`3599`	`{`
`3600`	`3600`	`prefixAdjustedSize = emitGetEvexPrefixSize(id);`
`3601`	`3601`	`assert(prefixAdjustedSize == 4);`
`3602`		`- /*if (IsApxOnlyInstruction(ins))`
`3603`		`- {`
`3604`		`- return prefixAdjustedSize;`
`3605`		`- }*/`
`3606`	`3602`	`}`
`3607`	`3603`	`else`
`3608`	`3604`	`{`