diff --git a/llvm/docs/CommandGuide/tblgen.rst b/llvm/docs/CommandGuide/tblgen.rst
--- a/llvm/docs/CommandGuide/tblgen.rst
+++ b/llvm/docs/CommandGuide/tblgen.rst
@@ -507,11 +507,17 @@
 
 .. 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 @@
 
 .. 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
--- a/llvm/utils/TableGen/GICombinerEmitter.cpp
+++ b/llvm/utils/TableGen/GICombinerEmitter.cpp
@@ -1019,6 +1019,13 @@
 //===----------------------------------------------------------------------===//
 
 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);