Index: llvm/trunk/utils/gn/secondary/llvm/unittests/BUILD.gn
===================================================================
--- llvm/trunk/utils/gn/secondary/llvm/unittests/BUILD.gn
+++ llvm/trunk/utils/gn/secondary/llvm/unittests/BUILD.gn
@@ -33,25 +33,26 @@
     #"MI:MITests",
     "Object:ObjectTests",
     "ObjectYAML:ObjectYAMLTests",
+    "OptRemarks:OptRemarksTests",
     "Option:OptionTests",
 
-    # FIXME: Add more:
-    #"OptRemarks:OptRemarksTests",
+    # FIXME: Add.
     #"Passes:PluginsTests",
-
     "ProfileData:ProfileDataTests",
+    "Support:SupportTests",
 
-    # FIXME: Add more:
-    #"Support:SupportTests",
+    # FIXME: Add.
     #"Support/DynamicLibrary:DynamicLibraryTests",
-    #"Transforms/IPO:IPOTests",
-    #"Transforms/Scalar:ScalarTests",
-    #"Transforms/Utils:UtilsTests",
+    "TextAPI:TextAPITests",
+    "Transforms/IPO:IPOTests",
+    "Transforms/Scalar:ScalarTests",
+    "Transforms/Utils:UtilsTests",
+    "Transforms/Vectorize:VectorizeTests",
     "XRay:XRayTests",
 
     # FIXME: Add more:
     #"tools/llvm-cfi-verify:CFIVerifyTests",
-    #"tools/llvm-exegesis:LLVMExegesisTests",
+    "tools/llvm-exegesis:LLVMExegesisTests",
   ]
 
   # Target-dependend unit tests.
@@ -69,8 +70,7 @@
   #deps += [ "tools/llvm-exegesis/ARM:LLVMExegesisARMTests" ]
   #}
   if (llvm_build_X86) {
-    # FIXME: Add:
-    #deps += [ "tools/llvm-exegesis/X86:LLVMExegesisX86Tests" ]
+    deps += [ "tools/llvm-exegesis/X86:LLVMExegesisX86Tests" ]
   }
 
   testonly = true
