[PATCH] D129506: Move instruction predicate verification to emitInstruction

[Dave Green via Phabricator via llvm-commits]

dmgreen created this revision.
dmgreen added reviewers: foad, dsanders, jmolloy, RKSimon, sdardis.
Herald added subscribers: jsji, kosarev, jsilvanus, mattd, gchakrabarti, pmatos, asb, luke957, asavonic, frasercrmck, ThomasRaoux, kerbowa, luismarques, apazos, sameer.abuasal, pengfei, s.egerton, Jim, jocewei, PkmX, the_o, brucehoult, MartinMosbeck, rogfer01, atanasyan, mgrang, edward-jones, zzheng, jrtc27, niosHD, sabuasal, simoncook, johnrusso, rbar, fedor.sergeev, kbarton, hiraditya, kristof.beyls, jgravelle-google, arichardson, sbc100, tpr, nhaehnle, jvesely, nemanjai, dylanmckay, jyknight, dschuff, arsenm.
Herald added a project: All.
dmgreen requested review of this revision.
Herald added subscribers: pcwang-thead, MaskRay, aheejin, jholewinski.
Herald added a reviewer: zuban32.
Herald added a project: LLVM.

D25618 <https://reviews.llvm.org/D25618> added a method to verify the instruction predicates for an emitted instruction, through verifyInstructionPredicates added into <Target>MCCodeEmitter::encodeInstruction. This is a very useful idea, but the implementation inside MCCodeEmitter made it only fire for object files, not assembly which most of the llvm test suite uses.

This patch moves the code into the <Target>_MC::verifyInstructionPredicates method, inside the InstrInfo. The allows it to be called from other places, such as in this patch where it is called from the <Target>AsmPrinter::emitInstruction methods which should trigger for both assembly and object files. It can also be called from other places such as verifyInstruction, but that is not done here (it tends to catch errors earlier, but in reality just shows all the mir tests that have incorrect feature predicates). The interface was also simplified slightly, moving computeAvailableFeatures into the function so that it does not need to be called externally.

The AArch64, ARM, AMDGPU (but not R600), AVR, Mips and X86 backends all currently show errors in the test-suite, so have been disabled with FIXME comments.


https://reviews.llvm.org/D129506

