From d7e13b0eb230d643990d44d731df8de6fc6f021d Mon Sep 17 00:00:00 2001 From: David Blaikie Date: Fri, 27 Feb 2015 23:29:33 +0000 Subject: [PATCH] Update SystemZ/Large test generators to handle new load IR syntax llvm-svn: 230809 --- llvm/test/CodeGen/SystemZ/Large/branch-range-01.py | 4 ++-- llvm/test/CodeGen/SystemZ/Large/branch-range-02.py | 2 +- llvm/test/CodeGen/SystemZ/Large/branch-range-03.py | 4 ++-- llvm/test/CodeGen/SystemZ/Large/branch-range-04.py | 4 ++-- llvm/test/CodeGen/SystemZ/Large/branch-range-05.py | 4 ++-- llvm/test/CodeGen/SystemZ/Large/branch-range-06.py | 4 ++-- llvm/test/CodeGen/SystemZ/Large/branch-range-07.py | 2 +- llvm/test/CodeGen/SystemZ/Large/branch-range-08.py | 2 +- llvm/test/CodeGen/SystemZ/Large/branch-range-09.py | 4 ++-- llvm/test/CodeGen/SystemZ/Large/branch-range-10.py | 4 ++-- llvm/test/CodeGen/SystemZ/Large/branch-range-11.py | 8 ++++---- llvm/test/CodeGen/SystemZ/Large/branch-range-12.py | 8 ++++---- llvm/test/CodeGen/SystemZ/Large/spill-01.py | 2 +- llvm/test/CodeGen/SystemZ/Large/spill-02.py | 2 +- 14 files changed, 27 insertions(+), 27 deletions(-) diff --git a/llvm/test/CodeGen/SystemZ/Large/branch-range-01.py b/llvm/test/CodeGen/SystemZ/Large/branch-range-01.py index edb631d..e13e0ff 100644 --- a/llvm/test/CodeGen/SystemZ/Large/branch-range-01.py +++ b/llvm/test/CodeGen/SystemZ/Large/branch-range-01.py @@ -79,7 +79,7 @@ for i in xrange(branch_blocks): next = 'before%d' % (i + 1) if i + 1 < branch_blocks else 'main' print 'before%d:' % i print ' %%bstop%d = getelementptr i32 *%%stop, i64 %d' % (i, i) - print ' %%bcur%d = load i32 *%%bstop%d' % (i, i) + print ' %%bcur%d = load i32 , i32 *%%bstop%d' % (i, i) print ' %%btest%d = icmp eq i32 %%limit, %%bcur%d' % (i, i) print ' br i1 %%btest%d, label %%after0, label %%%s' % (i, next) print '' @@ -95,7 +95,7 @@ for i in xrange(0, main_size, 6): for i in xrange(branch_blocks): print ' %%astop%d = getelementptr i32 *%%stop, i64 %d' % (i, i + 25) - print ' %%acur%d = load i32 *%%astop%d' % (i, i) + print ' %%acur%d = load i32 , i32 *%%astop%d' % (i, i) print ' %%atest%d = icmp eq i32 %%limit, %%acur%d' % (i, i) print ' br i1 %%atest%d, label %%main, label %%after%d' % (i, i) print '' diff --git a/llvm/test/CodeGen/SystemZ/Large/branch-range-02.py b/llvm/test/CodeGen/SystemZ/Large/branch-range-02.py index 743e12d..d4514e9 100644 --- a/llvm/test/CodeGen/SystemZ/Large/branch-range-02.py +++ b/llvm/test/CodeGen/SystemZ/Large/branch-range-02.py @@ -72,7 +72,7 @@ for i in xrange(blocks): print 'b%d:' % i print ' store volatile i8 %d, i8 *%%base' % value print ' %%astop%d = getelementptr i32 *%%stop, i64 %d' % (i, i) - print ' %%acur%d = load i32 *%%astop%d' % (i, i) + print ' %%acur%d = load i32 , i32 *%%astop%d' % (i, i) print ' %%atest%d = icmp eq i32 %%limit, %%acur%d' % (i, i) print ' br i1 %%atest%d, label %%%s, label %%%s' % (i, other, next) diff --git a/llvm/test/CodeGen/SystemZ/Large/branch-range-03.py b/llvm/test/CodeGen/SystemZ/Large/branch-range-03.py index 5c9a93b..4d27cfe 100644 --- a/llvm/test/CodeGen/SystemZ/Large/branch-range-03.py +++ b/llvm/test/CodeGen/SystemZ/Large/branch-range-03.py @@ -79,7 +79,7 @@ for i in xrange(branch_blocks): next = 'before%d' % (i + 1) if i + 1 < branch_blocks else 'main' print 'before%d:' % i print ' %%bstop%d = getelementptr i8 *%%stop, i64 %d' % (i, i) - print ' %%bcur%d = load i8 *%%bstop%d' % (i, i) + print ' %%bcur%d = load i8 , i8 *%%bstop%d' % (i, i) print ' %%bext%d = sext i8 %%bcur%d to i32' % (i, i) print ' %%btest%d = icmp eq i32 %%limit, %%bext%d' % (i, i) print ' br i1 %%btest%d, label %%after0, label %%%s' % (i, next) @@ -96,7 +96,7 @@ for i in xrange(0, main_size, 6): for i in xrange(branch_blocks): print ' %%astop%d = getelementptr i8 *%%stop, i64 %d' % (i, i + 25) - print ' %%acur%d = load i8 *%%astop%d' % (i, i) + print ' %%acur%d = load i8 , i8 *%%astop%d' % (i, i) print ' %%aext%d = sext i8 %%acur%d to i32' % (i, i) print ' %%atest%d = icmp eq i32 %%limit, %%aext%d' % (i, i) print ' br i1 %%atest%d, label %%main, label %%after%d' % (i, i) diff --git a/llvm/test/CodeGen/SystemZ/Large/branch-range-04.py b/llvm/test/CodeGen/SystemZ/Large/branch-range-04.py index 2c9090f..1fca06c1 100644 --- a/llvm/test/CodeGen/SystemZ/Large/branch-range-04.py +++ b/llvm/test/CodeGen/SystemZ/Large/branch-range-04.py @@ -83,7 +83,7 @@ for i in xrange(branch_blocks): next = 'before%d' % (i + 1) if i + 1 < branch_blocks else 'main' print 'before%d:' % i print ' %%bstop%d = getelementptr i8 *%%stop, i64 %d' % (i, i) - print ' %%bcur%d = load i8 *%%bstop%d' % (i, i) + print ' %%bcur%d = load i8 , i8 *%%bstop%d' % (i, i) print ' %%bext%d = sext i8 %%bcur%d to i64' % (i, i) print ' %%btest%d = icmp eq i64 %%limit, %%bext%d' % (i, i) print ' br i1 %%btest%d, label %%after0, label %%%s' % (i, next) @@ -100,7 +100,7 @@ for i in xrange(0, main_size, 6): for i in xrange(branch_blocks): print ' %%astop%d = getelementptr i8 *%%stop, i64 %d' % (i, i + 25) - print ' %%acur%d = load i8 *%%astop%d' % (i, i) + print ' %%acur%d = load i8 , i8 *%%astop%d' % (i, i) print ' %%aext%d = sext i8 %%acur%d to i64' % (i, i) print ' %%atest%d = icmp eq i64 %%limit, %%aext%d' % (i, i) print ' br i1 %%atest%d, label %%main, label %%after%d' % (i, i) diff --git a/llvm/test/CodeGen/SystemZ/Large/branch-range-05.py b/llvm/test/CodeGen/SystemZ/Large/branch-range-05.py index 52f4a96..d34c3d3 100644 --- a/llvm/test/CodeGen/SystemZ/Large/branch-range-05.py +++ b/llvm/test/CodeGen/SystemZ/Large/branch-range-05.py @@ -82,7 +82,7 @@ print '' for i in xrange(branch_blocks): next = 'before%d' % (i + 1) if i + 1 < branch_blocks else 'main' print 'before%d:' % i - print ' %%bcur%d = load i8 *%%stop' % i + print ' %%bcur%d = load i8 , i8 *%%stop' % i print ' %%bext%d = sext i8 %%bcur%d to i32' % (i, i) print ' %%btest%d = icmp slt i32 %%bext%d, %d' % (i, i, i + 50) print ' br i1 %%btest%d, label %%after0, label %%%s' % (i, next) @@ -98,7 +98,7 @@ for i in xrange(0, main_size, 6): print ' store volatile i8 %d, i8 *%%ptr%d' % (value, i) for i in xrange(branch_blocks): - print ' %%acur%d = load i8 *%%stop' % i + print ' %%acur%d = load i8 , i8 *%%stop' % i print ' %%aext%d = sext i8 %%acur%d to i32' % (i, i) print ' %%atest%d = icmp slt i32 %%aext%d, %d' % (i, i, i + 100) print ' br i1 %%atest%d, label %%main, label %%after%d' % (i, i) diff --git a/llvm/test/CodeGen/SystemZ/Large/branch-range-06.py b/llvm/test/CodeGen/SystemZ/Large/branch-range-06.py index c34ebac..41423ff 100644 --- a/llvm/test/CodeGen/SystemZ/Large/branch-range-06.py +++ b/llvm/test/CodeGen/SystemZ/Large/branch-range-06.py @@ -82,7 +82,7 @@ print '' for i in xrange(branch_blocks): next = 'before%d' % (i + 1) if i + 1 < branch_blocks else 'main' print 'before%d:' % i - print ' %%bcur%d = load i8 *%%stop' % i + print ' %%bcur%d = load i8 , i8 *%%stop' % i print ' %%bext%d = sext i8 %%bcur%d to i64' % (i, i) print ' %%btest%d = icmp slt i64 %%bext%d, %d' % (i, i, i + 50) print ' br i1 %%btest%d, label %%after0, label %%%s' % (i, next) @@ -98,7 +98,7 @@ for i in xrange(0, main_size, 6): print ' store volatile i8 %d, i8 *%%ptr%d' % (value, i) for i in xrange(branch_blocks): - print ' %%acur%d = load i8 *%%stop' % i + print ' %%acur%d = load i8 , i8 *%%stop' % i print ' %%aext%d = sext i8 %%acur%d to i64' % (i, i) print ' %%atest%d = icmp slt i64 %%aext%d, %d' % (i, i, i + 100) print ' br i1 %%atest%d, label %%main, label %%after%d' % (i, i) diff --git a/llvm/test/CodeGen/SystemZ/Large/branch-range-07.py b/llvm/test/CodeGen/SystemZ/Large/branch-range-07.py index 90c4420..f1c8ea0 100644 --- a/llvm/test/CodeGen/SystemZ/Large/branch-range-07.py +++ b/llvm/test/CodeGen/SystemZ/Large/branch-range-07.py @@ -40,7 +40,7 @@ print 'entry:' for i in xrange(branch_blocks - 1, -1, -1): print ' %%countptr%d = getelementptr i32 *%%counts, i64 %d' % (i, i) - print ' %%initcount%d = load i32 *%%countptr%d' % (i, i) + print ' %%initcount%d = load i32 , i32 *%%countptr%d' % (i, i) print ' br label %%loop%d' % i print 'loop%d:' % i diff --git a/llvm/test/CodeGen/SystemZ/Large/branch-range-08.py b/llvm/test/CodeGen/SystemZ/Large/branch-range-08.py index ac1b137..80256bc 100644 --- a/llvm/test/CodeGen/SystemZ/Large/branch-range-08.py +++ b/llvm/test/CodeGen/SystemZ/Large/branch-range-08.py @@ -41,7 +41,7 @@ print 'entry:' for i in xrange(branch_blocks - 1, -1, -1): print ' %%countptr%d = getelementptr i64 *%%counts, i64 %d' % (i, i) - print ' %%initcount%d = load i64 *%%countptr%d' % (i, i) + print ' %%initcount%d = load i64 , i64 *%%countptr%d' % (i, i) print ' br label %%loop%d' % i print 'loop%d:' % i diff --git a/llvm/test/CodeGen/SystemZ/Large/branch-range-09.py b/llvm/test/CodeGen/SystemZ/Large/branch-range-09.py index bc712cb..efba071 100644 --- a/llvm/test/CodeGen/SystemZ/Large/branch-range-09.py +++ b/llvm/test/CodeGen/SystemZ/Large/branch-range-09.py @@ -79,7 +79,7 @@ for i in xrange(branch_blocks): next = 'before%d' % (i + 1) if i + 1 < branch_blocks else 'main' print 'before%d:' % i print ' %%bstop%d = getelementptr i8 *%%stop, i64 %d' % (i, i) - print ' %%bcur%d = load i8 *%%bstop%d' % (i, i) + print ' %%bcur%d = load i8 , i8 *%%bstop%d' % (i, i) print ' %%bext%d = sext i8 %%bcur%d to i32' % (i, i) print ' %%btest%d = icmp ult i32 %%limit, %%bext%d' % (i, i) print ' br i1 %%btest%d, label %%after0, label %%%s' % (i, next) @@ -96,7 +96,7 @@ for i in xrange(0, main_size, 6): for i in xrange(branch_blocks): print ' %%astop%d = getelementptr i8 *%%stop, i64 %d' % (i, i + 25) - print ' %%acur%d = load i8 *%%astop%d' % (i, i) + print ' %%acur%d = load i8 , i8 *%%astop%d' % (i, i) print ' %%aext%d = sext i8 %%acur%d to i32' % (i, i) print ' %%atest%d = icmp ult i32 %%limit, %%aext%d' % (i, i) print ' br i1 %%atest%d, label %%main, label %%after%d' % (i, i) diff --git a/llvm/test/CodeGen/SystemZ/Large/branch-range-10.py b/llvm/test/CodeGen/SystemZ/Large/branch-range-10.py index 8c483c3..07dcf49 100644 --- a/llvm/test/CodeGen/SystemZ/Large/branch-range-10.py +++ b/llvm/test/CodeGen/SystemZ/Large/branch-range-10.py @@ -83,7 +83,7 @@ for i in xrange(branch_blocks): next = 'before%d' % (i + 1) if i + 1 < branch_blocks else 'main' print 'before%d:' % i print ' %%bstop%d = getelementptr i8 *%%stop, i64 %d' % (i, i) - print ' %%bcur%d = load i8 *%%bstop%d' % (i, i) + print ' %%bcur%d = load i8 , i8 *%%bstop%d' % (i, i) print ' %%bext%d = sext i8 %%bcur%d to i64' % (i, i) print ' %%btest%d = icmp ult i64 %%limit, %%bext%d' % (i, i) print ' br i1 %%btest%d, label %%after0, label %%%s' % (i, next) @@ -100,7 +100,7 @@ for i in xrange(0, main_size, 6): for i in xrange(branch_blocks): print ' %%astop%d = getelementptr i8 *%%stop, i64 %d' % (i, i + 25) - print ' %%acur%d = load i8 *%%astop%d' % (i, i) + print ' %%acur%d = load i8 , i8 *%%astop%d' % (i, i) print ' %%aext%d = sext i8 %%acur%d to i64' % (i, i) print ' %%atest%d = icmp ult i64 %%limit, %%aext%d' % (i, i) print ' br i1 %%atest%d, label %%main, label %%after%d' % (i, i) diff --git a/llvm/test/CodeGen/SystemZ/Large/branch-range-11.py b/llvm/test/CodeGen/SystemZ/Large/branch-range-11.py index 0546103..c08ceb5 100644 --- a/llvm/test/CodeGen/SystemZ/Large/branch-range-11.py +++ b/llvm/test/CodeGen/SystemZ/Large/branch-range-11.py @@ -98,8 +98,8 @@ print '' for i in xrange(branch_blocks): next = 'before%d' % (i + 1) if i + 1 < branch_blocks else 'main' print 'before%d:' % i - print ' %%bcur%da = load i32 *%%stopa' % i - print ' %%bcur%db = load i32 *%%stopb' % i + print ' %%bcur%da = load i32 , i32 *%%stopa' % i + print ' %%bcur%db = load i32 , i32 *%%stopb' % i print ' %%bsub%d = sub i32 %%bcur%da, %%bcur%db' % (i, i, i) print ' %%btest%d = icmp ult i32 %%bsub%d, %d' % (i, i, i + 50) print ' br i1 %%btest%d, label %%after0, label %%%s' % (i, next) @@ -115,8 +115,8 @@ for i in xrange(0, main_size, 6): print ' store volatile i8 %d, i8 *%%ptr%d' % (value, i) for i in xrange(branch_blocks): - print ' %%acur%da = load i32 *%%stopa' % i - print ' %%acur%db = load i32 *%%stopb' % i + print ' %%acur%da = load i32 , i32 *%%stopa' % i + print ' %%acur%db = load i32 , i32 *%%stopb' % i print ' %%asub%d = sub i32 %%acur%da, %%acur%db' % (i, i, i) print ' %%atest%d = icmp ult i32 %%asub%d, %d' % (i, i, i + 100) print ' br i1 %%atest%d, label %%main, label %%after%d' % (i, i) diff --git a/llvm/test/CodeGen/SystemZ/Large/branch-range-12.py b/llvm/test/CodeGen/SystemZ/Large/branch-range-12.py index 626c899..c612d30 100644 --- a/llvm/test/CodeGen/SystemZ/Large/branch-range-12.py +++ b/llvm/test/CodeGen/SystemZ/Large/branch-range-12.py @@ -98,8 +98,8 @@ print '' for i in xrange(branch_blocks): next = 'before%d' % (i + 1) if i + 1 < branch_blocks else 'main' print 'before%d:' % i - print ' %%bcur%da = load i64 *%%stopa' % i - print ' %%bcur%db = load i64 *%%stopb' % i + print ' %%bcur%da = load i64 , i64 *%%stopa' % i + print ' %%bcur%db = load i64 , i64 *%%stopb' % i print ' %%bsub%d = sub i64 %%bcur%da, %%bcur%db' % (i, i, i) print ' %%btest%d = icmp ult i64 %%bsub%d, %d' % (i, i, i + 50) print ' br i1 %%btest%d, label %%after0, label %%%s' % (i, next) @@ -115,8 +115,8 @@ for i in xrange(0, main_size, 6): print ' store volatile i8 %d, i8 *%%ptr%d' % (value, i) for i in xrange(branch_blocks): - print ' %%acur%da = load i64 *%%stopa' % i - print ' %%acur%db = load i64 *%%stopb' % i + print ' %%acur%da = load i64 , i64 *%%stopa' % i + print ' %%acur%db = load i64 , i64 *%%stopb' % i print ' %%asub%d = sub i64 %%acur%da, %%acur%db' % (i, i, i) print ' %%atest%d = icmp ult i64 %%asub%d, %d' % (i, i, i + 100) print ' br i1 %%atest%d, label %%main, label %%after%d' % (i, i) diff --git a/llvm/test/CodeGen/SystemZ/Large/spill-01.py b/llvm/test/CodeGen/SystemZ/Large/spill-01.py index 3c1d0b6..86ab741 100644 --- a/llvm/test/CodeGen/SystemZ/Large/spill-01.py +++ b/llvm/test/CodeGen/SystemZ/Large/spill-01.py @@ -26,7 +26,7 @@ print 'define void @f1(i64 *%base0, i64 *%base1) {' for i in range(count): print ' %%ptr%d = getelementptr i64 *%%base%d, i64 %d' % (i, i % 2, i / 2) - print ' %%val%d = load i64 *%%ptr%d' % (i, i) + print ' %%val%d = load i64 , i64 *%%ptr%d' % (i, i) print '' print ' call void @foo()' diff --git a/llvm/test/CodeGen/SystemZ/Large/spill-02.py b/llvm/test/CodeGen/SystemZ/Large/spill-02.py index 0aa43d1..e079a63 100644 --- a/llvm/test/CodeGen/SystemZ/Large/spill-02.py +++ b/llvm/test/CodeGen/SystemZ/Large/spill-02.py @@ -38,7 +38,7 @@ print '' count = 14 for i in range(count): print ' %%ptr%d = getelementptr i64 *%%base, i64 %d' % (i, i / 2) - print ' %%val%d = load volatile i64 *%%ptr%d' % (i, i) + print ' %%val%d = load volatile i64 , i64 *%%ptr%d' % (i, i) print '' # Encourage the register allocator to give preference to these %vals -- 2.7.4