This is an archive of the discontinued LLVM Phabricator instance.

Differential D55168

[test] Fix use of 'sort -b' in SimpleLoopUnswitch on NetBSD
ClosedPublic

Authored by mgorny on Dec 1 2018, 12:44 PM.

Details

Reviewers
krytarowski
fedor.sergeev
chandlerc
mkazantsev
Commits
rGff13c24cfe78: [test] Fix use of 'sort -b' in SimpleLoopUnswitch on NetBSD
rL348097: [test] Fix use of 'sort -b' in SimpleLoopUnswitch on NetBSD
Summary

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.

Diff Detail

Repository
rL LLVM

Event Timeline

mgorny created this revision.Dec 1 2018, 12:44 PM
krytarowski added a comment.Dec 1 2018, 2:16 PM

What's the sorted text? It will help to get some more context.

mgorny added a comment.Dec 1 2018, 11:39 PM

It's something along the lines of:

Loop at depth 1 containing: %outer_loop.us37.us125.us176<header>,%outer_loop.split.us40.us128.us179,%outer_latch.us41.us.us<latch><exiting>,%outer_loop.split.split.us.us129.us180,%outer_latch.split.us43.us.us,%outer_latch.split.split.us.us130.us,%outer_loop.split.split.split.us.us.us131.us181,%outer_loop.split.split.split.us.split.us.us.us182,%outer_latch.split.split.split.us.us.us.us,%outer_loop.split.split.split.us.split.us.split.us.us.us183,%outer_loop.split.split.split.us.split.us.split.us.split.us.us,%outer_latch.split.split.split.us.us.split.us.us.us,%outer_loop.split.split.split.us.split.us.split.us.split.split.us.us.us,%inner_loop.us12.us.us.us.us.us,%inner_latch.us20.us.us.us.us.us,%outer_latch.split.split.split.us.us.split.us.split.us.us.us.split.split,%outer_loop.split.split.split.us.split.us.split.us.split.split.us.split.us.us,%outer_loop.split.split.split.us.split.us.split.us.split.split.us.split.us.us.split,%outer_latch.split.split.split.us.us.split.us.split.us.us.us,%outer_latch.split.split.split.us.us.split.us.split.us.us.us.split
    Loop at depth 2 containing: %inner_loop.us12.us.us.us.us.us<header>,%inner_latch.us20.us.us.us.us.us<latch><exiting>
Loop at depth 1 containing: %outer_loop.us37.us125.us176.us190<header>,%outer_loop.split.us40.us128.us179.us193,%outer_latch.us41.us.us.us<latch><exiting>,%outer_loop.split.split.us.us129.us180.us194,%outer_latch.split.us43.us.us.us,%outer_latch.split.split.us.us130.us.us,%outer_loop.split.split.split.us.us.us131.us181.us195,%outer_loop.split.split.split.us.split.us.us.us182.us196,%outer_latch.split.split.split.us.us.us.us.us,%outer_loop.split.split.split.us.split.us.split.us.us.us183.us197,%outer_loop.split.split.split.us.split.us.split.us.split.us.us.us198,%outer_latch.split.split.split.us.us.split.us.us.us.us,%outer_loop.split.split.split.us.split.us.split.us.split.split.us.us.us.us199,%outer_loop.split.split.split.us.split.us.split.us.split.split.us.split.us.us.us,%outer_latch.split.split.split.us.us.split.us.split.us.us.us.us,%outer_loop.split.split.split.us.split.us.split.us.split.split.us.split.us.us.split.us.us,%inner_loop.us12.us.us.us.us.us.us.us,%case4.us15.us.us.us.us.us.us.us,%inner_latch.us20.us.us.us.us.us.us.us,%outer_latch.split.split.split.us.us.split.us.split.us.us.us.split.us.us
    Loop at depth 2 containing: %inner_loop.us12.us.us.us.us.us.us.us<header>,%case4.us15.us.us.us.us.us.us.us,%inner_latch.us20.us.us.us.us.us.us.us<latch><exiting>
