Merge commit '002f7808c93e' from llvm.org/main into next

Author: git apple-llvm automerger

llvm/utils/gn/secondary/llvm/unittests/TableGen/BUILD.gn

@@ -19,7 +19,7 @@ unittest("TableGenTests") {
     ":AutomataTables",
     "//llvm/lib/Support",
     "//llvm/lib/TableGen",
-    "//llvm/utils/TableGen/GlobalISel",
+    "//llvm/utils/TableGen/Common",
   ]
   include_dirs = [ "//llvm/utils/TableGen" ]
   sources = [

llvm/utils/gn/secondary/llvm/utils/TableGen/BUILD.gn

@@ -1,51 +1,38 @@
-source_set("llvm-min-tblgen-sources") {
+executable("llvm-min-tblgen") {
   sources = [
     "Attributes.cpp",
-    "CodeGenIntrinsics.cpp",
     "DirectiveEmitter.cpp",
     "IntrinsicEmitter.cpp",
     "RISCVTargetDefEmitter.cpp",
-    "SDNodeProperties.cpp",
     "TableGen.cpp",
     "VTEmitter.cpp",
   ]
-  deps = [ "//llvm/lib/Support" ]
-}
-
-executable("llvm-min-tblgen") {
   deps = [
-    ":llvm-min-tblgen-sources",
+    "Basic",
+    "//llvm/lib/Support",
     "//llvm/lib/TableGen",
   ]
 }
 
 executable("llvm-tblgen") {
   deps = [
-    ":llvm-min-tblgen-sources",
+    "Basic",
+    "Common",
     "//llvm/include/llvm/Config:llvm-config",
     "//llvm/lib/CodeGenTypes",
     "//llvm/lib/Support",
     "//llvm/lib/TableGen",
-    "//llvm/utils/TableGen/GlobalISel",
   ]
+  include_dirs = [ "." ]
   sources = [
     "AsmMatcherEmitter.cpp",
     "AsmWriterEmitter.cpp",
-    "AsmWriterInst.cpp",
     "CTagsEmitter.cpp",
     "CallingConvEmitter.cpp",
     "CodeEmitterGen.cpp",
-    "CodeGenDAGPatterns.cpp",
-    "CodeGenHwModes.cpp",
-    "CodeGenInstAlias.cpp",
-    "CodeGenInstruction.cpp",
     "CodeGenMapTable.cpp",
-    "CodeGenRegisters.cpp",
-    "CodeGenSchedule.cpp",
-    "CodeGenTarget.cpp",
     "CompressInstEmitter.cpp",
     "DAGISelEmitter.cpp",
-    "DAGISelMatcher.cpp",
     "DAGISelMatcherEmitter.cpp",
     "DAGISelMatcherGen.cpp",
     "DAGISelMatcherOpt.cpp",
@@ -58,24 +45,17 @@ executable("llvm-tblgen") {
     "FastISelEmitter.cpp",
     "GlobalISelCombinerEmitter.cpp",
     "GlobalISelEmitter.cpp",
-    "GlobalISelMatchTable.cpp",
-    "GlobalISelMatchTableExecutorEmitter.cpp",
-    "InfoByHwMode.cpp",
     "InstrDocsEmitter.cpp",
     "InstrInfoEmitter.cpp",
     "MacroFusionPredicatorEmitter.cpp",
-    "OptEmitter.cpp",
     "OptParserEmitter.cpp",
     "OptRSTEmitter.cpp",
-    "PredicateExpander.cpp",
     "PseudoLoweringEmitter.cpp",
     "RegisterBankEmitter.cpp",
     "RegisterInfoEmitter.cpp",
     "SearchableTableEmitter.cpp",
+    "TableGen.cpp",
     "SubtargetEmitter.cpp",
-    "SubtargetFeatureInfo.cpp",
-    "Types.cpp",
-    "VarLenCodeEmitterGen.cpp",
     "WebAssemblyDisassemblerEmitter.cpp",
     "X86CompressEVEXTablesEmitter.cpp",
     "X86DisassemblerTables.cpp",

llvm/utils/gn/secondary/llvm/utils/TableGen/Basic/BUILD.gn

@@ -0,0 +1,10 @@
+static_library("Basic") {
+  deps = [
+    "//llvm/lib/Support",
+    "//llvm/lib/TableGen",
+  ]
+  sources = [
+    "CodeGenIntrinsics.cpp",
+    "SDNodeProperties.cpp",
+  ]
+}

llvm/utils/gn/secondary/llvm/utils/TableGen/Common/BUILD.gn

@@ -0,0 +1,32 @@
+static_library("Common") {
+  deps = [
+    "//llvm/include/llvm/CodeGen:GenVT",
+    "//llvm/lib/CodeGenTypes",
+    "//llvm/lib/Support",
+    "//llvm/lib/TableGen",
+  ]
+  include_dirs = [ ".." ]
+  sources = [
+    "AsmWriterInst.cpp",
+    "CodeGenDAGPatterns.cpp",
+    "CodeGenHwModes.cpp",
+    "CodeGenInstAlias.cpp",
+    "CodeGenInstruction.cpp",
+    "CodeGenRegisters.cpp",
+    "CodeGenSchedule.cpp",
+    "CodeGenTarget.cpp",
+    "DAGISelMatcher.cpp",
+    "GlobalISel/CXXPredicates.cpp",
+    "GlobalISel/CodeExpander.cpp",
+    "GlobalISel/GlobalISelMatchTable.cpp",
+    "GlobalISel/GlobalISelMatchTableExecutorEmitter.cpp",
+    "GlobalISel/MatchDataInfo.cpp",
+    "GlobalISel/Patterns.cpp",
+    "InfoByHwMode.cpp",
+    "OptEmitter.cpp",
+    "PredicateExpander.cpp",
+    "SubtargetFeatureInfo.cpp",
+    "Types.cpp",
+    "VarLenCodeEmitterGen.cpp",
+  ]
+}