Files:
  llvm/lib/Target/AArch64/AArch64AsmPrinter.cpp
  llvm/lib/Target/AArch64/MCTargetDesc/AArch64MCCodeEmitter.cpp
  llvm/lib/Target/AArch64/MCTargetDesc/AArch64MCTargetDesc.cpp
  llvm/lib/Target/AArch64/MCTargetDesc/AArch64MCTargetDesc.h
  llvm/lib/Target/AMDGPU/AMDGPUMCInstLower.cpp
  llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCCodeEmitter.h
  llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.cpp
  llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h
  llvm/lib/Target/AMDGPU/MCTargetDesc/R600MCCodeEmitter.cpp
  llvm/lib/Target/AMDGPU/MCTargetDesc/R600MCTargetDesc.cpp
  llvm/lib/Target/AMDGPU/MCTargetDesc/R600MCTargetDesc.h
  llvm/lib/Target/AMDGPU/MCTargetDesc/SIMCCodeEmitter.cpp
  llvm/lib/Target/AMDGPU/R600MCInstLower.cpp
  llvm/lib/Target/ARC/ARCAsmPrinter.cpp
  llvm/lib/Target/ARC/MCTargetDesc/ARCMCTargetDesc.cpp
  llvm/lib/Target/ARC/MCTargetDesc/ARCMCTargetDesc.h
  llvm/lib/Target/ARM/ARMAsmPrinter.cpp
  llvm/lib/Target/ARM/MCTargetDesc/ARMMCTargetDesc.cpp
  llvm/lib/Target/ARM/MCTargetDesc/ARMMCTargetDesc.h
  llvm/lib/Target/AVR/AVRAsmPrinter.cpp
  llvm/lib/Target/AVR/MCTargetDesc/AVRMCTargetDesc.cpp
  llvm/lib/Target/AVR/MCTargetDesc/AVRMCTargetDesc.h
  llvm/lib/Target/BPF/BPFAsmPrinter.cpp
  llvm/lib/Target/BPF/MCTargetDesc/BPFMCCodeEmitter.cpp
  llvm/lib/Target/BPF/MCTargetDesc/BPFMCTargetDesc.cpp
  llvm/lib/Target/BPF/MCTargetDesc/BPFMCTargetDesc.h
  llvm/lib/Target/CSKY/CSKYAsmPrinter.cpp
  llvm/lib/Target/CSKY/MCTargetDesc/CSKYMCTargetDesc.cpp
  llvm/lib/Target/CSKY/MCTargetDesc/CSKYMCTargetDesc.h
  llvm/lib/Target/Hexagon/HexagonAsmPrinter.cpp
  llvm/lib/Target/Hexagon/MCTargetDesc/HexagonMCCodeEmitter.cpp
  llvm/lib/Target/Hexagon/MCTargetDesc/HexagonMCCodeEmitter.h
  llvm/lib/Target/Hexagon/MCTargetDesc/HexagonMCTargetDesc.cpp
  llvm/lib/Target/Hexagon/MCTargetDesc/HexagonMCTargetDesc.h
  llvm/lib/Target/Lanai/LanaiAsmPrinter.cpp
  llvm/lib/Target/Lanai/MCTargetDesc/LanaiMCTargetDesc.cpp
  llvm/lib/Target/Lanai/MCTargetDesc/LanaiMCTargetDesc.h
  llvm/lib/Target/LoongArch/LoongArchAsmPrinter.cpp
  llvm/lib/Target/LoongArch/MCTargetDesc/LoongArchMCTargetDesc.cpp
  llvm/lib/Target/LoongArch/MCTargetDesc/LoongArchMCTargetDesc.h
  llvm/lib/Target/M68k/M68kAsmPrinter.cpp
  llvm/lib/Target/M68k/MCTargetDesc/M68kMCTargetDesc.cpp
  llvm/lib/Target/M68k/MCTargetDesc/M68kMCTargetDesc.h
  llvm/lib/Target/MSP430/MCTargetDesc/MSP430MCTargetDesc.cpp
  llvm/lib/Target/MSP430/MCTargetDesc/MSP430MCTargetDesc.h
  llvm/lib/Target/MSP430/MSP430AsmPrinter.cpp
  llvm/lib/Target/Mips/MCTargetDesc/MipsMCTargetDesc.cpp
  llvm/lib/Target/Mips/MCTargetDesc/MipsMCTargetDesc.h
  llvm/lib/Target/Mips/MipsAsmPrinter.cpp
  llvm/lib/Target/NVPTX/MCTargetDesc/NVPTXMCTargetDesc.cpp
  llvm/lib/Target/NVPTX/MCTargetDesc/NVPTXMCTargetDesc.h
  llvm/lib/Target/NVPTX/NVPTX.h
  llvm/lib/Target/NVPTX/NVPTXAsmPrinter.cpp
  llvm/lib/Target/PowerPC/MCTargetDesc/PPCMCCodeEmitter.cpp
  llvm/lib/Target/PowerPC/MCTargetDesc/PPCMCCodeEmitter.h
  llvm/lib/Target/PowerPC/MCTargetDesc/PPCMCTargetDesc.cpp
  llvm/lib/Target/PowerPC/MCTargetDesc/PPCMCTargetDesc.h
  llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp
  llvm/lib/Target/RISCV/MCTargetDesc/RISCVMCCodeEmitter.cpp
  llvm/lib/Target/RISCV/MCTargetDesc/RISCVMCTargetDesc.cpp
  llvm/lib/Target/RISCV/MCTargetDesc/RISCVMCTargetDesc.h
  llvm/lib/Target/RISCV/RISCVAsmPrinter.cpp
  llvm/lib/Target/SPIRV/MCTargetDesc/SPIRVMCCodeEmitter.cpp
  llvm/lib/Target/SPIRV/MCTargetDesc/SPIRVMCTargetDesc.cpp
  llvm/lib/Target/SPIRV/MCTargetDesc/SPIRVMCTargetDesc.h
  llvm/lib/Target/SPIRV/SPIRVAsmPrinter.cpp
  llvm/lib/Target/Sparc/MCTargetDesc/SparcMCCodeEmitter.cpp
  llvm/lib/Target/Sparc/MCTargetDesc/SparcMCTargetDesc.cpp
  llvm/lib/Target/Sparc/MCTargetDesc/SparcMCTargetDesc.h
  llvm/lib/Target/Sparc/SparcAsmPrinter.cpp
  llvm/lib/Target/SystemZ/MCTargetDesc/SystemZMCCodeEmitter.cpp
  llvm/lib/Target/SystemZ/MCTargetDesc/SystemZMCTargetDesc.cpp
  llvm/lib/Target/SystemZ/MCTargetDesc/SystemZMCTargetDesc.h
  llvm/lib/Target/SystemZ/SystemZAsmPrinter.cpp
  llvm/lib/Target/VE/MCTargetDesc/VEMCCodeEmitter.cpp
  llvm/lib/Target/VE/MCTargetDesc/VEMCTargetDesc.cpp
  llvm/lib/Target/VE/MCTargetDesc/VEMCTargetDesc.h
  llvm/lib/Target/VE/VEAsmPrinter.cpp
  llvm/lib/Target/WebAssembly/MCTargetDesc/WebAssemblyMCTargetDesc.cpp
  llvm/lib/Target/WebAssembly/MCTargetDesc/WebAssemblyMCTargetDesc.h
  llvm/lib/Target/WebAssembly/TargetInfo/WebAssemblyTargetInfo.cpp
  llvm/lib/Target/WebAssembly/WebAssemblyAsmPrinter.cpp
  llvm/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.cpp
  llvm/lib/Target/X86/X86MCInstLower.cpp
  llvm/lib/Target/XCore/MCTargetDesc/XCoreMCTargetDesc.cpp
  llvm/lib/Target/XCore/MCTargetDesc/XCoreMCTargetDesc.h
  llvm/lib/Target/XCore/XCoreAsmPrinter.cpp
  llvm/utils/TableGen/CodeEmitterGen.cpp
  llvm/utils/TableGen/InstrInfoEmitter.cpp
  llvm/utils/TableGen/SubtargetFeatureInfo.cpp

-------------- next part --------------
A non-text attachment was scrubbed...
Name: D129506.443695.patch
Type: text/x-patch
Size: 67035 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20220711/78280d25/attachment-0001.bin>