diff options
| -rw-r--r-- | lib/Target/Mips/MipsOs16.cpp | 22 | ||||
| -rw-r--r-- | test/CodeGen/Mips/fp16mix.ll | 19 |
2 files changed, 35 insertions, 6 deletions
diff --git a/lib/Target/Mips/MipsOs16.cpp b/lib/Target/Mips/MipsOs16.cpp index 49c73b5..fe60841 100644 --- a/lib/Target/Mips/MipsOs16.cpp +++ b/lib/Target/Mips/MipsOs16.cpp @@ -94,6 +94,7 @@ namespace llvm { bool MipsOs16::runOnModule(Module &M) { bool usingMask = Mips32FunctionMask.length() > 0; + bool doneUsingMask = false; // this will make it stop repeating DEBUG(dbgs() << "Run on Module MipsOs16 \n" << Mips32FunctionMask << "\n"); if (usingMask) DEBUG(dbgs() << "using mask \n" << Mips32FunctionMask << "\n"); @@ -103,13 +104,22 @@ bool MipsOs16::runOnModule(Module &M) { if (F->isDeclaration()) continue; DEBUG(dbgs() << "Working on " << F->getName() << "\n"); if (usingMask) { - if (functionIndex == Mips32FunctionMask.length()) - functionIndex = 0; - if (Mips32FunctionMask[functionIndex] == '1') { - DEBUG(dbgs() << "mask forced mips32: " << F->getName() << "\n"); - F->addFnAttr("nomips16"); + if (!doneUsingMask) { + if (functionIndex == Mips32FunctionMask.length()) + functionIndex = 0; + switch (Mips32FunctionMask[functionIndex]) { + case '1': + DEBUG(dbgs() << "mask forced mips32: " << F->getName() << "\n"); + F->addFnAttr("nomips16"); + break; + case '.': + doneUsingMask = true; + break; + default: + break; + } + functionIndex++; } - functionIndex++; } else { if (needsFP(*F)) { diff --git a/test/CodeGen/Mips/fp16mix.ll b/test/CodeGen/Mips/fp16mix.ll index 73b1156..8d85099 100644 --- a/test/CodeGen/Mips/fp16mix.ll +++ b/test/CodeGen/Mips/fp16mix.ll @@ -2,6 +2,8 @@ ; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mcpu=mips16 -soft-float -mips16-hard-float -relocation-model=static -mips32-function-mask=01 -mips-os16 < %s | FileCheck %s -check-prefix=fmask2 +; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mcpu=mips16 -soft-float -mips16-hard-float -relocation-model=static -mips32-function-mask=10. -mips-os16 < %s | FileCheck %s -check-prefix=fmask1nr + ; Function Attrs: nounwind optsize readnone define void @foo1() { entry: @@ -17,6 +19,14 @@ entry: ; fmask2: .ent foo1 ; fmask2: save {{.*}} ; fmask2: .end foo1 +; fmask1nr: .ent foo1 +; fmask1nr: .set noreorder +; fmask1nr: .set nomacro +; fmask1nr: .set noat +; fmask1nr: .set at +; fmask1nr: .set macro +; fmask1nr: .set reorder +; fmask1nr: .end foo1 } ; Function Attrs: nounwind optsize readnone @@ -34,6 +44,9 @@ entry: ; fmask1: .ent foo2 ; fmask1: save {{.*}} ; fmask1: .end foo2 +; fmask1nr: .ent foo2 +; fmask1nr: save {{.*}} +; fmask1nr: .end foo2 } ; Function Attrs: nounwind optsize readnone @@ -51,6 +64,9 @@ entry: ; fmask2: .ent foo3 ; fmask2: save {{.*}} ; fmask2: .end foo3 +; fmask1r: .ent foo3 +; fmask1r: save {{.*}} +; fmask1r: .end foo3 } ; Function Attrs: nounwind optsize readnone @@ -68,6 +84,9 @@ entry: ; fmask1: .ent foo4 ; fmask1: save {{.*}} ; fmask1: .end foo4 +; fmask1nr: .ent foo4 +; fmask1nr: save {{.*}} +; fmask1nr: .end foo4 } |