Prep for merging 3.4: Undo changes from 3.3 branch

test/CodeGen/R600/bfe_uint.ll

Index: test/CodeGen/R600/bfe_uint.ll
diff --git a/test/CodeGen/R600/bfe_uint.ll b/test/CodeGen/R600/bfe_uint.ll
deleted file mode 100644
index 92570c31529983fdf2c4d78d3a98941e85e4c62b..0000000000000000000000000000000000000000
--- a/test/CodeGen/R600/bfe_uint.ll
+++ /dev/null
@@ -1,26 +0,0 @@
-; RUN: llc < %s -march=r600 -mcpu=redwood | FileCheck %s
-
-; CHECK: @bfe_def
-; CHECK: BFE_UINT
-define void @bfe_def(i32 addrspace(1)* %out, i32 %x) {
-entry:
-  %0 = lshr i32 %x, 5
-  %1 = and i32 %0, 15 ; 0xf
-  store i32 %1, i32 addrspace(1)* %out
-  ret void
-}
-
-; This program could be implemented using a BFE_UINT instruction, however
-; since the lshr constant + number of bits in the mask is >= 32, it can also be
-; implmented with a LSHR instruction, which is better, because LSHR has less
-; operands and requires less constants.
-
-; CHECK: @bfe_shift
-; CHECK-NOT: BFE_UINT
-define void @bfe_shift(i32 addrspace(1)* %out, i32 %x) {
-entry:
-  %0 = lshr i32 %x, 16
-  %1 = and i32 %0, 65535 ; 0xffff
-  store i32 %1, i32 addrspace(1)* %out
-  ret void
-}