From a75630302dd04cd83021c346263d6a19295fd7cf Mon Sep 17 00:00:00 2001 From: Craig Topper Date: Mon, 6 May 2019 23:57:42 +0000 Subject: [PATCH] [X86] Use extended vector register classes in getRegForInlineAsmConstraint to support x/y/zmm16-31 when the type is mismatched. The FR32/FR64/VR128/VR256 register classes don't contain the upper 16 registers. For most cases we use the default implementation which will find any register class that contains the register in question if the VT is legal for the register class. But if the VT is i32 or i64, we won't find a matching register class and will instead up in the code modified in this patch. If the requested register is x/y/zmm16-31 we weren't returning a register class that contains those registers and will hit an assertion in the caller. To fix this, I've changed to use the extended register class instead. I don't believe we need a subtarget check to see if avx512 is enabled. The default implementation just pick whatever register class it finds first. I checked and we currently pick FR32X for XMM0 with an f32 type using the default implementation regardless of whether avx512 is enabled. So I assume its it is ok to do the same for i32. Differential Revision: https://reviews.llvm.org/D61457 llvm-svn: 360102 --- llvm/lib/Target/X86/X86ISelLowering.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/llvm/lib/Target/X86/X86ISelLowering.cpp b/llvm/lib/Target/X86/X86ISelLowering.cpp index 1750d070062c..9659ae5a74aa 100644 --- a/llvm/lib/Target/X86/X86ISelLowering.cpp +++ b/llvm/lib/Target/X86/X86ISelLowering.cpp @@ -44203,13 +44203,13 @@ X86TargetLowering::getRegForInlineAsmConstraint(const TargetRegisterInfo *TRI, // TODO: Handle f128 and i128 in FR128RegClass after it is tested well. if (VT == MVT::f32 || VT == MVT::i32) - Res.second = &X86::FR32RegClass; + Res.second = &X86::FR32XRegClass; else if (VT == MVT::f64 || VT == MVT::i64) - Res.second = &X86::FR64RegClass; - else if (TRI->isTypeLegalForClass(X86::VR128RegClass, VT)) - Res.second = &X86::VR128RegClass; - else if (TRI->isTypeLegalForClass(X86::VR256RegClass, VT)) - Res.second = &X86::VR256RegClass; + Res.second = &X86::FR64XRegClass; + else if (TRI->isTypeLegalForClass(X86::VR128XRegClass, VT)) + Res.second = &X86::VR128XRegClass; + else if (TRI->isTypeLegalForClass(X86::VR256XRegClass, VT)) + Res.second = &X86::VR256XRegClass; else if (TRI->isTypeLegalForClass(X86::VR512RegClass, VT)) Res.second = &X86::VR512RegClass; else {