Skip to content

Commit 7cc1502

Browse files
GrumpyPigSkinkcloudy0717
authored andcommitted
[X86][GISel] Fix crash on bitcasting i16 <-> half with gisel enabled. (llvm#168456)
Added missing checks for casting half to/from i16 with global-isel enabled. Fixes llvm#166557
1 parent 84f6744 commit 7cc1502

File tree

3 files changed

+97
-1
lines changed

3 files changed

+97
-1
lines changed

llvm/lib/Target/X86/GISel/X86InstructionSelector.cpp

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -312,6 +312,53 @@ bool X86InstructionSelector::selectCopy(MachineInstr &I,
312312
}
313313
}
314314

315+
// Special case GPR16 -> XMM
316+
if (SrcSize == 16 && SrcRegBank.getID() == X86::GPRRegBankID &&
317+
(DstRegBank.getID() == X86::VECRRegBankID)) {
318+
319+
const DebugLoc &DL = I.getDebugLoc();
320+
321+
// Any extend GPR16 -> GPR32
322+
Register ExtReg = MRI.createVirtualRegister(&X86::GR32RegClass);
323+
BuildMI(*I.getParent(), I, DL, TII.get(TargetOpcode::SUBREG_TO_REG),
324+
ExtReg)
325+
.addImm(0)
326+
.addReg(SrcReg)
327+
.addImm(X86::sub_16bit);
328+
329+
// Copy GR32 -> XMM
330+
BuildMI(*I.getParent(), I, DL, TII.get(TargetOpcode::COPY), DstReg)
331+
.addReg(ExtReg);
332+
333+
I.eraseFromParent();
334+
}
335+
336+
// Special case XMM -> GR16
337+
if (DstSize == 16 && DstRegBank.getID() == X86::GPRRegBankID &&
338+
(SrcRegBank.getID() == X86::VECRRegBankID)) {
339+
340+
const DebugLoc &DL = I.getDebugLoc();
341+
342+
// Move XMM to GR32 register.
343+
Register Temp32 = MRI.createVirtualRegister(&X86::GR32RegClass);
344+
BuildMI(*I.getParent(), I, DL, TII.get(TargetOpcode::COPY), Temp32)
345+
.addReg(SrcReg);
346+
347+
// Extract the lower 16 bits
348+
if (Register Dst32 = TRI.getMatchingSuperReg(DstReg, X86::sub_16bit,
349+
&X86::GR32RegClass)) {
350+
// Optimization for Physical Dst (e.g. AX): Copy to EAX directly.
351+
BuildMI(*I.getParent(), I, DL, TII.get(TargetOpcode::COPY), Dst32)
352+
.addReg(Temp32);
353+
} else {
354+
// Handle if there is no super.
355+
BuildMI(*I.getParent(), I, DL, TII.get(TargetOpcode::COPY), DstReg)
356+
.addReg(Temp32, 0, X86::sub_16bit);
357+
}
358+
359+
I.eraseFromParent();
360+
}
361+
315362
return true;
316363
}
317364

llvm/lib/Target/X86/X86InstrInfo.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4296,10 +4296,11 @@ static unsigned CopyToFromAsymmetricReg(Register DestReg, Register SrcReg,
42964296

42974297
if (X86::VR128XRegClass.contains(DestReg) &&
42984298
X86::GR32RegClass.contains(SrcReg))
4299-
// Copy from a VR128 register to a VR128 register.
4299+
// Copy from a GR32 register to a VR128 register.
43004300
return HasAVX512 ? X86::VMOVDI2PDIZrr
43014301
: HasAVX ? X86::VMOVDI2PDIrr
43024302
: X86::MOVDI2PDIrr;
4303+
43034304
return 0;
43044305
}
43054306

@@ -4368,6 +4369,7 @@ void X86InstrInfo::copyPhysReg(MachineBasicBlock &MBB,
43684369
else if (X86::VK16RegClass.contains(DestReg, SrcReg))
43694370
Opc = Subtarget.hasBWI() ? (HasEGPR ? X86::KMOVQkk_EVEX : X86::KMOVQkk)
43704371
: (HasEGPR ? X86::KMOVQkk_EVEX : X86::KMOVWkk);
4372+
43714373
if (!Opc)
43724374
Opc = CopyToFromAsymmetricReg(DestReg, SrcReg, Subtarget);
43734375

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py
2+
; RUN: llc < %s -mtriple=x86_64-unknown-unknown -global-isel | FileCheck %s --check-prefixes=SSE2
3+
; RUN: llc < %s -mtriple=x86_64-unknown-unknown -global-isel -mattr=+avx | FileCheck %s --check-prefixes=AVX
4+
; RUN: llc < %s -mtriple=x86_64-unknown-unknown -global-isel -mattr=+avx512f | FileCheck %s --check-prefixes=AVX512
5+
6+
define half @test_i16_to_half(i16 %0) {
7+
; SSE2-LABEL: test_i16_to_half:
8+
; SSE2: # %bb.0: # %entry
9+
; SSE2-NEXT: movd %edi, %xmm0
10+
; SSE2-NEXT: retq
11+
;
12+
; AVX-LABEL: test_i16_to_half:
13+
; AVX: # %bb.0: # %entry
14+
; AVX-NEXT: vmovd %edi, %xmm0
15+
; AVX-NEXT: retq
16+
;
17+
; AVX512-LABEL: test_i16_to_half:
18+
; AVX512: # %bb.0: # %entry
19+
; AVX512-NEXT: vmovd %edi, %xmm0
20+
; AVX512-NEXT: retq
21+
entry:
22+
%2 = bitcast i16 %0 to half
23+
ret half %2
24+
}
25+
26+
define i16 @test_half_to_i16(half %0) {
27+
; SSE2-LABEL: test_half_to_i16:
28+
; SSE2: # %bb.0: # %entry
29+
; SSE2-NEXT: movd %xmm0, %eax
30+
; SSE2-NEXT: # kill: def $eax killed $eax def $ax
31+
; SSE2-NEXT: retq
32+
;
33+
; AVX-LABEL: test_half_to_i16:
34+
; AVX: # %bb.0: # %entry
35+
; AVX-NEXT: vmovd %xmm0, %eax
36+
; AVX-NEXT: # kill: def $eax killed $eax def $ax
37+
; AVX-NEXT: retq
38+
;
39+
; AVX512-LABEL: test_half_to_i16:
40+
; AVX512: # %bb.0: # %entry
41+
; AVX512-NEXT: vmovd %xmm0, %eax
42+
; AVX512-NEXT: # kill: def $eax killed $eax def $ax
43+
; AVX512-NEXT: retq
44+
entry:
45+
%2 = bitcast half %0 to i16
46+
ret i16 %2
47+
}

0 commit comments

Comments
 (0)