
This PR continues https://github.com/llvm/llvm-project/pull/101732 changes in virtual register processing aimed to improve correctness of emitted MIR between passes from the perspective of MachineVerifier. Namely, the following changes are introduced: * register classes (lib/Target/SPIRV/SPIRVRegisterInfo.td) and instruction patterns (lib/Target/SPIRV/SPIRVInstrInfo.td) are corrected and simplified (by removing unnecessary sophisticated options) -- e.g., this PR gets rid of duplicating 32/64 bits patterns, removes ANYID register class and simplifies definition of the rest of register classes, * hardcoded LLT scalar types in passes before instruction selection are corrected -- the goal is to have correct bit width before instruction selection, and use 64 bits registers for pattern matching in the instruction selection pass; 32-bit registers remain where they are described in such terms by SPIR-V specification (like, for example, creation of virtual registers for scope/mem semantics operands), * rework virtual register type/class assignment for calls/builtins lowering, * a series of minor changes to fix validity of emitted code between passes: - ensure that that bitcast changes the type, - fix the pattern for instruction selection for OpExtInst, - simplify inline asm operands usage, - account for arbitrary integer sizes / update legalizer rules; * add '-verify-machineinstrs' to existed test cases. See also https://github.com/llvm/llvm-project/issues/88129 that this PR may resolve. This PR fixes a great number of issues reported by MachineVerifier and, as a result, reduces a number of failed test cases for the mode with expensive checks set on from ~200 to ~57.
37 lines
1.1 KiB
LLVM
37 lines
1.1 KiB
LLVM
; RUN: llc -verify-machineinstrs -O0 -mtriple=spirv64-unknown-unknown %s -o - | FileCheck %s
|
|
|
|
;; Types:
|
|
; CHECK-DAG: %[[#I32:]] = OpTypeInt 32
|
|
; CHECK-DAG: %[[#F32:]] = OpTypeFloat 32
|
|
; CHECK-DAG: %[[#FNI32:]] = OpTypeFunction %[[#I32]] %[[#I32]]
|
|
; CHECK-DAG: %[[#FNF32:]] = OpTypeFunction %[[#F32]] %[[#F32]]
|
|
|
|
;; Function declarations:
|
|
; CHECK: %[[#ANON0:]] = OpFunction %[[#I32]] None %[[#FNI32]]
|
|
; CHECK-NEXT: OpFunctionParameter %[[#I32]]
|
|
; CHECK-NEXT: OpLabel
|
|
; CHECK-NEXT: OpReturnValue
|
|
; CHECK-NEXT: OpFunctionEnd
|
|
define internal spir_func i32 @0(i32 %a) {
|
|
ret i32 %a
|
|
}
|
|
|
|
; CHECK: %[[#ANON1:]] = OpFunction %[[#F32]] None %[[#FNF32]]
|
|
; CHECK-NEXT: OpFunctionParameter %[[#F32]]
|
|
; CHECK-NEXT: OpLabel
|
|
; CHECK-NEXT: OpReturnValue
|
|
; CHECK-NEXT: OpFunctionEnd
|
|
define internal spir_func float @1(float %a) {
|
|
ret float %a
|
|
}
|
|
|
|
;; Calls:
|
|
; CHECK: OpFunctionCall %[[#I32]] %[[#ANON0]]
|
|
; CHECK: OpFunctionCall %[[#F32]] %[[#ANON1]]
|
|
define spir_kernel void @foo(i32 %a) {
|
|
%call1 = call spir_func i32 @0(i32 %a)
|
|
%b = sitofp i32 %a to float
|
|
%call2 = call spir_func float @1(float %b)
|
|
ret void
|
|
}
|