Loop at depth 1 containing: %outer_loop.us37.us125.us176.us202<header>,%outer_loop.split.us40.us128.us179.us205,%outer_latch.us41.us.us.us206<latch><exiting>,%outer_loop.split.split.us.us129.us180.us208,%outer_latch.split.us43.us.us.us209,%outer_latch.split.split.us.us130.us.us210,%outer_loop.split.split.split.us.us.us131.us181.us211,%outer_loop.split.split.split.us.split.us.us.us182.us212,%outer_latch.split.split.split.us.us.us.us.us213,%outer_loop.split.split.split.us.split.us.split.us.us.us183.us214,%outer_loop.split.split.split.us.split.us.split.us.split.us.us.us215,%outer_latch.split.split.split.us.us.split.us.us.us.us216,%outer_loop.split.split.split.us.split.us.split.us.split.split.us.us.us.us217,%outer_loop.split.split.split.us.split.us.split.us.split.split.us.split.us.us.us218,%outer_latch.split.split.split.us.us.split.us.split.us.us.us.us219,%outer_latch.split.split.split.us.us.split.us.split.us.us.us.split.us220,%outer_loop.split.split.split.us.split.us.split.us.split.split.us.split.us.us.split.us184.us,%inner_loop.us12.us.us.us.us.us.us185.us,%case3.us16.us.us.us.us.us.us.us,%inner_latch.us20.us.us.us.us.us.us188.us,%outer_latch.split.split.split.us.us.split.us.split.us.us.us.split.split.us.us
    Loop at depth 2 containing: %inner_loop.us12.us.us.us.us.us.us185.us<header>,%case3.us16.us.us.us.us.us.us.us,%inner_latch.us20.us.us.us.us.us.us188.us<latch><exiting>

i.e. the problem is that 'depth 2' messages are indented, and (for some reason) the tests want them all sorted by message.

krytarowski accepted this revision.Dec 2 2018, 5:49 AM
This revision is now accepted and ready to land.Dec 2 2018, 5:49 AM
fedor.sergeev added a comment.Dec 2 2018, 7:45 AM
In D55168#1315857, @mgorny wrote:

i.e. the problem is that 'depth 2' messages are indented, and (for some reason) the tests want them all sorted by message.

The tests are trying to count loops at different depths, using -COUNT-<NUM> directives, e.g. 11 loops at depth 1, 40 loops at depth 2.
Alternative to sorting would be to implement support for -COUNT-<NUM>-DAG.

-b was added to sort to fix buildbot failures.
I could only speculate that under certain locales whitespaces might lead to different ordering.

fedor.sergeev accepted this revision.Dec 2 2018, 7:48 AM
Closed by commit rL348097: [test] Fix use of 'sort -b' in SimpleLoopUnswitch on NetBSD (authored by mgorny). · Explain WhyDec 2 2018, 8:52 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

Diff 176286

llvm/trunk/test/Transforms/SimpleLoopUnswitch/exponential-nontrivial-unswitch-nested.ll

