move isRenamedInGFX9 to be static and add helper macro for case prefixes

Author: CRobeck

llvm/lib/Target/AMDGPU/SIInstrInfo.cpp

@@ -9115,68 +9115,31 @@ bool SIInstrInfo::isAsmOnlyOpcode(int MCOp) const {
   }
 }
 
-bool SIInstrInfo::isRenamedInGFX9(int Opcode) const {
+#define GENERATE_RENAMED_GFX9_CASES(OPCODE)                                    \
+  case OPCODE##_dpp:                                                           \
+  case OPCODE##_e32:                                                           \
+  case OPCODE##_e64:                                                           \
+  case OPCODE##_e64_dpp:                                                       \
+  case OPCODE##_sdwa:
+
+static bool isRenamedInGFX9(int Opcode) {
   switch (Opcode) {
-  case AMDGPU::V_ADDC_U32_dpp:
-  case AMDGPU::V_ADDC_U32_e32:
-  case AMDGPU::V_ADDC_U32_e64:
-  case AMDGPU::V_ADDC_U32_e64_dpp:
-  case AMDGPU::V_ADDC_U32_sdwa:
-  //
-  case AMDGPU::V_ADD_CO_U32_dpp:
-  case AMDGPU::V_ADD_CO_U32_e32:
-  case AMDGPU::V_ADD_CO_U32_e64:
-  case AMDGPU::V_ADD_CO_U32_e64_dpp:
-  case AMDGPU::V_ADD_CO_U32_sdwa:
-  //
-  case AMDGPU::V_ADD_U32_dpp:
-  case AMDGPU::V_ADD_U32_e32:
-  case AMDGPU::V_ADD_U32_e64:
-  case AMDGPU::V_ADD_U32_e64_dpp:
-  case AMDGPU::V_ADD_U32_sdwa:
+    GENERATE_RENAMED_GFX9_CASES(AMDGPU::V_ADDC_U32)
+    GENERATE_RENAMED_GFX9_CASES(AMDGPU::V_ADD_CO_U32)
+    GENERATE_RENAMED_GFX9_CASES(AMDGPU::V_ADD_U32)
+    GENERATE_RENAMED_GFX9_CASES(AMDGPU::V_SUBBREV_U32)
+    GENERATE_RENAMED_GFX9_CASES(AMDGPU::V_SUBB_U32)
+    GENERATE_RENAMED_GFX9_CASES(AMDGPU::V_SUBREV_CO_U32)
+    GENERATE_RENAMED_GFX9_CASES(AMDGPU::V_SUBREV_U32)
+    GENERATE_RENAMED_GFX9_CASES(AMDGPU::V_SUB_CO_U32)
+    GENERATE_RENAMED_GFX9_CASES(AMDGPU::V_SUB_U32)
   //
   case AMDGPU::V_DIV_FIXUP_F16_gfx9_e64:
   case AMDGPU::V_FMA_F16_gfx9_e64:
   case AMDGPU::V_INTERP_P2_F16:
   case AMDGPU::V_MAD_F16_e64:
   case AMDGPU::V_MAD_U16_e64:
   case AMDGPU::V_MAD_I16_e64:
-  //
-  case AMDGPU::V_SUBBREV_U32_dpp:
-  case AMDGPU::V_SUBBREV_U32_e32:
-  case AMDGPU::V_SUBBREV_U32_e64:
-  case AMDGPU::V_SUBBREV_U32_e64_dpp:
-  case AMDGPU::V_SUBBREV_U32_sdwa:
-  //
-  case AMDGPU::V_SUBB_U32_dpp:
-  case AMDGPU::V_SUBB_U32_e32:
-  case AMDGPU::V_SUBB_U32_e64:
-  case AMDGPU::V_SUBB_U32_e64_dpp:
-  case AMDGPU::V_SUBB_U32_sdwa:
-  //
-  case AMDGPU::V_SUBREV_CO_U32_dpp:
-  case AMDGPU::V_SUBREV_CO_U32_e32:
-  case AMDGPU::V_SUBREV_CO_U32_e64:
-  case AMDGPU::V_SUBREV_CO_U32_e64_dpp:
-  case AMDGPU::V_SUBREV_CO_U32_sdwa:
-  //
-  case AMDGPU::V_SUBREV_U32_dpp:
-  case AMDGPU::V_SUBREV_U32_e32:
-  case AMDGPU::V_SUBREV_U32_e64:
-  case AMDGPU::V_SUBREV_U32_e64_dpp:
-  case AMDGPU::V_SUBREV_U32_sdwa:
-  //
-  case AMDGPU::V_SUB_CO_U32_dpp:
-  case AMDGPU::V_SUB_CO_U32_e32:
-  case AMDGPU::V_SUB_CO_U32_e64:
-  case AMDGPU::V_SUB_CO_U32_e64_dpp:
-  case AMDGPU::V_SUB_CO_U32_sdwa:
-  //
-  case AMDGPU::V_SUB_U32_dpp:
-  case AMDGPU::V_SUB_U32_e32:
-  case AMDGPU::V_SUB_U32_e64:
-  case AMDGPU::V_SUB_U32_e64_dpp:
-  case AMDGPU::V_SUB_U32_sdwa:
     return true;
   default:
     return false;

llvm/lib/Target/AMDGPU/SIInstrInfo.h

@@ -1339,8 +1339,6 @@ class SIInstrInfo final : public AMDGPUGenInstrInfo {
   /// Return true if this opcode should not be used by codegen.
   bool isAsmOnlyOpcode(int MCOp) const;
 
-  bool isRenamedInGFX9(int Opcode) const;
-
   const TargetRegisterClass *getRegClass(const MCInstrDesc &TID, unsigned OpNum,
                                          const TargetRegisterInfo *TRI,
                                          const MachineFunction &MF)