From: Richard Smith Date: Sat, 26 Mar 2016 02:02:59 +0000 (+0000) Subject: Stop testing the unspecified order in which the OnDiskHashTable stores entries. X-Git-Tag: llvmorg-3.9.0-rc1~10839 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1fd6d1fd367f8a66a6174fb4f837c7a53e752339;p=platform%2Fupstream%2Fllvm.git Stop testing the unspecified order in which the OnDiskHashTable stores entries. llvm-svn: 264487 --- diff --git a/llvm/test/tools/llvm-profdata/general.proftext b/llvm/test/tools/llvm-profdata/general.proftext index 3c62c20..6669cd6 100644 --- a/llvm/test/tools/llvm-profdata/general.proftext +++ b/llvm/test/tools/llvm-profdata/general.proftext @@ -55,8 +55,8 @@ hex_hash # RUN: llvm-profdata show %t.profdata --function _ | FileCheck %s -check-prefix=SOMEFUNCS # RUN: llvm-profdata show %t.profdata.dense --function _ | FileCheck %s -check-prefix=SOMEFUNCS_DENSE # SOMEFUNCS: Counters: -# SOMEFUNCS: function_count_only: -# SOMEFUNCS: large_numbers: +# SOMEFUNCS-DAG: large_numbers: +# SOMEFUNCS-DAG: function_count_only: # SOMEFUNCS: Functions shown: 2 # SOMEFUNCS_DENSE: Functions shown: 3 diff --git a/llvm/test/tools/llvm-profdata/multiple-inputs.test b/llvm/test/tools/llvm-profdata/multiple-inputs.test index 616efe9..40d1108 100644 --- a/llvm/test/tools/llvm-profdata/multiple-inputs.test +++ b/llvm/test/tools/llvm-profdata/multiple-inputs.test @@ -23,29 +23,31 @@ FOO3EMPTY: Maximum function count: 1 FOO3EMPTY: Maximum internal block count: 3 RUN: llvm-profdata merge %p/Inputs/foo3-1.proftext %p/Inputs/foo3bar3-1.proftext -o %t -RUN: llvm-profdata show %t -all-functions -counts | FileCheck %s --check-prefix=FOO3FOO3BAR3 -FOO3FOO3BAR3: foo: -FOO3FOO3BAR3: Counters: 3 -FOO3FOO3BAR3: Function count: 3 -FOO3FOO3BAR3: Block counts: [5, 8] -FOO3FOO3BAR3: bar: -FOO3FOO3BAR3: Counters: 3 -FOO3FOO3BAR3: Function count: 7 -FOO3FOO3BAR3: Block counts: [11, 13] +RUN: llvm-profdata show %t -all-functions -counts | FileCheck %s --check-prefix=FOO3FOO3BAR3 --check-prefix=FOO3FOO3BAR3-1 +RUN: llvm-profdata show %t -all-functions -counts | FileCheck %s --check-prefix=FOO3FOO3BAR3 --check-prefix=FOO3FOO3BAR3-2 +FOO3FOO3BAR3-1: foo: +FOO3FOO3BAR3-1: Counters: 3 +FOO3FOO3BAR3-1: Function count: 3 +FOO3FOO3BAR3-1: Block counts: [5, 8] +FOO3FOO3BAR3-2: bar: +FOO3FOO3BAR3-2: Counters: 3 +FOO3FOO3BAR3-2: Function count: 7 +FOO3FOO3BAR3-2: Block counts: [11, 13] FOO3FOO3BAR3: Total functions: 2 FOO3FOO3BAR3: Maximum function count: 7 FOO3FOO3BAR3: Maximum internal block count: 13 RUN: llvm-profdata merge %p/Inputs/foo3-1.proftext %p/Inputs/bar3-1.proftext -o %t -RUN: llvm-profdata show %t -all-functions -counts | FileCheck %s --check-prefix=DISJOINT -DISJOINT: foo: -DISJOINT: Counters: 3 -DISJOINT: Function count: 1 -DISJOINT: Block counts: [2, 3] -DISJOINT: bar: -DISJOINT: Counters: 3 -DISJOINT: Function count: 1 -DISJOINT: Block counts: [2, 3] +RUN: llvm-profdata show %t -all-functions -counts | FileCheck %s --check-prefix=DISJOINT --check-prefix=DISJOINT-1 +RUN: llvm-profdata show %t -all-functions -counts | FileCheck %s --check-prefix=DISJOINT --check-prefix=DISJOINT-2 +DISJOINT-1: foo: +DISJOINT-1: Counters: 3 +DISJOINT-1: Function count: 1 +DISJOINT-1: Block counts: [2, 3] +DISJOINT-2: bar: +DISJOINT-2: Counters: 3 +DISJOINT-2: Function count: 1 +DISJOINT-2: Block counts: [2, 3] DISJOINT: Total functions: 2 DISJOINT: Maximum function count: 1 DISJOINT: Maximum internal block count: 3 diff --git a/llvm/test/tools/llvm-profdata/weight-instr.test b/llvm/test/tools/llvm-profdata/weight-instr.test index 7294cf3..927a896 100644 --- a/llvm/test/tools/llvm-profdata/weight-instr.test +++ b/llvm/test/tools/llvm-profdata/weight-instr.test @@ -2,52 +2,64 @@ Tests for weighted merge of instrumented profiles. 1- Merge the foo and bar profiles with unity weight and verify the combined output RUN: llvm-profdata merge -instr -weighted-input=1,%p/Inputs/weight-instr-bar.profdata -weighted-input=1,%p/Inputs/weight-instr-foo.profdata -o %t -RUN: llvm-profdata show -instr -all-functions %t | FileCheck %s -check-prefix=1X_1X_WEIGHT +RUN: llvm-profdata show -instr -all-functions %t > %t.out1 +RUN: FileCheck %s -check-prefix=1X_1X_WEIGHT --check-prefix=1X_1X_WEIGHT-1 < %t.out1 +RUN: FileCheck %s -check-prefix=1X_1X_WEIGHT --check-prefix=1X_1X_WEIGHT-2 < %t.out1 +RUN: FileCheck %s -check-prefix=1X_1X_WEIGHT --check-prefix=1X_1X_WEIGHT-3 < %t.out1 +RUN: FileCheck %s -check-prefix=1X_1X_WEIGHT --check-prefix=1X_1X_WEIGHT-4 < %t.out1 RUN: llvm-profdata merge -instr -weighted-input=1,%p/Inputs/weight-instr-bar.profdata %p/Inputs/weight-instr-foo.profdata -o %t -RUN: llvm-profdata show -instr -all-functions %t | FileCheck %s -check-prefix=1X_1X_WEIGHT +RUN: llvm-profdata show -instr -all-functions %t > %t.out2 +RUN: FileCheck %s -check-prefix=1X_1X_WEIGHT --check-prefix=1X_1X_WEIGHT-1 < %t.out2 +RUN: FileCheck %s -check-prefix=1X_1X_WEIGHT --check-prefix=1X_1X_WEIGHT-2 < %t.out2 +RUN: FileCheck %s -check-prefix=1X_1X_WEIGHT --check-prefix=1X_1X_WEIGHT-3 < %t.out2 +RUN: FileCheck %s -check-prefix=1X_1X_WEIGHT --check-prefix=1X_1X_WEIGHT-4 < %t.out2 1X_1X_WEIGHT: Counters: -1X_1X_WEIGHT-NEXT: usage: -1X_1X_WEIGHT-NEXT: Hash: 0x0000000000000000 -1X_1X_WEIGHT-NEXT: Counters: 1 -1X_1X_WEIGHT-NEXT: Function count: 0 -1X_1X_WEIGHT-NEXT: foo: -1X_1X_WEIGHT-NEXT: Hash: 0x000000000000028a -1X_1X_WEIGHT-NEXT: Counters: 3 -1X_1X_WEIGHT-NEXT: Function count: 866988873 -1X_1X_WEIGHT-NEXT: bar: -1X_1X_WEIGHT-NEXT: Hash: 0x000000000000028a -1X_1X_WEIGHT-NEXT: Counters: 3 -1X_1X_WEIGHT-NEXT: Function count: 866988873 -1X_1X_WEIGHT-NEXT: main: -1X_1X_WEIGHT-NEXT: Hash: 0x7d31c47ea98f8248 -1X_1X_WEIGHT-NEXT: Counters: 60 -1X_1X_WEIGHT-NEXT: Function count: 2 -1X_1X_WEIGHT-NEXT: Functions shown: 4 +1X_1X_WEIGHT-1: usage: +1X_1X_WEIGHT-1: Hash: 0x0000000000000000 +1X_1X_WEIGHT-1: Counters: 1 +1X_1X_WEIGHT-1: Function count: 0 +1X_1X_WEIGHT-2: foo: +1X_1X_WEIGHT-2: Hash: 0x000000000000028a +1X_1X_WEIGHT-2: Counters: 3 +1X_1X_WEIGHT-2: Function count: 866988873 +1X_1X_WEIGHT-3: bar: +1X_1X_WEIGHT-3: Hash: 0x000000000000028a +1X_1X_WEIGHT-3: Counters: 3 +1X_1X_WEIGHT-3: Function count: 866988873 +1X_1X_WEIGHT-4: main: +1X_1X_WEIGHT-4: Hash: 0x7d31c47ea98f8248 +1X_1X_WEIGHT-4: Counters: 60 +1X_1X_WEIGHT-4: Function count: 2 +1X_1X_WEIGHT: Functions shown: 4 1X_1X_WEIGHT-NEXT: Total functions: 4 1X_1X_WEIGHT-NEXT: Maximum function count: 866988873 1X_1X_WEIGHT-NEXT: Maximum internal block count: 267914296 2- Merge the foo and bar profiles with weight 3x and 5x respectively and verify the combined output RUN: llvm-profdata merge -instr -weighted-input=3,%p/Inputs/weight-instr-bar.profdata -weighted-input=5,%p/Inputs/weight-instr-foo.profdata -o %t -RUN: llvm-profdata show -instr -all-functions %t | FileCheck %s -check-prefix=3X_5X_WEIGHT +RUN: llvm-profdata show -instr -all-functions %t > %t.out3 +RUN: FileCheck %s -check-prefix=3X_5X_WEIGHT --check-prefix=3X_5X_WEIGHT-1 < %t.out3 +RUN: FileCheck %s -check-prefix=3X_5X_WEIGHT --check-prefix=3X_5X_WEIGHT-2 < %t.out3 +RUN: FileCheck %s -check-prefix=3X_5X_WEIGHT --check-prefix=3X_5X_WEIGHT-3 < %t.out3 +RUN: FileCheck %s -check-prefix=3X_5X_WEIGHT --check-prefix=3X_5X_WEIGHT-4 < %t.out3 3X_5X_WEIGHT: Counters: -3X_5X_WEIGHT-NEXT: usage: -3X_5X_WEIGHT-NEXT: Hash: 0x0000000000000000 -3X_5X_WEIGHT-NEXT: Counters: 1 -3X_5X_WEIGHT-NEXT: Function count: 0 -3X_5X_WEIGHT-NEXT: foo: -3X_5X_WEIGHT-NEXT: Hash: 0x000000000000028a -3X_5X_WEIGHT-NEXT: Counters: 3 -3X_5X_WEIGHT-NEXT: Function count: 4334944365 -3X_5X_WEIGHT-NEXT: bar: -3X_5X_WEIGHT-NEXT: Hash: 0x000000000000028a -3X_5X_WEIGHT-NEXT: Counters: 3 -3X_5X_WEIGHT-NEXT: Function count: 2600966619 -3X_5X_WEIGHT-NEXT: main: -3X_5X_WEIGHT-NEXT: Hash: 0x7d31c47ea98f8248 -3X_5X_WEIGHT-NEXT: Counters: 60 -3X_5X_WEIGHT-NEXT: Function count: 8 -3X_5X_WEIGHT-NEXT: Functions shown: 4 +3X_5X_WEIGHT-1: usage: +3X_5X_WEIGHT-1: Hash: 0x0000000000000000 +3X_5X_WEIGHT-1: Counters: 1 +3X_5X_WEIGHT-1: Function count: 0 +3X_5X_WEIGHT-2: foo: +3X_5X_WEIGHT-2: Hash: 0x000000000000028a +3X_5X_WEIGHT-2: Counters: 3 +3X_5X_WEIGHT-2: Function count: 4334944365 +3X_5X_WEIGHT-3: bar: +3X_5X_WEIGHT-3: Hash: 0x000000000000028a +3X_5X_WEIGHT-3: Counters: 3 +3X_5X_WEIGHT-3: Function count: 2600966619 +3X_5X_WEIGHT-4: main: +3X_5X_WEIGHT-4: Hash: 0x7d31c47ea98f8248 +3X_5X_WEIGHT-4: Counters: 60 +3X_5X_WEIGHT-4: Function count: 8 +3X_5X_WEIGHT: Functions shown: 4 3X_5X_WEIGHT-NEXT: Total functions: 4 3X_5X_WEIGHT-NEXT: Maximum function count: 4334944365 3X_5X_WEIGHT-NEXT: Maximum internal block count: 1339571480