[NFC][TableGen][X86] Use StringSwitch to map from string -> enum by jurahul · Pull Request #139929 · llvm/llvm-project (original) (raw)

@llvm/pr-subscribers-backend-x86

@llvm/pr-subscribers-tablegen

Author: Rahul Joshi (jurahul)

Changes

Use StringSwitch instead of macro to map from a string to enum values in X86RecognizableInstr.cpp.


Patch is 34.90 KiB, truncated to 20.00 KiB below, full version: https://github.com/llvm/llvm-project/pull/139929.diff

1 Files Affected:

diff --git a/llvm/utils/TableGen/X86RecognizableInstr.cpp b/llvm/utils/TableGen/X86RecognizableInstr.cpp index 506995d26d660..f93e5fbcc4c27 100644 --- a/llvm/utils/TableGen/X86RecognizableInstr.cpp +++ b/llvm/utils/TableGen/X86RecognizableInstr.cpp @@ -17,6 +17,7 @@ #include "X86DisassemblerShared.h" #include "X86DisassemblerTables.h" #include "X86ModRMFilters.h" +#include "llvm/ADT/StringSwitch.h" #include "llvm/Support/ErrorHandling.h" #include "llvm/TableGen/Record.h" #include @@ -1020,280 +1021,292 @@ void RecognizableInstr::emitDecodePath(DisassemblerTables &tables) const { #undef MAP } -#define TYPE(Expected, Type)
- if (Str == Expected)
- return Type;

