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

diff --git a/test/TableGen/2003-08-03-PassCode.td b/test/TableGen/2003-08-03-PassCode.td
index c02f499b3822b57fc41923f1e15dd9974990721c..de7d6261b230333b518ce3f809599b63e4126242 100644 (file)
--- 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> {
 // 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 194699acc632c0200c4b789a7769aef42ff65436..f7ae4eecceb4502d6d0d5d2a16dd006f5f9a438f 100644 (file)
--- 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 {
 // XFAIL: vg_leak
 
 def X {

diff --git a/test/TableGen/2010-03-24-PrematureDefaults.td b/test/TableGen/2010-03-24-PrematureDefaults.td
index 2ff2d42d27304cc019c88365d36b0525fc434026..24f6c93b3e17cf7d4f00b4e20471bdb084ab7d86 100644 (file)
--- 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> {
 // XFAIL: vg_leak
 
 class A<int k, bits<2> x = 1> {

diff --git a/test/TableGen/AnonDefinitionOnDemand.td b/test/TableGen/AnonDefinitionOnDemand.td
index b10ad5870de194c311378d5f0d10bb5f89623622..b6e0fc7df5582b940316ac331bc4c9f98655828b 100644 (file)
--- 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; }
 // XFAIL: vg_leak
 
 class foo<int X> { int THEVAL = X; }

diff --git a/test/TableGen/BitsInitOverflow.td b/test/TableGen/BitsInitOverflow.td
index 076b3f6f73eb407f808783251eda77205dc99aa7..c3f9720c2d3d382fa11a75f98aa281d9cc80deb7 100644 (file)
--- 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
 
 def {
   bits<2> X = 5;  // bitfield is too small, reject

diff --git a/test/TableGen/CStyleComment.td b/test/TableGen/CStyleComment.td
index cc203d0fd0f82b0c9c94df13b08dbd37fc819fe0..55fb0e787b62e43f5c62e862714319f6963d8403 100644 (file)
--- a/test/TableGen/CStyleComment.td
+++ b/test/TableGen/CStyleComment.td
@@ -1,6 +1,6 @@
 // Test that multiline, nested, comments work correctly.
 //
 // Test that multiline, nested, comments work correctly.
 //

-// RUN: tblgen < %s
+// RUN: llvm-tblgen < %s

 // XFAIL: vg_leak
 
 /* Foo
 // XFAIL: vg_leak
 
 /* Foo

diff --git a/test/TableGen/Dag.td b/test/TableGen/Dag.td
index d3481a550c34d45184727d1ca82ec5d6c8db5f75..9ed2301cef04267ffce7de35973bdd340c34acfd 100644 (file)
--- 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
 
 //===----------------------------------------------------------------------===//
 // XFAIL: vg_leak
 
 //===----------------------------------------------------------------------===//

diff --git a/test/TableGen/DefmInherit.td b/test/TableGen/DefmInherit.td
index 9e16670526970f2d5ca5eac9ff2ad81ae183ddea..47fd81d2e71988c63761e6b304faaf9d49e35829 100644 (file)
--- 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> { 
 // XFAIL: vg_leak
 
 class C1<int A, string B> { 

diff --git a/test/TableGen/DefmInsideMultiClass.td b/test/TableGen/DefmInsideMultiClass.td
index 68cc12d5681159fd73ff230e1aaa7465411e4e11..e6fc019b1e3e3e8858cc45b76dc0ba29282c329d 100644 (file)
--- 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> {
 // XFAIL: vg_leak
 
 class Instruction<bits<4> opc, string Name> {

diff --git a/test/TableGen/FieldAccess.td b/test/TableGen/FieldAccess.td
index 8b4dc83e0a5bca8ed8e2cc8546e8a946bd976834..d69caae8a6fbda622c9a41232b6c7757e5b7870e 100644 (file)
--- 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>
 // XFAIL: vg_leak
 
 class Bla<string t>

diff --git a/test/TableGen/ForwardRef.td b/test/TableGen/ForwardRef.td
index 955cc14248f841d32ede4b3cb5374affd4a7a434..73884455b8832d52797a81bd3f16b8fa93594460 100644 (file)
--- 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 {
 // XFAIL: vg_leak
 
 class bar {

diff --git a/test/TableGen/GeneralList.td b/test/TableGen/GeneralList.td
index ca92a213b22888f220b480ec20d9810c339b06b9..9e0c7df552b373ba89fac3687f852369b42aafbf 100644 (file)
--- 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
 // 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 9b020e6871ee6103238e243362c0ed919afb677b..8783638f0c61fa8f16b00fc6e9f35c45ee766012 100644 (file)
--- 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;
 
 // XFAIL: vg_leak
 def BeforeInclude;
 

diff --git a/test/TableGen/IntBitInit.td b/test/TableGen/IntBitInit.td
index 16ac9c8f912d715742d1ec693821398a82f36443..83713a33321b80c07ce0c341dc1ea55db0aa211c 100644 (file)
--- 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;
 // XFAIL: vg_leak
 def {
   bit A = 1;

diff --git a/test/TableGen/LazyChange.td b/test/TableGen/LazyChange.td
index fa53562b8c2724e8d9c3d507c5910a22f88966b0..8145a3ff8d38dbbaa6a8973a09e402db0a88c71e 100644 (file)
--- 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 {
 // XFAIL: vg_leak
 
 class C {

diff --git a/test/TableGen/LetInsideMultiClasses.td b/test/TableGen/LetInsideMultiClasses.td
index 9238bf42d9bd6a5e6b4175197a56b689b3a29ddd..cb13508e51179ad6bdcc88ef02da330b05c34a10 100644 (file)
--- 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> {
 // XFAIL: vg_leak
 
 class Instruction<bits<4> opc, string Name> {

diff --git a/test/TableGen/ListArgs.td b/test/TableGen/ListArgs.td
index a513db6da3cd80624a196edde045b255c14bec23..8714112d137b2c84469751ae7e73c93e38c3cfc1 100644 (file)
--- 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> {
 // XFAIL: vg_leak
 
 class B<list<int> v> {

diff --git a/test/TableGen/ListArgsSimple.td b/test/TableGen/ListArgsSimple.td
index f7caed69a9964c9f6f28d3e8bda62b1ec734d7b5..b8ec6e024178ad47448a5a6be9e03d3f85654fb5 100644 (file)
--- 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> {
 // XFAIL: vg_leak
 
 class B<int v> {

diff --git a/test/TableGen/ListConversion.td b/test/TableGen/ListConversion.td
index 222b6140564e9ef2bcd436e10ee5392ef5dd3e62..29b87795bee525e7e69ffa8d77a8a565e5f7b3df 100644 (file)
--- 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;
 // XFAIL: vg_leak
 class A;
 class B : A;

diff --git a/test/TableGen/ListManip.td b/test/TableGen/ListManip.td
index 6b1e491cd25f581e76b4823efdbddd79dfaad8c0..bece266acbf9d66e83a94290780453f21d362190 100644 (file)
--- 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>
 // XFAIL: vg_leak
 
 class Bli<string _t>

diff --git a/test/TableGen/ListOfList.td b/test/TableGen/ListOfList.td
index 6fe0e89ed89fcda7339406db70de9d3da2ce9e26..17cc43b40a7f8905e557d1b612332dd99c3db738 100644 (file)
--- 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;
 
 class Base<string t> {
   string text = t;

diff --git a/test/TableGen/ListSlices.td b/test/TableGen/ListSlices.td
index 5848a4e487042660cffd147eab11548e136d6563..cbb2326a95c003952d0a0960c34778ea6298ef8d 100644 (file)
--- 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 {
 // XFAIL: vg_leak
 
 def A {

diff --git a/test/TableGen/LoLoL.td b/test/TableGen/LoLoL.td
index 0307b399bc518ed83eca68afb28e4cd807a9a402..f758e1b60476908b29020dc075fdd5be514d3296 100644 (file)
--- 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;
 
 class Base<list<int> v> {
   list<int> values = v;

diff --git a/test/TableGen/MultiClass.td b/test/TableGen/MultiClass.td
index 9f92b73dba65bdc1c437eab8c2f0b9f4e6a4e338..04f3a56558213eb5ad5f106412c71199a1467326 100644 (file)
--- 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> { 
 // XFAIL: vg_leak
 
 class C1<int A, string B> { 

diff --git a/test/TableGen/MultiClassDefName.td b/test/TableGen/MultiClassDefName.td
index 138c93d9bb0c408cc7e707bb377ae7a58bf37e54..296e30c7c788f330319acd22d8038db81a233751 100644 (file)
--- 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> {
 // XFAIL: vg_leak
 
 class C<string n> {

diff --git a/test/TableGen/MultiClassInherit.td b/test/TableGen/MultiClassInherit.td
index 9da80bad2d74ab34372b0eb41c69dffcb2a21967..8b78bc7736c33e537718fc597c6b8c3a91efefde 100644 (file)
--- 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> { 
 // XFAIL: vg_leak
 
 class C1<int A, string B> { 

diff --git a/test/TableGen/MultiDef.td b/test/TableGen/MultiDef.td
index 3a91c2ef92691ec9fd1a1f5585b62f5f80b3a749..f4527ac6f26e8d1460db397ca0048b2a34d63710 100644 (file)
--- 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;
 
 class Base<int i> {
   int value = i;

diff --git a/test/TableGen/MultiPat.td b/test/TableGen/MultiPat.td
index ed14438ca616afeebb3a25c5667cc399fc809254..648855b4d3c86c2f3ad749990839b81465379b40 100644 (file)
--- 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;
 
 class ValueType<int size, int value> {
   int Size = size;

diff --git a/test/TableGen/SetTheory.td b/test/TableGen/SetTheory.td
index e0abc631e0d27b86a68cffb4e031330097e6e0ae..a4acea907d80ede0afe81f77301b4392a4486fdb 100644 (file)
--- a/test/TableGen/SetTheory.td
+++ b/test/TableGen/SetTheory.td
@@ -1,5 +1,5 @@
 // Test evaluation of set operations in dags.
 // 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
 // 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 13d9da2b9fd61205891f3d4f88732016f4e6ec64..2d2822c53b14995c947c73f8cbf14896e4279c73 100644 (file)
--- 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> {
 // XFAIL: vg_leak
 
 class ValueType<int size, int value> {

diff --git a/test/TableGen/String.td b/test/TableGen/String.td
index fc0f5b8eb5464b54ebf463e5fa6b5a6c326d9f99..c71ed50f986072fb06927f6be1f34689f2e14a40 100644 (file)
--- 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";
 // XFAIL: vg_leak
 class x {
   string y = "missing terminating '\"' character";

diff --git a/test/TableGen/SuperSubclassSameName.td b/test/TableGen/SuperSubclassSameName.td
index 304c883417fac06fe3f8d1d634489ff3dbb452e8..643b380ca0055341d686f56ce5b768d50eaf0c91 100644 (file)
--- 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.
 // 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 6c39d5ce57c3f0bb0dd3a53c3b945142d472fc7b..e6c563b06aa521d43beaf98b83bf735c3fe15795 100644 (file)
--- 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.
 // 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.
 // XFAIL: vg_leak
 
 // Target indep stuff.

diff --git a/test/TableGen/TargetInstrSpec.td b/test/TableGen/TargetInstrSpec.td
index a7ca9022f8480781b38552386d8896b7be18b73b..7b611e7c174d3e51301aa02078a2891b6bbeb2af 100644 (file)
--- 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> {
 // XFAIL: vg_leak
 
 class ValueType<int size, int value> {

diff --git a/test/TableGen/TemplateArgRename.td b/test/TableGen/TemplateArgRename.td
index ee5d2cf775252476d0d33507b7f2665ea57c9803..654b86dc03e2fd925c0d6e3548b082c6ebf8b721 100644 (file)
--- 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.
 // 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 2796cfd3586f672ef02480b70ba4ab37fd3a4d3b..5190b96fcce1973aacb23a4131ac8040249957bd 100644 (file)
--- a/test/TableGen/Tree.td
+++ b/test/TableGen/Tree.td
@@ -1,5 +1,5 @@
 // This tests to make sure we can parse tree patterns.
 // This tests to make sure we can parse tree patterns.

-// RUN: tblgen %s
+// RUN: llvm-tblgen %s

 // XFAIL: vg_leak
 
 class TreeNode;
 // XFAIL: vg_leak
 
 class TreeNode;

diff --git a/test/TableGen/TreeNames.td b/test/TableGen/TreeNames.td
index ccdeb88dd02adb17c47e1313fa0beef6223f9346..b224e909f88212086f817002d3dc94ad856aaa75 100644 (file)
--- 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.
 // This tests to make sure we can parse tree patterns with names.

-// RUN: tblgen %s
+// RUN: llvm-tblgen %s

 // XFAIL: vg_leak
 
 class TreeNode;
 // XFAIL: vg_leak
 
 class TreeNode;

diff --git a/test/TableGen/UnsetBitInit.td b/test/TableGen/UnsetBitInit.td
index ff7010868bc0d21ca6779d33b7a0145e5bc6af30..d232293d787256473f284c749b1a544704214a68 100644 (file)
--- 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;
 // XFAIL: vg_leak
 class x {
   field bits<32> A;

diff --git a/test/TableGen/UnterminatedComment.td b/test/TableGen/UnterminatedComment.td
index 158cede2607a97dcfdb3c7279fc0527ecd9b0f61..f92525a99164420ca83f4c53d0f7e78a5112c974 100644 (file)
--- 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;
 
 
 def x;
 

diff --git a/test/TableGen/cast.td b/test/TableGen/cast.td
index 8164e74eae43a79f476e69d11ec0337998dadc9c..8a23eb4cc91f5309cf0c4745be1108c7574f8b70 100644 (file)
--- 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> {
 // XFAIL: vg_leak
 
 class ValueType<int size, int value> {

diff --git a/test/TableGen/defmclass.td b/test/TableGen/defmclass.td
index 57972b6dae54fd1a8fa266305376b6f7364e2c4d..80f03b319426e42e8f0db62ce7e48c62d9bb09ec 100644 (file)
--- 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; }
 // XFAIL: vg_leak
 
 class XD { bits<4> Prefix = 11; }

diff --git a/test/TableGen/eq.td b/test/TableGen/eq.td
index 518a80ac0d2680ad2f838bfeac0b85494f27ea91..f8daf880b9edef8305c4e11e8f5b88ae0b330854 100644 (file)
--- 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
 // XFAIL: vg_leak
 // CHECK: Value = 0
 // CHECK: Value = 1

diff --git a/test/TableGen/eqbit.td b/test/TableGen/eqbit.td
index 3953252c4179412e24391e1abc53a886a67c07bf..1d58fa0c1916116d6159843928cf6409443c2e1c 100644 (file)
--- 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
 // XFAIL: vg_leak
 // CHECK: a = 6
 // CHECK: a = 5

diff --git a/test/TableGen/foreach.td b/test/TableGen/foreach.td
index d4d81f829ed72b20e6243dd3bc9a7b4c0cbcafe9..cbcade921b919262dd87996e0f879bf77f51fafa 100644 (file)
--- 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
 // XFAIL: vg_leak
 
 // Variables for foreach

diff --git a/test/TableGen/if.td b/test/TableGen/if.td
index c4d953ea2245bb067cd20aaa90a4ce19f55d4ba1..18de368af9f13375e30a94d6094ba281b37446f5 100644 (file)
--- 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.
 // 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 3b0349e19b4e619e3d71b675c2d2517c2be73d80..88f575e9acfcf61d1730cfd2b0834ecb231cc0f1 100644 (file)
--- 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
 // XFAIL: vg_leak
 // CHECK: a = 6
 // CHECK: a = 5

diff --git a/test/TableGen/lisp.td b/test/TableGen/lisp.td
index bbed8690dd5d5e0f474b921cf53a2850c23f13f1..025aca961cd55da1e9525f55d11a1b1a7ce15e19 100644 (file)
--- 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> {
 // XFAIL: vg_leak
 
 class List<list<string> n> {

diff --git a/test/TableGen/nested-comment.td b/test/TableGen/nested-comment.td
index 98313576e38dd2621e58a8a654e205f566b816d4..bf030e77a4b05e52f8b5f6aefb9ec76df22895b9 100644 (file)
--- 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
 // XFAIL: vg_leak
 
 /* foo

diff --git a/test/TableGen/strconcat.td b/test/TableGen/strconcat.td
index 38409a99dc4e6afc18b6e15f9ab208f87d0985fd..85ee831b4dae6cc918bb1a4449f3e134ccb5f404 100644 (file)
--- 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> {
 // XFAIL: vg_leak
 
 class Y<string S> {

diff --git a/test/TableGen/subst.td b/test/TableGen/subst.td
index 05d424f6835576a2b672d9d27c2605f31ed36415..5a73ec4f129462539f21747b81b12c7cac05aac7 100644 (file)
--- 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> {
 // XFAIL: vg_leak
 
 class Honorific<string t> {

diff --git a/test/TableGen/subst2.td b/test/TableGen/subst2.td
index 584266ef2335748f41c9b397269cde143fcdddea..7c007f7db12ea2f87da00e9bcdb09f4751c9a3ad 100644 (file)
--- 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
 // XFAIL: vg_leak
 // CHECK: No subst
 // CHECK: No foo

diff --git a/test/TableGen/usevalname.td b/test/TableGen/usevalname.td
index 1b31c8f15061eab61cc61300f9e13b8db6dd7604..d85b98ac33e6438a5db008965d0c12f98ca93499 100644 (file)
--- 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> {
 // XFAIL: vg_leak
 
 class Instr<list<dag> pat> {

diff --git a/test/lib/llvm.exp b/test/lib/llvm.exp
index b859afd2c138bef8fc4586d21f558b8d83c4bdcf..89be85cda842b0a6cdea3a519584ea150b5238bc 100644 (file)
--- 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 {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
   regsub -all "not $valgrind " $new_line "$valgrind not " new_line
 
   return $new_line

diff --git a/test/lit.cfg b/test/lit.cfg
index 923e4dcc5b800ac8c878c738abdb5153909570e9..91abb636f47940895668cfea1eb84993b6737f05 100644 (file)
--- 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",
                                         # 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
                 r"\bFileUpdate\b",      r"\bc-index-test\b",
                 r"\bfpcmp\b",           r"\bllvm-PerfectShuffle\b",
                 # Handle these specially as they are strings searched