Fixing build errors.

dotnet · Nov 12, 2024 · eb47ede · eb47ede
1 parent 23dd7d9
commit eb47ede
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 6 deletions.
diff --git a/src/coreclr/jit/codegenxarch.cpp b/src/coreclr/jit/codegenxarch.cpp
@@ -775,8 +775,11 @@ void CodeGen::genCodeForNegNot(GenTree* tree)
         assert(operand->isUsedFromReg());
         regNumber operandReg = genConsumeReg(operand);
         instruction ins = genGetInsForOper(tree->OperGet(), targetType);
-
-        if (JitConfig.JitEnableApxNDD() && GetEmitter()->IsApxNDDEncodableInstruction(ins) && (targetReg != operandReg))
+        if (
+#ifdef DEBUG
+            JitConfig.JitEnableApxNDD() &&
+#endif
+            GetEmitter()->IsApxNDDEncodableInstruction(ins) && (targetReg != operandReg))
         {
             GetEmitter()->emitIns_R_R(ins, emitTypeSize(operand), targetReg, operandReg, INS_OPTS_EVEX_nd);
         }
@@ -1201,7 +1204,11 @@ void CodeGen::genCodeForBinary(GenTreeOp* treeNode)
     // reg3 = reg3 op reg2
     else
     {
-        if (JitConfig.JitEnableApxNDD() && emit->IsApxNDDEncodableInstruction(ins) && !varTypeIsFloating(treeNode))
+        if (
+#ifdef DEBUG
+            JitConfig.JitEnableApxNDD() &&
+#endif
+            emit->IsApxNDDEncodableInstruction(ins) && !varTypeIsFloating(treeNode))
         {
             // TODO-xarch-apx:
             // APX can provide optimal code gen in this case using NDD feature:
@@ -1376,7 +1383,11 @@ void CodeGen::genCodeForMul(GenTreeOp* treeNode)
         }
         assert(regOp->isUsedFromReg());
 
-        if (JitConfig.JitEnableApxNDD() && emit->IsApxNDDEncodableInstruction(ins) && regOp->GetRegNum() != mulTargetReg)
+        if (
+#ifdef DEBUG
+            JitConfig.JitEnableApxNDD() &&
+#endif
+            emit->IsApxNDDEncodableInstruction(ins) && regOp->GetRegNum() != mulTargetReg)
         {
             // use NDD form to optimize this form:
             // mov  targetReg, regOp
@@ -4947,7 +4958,11 @@ void CodeGen::genCodeForShift(GenTree* tree)
             }
 
 
-            if (JitConfig.JitEnableApxNDD() && GetEmitter()->IsApxNDDEncodableInstruction(ins) && (tree->GetRegNum() != operandReg))
+            if (
+#ifdef DEBUG
+                JitConfig.JitEnableApxNDD() &&
+#endif
+                GetEmitter()->IsApxNDDEncodableInstruction(ins) && (tree->GetRegNum() != operandReg))
             {
                 ins = genMapShiftInsToShiftByConstantIns(ins, shiftByValue);
                 // If APX is available, we can use NDD to optimize the case when LSRA failed to avoid explicit mov.
@@ -5009,7 +5024,11 @@ void CodeGen::genCodeForShift(GenTree* tree)
         // The operand to be shifted must not be in ECX
         noway_assert(operandReg != REG_RCX);
 
-        if (JitConfig.JitEnableApxNDD() && GetEmitter()->IsApxNDDEncodableInstruction(ins) && (tree->GetRegNum() != operandReg))
+        if (
+#ifdef DEBUG
+            JitConfig.JitEnableApxNDD() &&
+#endif
+            GetEmitter()->IsApxNDDEncodableInstruction(ins) && (tree->GetRegNum() != operandReg))
         {
             // If APX is available, we can use NDD to optimize the case when LSRA failed to avoid explicit mov.
             // this case might be rarely hit.

diff --git a/src/coreclr/jit/compiler.h b/src/coreclr/jit/compiler.h
@@ -9895,10 +9895,12 @@ class Compiler
     //
     bool canUseApxEncodings() const
     {
+#ifdef DEBUG
         if(JitConfig.JitBypassAPXCheck())
         {
             return true;
         }
+#endif
         return compOpportunisticallyDependsOn(InstructionSet_APX);
     }