Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "[Remarks] Introduce count subcommand for llvm-remarkutil. (#66214)" #68905

Closed
wants to merge 1 commit into from

Conversation

artagnon
Copy link
Contributor

@artagnon artagnon commented Oct 12, 2023

This reverts commit 31c2cf1, as it results in a broken LLVM build.

…vm#66214)"

This reverts commit 31c2cf1, as it
results in a broken LLVM build.
@llvmbot
Copy link
Collaborator

llvmbot commented Oct 12, 2023

@llvm/pr-subscribers-llvm-binary-utilities

Author: Ramkumar Ramachandra (artagnon)

Changes

…6214)"

This reverts commit 31c2cf1, as it results in a broken LLVM build.


Patch is 46.43 KiB, truncated to 20.00 KiB below, full version: https://github.com/llvm/llvm-project/pull/68905.diff

24 Files Affected:

  • (modified) llvm/docs/CommandGuide/llvm-remarkutil.rst (-74)
  • (modified) llvm/include/llvm/Remarks/Remark.h (-4)
  • (modified) llvm/lib/Remarks/Remark.cpp (-11)
  • (modified) llvm/test/tools/llvm-remarkutil/annotation-count-with-dbg-loc.test (-7)
  • (modified) llvm/test/tools/llvm-remarkutil/annotation-count.test (-7)
  • (modified) llvm/test/tools/llvm-remarkutil/broken-bitstream-remark.test (-2)
  • (modified) llvm/test/tools/llvm-remarkutil/broken-yaml-remark.test (-2)
  • (removed) llvm/test/tools/llvm-remarkutil/count/Inputs/remark-count-by.yaml (-43)
  • (removed) llvm/test/tools/llvm-remarkutil/count/Inputs/remark-filter-by.yaml (-40)
  • (removed) llvm/test/tools/llvm-remarkutil/count/Inputs/remark-group-by.yaml (-54)
  • (removed) llvm/test/tools/llvm-remarkutil/count/count-by-keys.test (-20)
  • (removed) llvm/test/tools/llvm-remarkutil/count/count-by-remark.test (-20)
  • (removed) llvm/test/tools/llvm-remarkutil/count/filter-by-pass-name.test (-10)
  • (removed) llvm/test/tools/llvm-remarkutil/count/filter-by-remark-name.test (-10)
  • (removed) llvm/test/tools/llvm-remarkutil/count/filter-by-type.test (-16)
  • (removed) llvm/test/tools/llvm-remarkutil/count/group-by-function-with-loc.test (-7)
  • (removed) llvm/test/tools/llvm-remarkutil/count/group-by-function.test (-7)
  • (removed) llvm/test/tools/llvm-remarkutil/count/group-by-source.test (-6)
  • (modified) llvm/test/tools/llvm-remarkutil/empty-file.test (-5)
  • (modified) llvm/test/tools/llvm-remarkutil/instruction-count-with-dbg-loc.test (-7)
  • (modified) llvm/test/tools/llvm-remarkutil/instruction-count.test (-7)
  • (modified) llvm/tools/llvm-remarkutil/CMakeLists.txt (-1)
  • (removed) llvm/tools/llvm-remarkutil/RemarkCounter.cpp (-337)
  • (removed) llvm/tools/llvm-remarkutil/RemarkCounter.h (-217)
diff --git a/llvm/docs/CommandGuide/llvm-remarkutil.rst b/llvm/docs/CommandGuide/llvm-remarkutil.rst
index 2e4953eb188ae7b..d13a51707a93c58 100644
--- a/llvm/docs/CommandGuide/llvm-remarkutil.rst
+++ b/llvm/docs/CommandGuide/llvm-remarkutil.rst
@@ -110,80 +110,6 @@ if `--use-debug-loc` is passed then the CSV will include the source path, line n
   Source,Function,Count
   path:line:column,foo,3
 
