[llvm] r340945 - [llvm-mca] Don't disable the SummaryView if flag `-all-stats` is false.

[Andrea Di Biagio via llvm-commits]

Author: adibiagio
Date: Wed Aug 29 10:40:04 2018
New Revision: 340945

URL: http://llvm.org/viewvc/llvm-project?rev=340945&view=rev
Log:
[llvm-mca] Don't disable the SummaryView if flag `-all-stats` is false.

Added:
    llvm/trunk/test/tools/llvm-mca/X86/option-no-stats-1.s
Modified:
    llvm/trunk/test/tools/llvm-mca/X86/option-all-stats-1.s
    llvm/trunk/tools/llvm-mca/llvm-mca.cpp

Modified: llvm/trunk/test/tools/llvm-mca/X86/option-all-stats-1.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-mca/X86/option-all-stats-1.s?rev=340945&r1=340944&r2=340945&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-mca/X86/option-all-stats-1.s (original)
+++ llvm/trunk/test/tools/llvm-mca/X86/option-all-stats-1.s Wed Aug 29 10:40:04 2018
@@ -6,12 +6,12 @@
 
 add %eax, %eax
 
-# FULLREPORT:      Iterations:        100
-# FULLREPORT-NEXT: Instructions:      100
-# FULLREPORT-NEXT: Total Cycles:      103
-# FULLREPORT-NEXT: Dispatch Width:    2
-# FULLREPORT-NEXT: IPC:               0.97
-# FULLREPORT-NEXT: Block RThroughput: 0.5
+# ALL:             Iterations:        100
+# ALL-NEXT:        Instructions:      100
+# ALL-NEXT:        Total Cycles:      103
+# ALL-NEXT:        Dispatch Width:    2
+# ALL-NEXT:        IPC:               0.97
+# ALL-NEXT:        Block RThroughput: 0.5
 
 # ALL:             Instruction Info:
 # ALL-NEXT:        [1]: #uOps

Added: llvm/trunk/test/tools/llvm-mca/X86/option-no-stats-1.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-mca/X86/option-no-stats-1.s?rev=340945&view=auto
==============================================================================
--- llvm/trunk/test/tools/llvm-mca/X86/option-no-stats-1.s (added)
+++ llvm/trunk/test/tools/llvm-mca/X86/option-no-stats-1.s Wed Aug 29 10:40:04 2018
@@ -0,0 +1,72 @@
+# NOTE: Assertions have been autogenerated by utils/update_mca_test_checks.py
+# RUN: llvm-mca -mtriple=x86_64-unknown-unknown -mcpu=btver2 -all-views -all-stats=false < %s | FileCheck %s
+
+# We don't want to disable the SummaryView if flag -all-stats is set to false.
+
+add %edi, %eax
+
+# CHECK:      Iterations:        100
+# CHECK-NEXT: Instructions:      100
+# CHECK-NEXT: Total Cycles:      103
+# CHECK-NEXT: Dispatch Width:    2
+# CHECK-NEXT: IPC:               0.97
+# CHECK-NEXT: Block RThroughput: 0.5
+
+# CHECK:      Instruction Info:
+# CHECK-NEXT: [1]: #uOps
+# CHECK-NEXT: [2]: Latency
+# CHECK-NEXT: [3]: RThroughput
+# CHECK-NEXT: [4]: MayLoad
+# CHECK-NEXT: [5]: MayStore
+# CHECK-NEXT: [6]: HasSideEffects (U)
+
+# CHECK:      [1]    [2]    [3]    [4]    [5]    [6]    Instructions:
+# CHECK-NEXT:  1      1     0.50                        addl	%edi, %eax
+
+# CHECK:      Resources:
+# CHECK-NEXT: [0]   - JALU0
+# CHECK-NEXT: [1]   - JALU1
+# CHECK-NEXT: [2]   - JDiv
+# CHECK-NEXT: [3]   - JFPA
+# CHECK-NEXT: [4]   - JFPM
+# CHECK-NEXT: [5]   - JFPU0
+# CHECK-NEXT: [6]   - JFPU1
+# CHECK-NEXT: [7]   - JLAGU
+# CHECK-NEXT: [8]   - JMul
+# CHECK-NEXT: [9]   - JSAGU
+# CHECK-NEXT: [10]  - JSTC
+# CHECK-NEXT: [11]  - JVALU0
+# CHECK-NEXT: [12]  - JVALU1
+# CHECK-NEXT: [13]  - JVIMUL
+
+# CHECK:      Resource pressure per iteration:
+# CHECK-NEXT: [0]    [1]    [2]    [3]    [4]    [5]    [6]    [7]    [8]    [9]    [10]   [11]   [12]   [13]
+# CHECK-NEXT: 0.50   0.50    -      -      -      -      -      -      -      -      -      -      -      -
+
+# CHECK:      Resource pressure by instruction:
+# CHECK-NEXT: [0]    [1]    [2]    [3]    [4]    [5]    [6]    [7]    [8]    [9]    [10]   [11]   [12]   [13]   Instructions:
+# CHECK-NEXT: 0.50   0.50    -      -      -      -      -      -      -      -      -      -      -      -     addl	%edi, %eax
+
+# CHECK:      Timeline view:
+# CHECK-NEXT:                     012
+# CHECK-NEXT: Index     0123456789
+
+# CHECK:      [0,0]     DeER .    . .   addl	%edi, %eax
+# CHECK-NEXT: [1,0]     D=eER.    . .   addl	%edi, %eax
+# CHECK-NEXT: [2,0]     .D=eER    . .   addl	%edi, %eax
+# CHECK-NEXT: [3,0]     .D==eER   . .   addl	%edi, %eax
+# CHECK-NEXT: [4,0]     . D==eER  . .   addl	%edi, %eax
+# CHECK-NEXT: [5,0]     . D===eER . .   addl	%edi, %eax
+# CHECK-NEXT: [6,0]     .  D===eER. .   addl	%edi, %eax
+# CHECK-NEXT: [7,0]     .  D====eER .   addl	%edi, %eax
+# CHECK-NEXT: [8,0]     .   D====eER.   addl	%edi, %eax
+# CHECK-NEXT: [9,0]     .   D=====eER   addl	%edi, %eax
+
+# CHECK:      Average Wait times (based on the timeline view):
+# CHECK-NEXT: [0]: Executions
+# CHECK-NEXT: [1]: Average time spent waiting in a scheduler's queue
+# CHECK-NEXT: [2]: Average time spent waiting in a scheduler's queue while ready
+# CHECK-NEXT: [3]: Average time elapsed from WB until retire stage
+
+# CHECK:            [0]    [1]    [2]    [3]
+# CHECK-NEXT: 0.     10    3.5    0.1    0.0       addl	%edi, %eax

Modified: llvm/trunk/tools/llvm-mca/llvm-mca.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-mca/llvm-mca.cpp?rev=340945&r1=340944&r2=340945&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-mca/llvm-mca.cpp (original)
+++ llvm/trunk/tools/llvm-mca/llvm-mca.cpp Wed Aug 29 10:40:04 2018
@@ -318,7 +318,6 @@ static void processViewOptions() {
       EnableAllViews.getPosition() < EnableAllStats.getPosition()
           ? EnableAllStats
           : EnableAllViews;
-  processOptionImpl(PrintSummaryView, Default);
   processOptionImpl(PrintRegisterFileStats, Default);
   processOptionImpl(PrintDispatchStats, Default);
   processOptionImpl(PrintSchedulerStats, Default);