Show All 12 Lines
; ;
; When we relax the candidates part of a multiplier formula ; When we relax the candidates part of a multiplier formula
; (unscaled candidates == 4) we start getting some unswitches, ; (unscaled candidates == 4) we start getting some unswitches,
; which leads to siblings multiplier kicking in. ; which leads to siblings multiplier kicking in.
; ;
; RUN: opt < %s -enable-nontrivial-unswitch -enable-unswitch-cost-multiplier=true \ ; RUN: opt < %s -enable-nontrivial-unswitch -enable-unswitch-cost-multiplier=true \
; RUN: -unswitch-num-initial-unscaled-candidates=4 -unswitch-siblings-toplevel-div=1 \ ; RUN: -unswitch-num-initial-unscaled-candidates=4 -unswitch-siblings-toplevel-div=1 \
; RUN: -passes='loop(unswitch),print<loops>' -disable-output 2>&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 ; NB: sort -b is essential here and below, otherwise blanks might lead to different
; order depending on locale. ; order depending on locale.
; ;
; RUN: opt < %s -enable-nontrivial-unswitch -enable-unswitch-cost-multiplier=true \ ; RUN: opt < %s -enable-nontrivial-unswitch -enable-unswitch-cost-multiplier=true \
; RUN: -unswitch-num-initial-unscaled-candidates=4 -unswitch-siblings-toplevel-div=2 \ ; RUN: -unswitch-num-initial-unscaled-candidates=4 -unswitch-siblings-toplevel-div=2 \
; RUN: -passes='loop(unswitch),print<loops>' -disable-output 2>&1 | \ ; 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 ; Get
; 2^(num conds) == 2^5 = 32 ; 2^(num conds) == 2^5 = 32
; loop nests when cost multiplier is disabled: ; loop nests when cost multiplier is disabled:
; ;
; RUN: opt < %s -enable-nontrivial-unswitch -enable-unswitch-cost-multiplier=false \ ; RUN: opt < %s -enable-nontrivial-unswitch -enable-unswitch-cost-multiplier=false \
; RUN: -passes='loop(unswitch),print<loops>' -disable-output 2>&1 | \ ; 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 ; Single loop nest, not unswitched
; LOOP1: Loop at depth 1 containing: ; LOOP1: Loop at depth 1 containing:
; LOOP1: Loop at depth 2 containing: ; LOOP1: Loop at depth 2 containing:
; LOOP1: Loop at depth 3 containing: ; LOOP1: Loop at depth 3 containing:
; LOOP1-NOT: Loop at depth {{[0-9]+}} containing: ; LOOP1-NOT: Loop at depth {{[0-9]+}} containing:
; ;
; Half unswitched loop nests, with unscaled4 and div1 it gets less depth1 loops unswitched ; Half unswitched loop nests, with unscaled4 and div1 it gets less depth1 loops unswitched
▲ Show 20 Lines • Show All 93 Lines • Show Last 20 Lines

llvm/trunk/test/Transforms/SimpleLoopUnswitch/exponential-nontrivial-unswitch-nested2.ll

Show All 17 Lines
; ;
; When we relax the candidates part of a multiplier formula ; When we relax the candidates part of a multiplier formula
; (unscaled candidates == 2) we start getting some unswitches in outer loops, ; (unscaled candidates == 2) we start getting some unswitches in outer loops,
; which leads to siblings multiplier kicking in. ; which leads to siblings multiplier kicking in.
; ;
; RUN: opt < %s -enable-nontrivial-unswitch -enable-unswitch-cost-multiplier=true \ ; RUN: opt < %s -enable-nontrivial-unswitch -enable-unswitch-cost-multiplier=true \
; RUN: -unswitch-num-initial-unscaled-candidates=3 -unswitch-siblings-toplevel-div=1 \ ; RUN: -unswitch-num-initial-unscaled-candidates=3 -unswitch-siblings-toplevel-div=1 \
; RUN: -passes='loop(unswitch),print<loops>' -disable-output 2>&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 ; NB: sort -b is essential here and below, otherwise blanks might lead to different
; order depending on locale. ; order depending on locale.
; ;
; RUN: opt < %s -enable-nontrivial-unswitch -enable-unswitch-cost-multiplier=true \ ; RUN: opt < %s -enable-nontrivial-unswitch -enable-unswitch-cost-multiplier=true \
; RUN: -unswitch-num-initial-unscaled-candidates=3 -unswitch-siblings-toplevel-div=2 \ ; RUN: -unswitch-num-initial-unscaled-candidates=3 -unswitch-siblings-toplevel-div=2 \
; RUN: -passes='loop(unswitch),print<loops>' -disable-output 2>&1 | \ ; 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. ; With disabled cost-multiplier we get maximal possible amount of unswitches.
; ;
; RUN: opt < %s -enable-nontrivial-unswitch -enable-unswitch-cost-multiplier=false \ ; RUN: opt < %s -enable-nontrivial-unswitch -enable-unswitch-cost-multiplier=false \
; RUN: -passes='loop(unswitch),print<loops>' -disable-output 2>&1 | \ ; 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 ; Single loop nest, not unswitched
; LOOP1: Loop at depth 1 containing: ; LOOP1: Loop at depth 1 containing:
; LOOP1-NOT: Loop at depth 1 containing: ; LOOP1-NOT: Loop at depth 1 containing:
; LOOP1: Loop at depth 2 containing: ; LOOP1: Loop at depth 2 containing:
; LOOP1-NOT: Loop at depth 2 containing: ; LOOP1-NOT: Loop at depth 2 containing:
; LOOP1: Loop at depth 3 containing: ; LOOP1: Loop at depth 3 containing:
; LOOP1-NOT: Loop at depth 3 containing: ; LOOP1-NOT: Loop at depth 3 containing:
▲ Show 20 Lines • Show All 101 Lines • Show Last 20 Lines

