Skip to content

Commit 1bc8dab

Browse files
davezarzyckidavezarzycki
committed
Fix x86 exegesis tests after c042aff
In c042aff, unused FileCheck prefixes became an error, which exposed some testing bugs in four exegesis tests. I've tried my best to either fix the testing bugs, or expand the testing to cover more scenarios. Reviewed By: lebedev.ri Differential Revision: https://reviews.llvm.org/D95287
1 parent 06ab795 commit 1bc8dab

File tree

4 files changed

+18
-18
lines changed

4 files changed

+18
-18
lines changed

‎llvm/test/tools/llvm-exegesis/X86/analysis-cluster-stabilization.test

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# RUN: llvm-exegesis -mode=analysis -benchmarks-file=%s -analysis-clusters-output-file=- -analysis-clustering-epsilon=0.1 -analysis-inconsistency-epsilon=0.1 -analysis-numpoints=1 | FileCheck -check-prefixes=CHECK-CLUSTERS %s
2-
# RUN: llvm-exegesis -mode=analysis -benchmarks-file=%s -analysis-inconsistencies-output-file=- -analysis-clustering-epsilon=0.5 -analysis-inconsistency-epsilon=0.5 -analysis-numpoints=1 | FileCheck -check-prefixes=CHECK-INCONSISTENCIES-ALL,CHECK-INCONSISTENCIES-STABLE %s
3-
# RUN: llvm-exegesis -mode=analysis -benchmarks-file=%s -analysis-inconsistencies-output-file=- -analysis-clustering-epsilon=0.5 -analysis-inconsistency-epsilon=0.5 -analysis-display-unstable-clusters -analysis-numpoints=1 | FileCheck -check-prefixes=CHECK-INCONSISTENCIES-ALL,CHECK-INCONSISTENCIES-UNSTABLE %s
2+
# RUN: llvm-exegesis -mode=analysis -benchmarks-file=%s -analysis-inconsistencies-output-file=- -analysis-clustering-epsilon=0.5 -analysis-inconsistency-epsilon=0.5 -analysis-numpoints=1 | FileCheck -check-prefixes=CHECK-INCONSISTENCIES-STABLE %s
3+
# RUN: llvm-exegesis -mode=analysis -benchmarks-file=%s -analysis-inconsistencies-output-file=- -analysis-clustering-epsilon=0.5 -analysis-inconsistency-epsilon=0.5 -analysis-display-unstable-clusters -analysis-numpoints=1 | FileCheck -check-prefixes=CHECK-INCONSISTENCIES-UNSTABLE %s
44

55
# We have one ADD32rr measurement, and two measurements for SQRTSSr.
66
# The ADD32rr measurement and one of the SQRTSSr measurements are identical,

‎llvm/test/tools/llvm-exegesis/X86/analysis-clustering-algorithms.test

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,14 @@
3030

3131
# And -analysis-clustering=naive every opcode goes into separate cluster.
3232

33-
# CHECK-CLUSTERS-NAIVE-049-NEXT: {{^}}0,
34-
# CHECK-CLUSTERS-NAIVE-049-SAME: ,1.50{{$}}
35-
# CHECK-CLUSTERS-NAIVE-049: {{^}}1,
36-
# CHECK-CLUSTERS-NAIVE-049-SAME: ,2.00{{$}}
37-
# CHECK-CLUSTERS-NAIVE-049: {{^}}2,
38-
# CHECK-CLUSTERS-NAIVE-049-SAME: ,2.50{{$}}
39-
# CHECK-CLUSTERS-NAIVE-049: {{^}}3,
40-
# CHECK-CLUSTERS-NAIVE-049-SAME: ,1.00{{$}}
33+
# CHECK-CLUSTERS-NAIVE-NEXT: {{^}}0,
34+
# CHECK-CLUSTERS-NAIVE-SAME: ,1.50{{$}}
35+
# CHECK-CLUSTERS-NAIVE: {{^}}1,
36+
# CHECK-CLUSTERS-NAIVE-SAME: ,2.00{{$}}
37+
# CHECK-CLUSTERS-NAIVE: {{^}}2,
38+
# CHECK-CLUSTERS-NAIVE-SAME: ,2.50{{$}}
39+
# CHECK-CLUSTERS-NAIVE: {{^}}3,
40+
# CHECK-CLUSTERS-NAIVE-SAME: ,1.00{{$}}
4141

4242
# The "value" is manually specified, not measured.
4343

‎llvm/test/tools/llvm-exegesis/X86/analysis-naive-cluster-stabilization.test

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
# RUN: llvm-exegesis -mode=analysis -benchmarks-file=%s -analysis-clusters-output-file=- -analysis-clustering-epsilon=0.5 -analysis-inconsistency-epsilon=0.5 -analysis-numpoints=1 -analysis-clustering=naive | FileCheck -check-prefixes=CHECK-CLUSTERS-ALL,CHECK-CLUSTERS-05 %s
1+
# RUN: llvm-exegesis -mode=analysis -benchmarks-file=%s -analysis-clusters-output-file=- -analysis-clustering-epsilon=0.5 -analysis-inconsistency-epsilon=0.5 -analysis-numpoints=1 -analysis-clustering=naive | FileCheck -check-prefixes=CHECK-CLUSTERS-ALL %s
22
# RUN: llvm-exegesis -mode=analysis -benchmarks-file=%s -analysis-inconsistencies-output-file=- -analysis-clustering-epsilon=0.5 -analysis-inconsistency-epsilon=0.5 -analysis-numpoints=1 -analysis-clustering=naive | FileCheck -check-prefixes=CHECK-INCONSISTENCIES-STABLE-05 %s
33
# RUN: llvm-exegesis -mode=analysis -benchmarks-file=%s -analysis-inconsistencies-output-file=- -analysis-clustering-epsilon=0.5 -analysis-inconsistency-epsilon=0.5 -analysis-display-unstable-clusters -analysis-numpoints=1 -analysis-clustering=naive | FileCheck -check-prefixes=CHECK-INCONSISTENCIES-UNSTABLE-05 %s
44

5-
# RUN: llvm-exegesis -mode=analysis -benchmarks-file=%s -analysis-clusters-output-file=- -analysis-clustering-epsilon=0.49 -analysis-inconsistency-epsilon=0.5 -analysis-numpoints=1 -analysis-clustering=naive | FileCheck -check-prefixes=CHECK-CLUSTERS-ALL,CHECK-CLUSTERS-049 %s
5+
# RUN: llvm-exegesis -mode=analysis -benchmarks-file=%s -analysis-clusters-output-file=- -analysis-clustering-epsilon=0.49 -analysis-inconsistency-epsilon=0.5 -analysis-numpoints=1 -analysis-clustering=naive | FileCheck -check-prefixes=CHECK-CLUSTERS-ALL %s
66
# RUN: llvm-exegesis -mode=analysis -benchmarks-file=%s -analysis-inconsistencies-output-file=- -analysis-clustering-epsilon=0.49 -analysis-inconsistency-epsilon=0.5 -analysis-numpoints=1 -analysis-clustering=naive | FileCheck -check-prefixes=CHECK-INCONSISTENCIES-STABLE-049 %s
77
# RUN: llvm-exegesis -mode=analysis -benchmarks-file=%s -analysis-inconsistencies-output-file=- -analysis-clustering-epsilon=0.49 -analysis-inconsistency-epsilon=0.5 -analysis-display-unstable-clusters -analysis-numpoints=1 -analysis-clustering=naive | FileCheck -check-prefixes=CHECK-INCONSISTENCIES-UNSTABLE-049 %s
88

99
# CHECK-CLUSTERS-ALL: {{^}}cluster_id,opcode_name,config,sched_class,latency{{$}}
1010

11-
# CHECK-CLUSTERS-NEXT-05: {{^}}0,
12-
# CHECK-CLUSTERS-SAME-05: ,90.00{{$}}
13-
# CHECK-CLUSTERS-05: {{^}}0,
14-
# CHECK-CLUSTERS-SAME-05: ,90.50{{$}}
11+
# CHECK-CLUSTERS-ALL-NEXT: {{^}}0,
12+
# CHECK-CLUSTERS-ALL-SAME: ,90.00{{$}}
13+
# CHECK-CLUSTERS-ALL: {{^}}0,
14+
# CHECK-CLUSTERS-ALL-SAME: ,90.50{{$}}
1515

1616
# CHECK-INCONSISTENCIES-STABLE-05: ADD32rr
1717
# CHECK-INCONSISTENCIES-STABLE-05: ADD32rr

‎llvm/test/tools/llvm-exegesis/X86/analysis-naive-clusterization.test

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# RUN: llvm-exegesis -mode=analysis -benchmarks-file=%s -analysis-clusters-output-file=- -analysis-clustering-epsilon=0.1 -analysis-inconsistency-epsilon=0.1 -analysis-numpoints=1 -analysis-clustering=naive | FileCheck -check-prefixes=CHECK-CLUSTERS %s
2-
# RUN: llvm-exegesis -mode=analysis -benchmarks-file=%s -analysis-inconsistencies-output-file=- -analysis-clustering-epsilon=0.5 -analysis-inconsistency-epsilon=0.5 -analysis-numpoints=1 -analysis-clustering=naive | FileCheck -check-prefixes=CHECK-INCONSISTENCIES-ALL,CHECK-INCONSISTENCIES-STABLE %s
3-
# RUN: llvm-exegesis -mode=analysis -benchmarks-file=%s -analysis-inconsistencies-output-file=- -analysis-clustering-epsilon=0.5 -analysis-inconsistency-epsilon=0.5 -analysis-display-unstable-clusters -analysis-numpoints=1 -analysis-clustering=naive | FileCheck -check-prefixes=CHECK-INCONSISTENCIES-ALL,CHECK-INCONSISTENCIES-UNSTABLE %s
2+
# RUN: llvm-exegesis -mode=analysis -benchmarks-file=%s -analysis-inconsistencies-output-file=- -analysis-clustering-epsilon=0.5 -analysis-inconsistency-epsilon=0.5 -analysis-numpoints=1 -analysis-clustering=naive | FileCheck -check-prefixes=CHECK-INCONSISTENCIES-STABLE %s
3+
# RUN: llvm-exegesis -mode=analysis -benchmarks-file=%s -analysis-inconsistencies-output-file=- -analysis-clustering-epsilon=0.5 -analysis-inconsistency-epsilon=0.5 -analysis-display-unstable-clusters -analysis-numpoints=1 -analysis-clustering=naive | FileCheck -check-prefixes=CHECK-INCONSISTENCIES-UNSTABLE %s
44

55
# We have two ADD32rr measurements, and two measurements for SQRTSSr.
66
# ADD32rr measurements are neighbours.

0 commit comments

Comments
 (0)