Index: llvm/include/llvm/CodeGen/BasicTTIImpl.h =================================================================== --- llvm/include/llvm/CodeGen/BasicTTIImpl.h +++ llvm/include/llvm/CodeGen/BasicTTIImpl.h @@ -356,7 +356,7 @@ // Check if suitable for a jump table. if (IsJTAllowed) { - if (N < 2 || N < TLI->getMinimumJumpTableEntries()) + if (N < 2 || N < TLI->getMinimumJumpTableCases()) return N; uint64_t Range = (MaxCaseVal - MinCaseVal) Index: llvm/include/llvm/CodeGen/TargetLowering.h =================================================================== --- llvm/include/llvm/CodeGen/TargetLowering.h +++ llvm/include/llvm/CodeGen/TargetLowering.h @@ -955,11 +955,12 @@ uint64_t Range) const { const bool OptForSize = SI->getParent()->getParent()->optForSize(); const unsigned MinDensity = getMinimumJumpTableDensity(OptForSize); - const unsigned MaxJumpTableSize = - OptForSize ? UINT_MAX : getMaximumJumpTableSize(); - // Check whether a range of clusters is dense enough for a jump table. - if (Range <= MaxJumpTableSize && - (NumCases * 100 >= Range * MinDensity)) { + const unsigned MaxJumpTableCases = + OptForSize ? UINT_MAX : getMaximumJumpTableCases(); + // Check whether the number of cases is small enough and + // the range is dense enough for a jump table. + if (NumCases + (NumCases < Range) <= MaxJumpTableCases && + NumCases * 100 >= Range * MinDensity) { return true; } return false; @@ -1426,14 +1427,14 @@ } /// Return lower limit for number of blocks in a jump table. - virtual unsigned getMinimumJumpTableEntries() const; + virtual unsigned getMinimumJumpTableCases() const; /// Return lower limit of the density in a jump table. unsigned getMinimumJumpTableDensity(bool OptForSize) const; /// Return upper limit for number of entries in a jump table. /// Zero if no limit. - unsigned getMaximumJumpTableSize() const; + unsigned getMaximumJumpTableCases() const; virtual bool isJumpTableRelative() const { return TM.isPositionIndependent(); @@ -1847,11 +1848,11 @@ } /// Indicate the minimum number of blocks to generate jump tables. - void setMinimumJumpTableEntries(unsigned Val); + void setMinimumJumpTableCases(unsigned Val); /// Indicate the maximum number of entries in jump tables. /// Set to zero to generate unlimited jump tables. - void setMaximumJumpTableSize(unsigned); + void setMaximumJumpTableCases(unsigned); /// If set to a physical register, this specifies the register that /// llvm.savestack/llvm.restorestack should save and restore. Index: llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp =================================================================== --- llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp +++ llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp @@ -9883,17 +9883,12 @@ #endif const TargetLowering &TLI = DAG.getTargetLoweringInfo(); - if (!TLI.areJTsAllowed(SI->getParent()->getParent())) - return; - - const int64_t N = Clusters.size(); - const unsigned MinJumpTableEntries = TLI.getMinimumJumpTableEntries(); - const unsigned SmallNumberOfEntries = MinJumpTableEntries / 2; - - if (N < 2 || N < MinJumpTableEntries) + const Function *F = SI->getParent()->getParent(); + if (!TLI.areJTsAllowed(F)) return; // TotalCases[i]: Total nbr of cases in Clusters[0..i]. + const int64_t N = Clusters.size(); SmallVector TotalCases(N); for (unsigned i = 0; i < N; ++i) { const APInt &Hi = Clusters[i].High->getValue(); @@ -9903,11 +9898,20 @@ TotalCases[i] += TotalCases[i - 1]; } - // Cheap case: the whole range may be suitable for jump table. - uint64_t Range = getJumpTableRange(Clusters,0, N - 1); + uint64_t Range = getJumpTableRange(Clusters, 0, N - 1); uint64_t NumCases = getJumpTableNumCases(TotalCases, 0, N - 1); assert(NumCases < UINT64_MAX / 100); assert(Range >= NumCases); + + const unsigned MinJumpTableEntries = TLI.getMinimumJumpTableCases(); + const unsigned SmallNumberOfEntries = MinJumpTableEntries / 2; + + // Bail if not enough cases, including any default filler. + uint64_t MaxCases = NumCases + (NumCases < Range); + if (MaxCases < 2 || MaxCases < MinJumpTableEntries) + return; + + // Cheap case: the whole range may be suitable for jump table. if (TLI.isSuitableForJumpTable(SI, NumCases, Range)) { CaseCluster JTCluster; if (buildJumpTable(Clusters, 0, N - 1, SI, DefaultMBB, JTCluster)) { @@ -9965,6 +9969,7 @@ uint64_t NumCases = getJumpTableNumCases(TotalCases, i, j); assert(NumCases < UINT64_MAX / 100); assert(Range >= NumCases); + if (TLI.isSuitableForJumpTable(SI, NumCases, Range)) { unsigned NumPartitions = 1 + (j == N - 1 ? 0 : MinPartitions[j + 1]); unsigned Score = j == N - 1 ? 0 : PartitionsScore[j + 1]; Index: llvm/lib/CodeGen/TargetLoweringBase.cpp =================================================================== --- llvm/lib/CodeGen/TargetLoweringBase.cpp +++ llvm/lib/CodeGen/TargetLoweringBase.cpp @@ -68,13 +68,13 @@ cl::desc("Do not create extra branches to split comparison logic."), cl::Hidden); -static cl::opt MinimumJumpTableEntries - ("min-jump-table-entries", cl::init(4), cl::Hidden, - cl::desc("Set minimum number of entries to use a jump table.")); +static cl::opt MinimumJumpTableCases + ("min-jump-table-cases", cl::init(4), cl::Hidden, + cl::desc("Set minimum number of cases to use a jump table.")); -static cl::opt MaximumJumpTableSize - ("max-jump-table-size", cl::init(UINT_MAX), cl::Hidden, - cl::desc("Set maximum size of jump tables.")); +static cl::opt MaximumJumpTableCases + ("max-jump-table-cases", cl::init(UINT_MAX), cl::Hidden, + cl::desc("Set maximum number of cases to use in a jump table.")); /// Minimum jump table density for normal functions. static cl::opt @@ -1684,24 +1684,24 @@ return nullptr; } -unsigned TargetLoweringBase::getMinimumJumpTableEntries() const { - return MinimumJumpTableEntries; +unsigned TargetLoweringBase::getMinimumJumpTableCases() const { + return MinimumJumpTableCases; } -void TargetLoweringBase::setMinimumJumpTableEntries(unsigned Val) { - MinimumJumpTableEntries = Val; +void TargetLoweringBase::setMinimumJumpTableCases(unsigned Val) { + MinimumJumpTableCases = Val; } -unsigned TargetLoweringBase::getMinimumJumpTableDensity(bool OptForSize) const { - return OptForSize ? OptsizeJumpTableDensity : JumpTableDensity; +unsigned TargetLoweringBase::getMaximumJumpTableCases() const { + return MaximumJumpTableCases; } -unsigned TargetLoweringBase::getMaximumJumpTableSize() const { - return MaximumJumpTableSize; +void TargetLoweringBase::setMaximumJumpTableCases(unsigned Val) { + MaximumJumpTableCases = Val; } -void TargetLoweringBase::setMaximumJumpTableSize(unsigned Val) { - MaximumJumpTableSize = Val; +unsigned TargetLoweringBase::getMinimumJumpTableDensity(bool OptForSize) const { + return OptForSize ? OptsizeJumpTableDensity : JumpTableDensity; } //===----------------------------------------------------------------------===// Index: llvm/lib/Target/AArch64/AArch64ISelLowering.cpp =================================================================== --- llvm/lib/Target/AArch64/AArch64ISelLowering.cpp +++ llvm/lib/Target/AArch64/AArch64ISelLowering.cpp @@ -612,11 +612,11 @@ setPrefFunctionAlignment(STI.getPrefFunctionAlignment()); setPrefLoopAlignment(STI.getPrefLoopAlignment()); - // Only change the limit for entries in a jump table if specified by + // Only change the limit for cases in a jump table if specified by // the sub target, but not at the command line. - unsigned MaxJT = STI.getMaximumJumpTableSize(); - if (MaxJT && getMaximumJumpTableSize() == UINT_MAX) - setMaximumJumpTableSize(MaxJT); + unsigned MaxJT = STI.getMaximumJumpTableCases(); + if (MaxJT && getMaximumJumpTableCases() == UINT_MAX) + setMaximumJumpTableCases(MaxJT); setHasExtractBitsInsn(true); Index: llvm/lib/Target/AArch64/AArch64Subtarget.h =================================================================== --- llvm/lib/Target/AArch64/AArch64Subtarget.h +++ llvm/lib/Target/AArch64/AArch64Subtarget.h @@ -184,7 +184,7 @@ unsigned MaxPrefetchIterationsAhead = UINT_MAX; unsigned PrefFunctionAlignment = 0; unsigned PrefLoopAlignment = 0; - unsigned MaxJumpTableSize = 0; + unsigned MaxJumpTableCases = 0; unsigned WideningBaseCost = 0; // ReserveXRegister[i] - X#i is not available as a general purpose register. @@ -346,7 +346,7 @@ unsigned getPrefFunctionAlignment() const { return PrefFunctionAlignment; } unsigned getPrefLoopAlignment() const { return PrefLoopAlignment; } - unsigned getMaximumJumpTableSize() const { return MaxJumpTableSize; } + unsigned getMaximumJumpTableCases() const { return MaxJumpTableCases; } unsigned getWideningBaseCost() const { return WideningBaseCost; } Index: llvm/lib/Target/AArch64/AArch64Subtarget.cpp =================================================================== --- llvm/lib/Target/AArch64/AArch64Subtarget.cpp +++ llvm/lib/Target/AArch64/AArch64Subtarget.cpp @@ -93,13 +93,13 @@ break; case ExynosM1: MaxInterleaveFactor = 4; - MaxJumpTableSize = 8; + MaxJumpTableCases = 8; PrefFunctionAlignment = 4; PrefLoopAlignment = 3; break; case ExynosM3: MaxInterleaveFactor = 4; - MaxJumpTableSize = 20; + MaxJumpTableCases = 20; PrefFunctionAlignment = 5; PrefLoopAlignment = 4; break; Index: llvm/lib/Target/AVR/AVRISelLowering.cpp =================================================================== --- llvm/lib/Target/AVR/AVRISelLowering.cpp +++ llvm/lib/Target/AVR/AVRISelLowering.cpp @@ -237,7 +237,7 @@ setLibcallName(RTLIB::COS_F32, "cos"); setMinFunctionAlignment(1); - setMinimumJumpTableEntries(INT_MAX); + setMinimumJumpTableCases(UINT_MAX); } const char *AVRTargetLowering::getTargetNodeName(unsigned Opcode) const { Index: llvm/lib/Target/Hexagon/HexagonISelLowering.cpp =================================================================== --- llvm/lib/Target/Hexagon/HexagonISelLowering.cpp +++ llvm/lib/Target/Hexagon/HexagonISelLowering.cpp @@ -1323,9 +1323,9 @@ setOperationAction(ISD::DYNAMIC_STACKALLOC, MVT::i32, Custom); if (EmitJumpTables) - setMinimumJumpTableEntries(MinimumJumpTables); + setMinimumJumpTableCases(MinimumJumpTables); else - setMinimumJumpTableEntries(std::numeric_limits::max()); + setMinimumJumpTableCases(std::numeric_limits::max()); setOperationAction(ISD::BR_JT, MVT::Other, Expand); setOperationAction(ISD::ABS, MVT::i32, Legal); Index: llvm/lib/Target/Lanai/LanaiISelLowering.cpp =================================================================== --- llvm/lib/Target/Lanai/LanaiISelLowering.cpp +++ llvm/lib/Target/Lanai/LanaiISelLowering.cpp @@ -154,7 +154,7 @@ // switch is transformed to a jump table to 100 to avoid creating jump tables // as this was causing bad performance compared to a large group of if // statements. Re-evaluate this on new benchmarks. - setMinimumJumpTableEntries(100); + setMinimumJumpTableCases(100); // Use fast calling convention for library functions. for (int I = 0; I < RTLIB::UNKNOWN_LIBCALL; ++I) { Index: llvm/lib/Target/PowerPC/PPCCTRLoops.cpp =================================================================== --- llvm/lib/Target/PowerPC/PPCCTRLoops.cpp +++ llvm/lib/Target/PowerPC/PPCCTRLoops.cpp @@ -453,7 +453,7 @@ // On PowerPC, indirect jumps use the counter register. return true; } else if (SwitchInst *SI = dyn_cast(J)) { - if (SI->getNumCases() + 1 >= (unsigned)TLI->getMinimumJumpTableEntries()) + if (SI->getNumCases() + 1 >= (unsigned)TLI->getMinimumJumpTableCases()) return true; } Index: llvm/lib/Target/RISCV/RISCVISelLowering.cpp =================================================================== --- llvm/lib/Target/RISCV/RISCVISelLowering.cpp +++ llvm/lib/Target/RISCV/RISCVISelLowering.cpp @@ -183,7 +183,7 @@ setPrefFunctionAlignment(FunctionAlignment); // Effectively disable jump table generation. - setMinimumJumpTableEntries(INT_MAX); + setMinimumJumpTableCases(INT_MAX); } EVT RISCVTargetLowering::getSetCCResultType(const DataLayout &DL, LLVMContext &, Index: llvm/test/CodeGen/AArch64/max-jump-table.ll =================================================================== --- llvm/test/CodeGen/AArch64/max-jump-table.ll +++ llvm/test/CodeGen/AArch64/max-jump-table.ll @@ -1,8 +1,9 @@ -; RUN: llc %s -O2 -print-machineinstrs -mtriple=aarch64-linux-gnu -jump-table-density=40 -o /dev/null 2> %t; FileCheck %s --check-prefixes=CHECK,CHECK0 < %t -; RUN: llc %s -O2 -print-machineinstrs -mtriple=aarch64-linux-gnu -jump-table-density=40 -max-jump-table-size=4 -o /dev/null 2> %t; FileCheck %s --check-prefixes=CHECK,CHECK4 < %t -; RUN: llc %s -O2 -print-machineinstrs -mtriple=aarch64-linux-gnu -jump-table-density=40 -max-jump-table-size=8 -o /dev/null 2> %t; FileCheck %s --check-prefixes=CHECK,CHECK8 < %t -; RUN: llc %s -O2 -print-machineinstrs -mtriple=aarch64-linux-gnu -jump-table-density=40 -mcpu=exynos-m1 -o /dev/null 2> %t; FileCheck %s --check-prefixes=CHECK,CHECKM1 < %t -; RUN: llc %s -O2 -print-machineinstrs -mtriple=aarch64-linux-gnu -jump-table-density=40 -mcpu=exynos-m3 -o /dev/null 2> %t; FileCheck %s --check-prefixes=CHECK,CHECKM3 < %t +; RUN: llc %s -O2 -print-machineinstrs -mtriple=aarch64-linux-gnu -jump-table-density=40 -o /dev/null 2> %t; FileCheck %s --check-prefixes=CHECK,CHECK0 < %t +; RUN: llc %s -O2 -print-machineinstrs -mtriple=aarch64-linux-gnu -jump-table-density=40 -max-jump-table-cases=4 -o /dev/null 2> %t; FileCheck %s --check-prefixes=CHECK,CHECK4 < %t +; RUN: llc %s -O2 -print-machineinstrs -mtriple=aarch64-linux-gnu -jump-table-density=40 -max-jump-table-cases=8 -o /dev/null 2> %t; FileCheck %s --check-prefixes=CHECK,CHECK8 < %t +; RUN: llc %s -O2 -print-machineinstrs -mtriple=aarch64-linux-gnu -jump-table-density=40 -max-jump-table-cases=16 -o /dev/null 2> %t; FileCheck %s --check-prefixes=CHECK,CHECK16 < %t +; RUN: llc %s -O2 -print-machineinstrs -mtriple=aarch64-linux-gnu -jump-table-density=40 -mcpu=exynos-m1 -o /dev/null 2> %t; FileCheck %s --check-prefixes=CHECK,CHECKM1 < %t +; RUN: llc %s -O2 -print-machineinstrs -mtriple=aarch64-linux-gnu -jump-table-density=40 -mcpu=exynos-m3 -o /dev/null 2> %t; FileCheck %s --check-prefixes=CHECK,CHECKM3 < %t declare void @ext(i32) @@ -83,9 +84,9 @@ ; CHECK0-NOT: %jump-table.1 ; CHECK4-NEXT: %jump-table.0: %bb.1 %bb.2 %bb.3 %bb.4{{$}} ; CHECK4-NOT: %jump-table.1 -; CHECK8-NEXT: %jump-table.0: %bb.1 %bb.2 %bb.3 %bb.4{{$}} +; CHECK8-NEXT: %jump-table.0: %bb.1 %bb.2 %bb.3 %bb.4 %bb.7 %bb.7 %bb.7 %bb.7 %bb.7 %bb.7 %bb.7 %bb.7 %bb.7 %bb.5 %bb.6{{$}} ; CHECK8-NOT: %jump-table.1 -; CHECKM1-NEXT: %jump-table.0: %bb.1 %bb.2 %bb.3 %bb.4{{$}} +; CHECKM1-NEXT: %jump-table.0: %bb.1 %bb.2 %bb.3 %bb.4 %bb.7 %bb.7 %bb.7 %bb.7 %bb.7 %bb.7 %bb.7 %bb.7 %bb.7 %bb.5 %bb.6{{$}} ; CHECKM1-NOT: %jump-table.1 ; CHECKM3-NEXT: %jump-table.0: %bb.1 %bb.2 %bb.3 %bb.4 %bb.7 %bb.7 %bb.7 %bb.7 %bb.7 %bb.7 %bb.7 %bb.7 %bb.7 %bb.5 %bb.6{{$}} ; CHECKM3-NOT: %jump-table.1 @@ -97,5 +98,55 @@ bb4: tail call void @ext(i32 4) br label %return bb5: tail call void @ext(i32 5) br label %return bb6: tail call void @ext(i32 6) br label %return + +return: ret void +} + +define void @jt3(i32 %x) { +entry: + switch i32 %x, label %return [ + i32 1, label %bb1 + i32 2, label %bb2 + i32 3, label %bb3 + i32 4, label %bb4 + + i32 14, label %bb5 + i32 15, label %bb6 + i32 16, label %bb7 + i32 17, label %bb8 + + i32 19, label %bb9 + i32 20, label %bb10 + + i32 22, label %bb11 + i32 23, label %bb12 + ] +; CHECK-LABEL: function jt3: +; CHECK-NEXT: Jump Tables: +; CHECK0-NEXT: %jump-table.0: %bb.1 %bb.2 %bb.3 %bb.4 %bb.13 %bb.13 %bb.13 %bb.13 %bb.13 %bb.13 %bb.13 %bb.13 %bb.13 %bb.5 %bb.6 %bb.7 %bb.8 %bb.13 %bb.9 %bb.10 %bb.13 %bb.11 %bb.12{{$}} +; CHECK0-NOT: %jump-table.1 +; CHECK4-NEXT: %jump-table.0: %bb.1 %bb.2 %bb.3 %bb.4 +; CHECK4-SAME: %jump-table.1: %bb.5 %bb.6 %bb.7 %bb.8{{$}} +; CHECK8-NEXT: %jump-table.0: %bb.1 %bb.2 %bb.3 %bb.4 %bb.13 %bb.13 %bb.13 %bb.13 %bb.13 %bb.13 %bb.13 %bb.13 %bb.13 %bb.5 %bb.6 %bb.7 +; CHECK8-SAME: %jump-table.1: %bb.8 %bb.13 %bb.9 %bb.10 %bb.13 %bb.11 %bb.12{{$}} +; CHECKM1-NEXT: %jump-table.0: %bb.1 %bb.2 %bb.3 %bb.4 %bb.13 %bb.13 %bb.13 %bb.13 %bb.13 %bb.13 %bb.13 %bb.13 %bb.13 %bb.5 %bb.6 %bb.7 +; CHECKM1-SAME: %jump-table.1: %bb.8 %bb.13 %bb.9 %bb.10 %bb.13 %bb.11 %bb.12{{$}} +; CHECKM3-NEXT: %jump-table.0: %bb.1 %bb.2 %bb.3 %bb.4 %bb.13 %bb.13 %bb.13 %bb.13 %bb.13 %bb.13 %bb.13 %bb.13 %bb.13 %bb.5 %bb.6 %bb.7 %bb.8 %bb.13 %bb.9 %bb.10 %bb.13 %bb.11 %bb.12{{$}} +; CHECKM3-NOT: %jump-table.1 +; CHECK-DAG: End machine code for function jt3. + +bb1: tail call void @ext(i32 1) br label %return +bb2: tail call void @ext(i32 2) br label %return +bb3: tail call void @ext(i32 3) br label %return +bb4: tail call void @ext(i32 4) br label %return +bb5: tail call void @ext(i32 5) br label %return +bb6: tail call void @ext(i32 6) br label %return +bb7: tail call void @ext(i32 7) br label %return +bb8: tail call void @ext(i32 8) br label %return +bb9: tail call void @ext(i32 9) br label %return +bb10: tail call void @ext(i32 10) br label %return +bb11: tail call void @ext(i32 11) br label %return +bb12: tail call void @ext(i32 12) br label %return + return: ret void } Index: llvm/test/CodeGen/AArch64/min-jump-table.ll =================================================================== --- llvm/test/CodeGen/AArch64/min-jump-table.ll +++ llvm/test/CodeGen/AArch64/min-jump-table.ll @@ -1,6 +1,6 @@ -; RUN: llc %s -O2 -print-machineinstrs -mtriple=aarch64-linux-gnu -jump-table-density=40 -min-jump-table-entries=0 -o /dev/null 2> %t; FileCheck %s --check-prefixes=CHECK,CHECK0 < %t -; RUN: llc %s -O2 -print-machineinstrs -mtriple=aarch64-linux-gnu -jump-table-density=40 -min-jump-table-entries=4 -o /dev/null 2> %t; FileCheck %s --check-prefixes=CHECK,CHECK4 < %t -; RUN: llc %s -O2 -print-machineinstrs -mtriple=aarch64-linux-gnu -jump-table-density=40 -min-jump-table-entries=8 -o /dev/null 2> %t; FileCheck %s --check-prefixes=CHECK,CHECK8 < %t +; RUN: llc %s -O2 -print-machineinstrs -mtriple=aarch64-linux-gnu -jump-table-density=40 -min-jump-table-cases=0 -o /dev/null 2> %t; FileCheck %s --check-prefixes=CHECK,CHECK0 < %t +; RUN: llc %s -O2 -print-machineinstrs -mtriple=aarch64-linux-gnu -jump-table-density=40 -min-jump-table-cases=4 -o /dev/null 2> %t; FileCheck %s --check-prefixes=CHECK,CHECK4 < %t +; RUN: llc %s -O2 -print-machineinstrs -mtriple=aarch64-linux-gnu -jump-table-density=40 -min-jump-table-cases=8 -o /dev/null 2> %t; FileCheck %s --check-prefixes=CHECK,CHECK8 < %t declare void @ext(i32) Index: llvm/test/CodeGen/Generic/MachineBranchProb.ll =================================================================== --- llvm/test/CodeGen/Generic/MachineBranchProb.ll +++ llvm/test/CodeGen/Generic/MachineBranchProb.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -print-machineinstrs=expand-isel-pseudos -o /dev/null 2>&1 | FileCheck %s +; RUN: llc < %s -min-jump-table-cases=8 -print-machineinstrs=expand-isel-pseudos -o /dev/null 2>&1 | FileCheck %s ; Hexagon runs passes that renumber the basic blocks, causing this test ; to fail. @@ -63,7 +63,7 @@ return: ret void ; Check that we set branch weights on the pivot cmp instruction correctly. -; Cases {0,10,20,30} go on the left with weight 13; cases {40,50} go on the +; Cases {0,100,200,300} go on the left with weight 13; cases {400,500} go on the ; right with weight 20. ; ; CHECK-LABEL: Machine code for function left_leaning_weight_balanced_tree: Index: llvm/test/CodeGen/WebAssembly/cfg-stackify.ll =================================================================== --- llvm/test/CodeGen/WebAssembly/cfg-stackify.ll +++ llvm/test/CodeGen/WebAssembly/cfg-stackify.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -asm-verbose=false -disable-wasm-fallthrough-return-opt -wasm-disable-explicit-locals -wasm-keep-registers -disable-block-placement -verify-machineinstrs -fast-isel=false -machine-sink-split-probability-threshold=0 -cgp-freq-ratio-to-skip-merge=1000 | FileCheck %s +; RUN: llc < %s -min-jump-table-cases=8 -asm-verbose=false -disable-wasm-fallthrough-return-opt -wasm-disable-explicit-locals -wasm-keep-registers -disable-block-placement -verify-machineinstrs -fast-isel=false -machine-sink-split-probability-threshold=0 -cgp-freq-ratio-to-skip-merge=1000 | FileCheck %s ; Test the CFG stackifier pass. Index: llvm/test/CodeGen/X86/switch-order-weight.ll =================================================================== --- llvm/test/CodeGen/X86/switch-order-weight.ll +++ llvm/test/CodeGen/X86/switch-order-weight.ll @@ -1,4 +1,4 @@ -; RUN: llc -mtriple=x86_64-apple-darwin11 < %s | FileCheck %s +; RUN: llc -mtriple=x86_64-apple-darwin11 -min-jump-table-cases=8 < %s | FileCheck %s ; Check that the cases which lead to unreachable are checked after "10" Index: llvm/test/CodeGen/X86/switch.ll =================================================================== --- llvm/test/CodeGen/X86/switch.ll +++ llvm/test/CodeGen/X86/switch.ll @@ -786,9 +786,9 @@ i32 1, label %bb1 i32 2, label %bb1 i32 3, label %bb1 - i32 4, label %bb2 - i32 5, label %bb2 - i32 6, label %bb2 + i32 14, label %bb2 + i32 15, label %bb2 + i32 16, label %bb2 ] bb1: tail call void @g(i32 0) br label %return bb2: tail call void @g(i32 1) br label %return @@ -798,8 +798,8 @@ ret void ; CHECK-LABEL: range_with_unreachable_fallthrough: -; Since the default is unreachable, either the 1--3 or the 4--6 cluster will be -; reached. Only one comparison should be emitted. +; Since the default is unreachable, either cluster will be reached. +; Only one comparison should be emitted. ; CHECK: cmpl ; CHECK-NOT: cmpl ; CHECK: jmp g