llvm/trunk/test/Transforms/SimpleLoopUnswitch/exponential-switch-unswitch.ll

Show All 18 Lines
; ;
; ;
; With relaxed candidates multiplier (unscaled candidates == 8) we should allow ; With relaxed candidates multiplier (unscaled candidates == 8) we should allow
; some unswitches to happen until siblings multiplier starts kicking in: ; some unswitches to happen until siblings multiplier starts kicking in:
; ;
; RUN: opt < %s -enable-nontrivial-unswitch -enable-unswitch-cost-multiplier=true \ ; RUN: opt < %s -enable-nontrivial-unswitch -enable-unswitch-cost-multiplier=true \
; RUN: -unswitch-num-initial-unscaled-candidates=8 -unswitch-siblings-toplevel-div=1 \ ; RUN: -unswitch-num-initial-unscaled-candidates=8 -unswitch-siblings-toplevel-div=1 \
; RUN: -passes='loop(unswitch),print<loops>' -disable-output 2>&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 ; With relaxed candidates multiplier (unscaled candidates == 8) and with relaxed
; siblings multiplier for top-level loops (toplevel-div == 8) we should get ; siblings multiplier for top-level loops (toplevel-div == 8) we should get
; considerably more copies of the loop (especially top-level ones). ; considerably more copies of the loop (especially top-level ones).
; ;
; RUN: opt < %s -enable-nontrivial-unswitch -enable-unswitch-cost-multiplier=true \ ; RUN: opt < %s -enable-nontrivial-unswitch -enable-unswitch-cost-multiplier=true \
; RUN: -unswitch-num-initial-unscaled-candidates=8 -unswitch-siblings-toplevel-div=8 \ ; RUN: -unswitch-num-initial-unscaled-candidates=8 -unswitch-siblings-toplevel-div=8 \
; RUN: -passes='loop(unswitch),print<loops>' -disable-output 2>&1 | \ ; 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: ; 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: opt < %s -enable-nontrivial-unswitch -enable-unswitch-cost-multiplier=false \
; RUN: -passes='loop(unswitch),print<loops>' -disable-output 2>&1 | \ ; 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 ; Single loop nest, not unswitched
; LOOP1: Loop at depth 1 containing: ; LOOP1: Loop at depth 1 containing:
; LOOP1-NOT: Loop at depth 1 containing: ; LOOP1-NOT: Loop at depth 1 containing:
; LOOP1: Loop at depth 2 containing: ; LOOP1: Loop at depth 2 containing:
; LOOP1-NOT: Loop at depth 2 containing: ; LOOP1-NOT: Loop at depth 2 containing:
; ;
▲ Show 20 Lines • Show All 68 Lines • Show Last 20 Lines