Index: llvm/trunk/test/Transforms/SimpleLoopUnswitch/exponential-nontrivial-unswitch-nested.ll =================================================================== --- llvm/trunk/test/Transforms/SimpleLoopUnswitch/exponential-nontrivial-unswitch-nested.ll +++ llvm/trunk/test/Transforms/SimpleLoopUnswitch/exponential-nontrivial-unswitch-nested.ll @@ -18,7 +18,7 @@ ; RUN: opt < %s -enable-nontrivial-unswitch -enable-unswitch-cost-multiplier=true \ ; RUN: -unswitch-num-initial-unscaled-candidates=4 -unswitch-siblings-toplevel-div=1 \ ; RUN: -passes='loop(unswitch),print' -disable-output 2>&1 | \ -; RUN: sort -b | FileCheck %s --check-prefixes=LOOP-UNSCALE4-DIV1 +; RUN: sort -b -k 1 | FileCheck %s --check-prefixes=LOOP-UNSCALE4-DIV1 ; ; NB: sort -b is essential here and below, otherwise blanks might lead to different ; order depending on locale. @@ -26,7 +26,7 @@ ; RUN: opt < %s -enable-nontrivial-unswitch -enable-unswitch-cost-multiplier=true \ ; RUN: -unswitch-num-initial-unscaled-candidates=4 -unswitch-siblings-toplevel-div=2 \ ; RUN: -passes='loop(unswitch),print' -disable-output 2>&1 | \ -; RUN: sort -b | FileCheck %s --check-prefixes=LOOP-UNSCALE4-DIV2 +; RUN: sort -b -k 1 | FileCheck %s --check-prefixes=LOOP-UNSCALE4-DIV2 ; ; ; Get @@ -35,7 +35,7 @@ ; ; RUN: opt < %s -enable-nontrivial-unswitch -enable-unswitch-cost-multiplier=false \ ; RUN: -passes='loop(unswitch),print' -disable-output 2>&1 | \ -; RUN: sort -b | FileCheck %s --check-prefixes=LOOP32 +; RUN: sort -b -k 1 | FileCheck %s --check-prefixes=LOOP32 ; ; Single loop nest, not unswitched ; LOOP1: Loop at depth 1 containing: Index: llvm/trunk/test/Transforms/SimpleLoopUnswitch/exponential-nontrivial-unswitch-nested2.ll =================================================================== --- llvm/trunk/test/Transforms/SimpleLoopUnswitch/exponential-nontrivial-unswitch-nested2.ll +++ llvm/trunk/test/Transforms/SimpleLoopUnswitch/exponential-nontrivial-unswitch-nested2.ll @@ -23,7 +23,7 @@ ; RUN: opt < %s -enable-nontrivial-unswitch -enable-unswitch-cost-multiplier=true \ ; RUN: -unswitch-num-initial-unscaled-candidates=3 -unswitch-siblings-toplevel-div=1 \ ; RUN: -passes='loop(unswitch),print' -disable-output 2>&1 | \ -; RUN: sort -b | FileCheck %s --check-prefixes=LOOP-UNSCALE3-DIV1 +; RUN: sort -b -k 1 | FileCheck %s --check-prefixes=LOOP-UNSCALE3-DIV1 ; ; NB: sort -b is essential here and below, otherwise blanks might lead to different ; order depending on locale. @@ -31,13 +31,13 @@ ; RUN: opt < %s -enable-nontrivial-unswitch -enable-unswitch-cost-multiplier=true \ ; RUN: -unswitch-num-initial-unscaled-candidates=3 -unswitch-siblings-toplevel-div=2 \ ; RUN: -passes='loop(unswitch),print' -disable-output 2>&1 | \ -; RUN: sort -b | FileCheck %s --check-prefixes=LOOP-UNSCALE3-DIV2 +; RUN: sort -b -k 1 | FileCheck %s --check-prefixes=LOOP-UNSCALE3-DIV2 ; ; With disabled cost-multiplier we get maximal possible amount of unswitches. ; ; RUN: opt < %s -enable-nontrivial-unswitch -enable-unswitch-cost-multiplier=false \ ; RUN: -passes='loop(unswitch),print' -disable-output 2>&1 | \ -; RUN: sort -b | FileCheck %s --check-prefixes=LOOP-MAX +; RUN: sort -b -k 1 | FileCheck %s --check-prefixes=LOOP-MAX ; ; Single loop nest, not unswitched ; LOOP1: Loop at depth 1 containing: Index: llvm/trunk/test/Transforms/SimpleLoopUnswitch/exponential-switch-unswitch.ll =================================================================== --- llvm/trunk/test/Transforms/SimpleLoopUnswitch/exponential-switch-unswitch.ll +++ llvm/trunk/test/Transforms/SimpleLoopUnswitch/exponential-switch-unswitch.ll @@ -24,7 +24,7 @@ ; RUN: opt < %s -enable-nontrivial-unswitch -enable-unswitch-cost-multiplier=true \ ; RUN: -unswitch-num-initial-unscaled-candidates=8 -unswitch-siblings-toplevel-div=1 \ ; RUN: -passes='loop(unswitch),print' -disable-output 2>&1 | \ -; RUN: sort -b | FileCheck %s --check-prefixes=LOOP-RELAX +; RUN: sort -b -k 1 | FileCheck %s --check-prefixes=LOOP-RELAX ; ; With relaxed candidates multiplier (unscaled candidates == 8) and with relaxed ; siblings multiplier for top-level loops (toplevel-div == 8) we should get @@ -33,13 +33,13 @@ ; RUN: opt < %s -enable-nontrivial-unswitch -enable-unswitch-cost-multiplier=true \ ; RUN: -unswitch-num-initial-unscaled-candidates=8 -unswitch-siblings-toplevel-div=8 \ ; RUN: -passes='loop(unswitch),print' -disable-output 2>&1 | \ -; RUN: sort -b | FileCheck %s --check-prefixes=LOOP-RELAX2 +; RUN: sort -b -k 1 | FileCheck %s --check-prefixes=LOOP-RELAX2 ; ; We get hundreds of copies of the loop when cost multiplier is disabled: ; ; RUN: opt < %s -enable-nontrivial-unswitch -enable-unswitch-cost-multiplier=false \ ; RUN: -passes='loop(unswitch),print' -disable-output 2>&1 | \ -; RUN: sort -b | FileCheck %s --check-prefixes=LOOP-MAX +; RUN: sort -b -k 1 | FileCheck %s --check-prefixes=LOOP-MAX ; ; Single loop nest, not unswitched