maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

TargetConstant immediates won't be placed into registers so tighten 

up the valid constant check earlier.

rdar://9692967

llvm-svn: 134286
This commit is contained in:
Eric Christopher 2011-07-01 23:04:38 +00:00
parent 8e25253e14
commit a8a56f7e5c
2 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
llvm/lib/Target/X86/X86ISelDAGToDAG.cpp
View File

@ -23,6 +23,7 @@
#include "llvm/Intrinsics.h" #include "llvm/Intrinsics.h"
#include "llvm/Support/CFG.h" #include "llvm/Support/CFG.h"
#include "llvm/Type.h" #include "llvm/Type.h"
#include "llvm/CodeGen/FunctionLoweringInfo.h"
#include "llvm/CodeGen/MachineConstantPool.h" #include "llvm/CodeGen/MachineConstantPool.h"
#include "llvm/CodeGen/MachineFunction.h" #include "llvm/CodeGen/MachineFunction.h"
#include "llvm/CodeGen/MachineFrameInfo.h" #include "llvm/CodeGen/MachineFrameInfo.h"
@ -1351,7 +1352,7 @@ SDNode *X86DAGToDAGISel::SelectAtomicLoadAdd(SDNode *Node, EVT NVT) {
bool isInc = false, isDec = false, isSub = false, isCN = false; bool isInc = false, isDec = false, isSub = false, isCN = false;
ConstantSDNode *CN = dyn_cast<ConstantSDNode>(Val); ConstantSDNode *CN = dyn_cast<ConstantSDNode>(Val);
if (CN) { if (CN && CN->getSExtValue() == (int32_t)CN->getSExtValue()) {
isCN = true; isCN = true;
int64_t CNVal = CN->getSExtValue(); int64_t CNVal = CN->getSExtValue();
if (CNVal == 1) if (CNVal == 1)
@ -1371,6 +1372,7 @@ SDNode *X86DAGToDAGISel::SelectAtomicLoadAdd(SDNode *Node, EVT NVT) {
Val = Val.getOperand(1); Val = Val.getOperand(1);
} }
DebugLoc dl = Node->getDebugLoc();
unsigned Opc = 0; unsigned Opc = 0;
switch (NVT.getSimpleVT().SimpleTy) { switch (NVT.getSimpleVT().SimpleTy) {
default: return 0; default: return 0;
@ -1462,7 +1464,6 @@ SDNode *X86DAGToDAGISel::SelectAtomicLoadAdd(SDNode *Node, EVT NVT) {
break; break;
} }
DebugLoc dl = Node->getDebugLoc();
SDValue Undef = SDValue(CurDAG->getMachineNode(TargetOpcode::IMPLICIT_DEF, SDValue Undef = SDValue(CurDAG->getMachineNode(TargetOpcode::IMPLICIT_DEF,
dl, NVT), 0); dl, NVT), 0);
MachineSDNode::mmo_iterator MemOp = MF->allocateMemRefsArray(1); MachineSDNode::mmo_iterator MemOp = MF->allocateMemRefsArray(1);
@ -1579,7 +1580,7 @@ SDNode *X86DAGToDAGISel::SelectAtomicLoadArith(SDNode *Node, EVT NVT) {
bool isCN = false; bool isCN = false;
ConstantSDNode *CN = dyn_cast<ConstantSDNode>(Val); ConstantSDNode *CN = dyn_cast<ConstantSDNode>(Val);
if (CN) { if (CN && (int32_t)CN->getSExtValue() == CN->getSExtValue()) {
isCN = true; isCN = true;
Val = CurDAG->getTargetConstant(CN->getSExtValue(), NVT); Val = CurDAG->getTargetConstant(CN->getSExtValue(), NVT);
} }

22
llvm/test/CodeGen/X86/atomic-or.ll
View File

@ -2,17 +2,35 @@
; rdar://9692967 ; rdar://9692967
define void @do_the_sync(i64* %p, i32 %b) nounwind { define void @t1(i64* %p, i32 %b) nounwind {
entry: entry:
%p.addr = alloca i64*, align 8 %p.addr = alloca i64*, align 8
store i64* %p, i64** %p.addr, align 8 store i64* %p, i64** %p.addr, align 8
%tmp = load i64** %p.addr, align 8 %tmp = load i64** %p.addr, align 8
call void @llvm.memory.barrier(i1 true, i1 true, i1 true, i1 true, i1 true) call void @llvm.memory.barrier(i1 true, i1 true, i1 true, i1 true, i1 true)
; CHECK: t1:
; CHECK: movl $2147483648, %eax
; CHECK: lock ; CHECK: lock
; CHECK-NEXT: orq $2147483648 ; CHECK-NEXT: orq %rax, (%rdi)
%0 = call i64 @llvm.atomic.load.or.i64.p0i64(i64* %tmp, i64 2147483648) %0 = call i64 @llvm.atomic.load.or.i64.p0i64(i64* %tmp, i64 2147483648)
call void @llvm.memory.barrier(i1 true, i1 true, i1 true, i1 true, i1 true) call void @llvm.memory.barrier(i1 true, i1 true, i1 true, i1 true, i1 true)
ret void ret void
} }
define void @t2(i64* %p, i32 %b) nounwind {
entry:
%p.addr = alloca i64*, align 8
store i64* %p, i64** %p.addr, align 8
%tmp = load i64** %p.addr, align 8
call void @llvm.memory.barrier(i1 true, i1 true, i1 true, i1 true, i1 true)
; CHECK: t2:
; CHECK-NOT: movl
; CHECK: lock
; CHECK-NEXT: orq $2147483644, (%rdi)
%0 = call i64 @llvm.atomic.load.or.i64.p0i64(i64* %tmp, i64 2147483644)
call void @llvm.memory.barrier(i1 true, i1 true, i1 true, i1 true, i1 true)
ret void
}
declare i64 @llvm.atomic.load.or.i64.p0i64(i64* nocapture, i64) nounwind declare i64 @llvm.atomic.load.or.i64.p0i64(i64* nocapture, i64) nounwind
declare void @llvm.memory.barrier(i1, i1, i1, i1, i1) nounwind declare void @llvm.memory.barrier(i1, i1, i1, i1, i1) nounwind