From 5d5c0624d0f5b9d89a6ad9cbc9fc96b0408ec033 Mon Sep 17 00:00:00 2001
From: Peter Collingbourne <peter@pcc.me.uk>
Date: Thu, 6 Oct 2011 13:39:59 +0000
Subject: [PATCH] s/tblgen/llvm-tblgen/g in a few missed places, including the
 tests

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@141294 91177308-0d34-0410-b5e6-96231b3b80d8
---
 test/TableGen/2003-08-03-PassCode.td          |  2 +-
 test/TableGen/2006-09-18-LargeInt.td          |  2 +-
 test/TableGen/2010-03-24-PrematureDefaults.td |  2 +-
 test/TableGen/AnonDefinitionOnDemand.td       |  2 +-
 test/TableGen/BitsInitOverflow.td             |  2 +-
 test/TableGen/CStyleComment.td                |  2 +-
 test/TableGen/Dag.td                          |  2 +-
 test/TableGen/DefmInherit.td                  |  2 +-
 test/TableGen/DefmInsideMultiClass.td         |  2 +-
 test/TableGen/FieldAccess.td                  |  2 +-
 test/TableGen/ForwardRef.td                   |  2 +-
 test/TableGen/GeneralList.td                  |  2 +-
 test/TableGen/Include.td                      |  2 +-
 test/TableGen/IntBitInit.td                   |  2 +-
 test/TableGen/LazyChange.td                   |  2 +-
 test/TableGen/LetInsideMultiClasses.td        |  2 +-
 test/TableGen/ListArgs.td                     |  2 +-
 test/TableGen/ListArgsSimple.td               |  2 +-
 test/TableGen/ListConversion.td               |  2 +-
 test/TableGen/ListManip.td                    |  2 +-
 test/TableGen/ListOfList.td                   |  4 ++--
 test/TableGen/ListSlices.td                   |  2 +-
 test/TableGen/LoLoL.td                        |  2 +-
 test/TableGen/MultiClass.td                   |  2 +-
 test/TableGen/MultiClassDefName.td            |  2 +-
 test/TableGen/MultiClassInherit.td            |  2 +-
 test/TableGen/MultiDef.td                     |  4 ++--
 test/TableGen/MultiPat.td                     |  2 +-
 test/TableGen/SetTheory.td                    |  2 +-
 test/TableGen/Slice.td                        |  4 ++--
 test/TableGen/String.td                       |  2 +-
 test/TableGen/SuperSubclassSameName.td        |  2 +-
 test/TableGen/TargetInstrInfo.td              |  2 +-
 test/TableGen/TargetInstrSpec.td              |  4 ++--
 test/TableGen/TemplateArgRename.td            |  2 +-
 test/TableGen/Tree.td                         |  2 +-
 test/TableGen/TreeNames.td                    |  2 +-
 test/TableGen/UnsetBitInit.td                 |  2 +-
 test/TableGen/UnterminatedComment.td          |  2 +-
 test/TableGen/cast.td                         |  2 +-
 test/TableGen/defmclass.td                    |  2 +-
 test/TableGen/eq.td                           |  2 +-
 test/TableGen/eqbit.td                        |  2 +-
 test/TableGen/foreach.td                      |  6 +++---
 test/TableGen/if.td                           |  2 +-
 test/TableGen/ifbit.td                        |  2 +-
 test/TableGen/lisp.td                         |  2 +-
 test/TableGen/nested-comment.td               |  2 +-
 test/TableGen/strconcat.td                    |  2 +-
 test/TableGen/subst.td                        | 12 ++++++------
 test/TableGen/subst2.td                       |  2 +-
 test/TableGen/usevalname.td                   |  2 +-
 test/lib/llvm.exp                             |  2 +-
 test/lit.cfg                                  |  2 +-
 54 files changed, 65 insertions(+), 65 deletions(-)

