[sampleprof] Drop test dependency on the string hash func (NFC)

The SampleProfWriter emits function information in an order determined
by the string hash function. The situation is a bit brittle, because
changing the hash function can break the tests.

Instead of sorting the function samples to get a relaible ordering (that
might be too expensive), make the tests not depend on a particular
ordering of function samples.

Differential Revision: https://reviews.llvm.org/D32516

llvm-svn: 301419

1 files changed, 32 insertions, 32 deletions

diff --git a/llvm/test/tools/llvm-profdata/overflow-sample.test b/llvm/test/tools/llvm-profdata/overflow-sample.test
index cd6268db2ab..83adf6d63b5 100644
--- a/llvm/test/tools/llvm-profdata/overflow-sample.test
+++ b/llvm/test/tools/llvm-profdata/overflow-sample.test
@@ -4,40 +4,40 @@ Tests for overflow when merging sampled profiles.
 RUN: llvm-profdata merge -sample %p/Inputs/overflow-sample.proftext %p/Inputs/overflow-sample.proftext -o %t.out 2>&1 | FileCheck %s -check-prefix=MERGE_OVERFLOW
 RUN: llvm-profdata show -sample %t.out | FileCheck %s --check-prefix=SHOW_OVERFLOW
 MERGE_OVERFLOW: {{.*}}: main: Counter overflow
-SHOW_OVERFLOW: Function: main: 2000, 0, 2 sampled lines
-SHOW_OVERFLOW-NEXT: Samples collected in the function's body {
-SHOW_OVERFLOW-NEXT:   1: 1000, calls: _Z3bari:18446744073709551615
-SHOW_OVERFLOW-NEXT:   2: 1000, calls: _Z3fooi:18446744073709551615
-SHOW_OVERFLOW-NEXT: }
-SHOW_OVERFLOW-NEXT: No inlined callsites in this function
-SHOW_OVERFLOW-NEXT: Function: _Z3fooi: 18446744073709551615, 2000, 1 sampled lines
-SHOW_OVERFLOW-NEXT: Samples collected in the function's body {
-SHOW_OVERFLOW-NEXT:   1: 18446744073709551615
-SHOW_OVERFLOW-NEXT: }
-SHOW_OVERFLOW-NEXT: No inlined callsites in this function
-SHOW_OVERFLOW-NEXT: Function: _Z3bari: 18446744073709551615, 2000, 1 sampled lines
-SHOW_OVERFLOW-NEXT: Samples collected in the function's body {
-SHOW_OVERFLOW-NEXT:   1: 18446744073709551615
-SHOW_OVERFLOW-NEXT: }
-SHOW_OVERFLOW-NEXT: No inlined callsites in this function
+SHOW_OVERFLOW-DAG: Function: main: 2000, 0, 2 sampled lines
+SHOW_OVERFLOW-DAG: Samples collected in the function's body {
+SHOW_OVERFLOW-DAG:   1: 1000, calls: _Z3bari:18446744073709551615
+SHOW_OVERFLOW-DAG:   2: 1000, calls: _Z3fooi:18446744073709551615
+SHOW_OVERFLOW-DAG: }
+SHOW_OVERFLOW-DAG: No inlined callsites in this function
+SHOW_OVERFLOW-DAG: Function: _Z3fooi: 18446744073709551615, 2000, 1 sampled lines
+SHOW_OVERFLOW-DAG: Samples collected in the function's body {
+SHOW_OVERFLOW-DAG:   1: 18446744073709551615
+SHOW_OVERFLOW-DAG: }
+SHOW_OVERFLOW-DAG: No inlined callsites in this function
+SHOW_OVERFLOW-DAG: Function: _Z3bari: 18446744073709551615, 2000, 1 sampled lines
+SHOW_OVERFLOW-DAG: Samples collected in the function's body {
+SHOW_OVERFLOW-DAG:   1: 18446744073709551615
+SHOW_OVERFLOW-DAG: }
+SHOW_OVERFLOW-DAG: No inlined callsites in this function
 
 2- Merge profile having maximum counts by itself and verify no overflow
 RUN: llvm-profdata merge -sample %p/Inputs/overflow-sample.proftext -o %t.out 2>&1 | FileCheck %s -allow-empty -check-prefix=MERGE_NO_OVERFLOW
 RUN: llvm-profdata show -sample %t.out | FileCheck %s --check-prefix=SHOW_NO_OVERFLOW
 MERGE_NO_OVERFLOW-NOT: {{.*}}: main: Counter overflow
-SHOW_NO_OVERFLOW: Function: main: 1000, 0, 2 sampled lines
-SHOW_NO_OVERFLOW-NEXT: Samples collected in the function's body {
-SHOW_NO_OVERFLOW-NEXT:   1: 500, calls: _Z3bari:18446744073709551615
-SHOW_NO_OVERFLOW-NEXT:   2: 500, calls: _Z3fooi:18446744073709551615
-SHOW_NO_OVERFLOW-NEXT: }
-SHOW_NO_OVERFLOW-NEXT: No inlined callsites in this function
-SHOW_NO_OVERFLOW-NEXT: Function: _Z3fooi: 18446744073709551615, 1000, 1 sampled lines
-SHOW_NO_OVERFLOW-NEXT: Samples collected in the function's body {
-SHOW_NO_OVERFLOW-NEXT:   1: 18446744073709551615
-SHOW_NO_OVERFLOW-NEXT: }
-SHOW_NO_OVERFLOW-NEXT: No inlined callsites in this function
-SHOW_NO_OVERFLOW-NEXT: Function: _Z3bari: 18446744073709551615, 1000, 1 sampled lines
-SHOW_NO_OVERFLOW-NEXT: Samples collected in the function's body {
-SHOW_NO_OVERFLOW-NEXT:   1: 18446744073709551615
-SHOW_NO_OVERFLOW-NEXT: }
-SHOW_NO_OVERFLOW-NEXT: No inlined callsites in this function
+SHOW_NO_OVERFLOW-DAG: Function: main: 1000, 0, 2 sampled lines
+SHOW_NO_OVERFLOW-DAG: Samples collected in the function's body {
+SHOW_NO_OVERFLOW-DAG:   1: 500, calls: _Z3bari:18446744073709551615
+SHOW_NO_OVERFLOW-DAG:   2: 500, calls: _Z3fooi:18446744073709551615
+SHOW_NO_OVERFLOW-DAG: }
+SHOW_NO_OVERFLOW-DAG: No inlined callsites in this function
+SHOW_NO_OVERFLOW-DAG: Function: _Z3fooi: 18446744073709551615, 1000, 1 sampled lines
+SHOW_NO_OVERFLOW-DAG: Samples collected in the function's body {
+SHOW_NO_OVERFLOW-DAG:   1: 18446744073709551615
+SHOW_NO_OVERFLOW-DAG: }
+SHOW_NO_OVERFLOW-DAG: No inlined callsites in this function
+SHOW_NO_OVERFLOW-DAG: Function: _Z3bari: 18446744073709551615, 1000, 1 sampled lines
+SHOW_NO_OVERFLOW-DAG: Samples collected in the function's body {
+SHOW_NO_OVERFLOW-DAG:   1: 18446744073709551615
+SHOW_NO_OVERFLOW-DAG: }
+SHOW_NO_OVERFLOW-DAG: No inlined callsites in this function