-.. _count_subcommand:
-
-count
-~~~~~
-
-..program:: llvm-remarkutil count
-
-USAGE: :program:`llvm-remarkutil` count [*options*] <input file>
-
-Summary
-^^^^^^^
-
-:program:`llvm-remarkutil count` counts `remarks <https://llvm.org/docs/Remarks.html>` based on specified properties. 
-By default the tool counts remarks based on how many occour in a source file or function or total for the generated remark file.
-The tool also supports collecting count based on specific remark arguments. The specified arguments should have an integer value to be able to report a count.
-
-The tool contains utilities to filter the remark count based on remark name, pass name, argument value and remark type.
-OPTIONS
--------
-
-.. option:: --parser=<yaml|bitstream>
-
-  Select the type of input remark parser. Required.
-  * ``yaml``: The tool will parse YAML remarks.
-  * ``bitstream``: The tool will parse bitstream remarks.
-
-.. option:: --count-by<value>
-  Select option to collect remarks by.
-  * ``remark-name``: count how many individual remarks exist.
-  * ``arg``: count remarks based on specified arguments passed by --(r)args. The argument value must be a number.
-
-.. option:: --group-by=<value>
-  group count of remarks by property.
-  * ``source``: Count will be collected per source path. Remarks with no debug location will not be counted. 
-  * ``function``: Count is collected per function.
-  * ``function-with-loc``: Count is collected per function per source. Remarks with no debug location will not be counted. 
-  * ``Total``: Report a count for the provided remark file.
-
-.. option:: --args[=arguments]
-  If `count-by` is set to `arg` this flag can be used to collect from specified remark arguments represented as a comma seperated string.
-  The arguments must have a numeral value to be able to count remarks by
-  
-.. option:: --rargs[=arguments]
-  If `count-by` is set to `arg` this flag can be used to collect from specified remark arguments using regular expression.
-  The arguments must have a numeral value to be able to count remarks by
-
-.. option:: --pass-name[=<string>]
-  Filter count by pass name.
-
-.. option:: --rpass-name[=<string>]
-  Filter count by pass name using regular expressions.
-
-.. option:: --remark-name[=<string>]
-  Filter count by remark name.
-
-.. option:: --rremark-name[=<string>]
-  Filter count by remark name using regular expressions.
-
-.. option:: --filter-arg-by[=<string>]
-  Filter count by argument value.
-
-.. option:: --rfilter-arg-by[=<string>]
-  Filter count by argument value using regular expressions.
-
-.. option:: --remark-type=<value>
-  Filter remarks by type with the following options.
-  * ``unknown``
-  * ``passed``               
-  * ``missed``               
-  * ``analysis``             
-  * ``analysis-fp-commute``
-  * ``analysis-aliasing``    
-  * ``failure``              
-
 .. _size-diff_subcommand:
 
 size-diff
diff --git a/llvm/include/llvm/Remarks/Remark.h b/llvm/include/llvm/Remarks/Remark.h
index de81c5a992805b4..a66f7ed73f2f507 100644
--- a/llvm/include/llvm/Remarks/Remark.h
+++ b/llvm/include/llvm/Remarks/Remark.h
@@ -52,10 +52,6 @@ struct Argument {
 
   /// Implement operator<< on Argument.
   void print(raw_ostream &OS) const;
-  /// Return the value of argument as int.
-  std::optional<int> getValAsInt() const;
-  /// Check if the argument value can be parsed as int.
-  bool isValInt() const;
 };
 
 // Create wrappers for C Binding types (see CBindingWrapping.h).
diff --git a/llvm/lib/Remarks/Remark.cpp b/llvm/lib/Remarks/Remark.cpp
index ef42271a3c8da6f..1b248db41747ed0 100644
--- a/llvm/lib/Remarks/Remark.cpp
+++ b/llvm/lib/Remarks/Remark.cpp
@@ -11,7 +11,6 @@
 //===----------------------------------------------------------------------===//
 
 #include "llvm/Remarks/Remark.h"
-#include "llvm/ADT/APInt.h"
 #include "llvm/ADT/ArrayRef.h"
 #include <optional>
 
@@ -26,16 +25,6 @@ std::string Remark::getArgsAsMsg() const {
   return OS.str();
 }
 