Index: llvm/trunk/utils/gn/secondary/llvm/unittests/OptRemarks/BUILD.gn
===================================================================
--- llvm/trunk/utils/gn/secondary/llvm/unittests/OptRemarks/BUILD.gn
+++ llvm/trunk/utils/gn/secondary/llvm/unittests/OptRemarks/BUILD.gn
@@ -0,0 +1,11 @@
+import("//llvm/utils/unittest/unittest.gni")
+
+unittest("OptRemarksTests") {
+  deps = [
+    "//llvm/lib/OptRemarks",
+    "//llvm/lib/Support",
+  ]
+  sources = [
+    "OptRemarksParsingTest.cpp",
+  ]
+}
Index: llvm/trunk/utils/gn/secondary/llvm/unittests/Support/BUILD.gn
===================================================================
--- llvm/trunk/utils/gn/secondary/llvm/unittests/Support/BUILD.gn
+++ llvm/trunk/utils/gn/secondary/llvm/unittests/Support/BUILD.gn
@@ -0,0 +1,83 @@
+import("//llvm/utils/unittest/unittest.gni")
+
+unittest("SupportTests") {
+  deps = [
+    "//llvm/lib/Support",
+    "//llvm/lib/Testing/Support",
+  ]
+  sources = [
+    "ARMAttributeParser.cpp",
+    "AlignOfTest.cpp",
+    "AllocatorTest.cpp",
+    "ArrayRecyclerTest.cpp",
+    "BinaryStreamTest.cpp",
+    "BlockFrequencyTest.cpp",
+    "BranchProbabilityTest.cpp",
+    "CachePruningTest.cpp",
+    "Casting.cpp",
+    "CheckedArithmeticTest.cpp",
+    "Chrono.cpp",
+    "CommandLineTest.cpp",
+    "CompressionTest.cpp",
+    "ConvertUTFTest.cpp",
+    "CrashRecoveryTest.cpp",
+    "DJBTest.cpp",
+    "DataExtractorTest.cpp",
+    "DebugCounterTest.cpp",
+    "DebugTest.cpp",
+    "EndianStreamTest.cpp",
+    "EndianTest.cpp",
+    "ErrnoTest.cpp",
+    "ErrorOrTest.cpp",
+    "ErrorTest.cpp",
+    "FileOutputBufferTest.cpp",
+    "FormatVariadicTest.cpp",
+    "GlobPatternTest.cpp",
+    "Host.cpp",
+    "ItaniumManglingCanonicalizerTest.cpp",
+    "JSONTest.cpp",
+    "LEB128Test.cpp",
+    "LineIteratorTest.cpp",
+    "LockFileManagerTest.cpp",
+    "MD5Test.cpp",
+    "ManagedStatic.cpp",
+    "MathExtrasTest.cpp",
+    "MemoryBufferTest.cpp",
+    "MemoryTest.cpp",
+    "NativeFormatTests.cpp",
+    "ParallelTest.cpp",
+    "Path.cpp",
+    "ProcessTest.cpp",
+    "ProgramTest.cpp",
+    "RegexTest.cpp",
+    "ReplaceFileTest.cpp",
+    "ReverseIterationTest.cpp",
+    "ScaledNumberTest.cpp",
+    "SourceMgrTest.cpp",
+    "SpecialCaseListTest.cpp",
+    "StringPool.cpp",
+    "SwapByteOrderTest.cpp",
+    "SymbolRemappingReaderTest.cpp",
+    "TarWriterTest.cpp",
+    "TargetParserTest.cpp",
+    "TaskQueueTest.cpp",
+    "ThreadLocalTest.cpp",
+    "ThreadPool.cpp",
+    "Threading.cpp",
+    "TimerTest.cpp",
+    "TrailingObjectsTest.cpp",
+    "TrigramIndexTest.cpp",
+    "TypeNameTest.cpp",
+    "TypeTraitsTest.cpp",
+    "UnicodeTest.cpp",
+    "VersionTupleTest.cpp",
+    "VirtualFileSystemTest.cpp",
+    "YAMLIOTest.cpp",
+    "YAMLParserTest.cpp",
+    "formatted_raw_ostream_test.cpp",
+    "raw_ostream_test.cpp",
+    "raw_pwrite_stream_test.cpp",
+    "raw_sha1_ostream_test.cpp",
+    "xxhashTest.cpp",
+  ]
+}
Index: llvm/trunk/utils/gn/secondary/llvm/unittests/TextAPI/BUILD.gn
===================================================================
--- llvm/trunk/utils/gn/secondary/llvm/unittests/TextAPI/BUILD.gn
+++ llvm/trunk/utils/gn/secondary/llvm/unittests/TextAPI/BUILD.gn
@@ -0,0 +1,11 @@
+import("//llvm/utils/unittest/unittest.gni")
+
+unittest("TextAPITests") {
+  deps = [
+    "//llvm/lib/Testing/Support",
+    "//llvm/lib/TextAPI",
+  ]
+  sources = [
+    "ELFYAMLTest.cpp",
+  ]
+}
Index: llvm/trunk/utils/gn/secondary/llvm/unittests/Transforms/IPO/BUILD.gn
===================================================================
--- llvm/trunk/utils/gn/secondary/llvm/unittests/Transforms/IPO/BUILD.gn
+++ llvm/trunk/utils/gn/secondary/llvm/unittests/Transforms/IPO/BUILD.gn
@@ -0,0 +1,13 @@
+import("//llvm/utils/unittest/unittest.gni")
+
+unittest("IPOTests") {
+  deps = [
+    "//llvm/lib/IR",
+    "//llvm/lib/Support",
+    "//llvm/lib/Transforms/IPO",
+  ]
+  sources = [
+    "LowerTypeTests.cpp",
+    "WholeProgramDevirt.cpp",
+  ]
+}
Index: llvm/trunk/utils/gn/secondary/llvm/unittests/Transforms/Scalar/BUILD.gn
===================================================================
--- llvm/trunk/utils/gn/secondary/llvm/unittests/Transforms/Scalar/BUILD.gn
+++ llvm/trunk/utils/gn/secondary/llvm/unittests/Transforms/Scalar/BUILD.gn
@@ -0,0 +1,15 @@
+import("//llvm/utils/unittest/unittest.gni")
+
+unittest("ScalarTests") {
+  deps = [
+    "//llvm/lib/Analysis",
+    "//llvm/lib/AsmParser",
+    "//llvm/lib/IR",
+    "//llvm/lib/Support",
+    "//llvm/lib/Transforms/Scalar",
+    "//llvm/lib/Transforms/Utils",
+  ]
+  sources = [
+    "LoopPassManagerTest.cpp",
+  ]
+}
Index: llvm/trunk/utils/gn/secondary/llvm/unittests/Transforms/Utils/BUILD.gn
===================================================================
--- llvm/trunk/utils/gn/secondary/llvm/unittests/Transforms/Utils/BUILD.gn
+++ llvm/trunk/utils/gn/secondary/llvm/unittests/Transforms/Utils/BUILD.gn
@@ -0,0 +1,23 @@
+import("//llvm/utils/unittest/unittest.gni")
+
+unittest("UtilsTests") {
+  deps = [
+    "//llvm/lib/Analysis",
+    "//llvm/lib/AsmParser",
+    "//llvm/lib/IR",
+    "//llvm/lib/Support",
+    "//llvm/lib/Transforms/Utils",
+  ]
+  sources = [
+    "ASanStackFrameLayoutTest.cpp",
+    "BasicBlockUtilsTest.cpp",
+    "CloningTest.cpp",
+    "CodeExtractorTest.cpp",
+    "FunctionComparatorTest.cpp",
+    "IntegerDivisionTest.cpp",
+    "LocalTest.cpp",
+    "SSAUpdaterBulkTest.cpp",
+    "UnrollLoopTest.cpp",
+    "ValueMapperTest.cpp",
+  ]
+}
Index: llvm/trunk/utils/gn/secondary/llvm/unittests/Transforms/Vectorize/BUILD.gn
===================================================================
--- llvm/trunk/utils/gn/secondary/llvm/unittests/Transforms/Vectorize/BUILD.gn
+++ llvm/trunk/utils/gn/secondary/llvm/unittests/Transforms/Vectorize/BUILD.gn
@@ -0,0 +1,17 @@
+import("//llvm/utils/unittest/unittest.gni")
+
+unittest("VectorizeTests") {
+  deps = [
+    "//llvm/lib/Analysis",
+    "//llvm/lib/AsmParser",
+    "//llvm/lib/IR",
+    "//llvm/lib/Transforms/Vectorize",
+  ]
+  sources = [
+    "VPlanDominatorTreeTest.cpp",
+    "VPlanHCFGTest.cpp",
+    "VPlanLoopInfoTest.cpp",
+    "VPlanSlpTest.cpp",
+    "VPlanTest.cpp",
+  ]
+}
Index: llvm/trunk/utils/gn/secondary/llvm/unittests/tools/llvm-exegesis/BUILD.gn
===================================================================
--- llvm/trunk/utils/gn/secondary/llvm/unittests/tools/llvm-exegesis/BUILD.gn
+++ llvm/trunk/utils/gn/secondary/llvm/unittests/tools/llvm-exegesis/BUILD.gn
@@ -0,0 +1,19 @@
+import("//llvm/utils/unittest/unittest.gni")
+
+unittest("LLVMExegesisTests") {
+  deps = [
+    "//llvm/lib/DebugInfo/Symbolize",
+    "//llvm/lib/MC",
+    "//llvm/lib/MC/MCParser",
+    "//llvm/lib/Object",
+    "//llvm/lib/Support",
+    "//llvm/tools/llvm-exegesis/lib",
+  ]
+  include_dirs = [ "../../../tools/llvm-exegesis/lib" ]
+  sources = [
+    "BenchmarkRunnerTest.cpp",
+    "ClusteringTest.cpp",
+    "PerfHelperTest.cpp",
+    "RegisterValueTest.cpp",
+  ]
+}
Index: llvm/trunk/utils/gn/secondary/llvm/unittests/tools/llvm-exegesis/X86/BUILD.gn
===================================================================
--- llvm/trunk/utils/gn/secondary/llvm/unittests/tools/llvm-exegesis/X86/BUILD.gn
+++ llvm/trunk/utils/gn/secondary/llvm/unittests/tools/llvm-exegesis/X86/BUILD.gn
@@ -0,0 +1,31 @@
+import("//llvm/utils/unittest/unittest.gni")
+
+unittest("LLVMExegesisX86Tests") {
+  deps = [
+    "//llvm/lib/DebugInfo/Symbolize",
+    "//llvm/lib/MC",
+    "//llvm/lib/MC/MCParser",
+    "//llvm/lib/Object",
+    "//llvm/lib/Support",
+    "//llvm/lib/Target/X86",
+
+    # Exegesis reaches inside the Target/X86 tablegen internals and must
+    # depend on this Target/X86-internal build target -- and so must its
+    # unittests.
+    "//llvm/lib/Target/X86/MCTargetDesc",
+    "//llvm/tools/llvm-exegesis/lib",
+    "//llvm/tools/llvm-exegesis/lib/X86",
+  ]
+  include_dirs = [
+    "//llvm/lib/Target/X86",
+    "//llvm/tools/llvm-exegesis/lib",
+  ]
+  sources = [
+    "AnalysisTest.cpp",
+    "AssemblerTest.cpp",
+    "BenchmarkResultTest.cpp",
+    "RegisterAliasingTest.cpp",
+    "SnippetGeneratorTest.cpp",
+    "TargetTest.cpp",
+  ]
+}