Prep for merging 3.4: Undo changes from 3.3 branch

test/CodeGen/NVPTX/generic-to-nvvm.ll

Index: test/CodeGen/NVPTX/generic-to-nvvm.ll
diff --git a/test/CodeGen/NVPTX/generic-to-nvvm.ll b/test/CodeGen/NVPTX/generic-to-nvvm.ll
deleted file mode 100644
index c9cb2f71f4255abf7b8aae86b8db59ab62edc6bb..0000000000000000000000000000000000000000
--- a/test/CodeGen/NVPTX/generic-to-nvvm.ll
+++ /dev/null
@@ -1,25 +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"
-
-; Ensure global variables in address space 0 are promoted to address space 1
-
-; CHECK: .global .align 4 .u32 myglobal = 42;
-@myglobal = internal global i32 42, align 4
-; CHECK: .global .align 4 .u32 myconst = 42;
-@myconst = internal constant i32 42, align 4
-
-
-define void @foo(i32* %a, i32* %b) {
-; CHECK: cvta.global.u32
-  %ld1 = load i32* @myglobal
-; CHECK: cvta.global.u32
-  %ld2 = load i32* @myconst
-  store i32 %ld1, i32* %a
-  store i32 %ld2, i32* %b
-  ret void
-}
-
-
-!nvvm.annotations = !{!0}
-!0 = metadata !{void (i32*, i32*)* @foo, metadata !"kernel", i32 1}