OperandType RecognizableInstr::typeFromString(StringRef Str, bool hasREX_W, uint8_t OpSize) { + StringSwitch Switch(Str); if (hasREX_W) { // For instructions with a REX_W prefix, a declared 32-bit register encoding // is special. - TYPE("GR32", TYPE_R32) + Switch.Case("GR32", TYPE_R32); } if (OpSize == X86Local::OpSize16) { // For OpSize16 instructions, a declared 16-bit register or // immediate encoding is special. - TYPE("GR16", TYPE_Rv) + Switch.Case("GR16", TYPE_Rv); } else if (OpSize == X86Local::OpSize32) { // For OpSize32 instructions, a declared 32-bit register or // immediate encoding is special. - TYPE("GR32", TYPE_Rv) + Switch.Case("GR32", TYPE_Rv); } - TYPE("i16mem", TYPE_M) - TYPE("i16imm", TYPE_IMM) - TYPE("i16i8imm", TYPE_IMM) - TYPE("GR16", TYPE_R16) - TYPE("GR16orGR32orGR64", TYPE_R16) - TYPE("i32mem", TYPE_M) - TYPE("i32imm", TYPE_IMM) - TYPE("i32i8imm", TYPE_IMM) - TYPE("GR32", TYPE_R32) - TYPE("GR32orGR64", TYPE_R32) - TYPE("i64mem", TYPE_M) - TYPE("i64i32imm", TYPE_IMM) - TYPE("i64i8imm", TYPE_IMM) - TYPE("GR64", TYPE_R64) - TYPE("i8mem", TYPE_M) - TYPE("i8imm", TYPE_IMM) - TYPE("u4imm", TYPE_UIMM8) - TYPE("u8imm", TYPE_UIMM8) - TYPE("i16u8imm", TYPE_UIMM8) - TYPE("i32u8imm", TYPE_UIMM8) - TYPE("i64u8imm", TYPE_UIMM8) - TYPE("GR8", TYPE_R8) - TYPE("VR128", TYPE_XMM) - TYPE("VR128X", TYPE_XMM) - TYPE("f128mem", TYPE_M) - TYPE("f256mem", TYPE_M) - TYPE("f512mem", TYPE_M) - TYPE("FR128", TYPE_XMM) - TYPE("FR64", TYPE_XMM) - TYPE("FR64X", TYPE_XMM) - TYPE("f64mem", TYPE_M) - TYPE("sdmem", TYPE_M) - TYPE("FR16X", TYPE_XMM) - TYPE("FR32", TYPE_XMM) - TYPE("FR32X", TYPE_XMM) - TYPE("f32mem", TYPE_M) - TYPE("f16mem", TYPE_M) - TYPE("ssmem", TYPE_M) - TYPE("shmem", TYPE_M) - TYPE("RST", TYPE_ST) - TYPE("RSTi", TYPE_ST) - TYPE("i128mem", TYPE_M) - TYPE("i256mem", TYPE_M) - TYPE("i512mem", TYPE_M) - TYPE("i512mem_GR16", TYPE_M) - TYPE("i512mem_GR32", TYPE_M) - TYPE("i512mem_GR64", TYPE_M) - TYPE("i64i32imm_brtarget", TYPE_REL) - TYPE("i8imm_brtarget", TYPE_REL) - TYPE("i16imm_brtarget", TYPE_REL) - TYPE("i32imm_brtarget", TYPE_REL) - TYPE("ccode", TYPE_IMM) - TYPE("cflags", TYPE_IMM) - TYPE("AVX512RC", TYPE_IMM) - TYPE("brtarget32", TYPE_REL) - TYPE("brtarget16", TYPE_REL) - TYPE("brtarget8", TYPE_REL) - TYPE("f80mem", TYPE_M) - TYPE("lea64_8mem", TYPE_M) - TYPE("lea64_16mem", TYPE_M) - TYPE("lea64_32mem", TYPE_M) - TYPE("lea64mem", TYPE_M) - TYPE("VR64", TYPE_MM64) - TYPE("i64imm", TYPE_IMM) - TYPE("anymem", TYPE_M) - TYPE("opaquemem", TYPE_M) - TYPE("sibmem", TYPE_MSIB) - TYPE("SEGMENT_REG", TYPE_SEGMENTREG) - TYPE("DEBUG_REG", TYPE_DEBUGREG) - TYPE("CONTROL_REG", TYPE_CONTROLREG) - TYPE("srcidx8", TYPE_SRCIDX) - TYPE("srcidx16", TYPE_SRCIDX) - TYPE("srcidx32", TYPE_SRCIDX) - TYPE("srcidx64", TYPE_SRCIDX) - TYPE("dstidx8", TYPE_DSTIDX) - TYPE("dstidx16", TYPE_DSTIDX) - TYPE("dstidx32", TYPE_DSTIDX) - TYPE("dstidx64", TYPE_DSTIDX) - TYPE("offset16_8", TYPE_MOFFS) - TYPE("offset16_16", TYPE_MOFFS) - TYPE("offset16_32", TYPE_MOFFS) - TYPE("offset32_8", TYPE_MOFFS) - TYPE("offset32_16", TYPE_MOFFS) - TYPE("offset32_32", TYPE_MOFFS) - TYPE("offset32_64", TYPE_MOFFS) - TYPE("offset64_8", TYPE_MOFFS) - TYPE("offset64_16", TYPE_MOFFS) - TYPE("offset64_32", TYPE_MOFFS) - TYPE("offset64_64", TYPE_MOFFS) - TYPE("VR256", TYPE_YMM) - TYPE("VR256X", TYPE_YMM) - TYPE("VR512", TYPE_ZMM) - TYPE("VK1", TYPE_VK) - TYPE("VK1WM", TYPE_VK) - TYPE("VK2", TYPE_VK) - TYPE("VK2WM", TYPE_VK) - TYPE("VK4", TYPE_VK) - TYPE("VK4WM", TYPE_VK) - TYPE("VK8", TYPE_VK) - TYPE("VK8WM", TYPE_VK) - TYPE("VK16", TYPE_VK) - TYPE("VK16WM", TYPE_VK) - TYPE("VK32", TYPE_VK) - TYPE("VK32WM", TYPE_VK) - TYPE("VK64", TYPE_VK) - TYPE("VK64WM", TYPE_VK) - TYPE("VK1Pair", TYPE_VK_PAIR) - TYPE("VK2Pair", TYPE_VK_PAIR) - TYPE("VK4Pair", TYPE_VK_PAIR) - TYPE("VK8Pair", TYPE_VK_PAIR) - TYPE("VK16Pair", TYPE_VK_PAIR) - TYPE("vx32mem", TYPE_MVSIBX) - TYPE("vx64mem", TYPE_MVSIBX) - TYPE("vy32mem", TYPE_MVSIBY) - TYPE("vy64mem", TYPE_MVSIBY) - TYPE("vx32xmem", TYPE_MVSIBX) - TYPE("vx64xmem", TYPE_MVSIBX) - TYPE("vy32xmem", TYPE_MVSIBY) - TYPE("vy64xmem", TYPE_MVSIBY) - TYPE("vz32mem", TYPE_MVSIBZ) - TYPE("vz64mem", TYPE_MVSIBZ) - TYPE("BNDR", TYPE_BNDR) - TYPE("TILE", TYPE_TMM) - TYPE("TILEPair", TYPE_TMM_PAIR) + OperandType Type = Switch.Case("i16mem", TYPE_M) + .Case("i16imm", TYPE_IMM) + .Case("i16i8imm", TYPE_IMM) + .Case("GR16", TYPE_R16) + .Case("GR16orGR32orGR64", TYPE_R16) + .Case("i32mem", TYPE_M) + .Case("i32imm", TYPE_IMM) + .Case("i32i8imm", TYPE_IMM) + .Case("GR32", TYPE_R32) + .Case("GR32orGR64", TYPE_R32) + .Case("i64mem", TYPE_M) + .Case("i64i32imm", TYPE_IMM) + .Case("i64i8imm", TYPE_IMM) + .Case("GR64", TYPE_R64) + .Case("i8mem", TYPE_M) + .Case("i8imm", TYPE_IMM) + .Case("u4imm", TYPE_UIMM8) + .Case("u8imm", TYPE_UIMM8) + .Case("i16u8imm", TYPE_UIMM8) + .Case("i32u8imm", TYPE_UIMM8) + .Case("i64u8imm", TYPE_UIMM8) + .Case("GR8", TYPE_R8) + .Case("VR128", TYPE_XMM) + .Case("VR128X", TYPE_XMM) + .Case("f128mem", TYPE_M) + .Case("f256mem", TYPE_M) + .Case("f512mem", TYPE_M) + .Case("FR128", TYPE_XMM) + .Case("FR64", TYPE_XMM) + .Case("FR64X", TYPE_XMM) + .Case("f64mem", TYPE_M) + .Case("sdmem", TYPE_M) + .Case("FR16X", TYPE_XMM) + .Case("FR32", TYPE_XMM) + .Case("FR32X", TYPE_XMM) + .Case("f32mem", TYPE_M) + .Case("f16mem", TYPE_M) + .Case("ssmem", TYPE_M) + .Case("shmem", TYPE_M) + .Case("RST", TYPE_ST) + .Case("RSTi", TYPE_ST) + .Case("i128mem", TYPE_M) + .Case("i256mem", TYPE_M) + .Case("i512mem", TYPE_M) + .Case("i512mem_GR16", TYPE_M) + .Case("i512mem_GR32", TYPE_M) + .Case("i512mem_GR64", TYPE_M) + .Case("i64i32imm_brtarget", TYPE_REL) + .Case("i8imm_brtarget", TYPE_REL) + .Case("i16imm_brtarget", TYPE_REL) + .Case("i32imm_brtarget", TYPE_REL) + .Case("ccode", TYPE_IMM) + .Case("cflags", TYPE_IMM) + .Case("AVX512RC", TYPE_IMM) + .Case("brtarget32", TYPE_REL) + .Case("brtarget16", TYPE_REL) + .Case("brtarget8", TYPE_REL) + .Case("f80mem", TYPE_M) + .Case("lea64_8mem", TYPE_M) + .Case("lea64_16mem", TYPE_M) + .Case("lea64_32mem", TYPE_M) + .Case("lea64mem", TYPE_M) + .Case("VR64", TYPE_MM64) + .Case("i64imm", TYPE_IMM) + .Case("anymem", TYPE_M) + .Case("opaquemem", TYPE_M) + .Case("sibmem", TYPE_MSIB) + .Case("SEGMENT_REG", TYPE_SEGMENTREG) + .Case("DEBUG_REG", TYPE_DEBUGREG) + .Case("CONTROL_REG", TYPE_CONTROLREG) + .Case("srcidx8", TYPE_SRCIDX) + .Case("srcidx16", TYPE_SRCIDX) + .Case("srcidx32", TYPE_SRCIDX) + .Case("srcidx64", TYPE_SRCIDX) + .Case("dstidx8", TYPE_DSTIDX) + .Case("dstidx16", TYPE_DSTIDX) + .Case("dstidx32", TYPE_DSTIDX) + .Case("dstidx64", TYPE_DSTIDX) + .Case("offset16_8", TYPE_MOFFS) + .Case("offset16_16", TYPE_MOFFS) + .Case("offset16_32", TYPE_MOFFS) + .Case("offset32_8", TYPE_MOFFS) + .Case("offset32_16", TYPE_MOFFS) + .Case("offset32_32", TYPE_MOFFS) + .Case("offset32_64", TYPE_MOFFS) + .Case("offset64_8", TYPE_MOFFS) + .Case("offset64_16", TYPE_MOFFS) + .Case("offset64_32", TYPE_MOFFS) + .Case("offset64_64", TYPE_MOFFS) + .Case("VR256", TYPE_YMM) + .Case("VR256X", TYPE_YMM) + .Case("VR512", TYPE_ZMM) + .Case("VK1", TYPE_VK) + .Case("VK1WM", TYPE_VK) + .Case("VK2", TYPE_VK) + .Case("VK2WM", TYPE_VK) + .Case("VK4", TYPE_VK) + .Case("VK4WM", TYPE_VK) + .Case("VK8", TYPE_VK) + .Case("VK8WM", TYPE_VK) + .Case("VK16", TYPE_VK) + .Case("VK16WM", TYPE_VK) + .Case("VK32", TYPE_VK) + .Case("VK32WM", TYPE_VK) + .Case("VK64", TYPE_VK) + .Case("VK64WM", TYPE_VK) + .Case("VK1Pair", TYPE_VK_PAIR) + .Case("VK2Pair", TYPE_VK_PAIR) + .Case("VK4Pair", TYPE_VK_PAIR) + .Case("VK8Pair", TYPE_VK_PAIR) + .Case("VK16Pair", TYPE_VK_PAIR) + .Case("vx32mem", TYPE_MVSIBX) + .Case("vx64mem", TYPE_MVSIBX) + .Case("vy32mem", TYPE_MVSIBY) + .Case("vy64mem", TYPE_MVSIBY) + .Case("vx32xmem", TYPE_MVSIBX) + .Case("vx64xmem", TYPE_MVSIBX) + .Case("vy32xmem", TYPE_MVSIBY) + .Case("vy64xmem", TYPE_MVSIBY) + .Case("vz32mem", TYPE_MVSIBZ) + .Case("vz64mem", TYPE_MVSIBZ) + .Case("BNDR", TYPE_BNDR) + .Case("TILE", TYPE_TMM) + .Case("TILEPair", TYPE_TMM_PAIR) + .Default(TYPE_NONE); + + if (Type != TYPE_NONE) + return Type; errs() << "Unhandled type string " << Str << "\n"; llvm_unreachable("Unhandled type string"); } -#undef TYPE

-#define ENCODING(Expected, Encoding) \

OperandEncoding RecognizableInstr::immediateEncodingFromString(StringRef Str, uint8_t OpSize) {

}

errs() << "Unhandled immediate encoding " << Str << "\n"; llvm_unreachable("Unhandled immediate encoding"); }

OperandEncoding RecognizableInstr::rmRegisterEncodingFromString(StringRef Str, uint8_t OpSize) {

errs() << "Unhandled R/M register encoding " << Str << "\n"; llvm_unreachable("Unhandled R/M register encoding"); }

OperandEncoding RecognizableInstr::roRegisterEncodingFromString(StringRef Str, uint8_t OpSize) {

[truncated]