[llvm] b50fe31 - [TableGen] Deprecate old GI Combiner Emitter

[via llvm-commits]

Author: pvanhout
Date: 2023-07-19T13:17:02+02:00
New Revision: b50fe313e8da1bbf61d047477eeb32469f2ce199

URL: https://github.com/llvm/llvm-project/commit/b50fe313e8da1bbf61d047477eeb32469f2ce199
DIFF: https://github.com/llvm/llvm-project/commit/b50fe313e8da1bbf61d047477eeb32469f2ce199.diff

LOG: [TableGen] Deprecate old GI Combiner Emitter

Will be removed in a month or so.

Reviewed By: aemerson

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

Added: 
    

Modified: 
    llvm/docs/CommandGuide/tblgen.rst
    llvm/utils/TableGen/GICombinerEmitter.cpp

Removed: 
    


################################################################################
diff  --git a/llvm/docs/CommandGuide/tblgen.rst b/llvm/docs/CommandGuide/tblgen.rst
index 310a4f21434138..8cffa7f88ff72b 100644
--- a/llvm/docs/CommandGuide/tblgen.rst
+++ b/llvm/docs/CommandGuide/tblgen.rst
@@ -507,11 +507,17 @@ llvm-tblgen Options
 
 .. option:: -gen-global-isel-combiner
 
-  Generate GlobalISel combiner.
+  (Deprecated, pending removal)
+  Generate legacy GlobalISel combiner.
+
+.. option:: -gen-global-isel-combiner-matchtable
+
+  Generate MatchTable-based GlobalISel combiner.
 
 .. option:: -combiners=list
 
-  Make -gen-global-isel-combiner emit the specified combiners.
+  Make -gen-global-isel-combiner and -gen-global-isel-combiner-matchtable
+  emit the specified combiners.
 
 .. option:: -gicombiner-show-expansions
 
@@ -524,8 +530,8 @@ llvm-tblgen Options
 
 .. option:: -gicombiner-stop-after-parse
 
-  Make -gen-global-isel-combiner stop processing after parsing rules
-  and dump state.
+  Make -gen-global-isel-combiner and -gen-global-isel-combiner-matchtable stop
+  processing after parsing rules and dump state.
 
 .. option:: -gen-instr-info
 

diff  --git a/llvm/utils/TableGen/GICombinerEmitter.cpp b/llvm/utils/TableGen/GICombinerEmitter.cpp
index d4a5d8d63c9ffe..ec26024b651860 100644
--- a/llvm/utils/TableGen/GICombinerEmitter.cpp
+++ b/llvm/utils/TableGen/GICombinerEmitter.cpp
@@ -1019,6 +1019,13 @@ void GICombinerEmitter::run(raw_ostream &OS) {
 //===----------------------------------------------------------------------===//
 
 static void EmitGICombiner(RecordKeeper &RK, raw_ostream &OS) {
+  PrintWarning(
+      "'-gen-global-isel-combiner' is deprecated and will be removed soon; "
+      "please use '-gen-global-isel-combiner-match-table' instead");
+  PrintNote(
+      "See "
+      "https://discourse.llvm.org/t/rfc-matchtable-based-globalisel-combiners");
+
   CodeGenTarget Target(RK);
   emitSourceFileHeader("Global Combiner", OS);