RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-26 04:32:44 +01:00
Code Issues Projects Releases Wiki Activity

[mips] Tighten FastISel restrictions

Browse Source 
LLVM PR/29052 highlighted that FastISel for MIPS attempted to lower
arguments assuming that it was using the paired 32bit registers to
perform operations for f64. This mode of operation is not supported
for MIPSR6.

This patch resolves the reported issue by adding additional checks
for unsupported floating point unit configuration.

Thanks to mike.k for reporting this issue!

Reviewers: seanbruno, vkalintiris

Differential Review: https://reviews.llvm.org/D23795

llvm-svn: 280706
This commit is contained in:
Simon Dardis 2016-09-06 12:36:24 +00:00
parent dcb86018ea
commit 6429b834f8
2 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/Target/Mips/MipsFastISel.cpp
View File

@ -976,9 +976,13 @@ bool MipsFastISel::selectFPExt(const Instruction *I) {
bool MipsFastISel::selectSelect(const Instruction *I) { bool MipsFastISel::selectSelect(const Instruction *I) {
assert(isa<SelectInst>(I) && "Expected a select instruction."); assert(isa<SelectInst>(I) && "Expected a select instruction.");
DEBUG(dbgs() << "selectSelect\n");
MVT VT; MVT VT;
if (!isTypeSupported(I->getType(), VT)) if (!isTypeSupported(I->getType(), VT) || UnsupportedFPMode) {
DEBUG(dbgs() << ".. .. gave up (!isTypeSupported || UnsupportedFPMode)\n");
return false; return false;
}
unsigned CondMovOpc; unsigned CondMovOpc;
const TargetRegisterClass *RC; const TargetRegisterClass *RC;
@ -1376,6 +1380,10 @@ bool MipsFastISel::fastLowerArguments() {
break; break;
case MVT::f64: case MVT::f64:
if (UnsupportedFPMode) {
DEBUG(dbgs() << ".. .. gave up (UnsupportedFPMode\n");
return false;
}
if (NextAFGR64 == AFGR64ArgRegs.end()) { if (NextAFGR64 == AFGR64ArgRegs.end()) {
DEBUG(dbgs() << ".. .. gave up (ran out of AFGR64 arguments)\n"); DEBUG(dbgs() << ".. .. gave up (ran out of AFGR64 arguments)\n");
return false; return false;
@ -1617,6 +1625,8 @@ bool MipsFastISel::selectRet(const Instruction *I) {
const Function &F = *I->getParent()->getParent(); const Function &F = *I->getParent()->getParent();
const ReturnInst *Ret = cast<ReturnInst>(I); const ReturnInst *Ret = cast<ReturnInst>(I);
DEBUG(dbgs() << "selectRet\n");
if (!FuncInfo.CanLowerReturn) if (!FuncInfo.CanLowerReturn)
return false; return false;
@ -1677,6 +1687,12 @@ bool MipsFastISel::selectRet(const Instruction *I) {
if (RVVT == MVT::f128) if (RVVT == MVT::f128)
return false; return false;
// Do not handle FGR64 returns for now.
if (RVVT == MVT::f64 && UnsupportedFPMode) {
DEBUG(dbgs() << ".. .. gave up (UnsupportedFPMode\n");
return false;
}
MVT DestVT = VA.getValVT(); MVT DestVT = VA.getValVT();
// Special handling for extended integers. // Special handling for extended integers.
if (RVVT != DestVT) { if (RVVT != DestVT) {

14
test/CodeGen/Mips/Fast-ISel/double-arg.ll Normal file
View File

@ -0,0 +1,14 @@
; RUN: not llc -march=mipsel -mcpu=mips32r2 -fast-isel -mattr=+fp64 < %s \
; RUN: -fast-isel-abort=3
; Check that FastISel aborts when we have 64bit FPU registers. FastISel currently
; supports AFGR64 only, which uses paired 32 bit registers.
define zeroext i1 @f(double %value) {
entry:
; CHECK-LABEL: f:
; CHECK: sdc1
%value.addr = alloca double, align 8
store double %value, double* %value.addr, align 8
ret i1 false
}