diff options
| author | David Goodwin <david_goodwin@apple.com> | 2009-07-30 21:51:41 +0000 |
|---|---|---|
| committer | David Goodwin <david_goodwin@apple.com> | 2009-07-30 21:51:41 +0000 |
| commit | 0bfc8312c2c22538acdac185ccad6a66fb155bc2 (patch) | |
| tree | e301f01b23f13865fb1f7e26f317baf0c1aebf6d | |
| parent | a523b2d7a0bead8ede279217cd9152fdeb71c0cf (diff) | |
| download | bcm5719-llvm-0bfc8312c2c22538acdac185ccad6a66fb155bc2.tar.gz bcm5719-llvm-0bfc8312c2c22538acdac185ccad6a66fb155bc2.zip | |
Darwin assembler now recognizes "orn", so remove workaround.
llvm-svn: 77627
| -rw-r--r-- | llvm/lib/Target/ARM/ARMInstrThumb2.td | 8 | ||||
| -rw-r--r-- | llvm/test/CodeGen/Thumb2/thumb2-orn.ll | 1 | ||||
| -rw-r--r-- | llvm/test/CodeGen/Thumb2/thumb2-orn2.ll | 1 |
3 files changed, 3 insertions, 7 deletions
diff --git a/llvm/lib/Target/ARM/ARMInstrThumb2.td b/llvm/lib/Target/ARM/ARMInstrThumb2.td index 15245c30c56..16d7e8e14a7 100644 --- a/llvm/lib/Target/ARM/ARMInstrThumb2.td +++ b/llvm/lib/Target/ARM/ARMInstrThumb2.td @@ -749,8 +749,7 @@ def t2BFC : T2I<(outs GPR:$dst), (ins GPR:$src, bf_inv_mask_imm:$imm), // FIXME: A8.6.18 BFI - Bitfield insert (Encoding T1) -// FIXME workaround for <rdar://problem/7096522> -//defm t2ORN : T2I_bin_irs<"orn", BinOpFrag<(or node:$LHS, (not node:$RHS))>>; +defm t2ORN : T2I_bin_irs<"orn", BinOpFrag<(or node:$LHS, (not node:$RHS))>>; // Prefer over of t2EORri ra, rb, -1 because mvn has 16-bit version let AddedComplexity = 1 in @@ -760,9 +759,8 @@ defm t2MVN : T2I_un_irs <"mvn", UnOpFrag<(not node:$Src)>, 1, 1>; def : T2Pat<(and GPR:$src, t2_so_imm_not:$imm), (t2BICri GPR:$src, t2_so_imm_not:$imm)>; -// FIXME workaround for <rdar://problem/7096522> -//def : T2Pat<(or GPR:$src, t2_so_imm_not:$imm), -// (t2ORNri GPR:$src, t2_so_imm_not:$imm)>; +def : T2Pat<(or GPR:$src, t2_so_imm_not:$imm), + (t2ORNri GPR:$src, t2_so_imm_not:$imm)>; def : T2Pat<(t2_so_imm_not:$src), (t2MVNi t2_so_imm_not:$src)>; diff --git a/llvm/test/CodeGen/Thumb2/thumb2-orn.ll b/llvm/test/CodeGen/Thumb2/thumb2-orn.ll index 576ff206379..92c4564841b 100644 --- a/llvm/test/CodeGen/Thumb2/thumb2-orn.ll +++ b/llvm/test/CodeGen/Thumb2/thumb2-orn.ll @@ -1,4 +1,3 @@ -; XFAIL: * ; RUN: llvm-as < %s | llc -march=thumb -mattr=+thumb2 | grep {orn\\W*r\[0-9\]*,\\W*r\[0-9\]*,\\W*r\[0-9\]*$} | count 4 ; RUN: llvm-as < %s | llc -march=thumb -mattr=+thumb2 | grep {orn\\W*r\[0-9\],\\W*r\[0-9\],\\W*r\[0-9\],\\W*lsl\\W*#5$} | count 1 ; RUN: llvm-as < %s | llc -march=thumb -mattr=+thumb2 | grep {orn\\W*r\[0-9\],\\W*r\[0-9\],\\W*r\[0-9\],\\W*lsr\\W*#6$} | count 1 diff --git a/llvm/test/CodeGen/Thumb2/thumb2-orn2.ll b/llvm/test/CodeGen/Thumb2/thumb2-orn2.ll index 5d23fbca778..7758edd1d69 100644 --- a/llvm/test/CodeGen/Thumb2/thumb2-orn2.ll +++ b/llvm/test/CodeGen/Thumb2/thumb2-orn2.ll @@ -1,4 +1,3 @@ -; XFAIL: * ; RUN: llvm-as < %s | llc -march=thumb -mattr=+thumb2 | grep {orn\\W*r\[0-9\]*,\\W*r\[0-9\]*,\\W*#\[0-9\]*} | grep {#187\\|#11141290\\|#3422604288\\|#1114112} | count 4 ; 0x000000bb = 187 |
