1 files changed, 44 insertions, 36 deletions
diff --git a/test/Transforms/InstCombine/narrow-switch.ll b/test/Transforms/InstCombine/narrow-switch.ll
index f3f19bae03dd..7cbc5e9f60b8 100644
--- a/test/Transforms/InstCombine/narrow-switch.ll
+++ b/test/Transforms/InstCombine/narrow-switch.ll
@@ -1,20 +1,25 @@
-; RUN: opt < %s -instcombine -S | FileCheck %s
+; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
+; Vary legal integer types in data layout.
+; RUN: opt < %s -instcombine -S -default-data-layout=n32    | FileCheck %s --check-prefix=ALL --check-prefix=CHECK32
+; RUN: opt < %s -instcombine -S -default-data-layout=n32:64 | FileCheck %s --check-prefix=ALL --check-prefix=CHECK64
 
-target datalayout = "e-m:o-p:32:32-f64:32:64-v64:32:64-v128:32:128-a:0:32-n32-S32"
-
-; CHECK-LABEL: define i32 @positive1
-; CHECK: switch i32
-; CHECK: i32 10, label
-; CHECK: i32 100, label
-; CHECK: i32 1001, label
+; In all cases, the data-layout is irrelevant. We should shrink as much as possible in InstCombine
+; and allow the backend to expand as much as needed to ensure optimal codegen for any target.
 
 define i32 @positive1(i64 %a) {
+; ALL-LABEL: @positive1(
+; ALL:         switch i32
+; ALL-NEXT:    i32 10, label %return
+; ALL-NEXT:    i32 100, label %sw.bb1
+; ALL-NEXT:    i32 1001, label %sw.bb2
+; ALL-NEXT:    ]
+;
 entry:
   %and = and i64 %a, 4294967295
   switch i64 %and, label %sw.default [
-    i64 10, label %return
-    i64 100, label %sw.bb1
-    i64 1001, label %sw.bb2
+  i64 10, label %return
+  i64 100, label %sw.bb1
+  i64 1001, label %sw.bb2
   ]
 
 sw.bb1:
@@ -31,19 +36,20 @@ return:
   ret i32 %retval.0
 }
 
-; CHECK-LABEL: define i32 @negative1
-; CHECK: switch i32
-; CHECK: i32 -10, label
-; CHECK: i32 -100, label
-; CHECK: i32 -1001, label
-
 define i32 @negative1(i64 %a) {
+; ALL-LABEL: @negative1(
+; ALL:         switch i32
+; ALL-NEXT:    i32 -10, label %return
+; ALL-NEXT:    i32 -100, label %sw.bb1
+; ALL-NEXT:    i32 -1001, label %sw.bb2
+; ALL-NEXT:    ]
+;
 entry:
   %or = or i64 %a, -4294967296
   switch i64 %or, label %sw.default [
-    i64 -10, label %return
-    i64 -100, label %sw.bb1
-    i64 -1001, label %sw.bb2
+  i64 -10, label %return
+  i64 -100, label %sw.bb1
+  i64 -1001, label %sw.bb2
   ]
 
 sw.bb1:
@@ -63,19 +69,20 @@ return:
 ; Make sure truncating a constant int larger than 64-bit doesn't trigger an
 ; assertion.
 
-; CHECK-LABEL: define i32 @trunc72to68
-; CHECK: switch i68
-; CHECK: i68 10, label
-; CHECK: i68 100, label
-; CHECK: i68 1001, label
-
 define i32 @trunc72to68(i72 %a) {
+; ALL-LABEL: @trunc72to68(
+; ALL:         switch i68
+; ALL-NEXT:    i68 10, label %return
+; ALL-NEXT:    i68 100, label %sw.bb1
+; ALL-NEXT:    i68 1001, label %sw.bb2
+; ALL-NEXT:    ]
+;
 entry:
   %and = and i72 %a, 295147905179352825855
   switch i72 %and, label %sw.default [
-    i72 10, label %return
-    i72 100, label %sw.bb1
-    i72 1001, label %sw.bb2
+  i72 10, label %return
+  i72 100, label %sw.bb1
+  i72 1001, label %sw.bb2
   ]
 
 sw.bb1:
@@ -95,21 +102,22 @@ return:
 ; Make sure to avoid assertion crashes and use the type before
 ; truncation to generate the sub constant expressions that leads
 ; to the recomputed condition.
-;
-; CHECK-LABEL: @trunc64to59
-; CHECK: switch i59
-; CHECK: i59 0, label
-; CHECK: i59 18717182647723699, label
 
 define void @trunc64to59(i64 %a) {
+; ALL-LABEL: @trunc64to59(
+; ALL:         switch i59
+; ALL-NEXT:    i59 0, label %sw.bb1
+; ALL-NEXT:    i59 18717182647723699, label %sw.bb2
+; ALL-NEXT:    ]
+;
 entry:
   %tmp0 = and i64 %a, 15
   %tmp1 = mul i64 %tmp0, -6425668444178048401
   %tmp2 = add i64 %tmp1, 5170979678563097242
   %tmp3 = mul i64 %tmp2, 1627972535142754813
   switch i64 %tmp3, label %sw.default [
-    i64 847514119312061490, label %sw.bb1
-    i64 866231301959785189, label %sw.bb2
+  i64 847514119312061490, label %sw.bb1
+  i64 866231301959785189, label %sw.bb2
   ]
 
 sw.bb1: