Prep for merging 3.4: Undo changes from 3.3 branch

test/CodeGen/NVPTX/i1-param.ll

Index: test/CodeGen/NVPTX/i1-param.ll
diff --git a/test/CodeGen/NVPTX/i1-param.ll b/test/CodeGen/NVPTX/i1-param.ll
deleted file mode 100644
index fabd61a25d2fd8df5fda2edd9133a49a1db2ba43..0000000000000000000000000000000000000000
--- a/test/CodeGen/NVPTX/i1-param.ll
+++ /dev/null
@@ -1,18 +0,0 @@
-; RUN: llc < %s -march=nvptx -mcpu=sm_20 -drvcuda | FileCheck %s
-
-target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v16:16:16-v32:32:32-v64:64:64-v128:128:128-n16:32:64"
-
-; Make sure predicate (i1) operands to kernels get expanded out to .u8
-
-; CHECK: .entry foo
-; CHECK:   .param .u8 foo_param_0
-; CHECK:   .param .u32 foo_param_1
-define void @foo(i1 %p, i32* %out) {
-  %val = zext i1 %p to i32
-  store i32 %val, i32* %out
-  ret void
-}
-
-
-!nvvm.annotations = !{!0}
-!0 = metadata !{void (i1, i32*)* @foo, metadata !"kernel", i32 1}