From f9e5b5ebb4d7f30a32bd1ba6527277519c186f20 Mon Sep 17 00:00:00 2001 From: Evan Cheng Date: Wed, 12 Aug 2009 01:56:42 +0000 Subject: Remove an Darwin assembler workaround. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@78777 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Target/ARM/ARMInstrThumb2.td | 16 +--------------- test/CodeGen/Thumb2/thumb2-orn2.ll | 2 +- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/lib/Target/ARM/ARMInstrThumb2.td b/lib/Target/ARM/ARMInstrThumb2.td index 57026fa..49875cb 100644 --- a/lib/Target/ARM/ARMInstrThumb2.td +++ b/lib/Target/ARM/ARMInstrThumb2.td @@ -786,21 +786,7 @@ def t2BFC : T2I<(outs GPR:$dst), (ins GPR:$src, bf_inv_mask_imm:$imm), IIC_iALU, // FIXME: A8.6.18 BFI - Bitfield insert (Encoding T1) -/* defm t2ORN : T2I_bin_irs<"orn", BinOpFrag<(or node:$LHS, (not node:$RHS))>>; -*/ -// FIXME: Disable this pattern on Darwin to workaround an assembler bug. -def t2ORNri : T2sI<(outs GPR:$dst), (ins GPR:$lhs, t2_so_imm:$rhs), IIC_iALU, - "orn", " $dst, $lhs, $rhs", - [(set GPR:$dst, (or GPR:$lhs, (not t2_so_imm:$rhs)))]>, - Requires<[IsThumb2, IsNotDarwin]>; - -def t2ORNrr : T2sI<(outs GPR:$dst), (ins GPR:$lhs, GPR:$rhs), IIC_iALU, - "orn", " $dst, $lhs, $rhs", - [(set GPR:$dst, (or GPR:$lhs, (not GPR:$rhs)))]>; -def t2ORNrs : T2sI<(outs GPR:$dst), (ins GPR:$lhs, t2_so_reg:$rhs), IIC_iALU, - "orn", " $dst, $lhs, $rhs", - [(set GPR:$dst, (or GPR:$lhs, (not t2_so_reg:$rhs)))]>; // Prefer over of t2EORri ra, rb, -1 because mvn has 16-bit version let AddedComplexity = 1 in @@ -813,7 +799,7 @@ def : T2Pat<(and GPR:$src, t2_so_imm_not:$imm), // FIXME: Disable this pattern on Darwin to workaround an assembler bug. def : T2Pat<(or GPR:$src, t2_so_imm_not:$imm), (t2ORNri GPR:$src, t2_so_imm_not:$imm)>, - Requires<[IsThumb2, IsNotDarwin]>; + Requires<[IsThumb2]>; def : T2Pat<(t2_so_imm_not:$src), (t2MVNi t2_so_imm_not:$src)>; diff --git a/test/CodeGen/Thumb2/thumb2-orn2.ll b/test/CodeGen/Thumb2/thumb2-orn2.ll index 7679e38..7758edd 100644 --- a/test/CodeGen/Thumb2/thumb2-orn2.ll +++ b/test/CodeGen/Thumb2/thumb2-orn2.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -mtriple=thumb-linux -mattr=+thumb2 | grep {orn\\W*r\[0-9\]*,\\W*r\[0-9\]*,\\W*#\[0-9\]*} | grep {#187\\|#11141290\\|#3422604288\\|#1114112} | count 4 +; 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 define i32 @f1(i32 %a) { -- cgit v1.1