-/// Returns the value of a specified key parsed from StringRef.
-std::optional<int> Argument::getValAsInt() const {
-  APInt KeyVal;
-  if (Val.getAsInteger(10, KeyVal))
-    return std::nullopt;
-  return KeyVal.getSExtValue();
-}
-
-bool Argument::isValInt() const { return getValAsInt().has_value(); }
-
 void RemarkLocation::print(raw_ostream &OS) const {
   OS << "{ "
      << "File: " << SourceFilePath << ", Line: " << SourceLine
diff --git a/llvm/test/tools/llvm-remarkutil/annotation-count-with-dbg-loc.test b/llvm/test/tools/llvm-remarkutil/annotation-count-with-dbg-loc.test
index 673a38001f760b4..cdc731c003f6a04 100644
--- a/llvm/test/tools/llvm-remarkutil/annotation-count-with-dbg-loc.test
+++ b/llvm/test/tools/llvm-remarkutil/annotation-count-with-dbg-loc.test
@@ -1,14 +1,7 @@
 RUN: llvm-remarkutil annotation-count --use-debug-loc --parser=yaml --annotation-type=remark %p/Inputs/annotation-count-with-dbg-loc.yaml | FileCheck %s
 RUN: llvm-remarkutil yaml2bitstream %p/Inputs/annotation-count-with-dbg-loc.yaml | llvm-remarkutil annotation-count --use-debug-loc --parser=bitstream --annotation-type=remark | FileCheck %s
-RUN: llvm-remarkutil count --parser=yaml --count-by=arg --group-by=function-with-loc --remark-name="AnnotationSummary" %p/Inputs/annotation-count-with-dbg-loc.yaml | FileCheck %s --check-prefix=COUNT-CHECK
-RUN: llvm-remarkutil yaml2bitstream %p/Inputs/annotation-count-with-dbg-loc.yaml | llvm-remarkutil count --parser=bitstream --count-by=arg --group-by=function-with-loc --remark-name="AnnotationSummary" | FileCheck %s --check-prefix=COUNT-CHECK
 
 ; CHECK-LABEL: Source,Function,Count
 ; CHECK: path/to/anno.c:1:2,func1,1
 ; CHECK: path/to/anno2.c:1:2,func2,2
 ; CHECK: path/to/anno3.c:1:2,func3,3
-
-; COUNT-CHECK-LABEL: FuctionWithDebugLoc,count
-; COUNT-CHECK: path/to/anno.c:func1,1
-; COUNT-CHECK: path/to/anno2.c:func2,2
-; COUNT-CHECK: path/to/anno3.c:func3,3
diff --git a/llvm/test/tools/llvm-remarkutil/annotation-count.test b/llvm/test/tools/llvm-remarkutil/annotation-count.test
index e006220c64f38fc..73582402201dc98 100644
--- a/llvm/test/tools/llvm-remarkutil/annotation-count.test
+++ b/llvm/test/tools/llvm-remarkutil/annotation-count.test
@@ -1,14 +1,7 @@
 RUN: llvm-remarkutil annotation-count --parser=yaml --annotation-type=remark %p/Inputs/annotation-count.yaml | FileCheck %s
 RUN: llvm-remarkutil yaml2bitstream %p/Inputs/annotation-count.yaml | llvm-remarkutil annotation-count --parser=bitstream --annotation-type=remark | FileCheck %s
-RUN: llvm-remarkutil count --parser=yaml --count-by=arg --group-by=function --remark-name="AnnotationSummary" %p/Inputs/annotation-count.yaml | FileCheck %s --check-prefix=COUNT-CHECK
-RUN: llvm-remarkutil yaml2bitstream %p/Inputs/annotation-count.yaml | llvm-remarkutil count --parser=bitstream --count-by=arg --group-by=function --remark-name="AnnotationSummary" | FileCheck %s --check-prefix=COUNT-CHECK
 
 ; CHECK-LABEL: Function,Count
 ; CHECK: func1,1
 ; CHECK: func2,2
 ; CHECK: func3,3
-
-; COUNT-CHECK-LABEL: Function,count
-; COUNT-CHECK: func1,1
-; COUNT-CHECK: func2,2
-; COUNT-CHECK: func3,3
diff --git a/llvm/test/tools/llvm-remarkutil/broken-bitstream-remark.test b/llvm/test/tools/llvm-remarkutil/broken-bitstream-remark.test
index 78011aece08f720..515c096f540eb47 100644
--- a/llvm/test/tools/llvm-remarkutil/broken-bitstream-remark.test
+++ b/llvm/test/tools/llvm-remarkutil/broken-bitstream-remark.test
@@ -1,6 +1,4 @@
 RUN: not llvm-remarkutil bitstream2yaml %p/Inputs/broken-remark -o - 2>&1 | FileCheck %s
 RUN: not llvm-remarkutil instruction-count --parser=bitstream %p/Inputs/broken-remark -o - 2>&1 | FileCheck %s
 RUN: not llvm-remarkutil annotation-count --parser=bitstream --annotation-type=remark %p/Inputs/broken-remark -o - 2>&1 | FileCheck %s
-RUN: not llvm-remarkutil count --parser=bitstream %p/Inputs/broken-remark -o - 2>&1 | FileCheck %s
-
 CHECK: error: Unknown magic number: expecting RMRK, got --- .
diff --git a/llvm/test/tools/llvm-remarkutil/broken-yaml-remark.test b/llvm/test/tools/llvm-remarkutil/broken-yaml-remark.test
index 0f0650660336379..df87e3db80442ef 100644
--- a/llvm/test/tools/llvm-remarkutil/broken-yaml-remark.test
+++ b/llvm/test/tools/llvm-remarkutil/broken-yaml-remark.test
@@ -1,6 +1,4 @@
 RUN: not llvm-remarkutil yaml2bitstream %p/Inputs/broken-remark -o - 2>&1 | FileCheck %s
 RUN: not llvm-remarkutil instruction-count --parser=yaml %p/Inputs/broken-remark -o - 2>&1 | FileCheck %s
 RUN: not llvm-remarkutil annotation-count --parser=yaml --annotation-type=remark %p/Inputs/broken-remark -o - 2>&1 | FileCheck %s
-RUN: not llvm-remarkutil count --parser=yaml %p/Inputs/broken-remark -o - 2>&1 | FileCheck %s
-
 CHECK: error: Type, Pass, Name or Function missing
diff --git a/llvm/test/tools/llvm-remarkutil/count/Inputs/remark-count-by.yaml b/llvm/test/tools/llvm-remarkutil/count/Inputs/remark-count-by.yaml
deleted file mode 100644
index 3bd0783b7a0a12b..000000000000000
--- a/llvm/test/tools/llvm-remarkutil/count/Inputs/remark-count-by.yaml
+++ /dev/null
@@ -1,43 +0,0 @@
---- !Analysis
-Pass:            generic-remarks-pass
-Name:            Remark 
-DebugLoc:        { File: path/to/anno.c, Line: 1, Column: 2 }
-Function:        func1
-Args:
-  - count1:           '1'
-  - count2:           '2'
-  - count3:           '3'
-  - count4:           '4'
-  - String:          ' instructions with '
-  - type:            remark
---- !Analysis
-Pass:            generic-remarks-pass
-Name:            Remark2
-DebugLoc:        { File: path/to/anno2.c, Line: 1, Column: 2 }
-Function:        func1
-Args:
-  - count1:           '1'
-  - count2:           '2'
-  - count3:           '3'
-  - String:          ' instructions with '
-  - type:            remark
---- !Analysis
-Pass:            generic-remarks-pass
-Name:            Remark3 
-DebugLoc:        { File: path/to/anno.c, Line: 1, Column: 2 }
-Function:        func1
-Args:
-  - count1:           '1'
-  - String:          ' instructions with '
-  - type:            remark
---- !Analysis
-Pass:            generic-remarks-pass
-Name:            Remark 
-DebugLoc:        { File: path/to/anno.c, Line: 1, Column: 2 }
-Function:        func2
-Args:
-  - count1:           '1'
-  - count2:           '2'
-  - count3:           '3'
-  - String:          ' instructions with '
-  - type:            remark
diff --git a/llvm/test/tools/llvm-remarkutil/count/Inputs/remark-filter-by.yaml b/llvm/test/tools/llvm-remarkutil/count/Inputs/remark-filter-by.yaml
deleted file mode 100644
index e9267bd9404848e..000000000000000
--- a/llvm/test/tools/llvm-remarkutil/count/Inputs/remark-filter-by.yaml
+++ /dev/null
@@ -1,40 +0,0 @@
---- !Analysis
-Pass:            generic-remarks-pass
-Name:            Remark 
-DebugLoc:        { File: path/to/anno2.c, Line: 1, Column: 2 }
-Function:        func1
-Args:
-  - count1:           '1'
-  - String:          ' instructions with '
-  - type:            remark
---- !Analysis
-Pass:            generic-remarks-pass2
-Name:            Remark2
-DebugLoc:        { File: path/to/anno2.c, Line: 1, Column: 2 }
-Function:        func1
-Args:
-  - count1:           '1'
-  - count2:           '2'
-  - count3:           '3'
-  - String:          ' instructions with '
-  - type:            remark
---- !Missed
-Pass:            generic-remarks-pass
-Name:            Remark3 
-DebugLoc:        { File: path/to/anno.c, Line: 1, Column: 2 }
-Function:        func1
-Args:
-  - count1:           '1'
-  - String:          ' instructions with '
-  - type:            remark
---- !Passed
-Pass:            generic-remarks-pass
-Name:            Remark 
-DebugLoc:        { File: path/to/anno.c, Line: 1, Column: 2 }
-Function:        func1
-Args:
-  - count1:           '1'
-  - count2:           '2'
-  - count3:           '3'
-  - String:          ' instructions with '
-  - type:            remark
diff --git a/llvm/test/tools/llvm-remarkutil/count/Inputs/remark-group-by.yaml b/llvm/test/tools/llvm-remarkutil/count/Inputs/remark-group-by.yaml
deleted file mode 100644
index 5f9222214f2c7bf..000000000000000
--- a/llvm/test/tools/llvm-remarkutil/count/Inputs/remark-group-by.yaml
+++ /dev/null
@@ -1,54 +0,0 @@
---- !Analysis
-Pass:            generic-remarks-pass
-Name:            Remark 
-DebugLoc:        { File: path/to/anno.c, Line: 1, Column: 2 }
-Function:        func1
-Args:
-  - count:           '1'
-  - String:          ' instructions with '
-  - type:            remark
---- !Missed
-Pass:            generic-remarks-pass
-Name:            Remark 
-DebugLoc:        { File: path/to/anno.c, Line: 1, Column: 2 }
-Function:        func1
-Args:
-  - count:           '3'
-  - String:          ' instructions with '
-  - type:            remark
---- !Passed
-Pass:            generic-remarks-pass
-Name:            Remark 
-DebugLoc:        { File: path/to/anno.c, Line: 1, Column: 2 }
-Function:        func2
-Args:
-  - count:           '3'
-  - String:          ' instructions with '
-  - type:            remark
---- !Analysis
-Pass:            generic-remarks-pass2
-Name:            Remark 
-DebugLoc:        { File: path/to/anno3.c, Line: 1, Column: 2 }
-Function:        func1
-Args:
-  - count:           '3'
-  - String:          ' instructions with '
-  - type:            remark
---- !Analysis
-Pass:            generic-remarks-pass3
-Name:            Remark 
-DebugLoc:        { File: path/to/anno.c, Line: 1, Column: 2 }
-Function:        func2
-Args:
-  - count:           '2'
-  - String:          ' instructions with '
-  - type:            remark
---- !Analysis
-Pass:            generic-remarks-pass4
-Name:            Remark 
-DebugLoc:        { File: path/to/anno2.c, Line: 1, Column: 2 }
-Function:        func3
-Args:
-  - count:           '2'
-  - String:          ' instructions with '
-  - type:            remark
diff --git a/llvm/test/tools/llvm-remarkutil/count/count-by-keys.test b/llvm/test/tools/llvm-remarkutil/count/count-by-keys.test
deleted file mode 100644
index dc414620c3aa550..000000000000000
--- a/llvm/test/tools/llvm-remarkutil/count/count-by-keys.test
+++ /dev/null
@@ -1,20 +0,0 @@
-RUN: llvm-remarkutil count --parser=yaml --count-by=arg --group-by=source %p/Inputs/remark-count-by.yaml | FileCheck %s
-RUN: llvm-remarkutil count --parser=yaml --count-by=arg --group-by=function %p/Inputs/remark-count-by.yaml | FileCheck %s --check-prefix=CHECKFUNC
-RUN: llvm-remarkutil count --parser=yaml --count-by=arg --group-by=function-with-loc %p/Inputs/remark-count-by.yaml | FileCheck %s --check-prefix=CHECKFUNCLOC
-RUN: llvm-remarkutil count --parser=yaml --count-by=arg --group-by=total %p/Inputs/remark-count-by.yaml | FileCheck %s --check-prefix=CHECKTOTAL 
-
-; CHECK-LABEL: Source,count1,count2,count3,count4
-; CHECK: path/to/anno.c,3,4,6,4
-; CHECK: path/to/anno2.c,1,2,3,0
-
-; CHECKFUNC-LABEL: Function,count1,count2,count3,count4
-; CHECKFUNC: func1,3,4,6,4
-; CHECKFUNC: func2,1,2,3,0
-
-; CHECKFUNCLOC-LABEL: FuctionWithDebugLoc,count1,count2,count3,count4
-; CHECKFUNCLOC: path/to/anno.c:func1,2,2,3,4
-; CHECKFUNCLOC: path/to/anno.c:func2,1,2,3,0
-; CHECKFUNCLOC: path/to/anno2.c:func1,1,2,3,0
-
-; CHECKTOTAL-LABEL: Total,count1,count2,count3,count4
-; CHECKTOTAL: Total,4,6,9,4
diff --git a/llvm/test/tools/llvm-remarkutil/count/count-by-remark.test b/llvm/test/tools/llvm-remarkutil/count/count-by-remark.test
deleted file mode 100644
index b0248b9b6ec7111..000000000000000
--- a/llvm/test/tools/llvm-remarkutil/count/count-by-remark.test
+++ /dev/null
@@ -1,20 +0,0 @@
-RUN: llvm-remarkutil count --parser=yaml --count-by=remark-name --group-by=source %p/Inputs/remark-count-by.yaml | FileCheck %s
-RUN: llvm-remarkutil count --parser=yaml --count-by=remark-name --group-by=function %p/Inputs/remark-count-by.yaml | FileCheck %s --check-prefix=CHECKFUNC
-RUN: llvm-remarkutil count --parser=yaml --count-by=remark-name --group-by=function-with-loc %p/Inputs/remark-count-by.yaml | FileCheck %s --check-prefix=CHECKFUNCLOC
-RUN: llvm-remarkutil count --parser=yaml --count-by=remark-name --group-by=total %p/Inputs/remark-count-by.yaml | FileCheck %s --check-prefix=CHECKTOTAL 
-
-; CHECK-LABEL: Source,Count
-; CHECK: path/to/anno.c,3
-; CHECK: path/to/anno2.c,1
-
-; CHECKFUNC-LABEL: Function,Count
-; CHECKFUNC: func1,3
-; CHECKFUNC: func2,1
-
-; CHECKFUNCLOC-LABEL: FuctionWithDebugLoc,Count
-; CHECKFUNCLOC: path/to/anno.c:func1,2
-; CHECKFUNCLOC: path/to/anno.c:func2,1
-; CHECKFUNCLOC: path/to/anno2.c:func1,1
-
-; CHECKTOTAL-LABEL: Total,Count
-; CHECKTOTAL: Total,4
diff --git a/llvm/test/tools/llvm-remarkutil/count/filter-by-pass-name.test b/llvm/test/tools/llvm-remarkutil/count/filter-by-pass-name.test
deleted file mode 100644
index 481d6fd2f5820b8..000000000000000
--- a/llvm/test/tools/llvm-remarkutil/count/filter-by-pass-name.test
+++ /dev/null
@@ -1,10 +0,0 @@
-RUN: llvm-remarkutil count --parser=yaml --pass-name=generic-remarks-pass %p/Inputs/remark-filter-by.yaml | FileCheck %s 
-RUN: llvm-remarkutil count --parser=yaml --rpass-name=.* %p/Inputs/remark-filter-by.yaml | FileCheck %s --check-prefix=CHECKALL 
-
-; CHECK-LABEL: Source,Count
-; CHECK: path/to/anno.c,2
-; CHECK: path/to/anno2.c,1
-
-; CHECKALL-LABEL: Source,Count
-; CHECKALL: path/to/anno.c,2
-; CHECKALL: path/to/anno2.c,2
diff --git a/llvm/test/tools/llvm-remarkutil/count/filter-by-remark-name.test b/llvm/test/tools/llvm-remarkutil/count/filter-by-remark-name.test
deleted file mode 100644
index 20684d57f648cd6..000000000000000
--- a/llvm/test/tools/llvm-remarkutil/count/filter-by-remark-name.test
+++ /dev/null
@@ -1,10 +0,0 @@
-RUN: llvm-remarkutil count --parser=yaml --remark-name=Remark %p/Inputs/remark-filter-by.yaml | FileCheck %s 
-RUN: llvm-remarkutil count --parser=yaml --rremark-name=R.* %p/Inputs/remark-filter-by.yaml | FileCheck %s --check-prefix=CHECKALL 
-
-; CHECK-LABEL: Source,Count
-; CHECK: path/to/anno.c,1
-; CHECK: path/to/anno2.c,1
-
-; CHECKALL-LABEL: Source,Count
-; CHECKALL: path/to/anno.c,2
-; CHECKALL: path/to/anno2.c,2
diff --git a/llvm/test/tools/llvm-remarkutil/count/filter-by-type.test b/llvm/test/tools/llvm-remarkutil/count/filter-by-type.test
deleted file mode 100644
index c392fe43aa199e5..000000000000000
--- a/llvm/test/tools/llvm-remarkutil/count/filter-by-type.test
+++ /dev/null
@@ -1,16 +0,0 @@
-RUN: llvm-remarkutil count --parser=yaml --remark-type=missed %p/Inputs/remark-filter-by.yaml | FileCheck %s --check-prefix=MISSED
-RUN: llvm-remarkutil count --parser=yaml --remark-type=passed %p/Inputs/remark-filter-by.yaml | FileCheck %s --check-prefix=PASSED
-RUN: llvm-remarkutil count --parser=yaml --remark-type=analysis %p/Inputs/remark-filter-by.yaml | FileCheck %s --check-prefix=ANALYSIS
-RUN: llvm-remarkutil count --parser=yaml --remark-type=unknown %p/Inputs/remark-filter-by.yaml | FileCheck %s --check-prefix=UNKNOWN
-
-; MISSED-LABEL: Source,Count
-; MISSED: path/to/anno.c,1
-
-; PASSED-LABEL: Source,Count
-; PASSED: path/to/anno.c,1
-
-; ANALYSIS-LABEL: Source,Count
-; ANALYSIS: path/to/anno2.c,2
-
-; UNKNOWN: Source,Count
-; UNKNOWN-EMPTY: 
diff --git a/llvm/test/tools/llvm-remarkutil/count/group-by-function-with-loc.test b/llvm/test/tools/llvm-remarkutil/count/group-by-function-with-loc.test
deleted file mode 100644
index 2ceb45b38f29f6e..000000000000000
--- a/llvm/test/tools/llvm-remarkutil/count/group-by-function-with-loc.test
+++ /dev/null
@@ -1,7 +0,0 @@
-RUN: llvm-remarkutil count --parser=yaml --group-by=function-with-loc %p/Inputs/remark-group-by.yaml | FileCheck %s
-
-; CHECK-LABEL: FuctionWithDebugLoc,Count
-; CHECK: path/to/anno.c:func1,2
-; CHECK: path/to/anno.c:func2,2
-; CHECK: path/to/anno2.c:func3,1
-; CHECK: path/to/anno3.c:func1,1
diff --git a/llvm/test/tools/llvm-remarkutil/count/group-by-function.test b/llvm/test/tools/llvm-remarkutil/count/group-by-function.test
deleted file mode 100644
index f3d04bb00c269a9..000000000000000
--- a/llvm/test/tools/llvm-remarkutil/count/group-by-function.test
+++ /dev/null
@@ -1,7 +0,0 @@
-
-RUN: llvm-remarkutil count --parser=yaml --group-by=function %p/Inputs/remark-group-by.yaml | FileCheck %s
-
-; CHECK-LABEL: Fu...
[truncated]

@nikic nikic changed the title Revert "[Remarks] Introduce count subcommand for llvm-remarkutil. (#6… Revert "[Remarks] Introduce count subcommand for llvm-remarkutil. (#66214)" Oct 12, 2023
@artagnon
Copy link
Contributor Author

It looks like @darkbuck committed a quick fix.

@artagnon artagnon closed this Oct 12, 2023
@artagnon artagnon deleted the remarkutil-revert branch October 12, 2023 16:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants