diff --git a/llvm/test/CodeGen/NVPTX/sm-version-20.ll b/llvm/test/CodeGen/NVPTX/sm-version-20.ll
deleted file mode 100644
--- a/llvm/test/CodeGen/NVPTX/sm-version-20.ll
+++ /dev/null
@@ -1,6 +0,0 @@
-; RUN: llc < %s -march=nvptx -mcpu=sm_20 | FileCheck %s
-; RUN: llc < %s -march=nvptx64 -mcpu=sm_20 | FileCheck %s
-
-
-; CHECK: .target sm_20
-
diff --git a/llvm/test/CodeGen/NVPTX/sm-version-21.ll b/llvm/test/CodeGen/NVPTX/sm-version-21.ll
deleted file mode 100644
--- a/llvm/test/CodeGen/NVPTX/sm-version-21.ll
+++ /dev/null
@@ -1,6 +0,0 @@
-; RUN: llc < %s -march=nvptx -mcpu=sm_21 | FileCheck %s
-; RUN: llc < %s -march=nvptx64 -mcpu=sm_21 | FileCheck %s
-
-
-; CHECK: .target sm_21
-
diff --git a/llvm/test/CodeGen/NVPTX/sm-version-30.ll b/llvm/test/CodeGen/NVPTX/sm-version-30.ll
deleted file mode 100644
--- a/llvm/test/CodeGen/NVPTX/sm-version-30.ll
+++ /dev/null
@@ -1,7 +0,0 @@
-; RUN: llc < %s -march=nvptx -mcpu=sm_30 | FileCheck %s
-; RUN: llc < %s -march=nvptx64 -mcpu=sm_30 | FileCheck %s
-
-
-; CHECK: .version 3.2
-; CHECK: .target sm_30
-
diff --git a/llvm/test/CodeGen/NVPTX/sm-version-32.ll b/llvm/test/CodeGen/NVPTX/sm-version-32.ll
deleted file mode 100644
--- a/llvm/test/CodeGen/NVPTX/sm-version-32.ll
+++ /dev/null
@@ -1,7 +0,0 @@
-; RUN: llc < %s -march=nvptx -mcpu=sm_32 | FileCheck %s
-; RUN: llc < %s -march=nvptx64 -mcpu=sm_32 | FileCheck %s
-
-
-; CHECK: .version 4.0
-; CHECK: .target sm_32
-
diff --git a/llvm/test/CodeGen/NVPTX/sm-version-35.ll b/llvm/test/CodeGen/NVPTX/sm-version-35.ll
deleted file mode 100644
--- a/llvm/test/CodeGen/NVPTX/sm-version-35.ll
+++ /dev/null
@@ -1,7 +0,0 @@
-; RUN: llc < %s -march=nvptx -mcpu=sm_35 | FileCheck %s
-; RUN: llc < %s -march=nvptx64 -mcpu=sm_35 | FileCheck %s
-
-
-; CHECK: .version 3.2
-; CHECK: .target sm_35
-
diff --git a/llvm/test/CodeGen/NVPTX/sm-version-37.ll b/llvm/test/CodeGen/NVPTX/sm-version-37.ll
deleted file mode 100644
--- a/llvm/test/CodeGen/NVPTX/sm-version-37.ll
+++ /dev/null
@@ -1,7 +0,0 @@
-; RUN: llc < %s -march=nvptx -mcpu=sm_37 | FileCheck %s
-; RUN: llc < %s -march=nvptx64 -mcpu=sm_37 | FileCheck %s
-
-
-; CHECK: .version 4.1
-; CHECK: .target sm_37
-
diff --git a/llvm/test/CodeGen/NVPTX/sm-version-50.ll b/llvm/test/CodeGen/NVPTX/sm-version-50.ll
deleted file mode 100644
--- a/llvm/test/CodeGen/NVPTX/sm-version-50.ll
+++ /dev/null
@@ -1,7 +0,0 @@
-; RUN: llc < %s -march=nvptx -mcpu=sm_50 | FileCheck %s
-; RUN: llc < %s -march=nvptx64 -mcpu=sm_50 | FileCheck %s
-
-
-; CHECK: .version 4.0
-; CHECK: .target sm_50
-
diff --git a/llvm/test/CodeGen/NVPTX/sm-version-52.ll b/llvm/test/CodeGen/NVPTX/sm-version-52.ll
deleted file mode 100644
--- a/llvm/test/CodeGen/NVPTX/sm-version-52.ll
+++ /dev/null
@@ -1,7 +0,0 @@
-; RUN: llc < %s -march=nvptx -mcpu=sm_52 | FileCheck %s
-; RUN: llc < %s -march=nvptx64 -mcpu=sm_52 | FileCheck %s
-
-
-; CHECK: .version 4.1
-; CHECK: .target sm_52
-
diff --git a/llvm/test/CodeGen/NVPTX/sm-version-53.ll b/llvm/test/CodeGen/NVPTX/sm-version-53.ll
deleted file mode 100644
--- a/llvm/test/CodeGen/NVPTX/sm-version-53.ll
+++ /dev/null
@@ -1,7 +0,0 @@
-; RUN: llc < %s -march=nvptx -mcpu=sm_53 | FileCheck %s
-; RUN: llc < %s -march=nvptx64 -mcpu=sm_53 | FileCheck %s
-
-
-; CHECK: .version 4.2
-; CHECK: .target sm_53
-
diff --git a/llvm/test/CodeGen/NVPTX/sm-version-60.ll b/llvm/test/CodeGen/NVPTX/sm-version-60.ll
deleted file mode 100644
--- a/llvm/test/CodeGen/NVPTX/sm-version-60.ll
+++ /dev/null
@@ -1,5 +0,0 @@
-; RUN: llc < %s -march=nvptx -mcpu=sm_60 | FileCheck %s
-; RUN: llc < %s -march=nvptx64 -mcpu=sm_60 | FileCheck %s
-
-; CHECK: .version 5.0
-; CHECK: .target sm_60
diff --git a/llvm/test/CodeGen/NVPTX/sm-version-61.ll b/llvm/test/CodeGen/NVPTX/sm-version-61.ll
deleted file mode 100644
--- a/llvm/test/CodeGen/NVPTX/sm-version-61.ll
+++ /dev/null
@@ -1,5 +0,0 @@
-; RUN: llc < %s -march=nvptx -mcpu=sm_61 | FileCheck %s
-; RUN: llc < %s -march=nvptx64 -mcpu=sm_61 | FileCheck %s
-
-; CHECK: .version 5.0
-; CHECK: .target sm_61
diff --git a/llvm/test/CodeGen/NVPTX/sm-version-62.ll b/llvm/test/CodeGen/NVPTX/sm-version-62.ll
deleted file mode 100644
--- a/llvm/test/CodeGen/NVPTX/sm-version-62.ll
+++ /dev/null
@@ -1,5 +0,0 @@
-; RUN: llc < %s -march=nvptx -mcpu=sm_62 | FileCheck %s
-; RUN: llc < %s -march=nvptx64 -mcpu=sm_62 | FileCheck %s
-
-; CHECK: .version 5.0
-; CHECK: .target sm_62
diff --git a/llvm/test/CodeGen/NVPTX/sm-version-70.ll b/llvm/test/CodeGen/NVPTX/sm-version-70.ll
deleted file mode 100644
--- a/llvm/test/CodeGen/NVPTX/sm-version-70.ll
+++ /dev/null
@@ -1,5 +0,0 @@
-; RUN: llc < %s -march=nvptx -mcpu=sm_70 | FileCheck %s
-; RUN: llc < %s -march=nvptx64 -mcpu=sm_70 | FileCheck %s
-
-; CHECK: .version 6.0
-; CHECK: .target sm_70
diff --git a/llvm/test/CodeGen/NVPTX/sm-version.ll b/llvm/test/CodeGen/NVPTX/sm-version.ll
new file mode 100644
--- /dev/null
+++ b/llvm/test/CodeGen/NVPTX/sm-version.ll
@@ -0,0 +1,65 @@
+; RUN: llc < %s -march=nvptx -mcpu=sm_20 | FileCheck %s --check-prefix=SM20
+; RUN: llc < %s -march=nvptx -mcpu=sm_21 | FileCheck %s --check-prefix=SM21
+; RUN: llc < %s -march=nvptx -mcpu=sm_30 | FileCheck %s --check-prefix=SM30
+; RUN: llc < %s -march=nvptx -mcpu=sm_32 | FileCheck %s --check-prefix=SM32
+; RUN: llc < %s -march=nvptx -mcpu=sm_35 | FileCheck %s --check-prefix=SM35
+; RUN: llc < %s -march=nvptx -mcpu=sm_37 | FileCheck %s --check-prefix=SM37
+; RUN: llc < %s -march=nvptx -mcpu=sm_50 | FileCheck %s --check-prefix=SM50
+; RUN: llc < %s -march=nvptx -mcpu=sm_52 | FileCheck %s --check-prefix=SM52
+; RUN: llc < %s -march=nvptx -mcpu=sm_53 | FileCheck %s --check-prefix=SM53
+; RUN: llc < %s -march=nvptx -mcpu=sm_60 | FileCheck %s --check-prefix=SM60
+; RUN: llc < %s -march=nvptx -mcpu=sm_61 | FileCheck %s --check-prefix=SM61
+; RUN: llc < %s -march=nvptx -mcpu=sm_62 | FileCheck %s --check-prefix=SM62
+; RUN: llc < %s -march=nvptx -mcpu=sm_70 | FileCheck %s --check-prefix=SM70
+; RUN: llc < %s -march=nvptx -mcpu=sm_75 | FileCheck %s --check-prefix=SM75
+; RUN: llc < %s -march=nvptx -mcpu=sm_80 | FileCheck %s --check-prefix=SM80
+; RUN: llc < %s -march=nvptx -mcpu=sm_86 | FileCheck %s --check-prefix=SM86
+
+; RUN: llc < %s -march=nvptx64 -mcpu=sm_20 | FileCheck %s --check-prefix=SM20
+; RUN: llc < %s -march=nvptx64 -mcpu=sm_21 | FileCheck %s --check-prefix=SM21
+; RUN: llc < %s -march=nvptx64 -mcpu=sm_30 | FileCheck %s --check-prefix=SM30
+; RUN: llc < %s -march=nvptx64 -mcpu=sm_32 | FileCheck %s --check-prefix=SM32
+; RUN: llc < %s -march=nvptx64 -mcpu=sm_35 | FileCheck %s --check-prefix=SM35
+; RUN: llc < %s -march=nvptx64 -mcpu=sm_37 | FileCheck %s --check-prefix=SM37
+; RUN: llc < %s -march=nvptx64 -mcpu=sm_50 | FileCheck %s --check-prefix=SM50
+; RUN: llc < %s -march=nvptx64 -mcpu=sm_52 | FileCheck %s --check-prefix=SM52
+; RUN: llc < %s -march=nvptx64 -mcpu=sm_53 | FileCheck %s --check-prefix=SM53
+; RUN: llc < %s -march=nvptx64 -mcpu=sm_60 | FileCheck %s --check-prefix=SM60
+; RUN: llc < %s -march=nvptx64 -mcpu=sm_61 | FileCheck %s --check-prefix=SM61
+; RUN: llc < %s -march=nvptx64 -mcpu=sm_62 | FileCheck %s --check-prefix=SM62
+; RUN: llc < %s -march=nvptx64 -mcpu=sm_70 | FileCheck %s --check-prefix=SM70
+; RUN: llc < %s -march=nvptx64 -mcpu=sm_75 | FileCheck %s --check-prefix=SM75
+; RUN: llc < %s -march=nvptx64 -mcpu=sm_80 | FileCheck %s --check-prefix=SM80
+; RUN: llc < %s -march=nvptx64 -mcpu=sm_86 | FileCheck %s --check-prefix=SM86
+
+; SM30: .version 3.2
+; SM32: .version 4.0
+; SM35: .version 3.2
+; SM37: .version 4.1
+; SM50: .version 4.0
+; SM52: .version 4.1
+; SM53: .version 4.2
+; SM60: .version 5.0
+; SM61: .version 5.0
+; SM62: .version 5.0
+; SM70: .version 6.0
+; SM75: .version 6.3
+; SM80: .version 7.0
+; SM86: .version 7.1
+
+; SM20: .target sm_20
+; SM21: .target sm_21
+; SM30: .target sm_30
+; SM32: .target sm_32
+; SM35: .target sm_35
+; SM37: .target sm_37
+; SM50: .target sm_50
+; SM52: .target sm_52
+; SM53: .target sm_53
+; SM60: .target sm_60
+; SM61: .target sm_61
+; SM62: .target sm_62
+; SM70: .target sm_70
+; SM75: .target sm_75
+; SM80: .target sm_80
+; SM86: .target sm_86