[llvm] a23e01a - [AMDGPU] Fix -Wenum-compare warnings

Bjorn Pettersson via llvm-commits llvm-commits at lists.llvm.org
Wed Aug 23 05:27:44 PDT 2023


Author: Bjorn Pettersson
Date: 2023-08-23T14:24:30+02:00
New Revision: a23e01ada70ef2e0f12a03ed279f409f093e066e

URL: https://github.com/llvm/llvm-project/commit/a23e01ada70ef2e0f12a03ed279f409f093e066e
DIFF: https://github.com/llvm/llvm-project/commit/a23e01ada70ef2e0f12a03ed279f409f093e066e.diff

LOG: [AMDGPU] Fix -Wenum-compare warnings

Avoiding warnings like this when building with GCC:
  warning: enumeral mismatch in conditional expression:
  'llvm::AMDGPUISD::NodeType' vs 'llvm::ISD::NodeType'
  [-Wenum-compare]

Added: 
    

Modified: 
    llvm/lib/Target/AMDGPU/AMDGPUISelLowering.cpp

Removed: 
    


################################################################################
diff  --git a/llvm/lib/Target/AMDGPU/AMDGPUISelLowering.cpp b/llvm/lib/Target/AMDGPU/AMDGPUISelLowering.cpp
index 6c709df25407dc..6c1774d1e90e80 100644
--- a/llvm/lib/Target/AMDGPU/AMDGPUISelLowering.cpp
+++ b/llvm/lib/Target/AMDGPU/AMDGPUISelLowering.cpp
@@ -2703,7 +2703,8 @@ SDValue AMDGPUTargetLowering::LowerFLOGUnsafe(SDValue Src, const SDLoc &SL,
                                               SelectionDAG &DAG, bool IsLog10,
                                               SDNodeFlags Flags) const {
   EVT VT = Src.getValueType();
-  unsigned LogOp = VT == MVT::f32 ? AMDGPUISD::LOG : ISD::FLOG2;
+  unsigned LogOp =
+      VT == MVT::f32 ? (unsigned)AMDGPUISD::LOG : (unsigned)ISD::FLOG2;
 
   double Log2BaseInverted =
       IsLog10 ? numbers::ln2 / numbers::ln10 : numbers::ln2;
@@ -2797,8 +2798,9 @@ SDValue AMDGPUTargetLowering::lowerFEXPUnsafe(SDValue X, const SDLoc &SL,
   if (VT != MVT::f32 || !needsDenormHandlingF32(DAG, X, Flags)) {
     // exp2(M_LOG2E_F * f);
     SDValue Mul = DAG.getNode(ISD::FMUL, SL, VT, X, Log2E, Flags);
-    return DAG.getNode(VT == MVT::f32 ? AMDGPUISD::EXP : ISD::FEXP2, SL, VT,
-                       Mul, Flags);
+    return DAG.getNode(VT == MVT::f32 ? (unsigned)AMDGPUISD::EXP
+                                      : (unsigned)ISD::FEXP2,
+                       SL, VT, Mul, Flags);
   }
 
   EVT SetCCVT = getSetCCResultType(DAG.getDataLayout(), *DAG.getContext(), VT);


        


More information about the llvm-commits mailing list