diff --git a/test/TableGen/2003-08-03-PassCode.td b/test/TableGen/2003-08-03-PassCode.td
index c02f499b382..de7d6261b23 100644
--- a/test/TableGen/2003-08-03-PassCode.td
+++ b/test/TableGen/2003-08-03-PassCode.td
@@ -1,4 +1,4 @@
-// RUN: tblgen %s
+// RUN: llvm-tblgen %s
 // XFAIL: vg_leak
 
 class test<code C> {
diff --git a/test/TableGen/2006-09-18-LargeInt.td b/test/TableGen/2006-09-18-LargeInt.td
index 194699acc63..f7ae4eecceb 100644
--- a/test/TableGen/2006-09-18-LargeInt.td
+++ b/test/TableGen/2006-09-18-LargeInt.td
@@ -1,4 +1,4 @@
-// RUN: tblgen %s | grep -- 4294901760
+// RUN: llvm-tblgen %s | grep -- 4294901760
 // XFAIL: vg_leak
 
 def X {
diff --git a/test/TableGen/2010-03-24-PrematureDefaults.td b/test/TableGen/2010-03-24-PrematureDefaults.td
index 2ff2d42d273..24f6c93b3e1 100644
--- a/test/TableGen/2010-03-24-PrematureDefaults.td
+++ b/test/TableGen/2010-03-24-PrematureDefaults.td
@@ -1,4 +1,4 @@
-// RUN: tblgen %s | FileCheck %s
+// RUN: llvm-tblgen %s | FileCheck %s
 // XFAIL: vg_leak
 
 class A<int k, bits<2> x = 1> {
diff --git a/test/TableGen/AnonDefinitionOnDemand.td b/test/TableGen/AnonDefinitionOnDemand.td
index b10ad5870de..b6e0fc7df55 100644
--- a/test/TableGen/AnonDefinitionOnDemand.td
+++ b/test/TableGen/AnonDefinitionOnDemand.td
@@ -1,4 +1,4 @@
-// RUN: tblgen < %s
+// RUN: llvm-tblgen < %s
 // XFAIL: vg_leak
 
 class foo<int X> { int THEVAL = X; }
diff --git a/test/TableGen/BitsInitOverflow.td b/test/TableGen/BitsInitOverflow.td
index 076b3f6f73e..c3f9720c2d3 100644
--- a/test/TableGen/BitsInitOverflow.td
+++ b/test/TableGen/BitsInitOverflow.td
@@ -1,4 +1,4 @@
-// RUN: not tblgen %s 2> /dev/null
+// RUN: not llvm-tblgen %s 2> /dev/null
 
 def {
   bits<2> X = 5;  // bitfield is too small, reject
diff --git a/test/TableGen/CStyleComment.td b/test/TableGen/CStyleComment.td
index cc203d0fd0f..55fb0e787b6 100644
--- a/test/TableGen/CStyleComment.td
+++ b/test/TableGen/CStyleComment.td
@@ -1,6 +1,6 @@
 // Test that multiline, nested, comments work correctly.
 //
-// RUN: tblgen < %s
+// RUN: llvm-tblgen < %s
 // XFAIL: vg_leak
 
 /* Foo
diff --git a/test/TableGen/Dag.td b/test/TableGen/Dag.td
index d3481a550c3..9ed2301cef0 100644
--- a/test/TableGen/Dag.td
+++ b/test/TableGen/Dag.td
@@ -1,4 +1,4 @@
-// RUN: tblgen %s | FileCheck %s
+// RUN: llvm-tblgen %s | FileCheck %s
 // XFAIL: vg_leak
 
 //===----------------------------------------------------------------------===//
diff --git a/test/TableGen/DefmInherit.td b/test/TableGen/DefmInherit.td
index 9e166705269..47fd81d2e71 100644
--- a/test/TableGen/DefmInherit.td
+++ b/test/TableGen/DefmInherit.td
@@ -1,4 +1,4 @@
-// RUN: tblgen %s | grep {zing = 4} | count 4
+// RUN: llvm-tblgen %s | grep {zing = 4} | count 4
 // XFAIL: vg_leak
 
 class C1<int A, string B> { 
diff --git a/test/TableGen/DefmInsideMultiClass.td b/test/TableGen/DefmInsideMultiClass.td
index 68cc12d5681..e6fc019b1e3 100644
--- a/test/TableGen/DefmInsideMultiClass.td
+++ b/test/TableGen/DefmInsideMultiClass.td
@@ -1,4 +1,4 @@
-// RUN: tblgen %s | grep ADDPSrr | count 1
+// RUN: llvm-tblgen %s | grep ADDPSrr | count 1
 // XFAIL: vg_leak
 
 class Instruction<bits<4> opc, string Name> {
diff --git a/test/TableGen/FieldAccess.td b/test/TableGen/FieldAccess.td
index 8b4dc83e0a5..d69caae8a6f 100644
--- a/test/TableGen/FieldAccess.td
+++ b/test/TableGen/FieldAccess.td
@@ -1,4 +1,4 @@
-// RUN: tblgen %s
+// RUN: llvm-tblgen %s
 // XFAIL: vg_leak
 
 class Bla<string t>
diff --git a/test/TableGen/ForwardRef.td b/test/TableGen/ForwardRef.td
index 955cc14248f..73884455b88 100644
--- a/test/TableGen/ForwardRef.td
+++ b/test/TableGen/ForwardRef.td
@@ -1,4 +1,4 @@
-// RUN: tblgen %s -o -
+// RUN: llvm-tblgen %s -o -
 // XFAIL: vg_leak
 
 class bar {
diff --git a/test/TableGen/GeneralList.td b/test/TableGen/GeneralList.td
index ca92a213b22..9e0c7df552b 100644
--- a/test/TableGen/GeneralList.td
+++ b/test/TableGen/GeneralList.td
@@ -1,4 +1,4 @@
-// RUN: tblgen %s
+// RUN: llvm-tblgen %s
 // XFAIL: vg_leak
 //
 // Test to make sure that lists work with any data-type
diff --git a/test/TableGen/Include.td b/test/TableGen/Include.td
index 9b020e6871e..8783638f0c6 100644
--- a/test/TableGen/Include.td
+++ b/test/TableGen/Include.td
@@ -1,4 +1,4 @@
-// RUN: tblgen -I %p %s
+// RUN: llvm-tblgen -I %p %s
 // XFAIL: vg_leak
 def BeforeInclude;
 
diff --git a/test/TableGen/IntBitInit.td b/test/TableGen/IntBitInit.td
index 16ac9c8f912..83713a33321 100644
--- a/test/TableGen/IntBitInit.td
+++ b/test/TableGen/IntBitInit.td
@@ -1,4 +1,4 @@
-// RUN: tblgen %s
+// RUN: llvm-tblgen %s
 // XFAIL: vg_leak
 def {
   bit A = 1;
diff --git a/test/TableGen/LazyChange.td b/test/TableGen/LazyChange.td
index fa53562b8c2..8145a3ff8d3 100644
--- a/test/TableGen/LazyChange.td
+++ b/test/TableGen/LazyChange.td
@@ -1,4 +1,4 @@
-// RUN: tblgen %s | grep {int Y = 3}
+// RUN: llvm-tblgen %s | grep {int Y = 3}
 // XFAIL: vg_leak
 
 class C {
diff --git a/test/TableGen/LetInsideMultiClasses.td b/test/TableGen/LetInsideMultiClasses.td
index 9238bf42d9b..cb13508e511 100644
--- a/test/TableGen/LetInsideMultiClasses.td
+++ b/test/TableGen/LetInsideMultiClasses.td
@@ -1,4 +1,4 @@
-// RUN: tblgen %s | grep "bit IsDouble = 1;" | count 3
+// RUN: llvm-tblgen %s | grep "bit IsDouble = 1;" | count 3
 // XFAIL: vg_leak
 
 class Instruction<bits<4> opc, string Name> {
diff --git a/test/TableGen/ListArgs.td b/test/TableGen/ListArgs.td
index a513db6da3c..8714112d137 100644
--- a/test/TableGen/ListArgs.td
+++ b/test/TableGen/ListArgs.td
@@ -1,4 +1,4 @@
-// RUN: tblgen %s
+// RUN: llvm-tblgen %s
 // XFAIL: vg_leak
 
 class B<list<int> v> {
diff --git a/test/TableGen/ListArgsSimple.td b/test/TableGen/ListArgsSimple.td
index f7caed69a99..b8ec6e02417 100644
--- a/test/TableGen/ListArgsSimple.td
+++ b/test/TableGen/ListArgsSimple.td
@@ -1,4 +1,4 @@
-// RUN: tblgen %s
+// RUN: llvm-tblgen %s
 // XFAIL: vg_leak
 
 class B<int v> {
diff --git a/test/TableGen/ListConversion.td b/test/TableGen/ListConversion.td
index 222b6140564..29b87795bee 100644
--- a/test/TableGen/ListConversion.td
+++ b/test/TableGen/ListConversion.td
@@ -1,4 +1,4 @@
-// RUN: tblgen %s
+// RUN: llvm-tblgen %s
 // XFAIL: vg_leak
 class A;
 class B : A;
diff --git a/test/TableGen/ListManip.td b/test/TableGen/ListManip.td
index 6b1e491cd25..bece266acbf 100644
--- a/test/TableGen/ListManip.td
+++ b/test/TableGen/ListManip.td
@@ -1,4 +1,4 @@
-// RUN: tblgen %s
+// RUN: llvm-tblgen %s
 // XFAIL: vg_leak
 
 class Bli<string _t>
diff --git a/test/TableGen/ListOfList.td b/test/TableGen/ListOfList.td
index 6fe0e89ed89..17cc43b40a7 100644
--- a/test/TableGen/ListOfList.td
+++ b/test/TableGen/ListOfList.td
@@ -1,6 +1,6 @@
-// RUN tblgen %s | FileCheck %s
+// RUN llvm-tblgen %s | FileCheck %s
 
-// RUN: tblgen %s | grep {foo} | count 1
+// RUN: llvm-tblgen %s | grep {foo} | count 1
 
 class Base<string t> {
   string text = t;
diff --git a/test/TableGen/ListSlices.td b/test/TableGen/ListSlices.td
index 5848a4e4870..cbb2326a95c 100644
--- a/test/TableGen/ListSlices.td
+++ b/test/TableGen/ListSlices.td
@@ -1,4 +1,4 @@
-// RUN: tblgen %s
+// RUN: llvm-tblgen %s
 // XFAIL: vg_leak
 
 def A {
diff --git a/test/TableGen/LoLoL.td b/test/TableGen/LoLoL.td
index 0307b399bc5..f758e1b6047 100644
--- a/test/TableGen/LoLoL.td
+++ b/test/TableGen/LoLoL.td
@@ -1,4 +1,4 @@
-// RUN: tblgen %s | FileCheck %s
+// RUN: llvm-tblgen %s | FileCheck %s
 
 class Base<list<int> v> {
   list<int> values = v;
diff --git a/test/TableGen/MultiClass.td b/test/TableGen/MultiClass.td
index 9f92b73dba6..04f3a565582 100644
--- a/test/TableGen/MultiClass.td
+++ b/test/TableGen/MultiClass.td
@@ -1,4 +1,4 @@
-// RUN: tblgen %s | grep {zing = 4} | count 2
+// RUN: llvm-tblgen %s | grep {zing = 4} | count 2
 // XFAIL: vg_leak
 
 class C1<int A, string B> { 
diff --git a/test/TableGen/MultiClassDefName.td b/test/TableGen/MultiClassDefName.td
index 138c93d9bb0..296e30c7c78 100644
--- a/test/TableGen/MultiClassDefName.td
+++ b/test/TableGen/MultiClassDefName.td
@@ -1,4 +1,4 @@
-// RUN: tblgen %s | grep WorldHelloCC | count 1
+// RUN: llvm-tblgen %s | grep WorldHelloCC | count 1
 // XFAIL: vg_leak
 
 class C<string n> {
diff --git a/test/TableGen/MultiClassInherit.td b/test/TableGen/MultiClassInherit.td
index 9da80bad2d7..8b78bc7736c 100644
--- a/test/TableGen/MultiClassInherit.td
+++ b/test/TableGen/MultiClassInherit.td
@@ -1,4 +1,4 @@
-// RUN: tblgen %s | grep {zing = 4} | count 28
+// RUN: llvm-tblgen %s | grep {zing = 4} | count 28
 // XFAIL: vg_leak
 
 class C1<int A, string B> { 
diff --git a/test/TableGen/MultiDef.td b/test/TableGen/MultiDef.td
index 3a91c2ef926..f4527ac6f26 100644
--- a/test/TableGen/MultiDef.td
+++ b/test/TableGen/MultiDef.td
@@ -1,5 +1,5 @@
-// RUN: tblgen %s | FileCheck %s
-// RUN: tblgen %s | FileCheck %s
+// RUN: llvm-tblgen %s | FileCheck %s
+// RUN: llvm-tblgen %s | FileCheck %s
 
 class Base<int i> {
   int value = i;
diff --git a/test/TableGen/MultiPat.td b/test/TableGen/MultiPat.td
index ed14438ca61..648855b4d3c 100644
--- a/test/TableGen/MultiPat.td
+++ b/test/TableGen/MultiPat.td
@@ -1,4 +1,4 @@
-// RUN: tblgen %s | FileCheck %s
+// RUN: llvm-tblgen %s | FileCheck %s
 
 class ValueType<int size, int value> {
   int Size = size;
diff --git a/test/TableGen/SetTheory.td b/test/TableGen/SetTheory.td
index e0abc631e0d..a4acea907d8 100644
--- a/test/TableGen/SetTheory.td
+++ b/test/TableGen/SetTheory.td
@@ -1,5 +1,5 @@
 // Test evaluation of set operations in dags.
-// RUN: tblgen -print-sets %s | FileCheck %s
+// RUN: llvm-tblgen -print-sets %s | FileCheck %s
 // XFAIL: vg_leak
 //
 // The -print-sets driver configures a primitive SetTheory instance that
diff --git a/test/TableGen/Slice.td b/test/TableGen/Slice.td
index 13d9da2b9fd..2d2822c53b1 100644
--- a/test/TableGen/Slice.td
+++ b/test/TableGen/Slice.td
@@ -1,5 +1,5 @@
-// RUN: tblgen %s | grep {\\\[(set} | count 2
-// RUN: tblgen %s | grep {\\\[\\\]} | count 2
+// RUN: llvm-tblgen %s | grep {\\\[(set} | count 2
+// RUN: llvm-tblgen %s | grep {\\\[\\\]} | count 2
 // XFAIL: vg_leak
 
 class ValueType<int size, int value> {
diff --git a/test/TableGen/String.td b/test/TableGen/String.td
index fc0f5b8eb54..c71ed50f986 100644
--- a/test/TableGen/String.td
+++ b/test/TableGen/String.td
@@ -1,4 +1,4 @@
-// RUN: tblgen %s 
+// RUN: llvm-tblgen %s 
 // XFAIL: vg_leak
 class x {
   string y = "missing terminating '\"' character";
diff --git a/test/TableGen/SuperSubclassSameName.td b/test/TableGen/SuperSubclassSameName.td
index 304c883417f..643b380ca00 100644
--- a/test/TableGen/SuperSubclassSameName.td
+++ b/test/TableGen/SuperSubclassSameName.td
@@ -1,4 +1,4 @@
-// RUN: tblgen < %s
+// RUN: llvm-tblgen < %s
 // XFAIL: vg_leak
 // Test for template arguments that have the same name as superclass template
 // arguments.
diff --git a/test/TableGen/TargetInstrInfo.td b/test/TableGen/TargetInstrInfo.td
index 6c39d5ce57c..e6c563b06aa 100644
--- a/test/TableGen/TargetInstrInfo.td
+++ b/test/TableGen/TargetInstrInfo.td
@@ -1,6 +1,6 @@
 // This test describes how we eventually want to describe instructions in
 // the target independent code generators.
-// RUN: tblgen %s
+// RUN: llvm-tblgen %s
 // XFAIL: vg_leak
 
 // Target indep stuff.
diff --git a/test/TableGen/TargetInstrSpec.td b/test/TableGen/TargetInstrSpec.td
index a7ca9022f84..7b611e7c174 100644
--- a/test/TableGen/TargetInstrSpec.td
+++ b/test/TableGen/TargetInstrSpec.td
@@ -1,5 +1,5 @@
-// RUN: tblgen %s | grep {\\\[(set VR128:\$dst, (int_x86_sse2_add_pd VR128:\$src1, VR128:\$src2))\\\]} | count 1
-// RUN: tblgen %s | grep {\\\[(set VR128:\$dst, (int_x86_sse2_add_ps VR128:\$src1, VR128:\$src2))\\\]} | count 1
+// RUN: llvm-tblgen %s | grep {\\\[(set VR128:\$dst, (int_x86_sse2_add_pd VR128:\$src1, VR128:\$src2))\\\]} | count 1
+// RUN: llvm-tblgen %s | grep {\\\[(set VR128:\$dst, (int_x86_sse2_add_ps VR128:\$src1, VR128:\$src2))\\\]} | count 1
 // XFAIL: vg_leak
 
 class ValueType<int size, int value> {
diff --git a/test/TableGen/TemplateArgRename.td b/test/TableGen/TemplateArgRename.td
index ee5d2cf7752..654b86dc03e 100644
--- a/test/TableGen/TemplateArgRename.td
+++ b/test/TableGen/TemplateArgRename.td
@@ -1,4 +1,4 @@
-// RUN: tblgen %s
+// RUN: llvm-tblgen %s
 // XFAIL: vg_leak
 
 // Make sure there is no collision between XX and XX.
diff --git a/test/TableGen/Tree.td b/test/TableGen/Tree.td
index 2796cfd3586..5190b96fcce 100644
--- a/test/TableGen/Tree.td
+++ b/test/TableGen/Tree.td
@@ -1,5 +1,5 @@
 // This tests to make sure we can parse tree patterns.
-// RUN: tblgen %s
+// RUN: llvm-tblgen %s
 // XFAIL: vg_leak
 
 class TreeNode;
diff --git a/test/TableGen/TreeNames.td b/test/TableGen/TreeNames.td
index ccdeb88dd02..b224e909f88 100644
--- a/test/TableGen/TreeNames.td
+++ b/test/TableGen/TreeNames.td
@@ -1,5 +1,5 @@
 // This tests to make sure we can parse tree patterns with names.
-// RUN: tblgen %s
+// RUN: llvm-tblgen %s
 // XFAIL: vg_leak
 
 class TreeNode;
diff --git a/test/TableGen/UnsetBitInit.td b/test/TableGen/UnsetBitInit.td
index ff7010868bc..d232293d787 100644
--- a/test/TableGen/UnsetBitInit.td
+++ b/test/TableGen/UnsetBitInit.td
@@ -1,4 +1,4 @@
-// RUN: tblgen %s
+// RUN: llvm-tblgen %s
 // XFAIL: vg_leak
 class x {
   field bits<32> A;
diff --git a/test/TableGen/UnterminatedComment.td b/test/TableGen/UnterminatedComment.td
index 158cede2607..f92525a9916 100644
--- a/test/TableGen/UnterminatedComment.td
+++ b/test/TableGen/UnterminatedComment.td
@@ -1,4 +1,4 @@
-// RUN: not tblgen < %s >& /dev/null
+// RUN: not llvm-tblgen < %s >& /dev/null
 
 def x;
 
diff --git a/test/TableGen/cast.td b/test/TableGen/cast.td
index 8164e74eae4..8a23eb4cc91 100644
--- a/test/TableGen/cast.td
+++ b/test/TableGen/cast.td
@@ -1,4 +1,4 @@
-// RUN: tblgen %s | grep {add_ps} | count 3
+// RUN: llvm-tblgen %s | grep {add_ps} | count 3
 // XFAIL: vg_leak
 
 class ValueType<int size, int value> {
diff --git a/test/TableGen/defmclass.td b/test/TableGen/defmclass.td
index 57972b6dae5..80f03b31942 100644
--- a/test/TableGen/defmclass.td
+++ b/test/TableGen/defmclass.td
@@ -1,4 +1,4 @@
-// RUN: tblgen %s | FileCheck %s
+// RUN: llvm-tblgen %s | FileCheck %s
 // XFAIL: vg_leak
 
 class XD { bits<4> Prefix = 11; }
diff --git a/test/TableGen/eq.td b/test/TableGen/eq.td
index 518a80ac0d2..f8daf880b9e 100644
--- a/test/TableGen/eq.td
+++ b/test/TableGen/eq.td
@@ -1,4 +1,4 @@
-// RUN: tblgen %s | FileCheck %s
+// RUN: llvm-tblgen %s | FileCheck %s
 // XFAIL: vg_leak
 // CHECK: Value = 0
 // CHECK: Value = 1
diff --git a/test/TableGen/eqbit.td b/test/TableGen/eqbit.td
index 3953252c417..1d58fa0c191 100644
--- a/test/TableGen/eqbit.td
+++ b/test/TableGen/eqbit.td
@@ -1,4 +1,4 @@
-// RUN: tblgen %s | FileCheck %s
+// RUN: llvm-tblgen %s | FileCheck %s
 // XFAIL: vg_leak
 // CHECK: a = 6
 // CHECK: a = 5
diff --git a/test/TableGen/foreach.td b/test/TableGen/foreach.td
index d4d81f829ed..cbcade921b9 100644
--- a/test/TableGen/foreach.td
+++ b/test/TableGen/foreach.td
@@ -1,6 +1,6 @@
-// RUN: tblgen %s | grep {Jr} | count 2
-// RUN: tblgen %s | grep {Sr} | count 2
-// RUN: tblgen %s | grep {NAME} | count 1
+// RUN: llvm-tblgen %s | grep {Jr} | count 2
+// RUN: llvm-tblgen %s | grep {Sr} | count 2
+// RUN: llvm-tblgen %s | grep {NAME} | count 1
 // XFAIL: vg_leak
 
 // Variables for foreach
diff --git a/test/TableGen/if.td b/test/TableGen/if.td
index c4d953ea224..18de368af9f 100644
--- a/test/TableGen/if.td
+++ b/test/TableGen/if.td
@@ -1,4 +1,4 @@
-// RUN: tblgen %s | FileCheck %s
+// RUN: llvm-tblgen %s | FileCheck %s
 // XFAIL: vg_leak
 
 // Support for an `!if' operator as part of a `let' statement.
diff --git a/test/TableGen/ifbit.td b/test/TableGen/ifbit.td
index 3b0349e19b4..88f575e9acf 100644
--- a/test/TableGen/ifbit.td
+++ b/test/TableGen/ifbit.td
@@ -1,4 +1,4 @@
-// RUN: tblgen %s | FileCheck %s
+// RUN: llvm-tblgen %s | FileCheck %s
 // XFAIL: vg_leak
 // CHECK: a = 6
 // CHECK: a = 5
diff --git a/test/TableGen/lisp.td b/test/TableGen/lisp.td
index bbed8690dd5..025aca961cd 100644
--- a/test/TableGen/lisp.td
+++ b/test/TableGen/lisp.td
@@ -1,4 +1,4 @@
-// RUN: tblgen %s | grep {}
+// RUN: llvm-tblgen %s | grep {}
 // XFAIL: vg_leak
 
 class List<list<string> n> {
diff --git a/test/TableGen/nested-comment.td b/test/TableGen/nested-comment.td
index 98313576e38..bf030e77a4b 100644
--- a/test/TableGen/nested-comment.td
+++ b/test/TableGen/nested-comment.td
@@ -1,4 +1,4 @@
-// RUN: tblgen < %s
+// RUN: llvm-tblgen < %s
 // XFAIL: vg_leak
 
 /* foo
diff --git a/test/TableGen/strconcat.td b/test/TableGen/strconcat.td
index 38409a99dc4..85ee831b4da 100644
--- a/test/TableGen/strconcat.td
+++ b/test/TableGen/strconcat.td
@@ -1,4 +1,4 @@
-// RUN: tblgen %s | grep fufoo
+// RUN: llvm-tblgen %s | grep fufoo
 // XFAIL: vg_leak
 
 class Y<string S> {
diff --git a/test/TableGen/subst.td b/test/TableGen/subst.td
index 05d424f6835..5a73ec4f129 100644
--- a/test/TableGen/subst.td
+++ b/test/TableGen/subst.td
@@ -1,9 +1,9 @@
-// RUN: tblgen %s | grep {Smith} | count 7
-// RUN: tblgen %s | grep {Johnson} | count 2
-// RUN: tblgen %s | grep {FIRST} | count 1
-// RUN: tblgen %s | grep {LAST} | count 1
-// RUN: tblgen %s | grep {TVAR} | count 2
-// RUN: tblgen %s | grep {Bogus} | count 1
+// RUN: llvm-tblgen %s | grep {Smith} | count 7
+// RUN: llvm-tblgen %s | grep {Johnson} | count 2
+// RUN: llvm-tblgen %s | grep {FIRST} | count 1
+// RUN: llvm-tblgen %s | grep {LAST} | count 1
+// RUN: llvm-tblgen %s | grep {TVAR} | count 2
+// RUN: llvm-tblgen %s | grep {Bogus} | count 1
 // XFAIL: vg_leak
 
 class Honorific<string t> {
diff --git a/test/TableGen/subst2.td b/test/TableGen/subst2.td
index 584266ef233..7c007f7db12 100644
--- a/test/TableGen/subst2.td
+++ b/test/TableGen/subst2.td
@@ -1,4 +1,4 @@
-// RUN: tblgen %s | FileCheck %s
+// RUN: llvm-tblgen %s | FileCheck %s
 // XFAIL: vg_leak
 // CHECK: No subst
 // CHECK: No foo
diff --git a/test/TableGen/usevalname.td b/test/TableGen/usevalname.td
index 1b31c8f1506..d85b98ac33e 100644
--- a/test/TableGen/usevalname.td
+++ b/test/TableGen/usevalname.td
@@ -1,4 +1,4 @@
-// RUN: tblgen %s | FileCheck %s
+// RUN: llvm-tblgen %s | FileCheck %s
 // XFAIL: vg_leak
 
 class Instr<list<dag> pat> {
diff --git a/test/lib/llvm.exp b/test/lib/llvm.exp
index b859afd2c13..89be85cda84 100644
--- a/test/lib/llvm.exp
+++ b/test/lib/llvm.exp
@@ -111,7 +111,7 @@ proc substitute { line test tmpFile } {
   regsub -all {llvm-ranlib } $new_line "$valgrind llvm-ranlib " new_line
   regsub -all {([^a-zA-Z_-])opt } $new_line "\\1$valgrind opt " new_line
   regsub -all {^opt } $new_line "$valgrind opt " new_line
-  regsub -all {tblgen } $new_line "$valgrind tblgen " new_line
+  regsub -all {llvm-tblgen } $new_line "$valgrind llvm-tblgen " new_line
   regsub -all "not $valgrind " $new_line "$valgrind not " new_line
 
   return $new_line
diff --git a/test/lit.cfg b/test/lit.cfg
index 923e4dcc5b8..91abb636f47 100644
--- a/test/lit.cfg
+++ b/test/lit.cfg
@@ -198,7 +198,7 @@ for pattern in [r"\bbugpoint\b(?!-)",   r"(?<!/|-)\bclang\b(?!-)",
                                         # Don't match '.opt', '-opt',
                                         # '^opt' or '/opt'.
                 r"\bmacho-dump\b",      r"(?<!\.|-|\^|/)\bopt\b",
-                r"\btblgen\b",          r"\bFileCheck\b",
+                r"\bllvm-tblgen\b",     r"\bFileCheck\b",
                 r"\bFileUpdate\b",      r"\bc-index-test\b",
                 r"\bfpcmp\b",           r"\bllvm-PerfectShuffle\b",
                 # Handle these specially as they are strings searched