[llvm-branch-commits] [llvm-branch] r232083 - Merging r224425:
Daniel Sanders
daniel.sanders at imgtec.com
Thu Mar 12 12:17:32 PDT 2015
Author: dsanders
Date: Thu Mar 12 14:17:32 2015
New Revision: 232083
URL: http://llvm.org/viewvc/llvm-project?rev=232083&view=rev
Log:
Merging r224425:
------------------------------------------------------------------------
r224425 | tomatabacu | 2014-12-17 10:56:16 +0000 (Wed, 17 Dec 2014) | 17 lines
[mips] Set GCC-compatible MIPS asssembler options before inline asm blocks.
Summary:
When generating MIPS assembly, LLVM always overrides the default assembler options by emitting the '.set noreorder', '.set nomacro' and '.set noat' directives,
while GCC uses the default options if an assembly-level function contains inline assembly code.
This becomes a problem when the code generated by LLVM is interleaved with inline assembly which assumes GCC-like assembler options (from Linux, for example).
This patch fixes these conflicts by setting the appropriate assembler options at the beginning of an inline asm block and popping them at the end.
Reviewers: dsanders
Reviewed By: dsanders
Subscribers: llvm-commits
Differential Revision: http://reviews.llvm.org/D6637
------------------------------------------------------------------------
Added:
llvm/branches/release_35/test/CodeGen/Mips/inlineasm-assembler-directives.ll
Removed:
llvm/branches/release_35/test/CodeGen/Mips/fptr2.ll
Modified:
llvm/branches/release_35/include/llvm/CodeGen/AsmPrinter.h
llvm/branches/release_35/lib/CodeGen/AsmPrinter/AsmPrinterInlineAsm.cpp
llvm/branches/release_35/lib/Target/Mips/Mips16HardFloat.cpp
llvm/branches/release_35/lib/Target/Mips/MipsAsmPrinter.cpp
llvm/branches/release_35/lib/Target/Mips/MipsAsmPrinter.h
llvm/branches/release_35/test/CodeGen/Mips/inlineasm-cnstrnt-reg.ll
llvm/branches/release_35/test/CodeGen/Mips/inlineasmmemop.ll
Modified: llvm/branches/release_35/include/llvm/CodeGen/AsmPrinter.h
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_35/include/llvm/CodeGen/AsmPrinter.h?rev=232083&r1=232082&r2=232083&view=diff
==============================================================================
--- llvm/branches/release_35/include/llvm/CodeGen/AsmPrinter.h (original)
+++ llvm/branches/release_35/include/llvm/CodeGen/AsmPrinter.h Thu Mar 12 14:17:32 2015
@@ -461,6 +461,10 @@ public:
unsigned AsmVariant, const char *ExtraCode,
raw_ostream &OS);
+ /// Let the target do anything it needs to do before emitting inlineasm.
+ /// \p StartInfo - the subtarget info before parsing inline asm
+ virtual void emitInlineAsmStart(const MCSubtargetInfo &StartInfo) const;
+
/// Let the target do anything it needs to do after emitting inlineasm.
/// This callback can be used restore the original mode in case the
/// inlineasm contains directives to switch modes.
Modified: llvm/branches/release_35/lib/CodeGen/AsmPrinter/AsmPrinterInlineAsm.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_35/lib/CodeGen/AsmPrinter/AsmPrinterInlineAsm.cpp?rev=232083&r1=232082&r2=232083&view=diff
==============================================================================
--- llvm/branches/release_35/lib/CodeGen/AsmPrinter/AsmPrinterInlineAsm.cpp (original)
+++ llvm/branches/release_35/lib/CodeGen/AsmPrinter/AsmPrinterInlineAsm.cpp Thu Mar 12 14:17:32 2015
@@ -89,6 +89,7 @@ void AsmPrinter::EmitInlineAsm(StringRef
assert(MCAI && "No MCAsmInfo");
if (!MCAI->useIntegratedAssembler() &&
!OutStreamer.isIntegratedAssemblerRequired()) {
+ emitInlineAsmStart(TM.getSubtarget<MCSubtargetInfo>());
OutStreamer.EmitRawText(Str);
emitInlineAsmEnd(TM.getSubtarget<MCSubtargetInfo>(), nullptr);
return;
@@ -147,6 +148,7 @@ void AsmPrinter::EmitInlineAsm(StringRef
Parser->setAssemblerDialect(Dialect);
Parser->setTargetParser(*TAP.get());
+ emitInlineAsmStart(STIOrig);
// Don't implicitly switch to the text section before the asm.
int Res = Parser->Run(/*NoInitialTextSection*/ true,
/*NoFinalize*/ true);
@@ -561,5 +563,7 @@ bool AsmPrinter::PrintAsmMemoryOperand(c
return true;
}
+void AsmPrinter::emitInlineAsmStart(const MCSubtargetInfo &StartInfo) const {}
+
void AsmPrinter::emitInlineAsmEnd(const MCSubtargetInfo &StartInfo,
const MCSubtargetInfo *EndInfo) const {}
Modified: llvm/branches/release_35/lib/Target/Mips/Mips16HardFloat.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_35/lib/Target/Mips/Mips16HardFloat.cpp?rev=232083&r1=232082&r2=232083&view=diff
==============================================================================
--- llvm/branches/release_35/lib/Target/Mips/Mips16HardFloat.cpp (original)
+++ llvm/branches/release_35/lib/Target/Mips/Mips16HardFloat.cpp Thu Mar 12 14:17:32 2015
@@ -458,7 +458,6 @@ static void createFPFnStub(Function *F,
FStub->setSection(SectionName);
BasicBlock *BB = BasicBlock::Create(Context, "entry", FStub);
InlineAsmHelper IAH(Context, BB);
- IAH.Out(" .set macro");
if (PicMode) {
IAH.Out(".set noreorder");
IAH.Out(".cpload $$25");
@@ -467,7 +466,6 @@ static void createFPFnStub(Function *F,
IAH.Out("la $$25," + LocalName);
}
else {
- IAH.Out(".set reorder");
IAH.Out("la $$25," + Name);
}
swapFPIntParams(PV, M, IAH, LE, false);
Modified: llvm/branches/release_35/lib/Target/Mips/MipsAsmPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_35/lib/Target/Mips/MipsAsmPrinter.cpp?rev=232083&r1=232082&r2=232083&view=diff
==============================================================================
--- llvm/branches/release_35/lib/Target/Mips/MipsAsmPrinter.cpp (original)
+++ llvm/branches/release_35/lib/Target/Mips/MipsAsmPrinter.cpp Thu Mar 12 14:17:32 2015
@@ -53,7 +53,7 @@ using namespace llvm;
#define DEBUG_TYPE "mips-asm-printer"
-MipsTargetStreamer &MipsAsmPrinter::getTargetStreamer() {
+MipsTargetStreamer &MipsAsmPrinter::getTargetStreamer() const {
return static_cast<MipsTargetStreamer &>(*OutStreamer.getTargetStreamer());
}
@@ -721,6 +721,23 @@ void MipsAsmPrinter::EmitStartOfAsmFile(
Subtarget->isABI_O32());
}
+void MipsAsmPrinter::emitInlineAsmStart(
+ const MCSubtargetInfo &StartInfo) const {
+ MipsTargetStreamer &TS = getTargetStreamer();
+
+ TS.emitDirectiveSetPush();
+ TS.emitDirectiveSetAt();
+ TS.emitDirectiveSetMacro();
+ TS.emitDirectiveSetReorder();
+ OutStreamer.AddBlankLine();
+}
+
+void MipsAsmPrinter::emitInlineAsmEnd(const MCSubtargetInfo &StartInfo,
+ const MCSubtargetInfo *EndInfo) const {
+ OutStreamer.AddBlankLine();
+ getTargetStreamer().emitDirectiveSetPop();
+}
+
void MipsAsmPrinter::EmitJal(MCSymbol *Symbol) {
MCInst I;
I.setOpcode(Mips::JAL);
Modified: llvm/branches/release_35/lib/Target/Mips/MipsAsmPrinter.h
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_35/lib/Target/Mips/MipsAsmPrinter.h?rev=232083&r1=232082&r2=232083&view=diff
==============================================================================
--- llvm/branches/release_35/lib/Target/Mips/MipsAsmPrinter.h (original)
+++ llvm/branches/release_35/lib/Target/Mips/MipsAsmPrinter.h Thu Mar 12 14:17:32 2015
@@ -31,7 +31,7 @@ class Module;
class raw_ostream;
class LLVM_LIBRARY_VISIBILITY MipsAsmPrinter : public AsmPrinter {
- MipsTargetStreamer &getTargetStreamer();
+ MipsTargetStreamer &getTargetStreamer() const;
void EmitInstrWithMacroNoAT(const MachineInstr *MI);
@@ -60,6 +60,11 @@ private:
std::map<const char *, const llvm::Mips16HardFloatInfo::FuncSignature *>
StubsNeeded;
+ void emitInlineAsmStart(const MCSubtargetInfo &StartInfo) const override;
+
+ void emitInlineAsmEnd(const MCSubtargetInfo &StartInfo,
+ const MCSubtargetInfo *EndInfo) const override;
+
void EmitJal(MCSymbol *Symbol);
void EmitInstrReg(unsigned Opcode, unsigned Reg);
Removed: llvm/branches/release_35/test/CodeGen/Mips/fptr2.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_35/test/CodeGen/Mips/fptr2.ll?rev=232082&view=auto
==============================================================================
--- llvm/branches/release_35/test/CodeGen/Mips/fptr2.ll (original)
+++ llvm/branches/release_35/test/CodeGen/Mips/fptr2.ll (removed)
@@ -1,20 +0,0 @@
-; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mcpu=mips16 -relocation-model=static < %s | FileCheck %s -check-prefix=static16
-
-; Function Attrs: nounwind
-define double @my_mul(double %a, double %b) #0 {
-entry:
- %a.addr = alloca double, align 8
- %b.addr = alloca double, align 8
- store double %a, double* %a.addr, align 8
- store double %b, double* %b.addr, align 8
- %0 = load double* %a.addr, align 8
- %1 = load double* %b.addr, align 8
- %mul = fmul double %0, %1
- ret double %mul
-}
-
-; static16: .ent __fn_stub_my_mul
-; static16: .set reorder
-; static16-NEXT: #NO_APP
-; static16: .end __fn_stub_my_mul
-attributes #0 = { nounwind "less-precise-fpmad"="false" "no-frame-pointer-elim"="true" "no-frame-pointer-elim-non-leaf" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="true" }
Added: llvm/branches/release_35/test/CodeGen/Mips/inlineasm-assembler-directives.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_35/test/CodeGen/Mips/inlineasm-assembler-directives.ll?rev=232083&view=auto
==============================================================================
--- llvm/branches/release_35/test/CodeGen/Mips/inlineasm-assembler-directives.ll (added)
+++ llvm/branches/release_35/test/CodeGen/Mips/inlineasm-assembler-directives.ll Thu Mar 12 14:17:32 2015
@@ -0,0 +1,23 @@
+; RUN: llc -march=mips < %s | FileCheck %s
+
+; Check for the emission of appropriate assembler directives before and
+; after the inline assembly code.
+define void @f() nounwind {
+entry:
+; CHECK: #APP
+; CHECK-NEXT: .set push
+; CHECK-NEXT: .set at
+; CHECK-NEXT: .set macro
+; CHECK-NEXT: .set reorder
+; CHECK: addi $9, ${{[2-9][0-9]?}}, 8
+; CHECK: subi ${{[2-9][0-9]?}}, $9, 6
+; CHECK: .set pop
+; CHECK-NEXT: #NO_APP
+ %a = alloca i32, align 4
+ %b = alloca i32, align 4
+ store i32 20, i32* %a, align 4
+ %0 = load i32* %a, align 4
+ %1 = call i32 asm sideeffect "addi $$9, $1, 8\0A\09subi $0, $$9, 6", "=r,r,~{$1}"(i32 %0)
+ store i32 %1, i32* %b, align 4
+ ret void
+}
Modified: llvm/branches/release_35/test/CodeGen/Mips/inlineasm-cnstrnt-reg.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_35/test/CodeGen/Mips/inlineasm-cnstrnt-reg.ll?rev=232083&r1=232082&r2=232083&view=diff
==============================================================================
--- llvm/branches/release_35/test/CodeGen/Mips/inlineasm-cnstrnt-reg.ll (original)
+++ llvm/branches/release_35/test/CodeGen/Mips/inlineasm-cnstrnt-reg.ll Thu Mar 12 14:17:32 2015
@@ -32,10 +32,10 @@ entry:
; Now l with 1024: make sure register lo is picked. We do this by checking the instruction
; after the inline expression for a mflo to pull the value out of lo.
-; CHECK: #APP
-; CHECK-NEXT: mtlo ${{[0-9]+}}
+; CHECK: #APP
+; CHECK: mtlo ${{[0-9]+}}
; CHECK-NEXT: madd ${{[0-9]+}},${{[0-9]+}}
-; CHECK-NEXT: #NO_APP
+; CHECK: #NO_APP
; CHECK-NEXT: mflo ${{[0-9]+}}
%bosco = alloca i32, align 4
call i32 asm sideeffect "\09mtlo $3 \0A\09\09madd $1,$2 ", "=l,r,r,r"(i32 7, i32 6, i32 44) nounwind
Modified: llvm/branches/release_35/test/CodeGen/Mips/inlineasmmemop.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_35/test/CodeGen/Mips/inlineasmmemop.ll?rev=232083&r1=232082&r2=232083&view=diff
==============================================================================
--- llvm/branches/release_35/test/CodeGen/Mips/inlineasmmemop.ll (original)
+++ llvm/branches/release_35/test/CodeGen/Mips/inlineasmmemop.ll Thu Mar 12 14:17:32 2015
@@ -5,6 +5,7 @@
define i32 @f1(i32 %x) nounwind {
entry:
+; CHECK-LABEL: f1:
; CHECK: addiu $[[T0:[0-9]+]], $sp
; CHECK: #APP
; CHECK: sw $4, 0($[[T0]])
@@ -22,17 +23,18 @@ entry:
ret i32 %0
}
+; CHECK-LABEL: main:
; "D": Second word of double word. This works for any memory element
; double or single.
; CHECK: #APP
-; CHECK-NEXT: lw ${{[0-9]+}},4(${{[0-9]+}});
-; CHECK-NEXT: #NO_APP
+; CHECK: lw ${{[0-9]+}},4(${{[0-9]+}});
+; CHECK: #NO_APP
; No "D": First word of double word. This works for any memory element
; double or single.
; CHECK: #APP
-; CHECK-NEXT: lw ${{[0-9]+}},0(${{[0-9]+}});
-; CHECK-NEXT: #NO_APP
+; CHECK: lw ${{[0-9]+}},0(${{[0-9]+}});
+; CHECK: #NO_APP
;int b[8] = {0,1,2,3,4,5,6,7};
;int main()
More information about the llvm-branch-commits
mailing list