diff options
| -rw-r--r-- | lib/Target/X86/X86Instr64bit.td | 2 | ||||
| -rw-r--r-- | lib/Target/X86/X86InstrInfo.td | 2 | ||||
| -rw-r--r-- | test/CodeGen/X86/fold-call.ll | 10 | ||||
| -rw-r--r-- | utils/TableGen/DAGISelEmitter.cpp | 11 |
4 files changed, 17 insertions, 8 deletions
diff --git a/lib/Target/X86/X86Instr64bit.td b/lib/Target/X86/X86Instr64bit.td index 55f8ca3..de422f0 100644 --- a/lib/Target/X86/X86Instr64bit.td +++ b/lib/Target/X86/X86Instr64bit.td @@ -101,7 +101,7 @@ let isCall = 1 in def CALL64r : I<0xFF, MRM2r, (outs), (ins GR64:$dst, variable_ops), "call\t{*}$dst", [(X86call GR64:$dst)]>; def CALL64m : I<0xFF, MRM2m, (outs), (ins i64mem:$dst, variable_ops), - "call\t{*}$dst", []>; + "call\t{*}$dst", [(X86call (loadi64 addr:$dst))]>; } diff --git a/lib/Target/X86/X86InstrInfo.td b/lib/Target/X86/X86InstrInfo.td index d0bd955..4ffc303 100644 --- a/lib/Target/X86/X86InstrInfo.td +++ b/lib/Target/X86/X86InstrInfo.td @@ -397,7 +397,7 @@ let isCall = 1 in def CALL32r : I<0xFF, MRM2r, (outs), (ins GR32:$dst, variable_ops), "call\t{*}$dst", [(X86call GR32:$dst)]>; def CALL32m : I<0xFF, MRM2m, (outs), (ins i32mem:$dst, variable_ops), - "call\t{*}$dst", []>; + "call\t{*}$dst", [(X86call (loadi32 addr:$dst))]>; } // Tail call stuff. diff --git a/test/CodeGen/X86/fold-call.ll b/test/CodeGen/X86/fold-call.ll new file mode 100644 index 0000000..5399171 --- /dev/null +++ b/test/CodeGen/X86/fold-call.ll @@ -0,0 +1,10 @@ +; RUN: llvm-as < %s | llc -march=x86 | not grep mov +; RUN: llvm-as < %s | llc -march=x86-64 | not grep mov + +declare void @bar() + +define void @foo(i32 %i0, i32 %i1, i32 %i2, i32 %i3, i32 %i4, i32 %i5, void()* %arg) nounwind { + call void @bar() + call void %arg() + ret void +} diff --git a/utils/TableGen/DAGISelEmitter.cpp b/utils/TableGen/DAGISelEmitter.cpp index b112b7e..cf8c627 100644 --- a/utils/TableGen/DAGISelEmitter.cpp +++ b/utils/TableGen/DAGISelEmitter.cpp @@ -947,7 +947,7 @@ public: // instruction operands to do this. std::vector<std::string> AllOps; unsigned NumEAInputs = 0; // # of synthesized 'execute always' inputs. - unsigned NumDiscardedInputs = 0; // # of 'discard' inputs to skip. + unsigned InputIndex = 0; for (unsigned ChildNo = 0, InstOpNo = NumResults; InstOpNo != II.OperandList.size(); ++InstOpNo) { std::vector<std::string> Ops; @@ -956,7 +956,7 @@ public: Record *OperandNode = II.OperandList[InstOpNo].Rec; if (OperandNode->getName() == "discard") { // This is a "discard" operand; emit nothing. Just note it. - ++NumDiscardedInputs; + ++InputIndex; } else if ((OperandNode->isSubClassOf("PredicateOperand") || OperandNode->isSubClassOf("OptionalDefOperand")) && !CGP.getDefaultOperand(OperandNode).DefaultOps.empty()) { @@ -970,6 +970,7 @@ public: AllOps.insert(AllOps.end(), Ops.begin(), Ops.end()); NumEAInputs += Ops.size(); } + ++InputIndex; } else { // Otherwise this is a normal operand or a predicate operand without // 'execute always'; emit it. @@ -977,6 +978,7 @@ public: InFlagDecled, ResNodeDecled); AllOps.insert(AllOps.end(), Ops.begin(), Ops.end()); ++ChildNo; + ++InputIndex; } } @@ -1062,10 +1064,7 @@ public: // number of operands that are 'execute always'. This is the index // where we should start copying operands into the 'variable_ops' // portion of the output. - unsigned InputIndex = AllOps.size() + - NumDiscardedInputs + - NodeHasChain - - NumEAInputs; + InputIndex += NodeHasChain - NumEAInputs; for (unsigned i = 0, e = AllOps.size(); i != e; ++i) emitCode("Ops" + utostr(OpsNo) + ".push_back(" + AllOps[i] + ");"); |