[PATCH] D55168: [test] Fix use of 'sort -b' in SimpleLoopUnswitch on NetBSD

[Michał Górny via Phabricator via llvm-commits]

mgorny created this revision.
mgorny added reviewers: krytarowski, fedor.sergeev, chandlerc, mkazantsev.

Add '-k 1' to 'sort -b' calls in SimpleLoopUnswitch tests, as required
for sort implementation on NetBSD.  The '-b' modifier is ineffective
if specified without any key.  Per the manpage:

  Note that the -b option has no effect unless key fields are specified.


Repository:
  rL LLVM

https://reviews.llvm.org/D55168

Files:
  test/Transforms/SimpleLoopUnswitch/exponential-nontrivial-unswitch-nested.ll
  test/Transforms/SimpleLoopUnswitch/exponential-nontrivial-unswitch-nested2.ll
  test/Transforms/SimpleLoopUnswitch/exponential-switch-unswitch.ll


Index: test/Transforms/SimpleLoopUnswitch/exponential-switch-unswitch.ll
===================================================================
--- test/Transforms/SimpleLoopUnswitch/exponential-switch-unswitch.ll
+++ 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<loops>' -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<loops>' -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<loops>' -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
Index: test/Transforms/SimpleLoopUnswitch/exponential-nontrivial-unswitch-nested2.ll
===================================================================
--- test/Transforms/SimpleLoopUnswitch/exponential-nontrivial-unswitch-nested2.ll
+++ 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<loops>' -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<loops>' -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<loops>' -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: test/Transforms/SimpleLoopUnswitch/exponential-nontrivial-unswitch-nested.ll
===================================================================
--- test/Transforms/SimpleLoopUnswitch/exponential-nontrivial-unswitch-nested.ll
+++ 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<loops>' -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<loops>' -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<loops>' -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:


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D55168.176267.patch
Type: text/x-patch
Size: 5045 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20181201/77feb6e6/attachment.bin>