From ee62d93f1b1f856c0c5338c33d47703db3f15b30 Mon Sep 17 00:00:00 2001 From: David Blaikie Date: Fri, 27 Feb 2015 23:29:39 +0000 Subject: [PATCH] Update SystemZ/Large test generators to handle new gep IR syntax git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@230810 91177308-0d34-0410-b5e6-96231b3b80d8 --- test/CodeGen/SystemZ/Large/branch-range-01.py | 6 +++--- test/CodeGen/SystemZ/Large/branch-range-02.py | 2 +- test/CodeGen/SystemZ/Large/branch-range-03.py | 6 +++--- test/CodeGen/SystemZ/Large/branch-range-04.py | 6 +++--- test/CodeGen/SystemZ/Large/branch-range-05.py | 2 +- test/CodeGen/SystemZ/Large/branch-range-06.py | 2 +- test/CodeGen/SystemZ/Large/branch-range-07.py | 4 ++-- test/CodeGen/SystemZ/Large/branch-range-08.py | 4 ++-- test/CodeGen/SystemZ/Large/branch-range-09.py | 6 +++--- test/CodeGen/SystemZ/Large/branch-range-10.py | 6 +++--- test/CodeGen/SystemZ/Large/branch-range-11.py | 2 +- test/CodeGen/SystemZ/Large/branch-range-12.py | 2 +- test/CodeGen/SystemZ/Large/spill-01.py | 2 +- test/CodeGen/SystemZ/Large/spill-02.py | 4 ++-- 14 files changed, 27 insertions(+), 27 deletions(-) diff --git a/test/CodeGen/SystemZ/Large/branch-range-01.py b/test/CodeGen/SystemZ/Large/branch-range-01.py index e13e0ffa7d0..365d7e42081 100644 --- a/test/CodeGen/SystemZ/Large/branch-range-01.py +++ b/test/CodeGen/SystemZ/Large/branch-range-01.py @@ -78,7 +78,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 ' %%bstop%d = getelementptr i32 *%%stop, i64 %d' % (i, i) + print ' %%bstop%d = getelementptr i32, i32 *%%stop, i64 %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) @@ -90,11 +90,11 @@ for i in xrange(0, main_size, 6): a, b = b, a + b offset = 4096 + b % 500000 value = a % 256 - print ' %%ptr%d = getelementptr i8 *%%base, i64 %d' % (i, offset) + print ' %%ptr%d = getelementptr i8, i8 *%%base, i64 %d' % (i, offset) print ' store volatile i8 %d, i8 *%%ptr%d' % (value, i) for i in xrange(branch_blocks): - print ' %%astop%d = getelementptr i32 *%%stop, i64 %d' % (i, i + 25) + print ' %%astop%d = getelementptr i32, i32 *%%stop, i64 %d' % (i, i + 25) 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) diff --git a/test/CodeGen/SystemZ/Large/branch-range-02.py b/test/CodeGen/SystemZ/Large/branch-range-02.py index d4514e9ea9f..7f7b09954a6 100644 --- a/test/CodeGen/SystemZ/Large/branch-range-02.py +++ b/test/CodeGen/SystemZ/Large/branch-range-02.py @@ -71,7 +71,7 @@ for i in xrange(blocks): other = 'end' if 2 * i < blocks else 'b0' print 'b%d:' % i print ' store volatile i8 %d, i8 *%%base' % value - print ' %%astop%d = getelementptr i32 *%%stop, i64 %d' % (i, i) + print ' %%astop%d = getelementptr i32, i32 *%%stop, i64 %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/test/CodeGen/SystemZ/Large/branch-range-03.py b/test/CodeGen/SystemZ/Large/branch-range-03.py index 4d27cfe7bd0..745d733211f 100644 --- a/test/CodeGen/SystemZ/Large/branch-range-03.py +++ b/test/CodeGen/SystemZ/Large/branch-range-03.py @@ -78,7 +78,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 ' %%bstop%d = getelementptr i8 *%%stop, i64 %d' % (i, i) + print ' %%bstop%d = getelementptr i8, i8 *%%stop, i64 %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) @@ -91,11 +91,11 @@ for i in xrange(0, main_size, 6): a, b = b, a + b offset = 4096 + b % 500000 value = a % 256 - print ' %%ptr%d = getelementptr i8 *%%base, i64 %d' % (i, offset) + print ' %%ptr%d = getelementptr i8, i8 *%%base, i64 %d' % (i, offset) print ' store volatile i8 %d, i8 *%%ptr%d' % (value, i) for i in xrange(branch_blocks): - print ' %%astop%d = getelementptr i8 *%%stop, i64 %d' % (i, i + 25) + print ' %%astop%d = getelementptr i8, i8 *%%stop, i64 %d' % (i, i + 25) 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) diff --git a/test/CodeGen/SystemZ/Large/branch-range-04.py b/test/CodeGen/SystemZ/Large/branch-range-04.py index 1fca06c1a21..a0c9c442645 100644 --- a/test/CodeGen/SystemZ/Large/branch-range-04.py +++ b/test/CodeGen/SystemZ/Large/branch-range-04.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 ' %%bstop%d = getelementptr i8 *%%stop, i64 %d' % (i, i) + print ' %%bstop%d = getelementptr i8, i8 *%%stop, i64 %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) @@ -95,11 +95,11 @@ for i in xrange(0, main_size, 6): a, b = b, a + b offset = 4096 + b % 500000 value = a % 256 - print ' %%ptr%d = getelementptr i8 *%%base, i64 %d' % (i, offset) + print ' %%ptr%d = getelementptr i8, i8 *%%base, i64 %d' % (i, offset) print ' store volatile i8 %d, i8 *%%ptr%d' % (value, i) for i in xrange(branch_blocks): - print ' %%astop%d = getelementptr i8 *%%stop, i64 %d' % (i, i + 25) + print ' %%astop%d = getelementptr i8, i8 *%%stop, i64 %d' % (i, i + 25) 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) diff --git a/test/CodeGen/SystemZ/Large/branch-range-05.py b/test/CodeGen/SystemZ/Large/branch-range-05.py index d34c3d3d1b5..69a8112162a 100644 --- a/test/CodeGen/SystemZ/Large/branch-range-05.py +++ b/test/CodeGen/SystemZ/Large/branch-range-05.py @@ -94,7 +94,7 @@ for i in xrange(0, main_size, 6): a, b = b, a + b offset = 4096 + b % 500000 value = a % 256 - print ' %%ptr%d = getelementptr i8 *%%base, i64 %d' % (i, offset) + print ' %%ptr%d = getelementptr i8, i8 *%%base, i64 %d' % (i, offset) print ' store volatile i8 %d, i8 *%%ptr%d' % (value, i) for i in xrange(branch_blocks): diff --git a/test/CodeGen/SystemZ/Large/branch-range-06.py b/test/CodeGen/SystemZ/Large/branch-range-06.py index 41423ffde0c..b08bc119c45 100644 --- a/test/CodeGen/SystemZ/Large/branch-range-06.py +++ b/test/CodeGen/SystemZ/Large/branch-range-06.py @@ -94,7 +94,7 @@ for i in xrange(0, main_size, 6): a, b = b, a + b offset = 4096 + b % 500000 value = a % 256 - print ' %%ptr%d = getelementptr i8 *%%base, i64 %d' % (i, offset) + print ' %%ptr%d = getelementptr i8, i8 *%%base, i64 %d' % (i, offset) print ' store volatile i8 %d, i8 *%%ptr%d' % (value, i) for i in xrange(branch_blocks): diff --git a/test/CodeGen/SystemZ/Large/branch-range-07.py b/test/CodeGen/SystemZ/Large/branch-range-07.py index f1c8ea0328b..c5fef10577f 100644 --- a/test/CodeGen/SystemZ/Large/branch-range-07.py +++ b/test/CodeGen/SystemZ/Large/branch-range-07.py @@ -39,7 +39,7 @@ print 'define void @f1(i8 *%base, i32 *%counts) {' print 'entry:' for i in xrange(branch_blocks - 1, -1, -1): - print ' %%countptr%d = getelementptr i32 *%%counts, i64 %d' % (i, i) + print ' %%countptr%d = getelementptr i32, i32 *%%counts, i64 %d' % (i, i) print ' %%initcount%d = load i32 , i32 *%%countptr%d' % (i, i) print ' br label %%loop%d' % i @@ -54,7 +54,7 @@ for i in xrange(0, main_size, 6): a, b = b, a + b offset = 4096 + b % 500000 value = a % 256 - print ' %%ptr%d = getelementptr i8 *%%base, i64 %d' % (i, offset) + print ' %%ptr%d = getelementptr i8, i8 *%%base, i64 %d' % (i, offset) print ' store volatile i8 %d, i8 *%%ptr%d' % (value, i) for i in xrange(branch_blocks): diff --git a/test/CodeGen/SystemZ/Large/branch-range-08.py b/test/CodeGen/SystemZ/Large/branch-range-08.py index 80256bc5df6..8b6b6739833 100644 --- a/test/CodeGen/SystemZ/Large/branch-range-08.py +++ b/test/CodeGen/SystemZ/Large/branch-range-08.py @@ -40,7 +40,7 @@ print 'define void @f1(i8 *%base, i64 *%counts) {' print 'entry:' for i in xrange(branch_blocks - 1, -1, -1): - print ' %%countptr%d = getelementptr i64 *%%counts, i64 %d' % (i, i) + print ' %%countptr%d = getelementptr i64, i64 *%%counts, i64 %d' % (i, i) print ' %%initcount%d = load i64 , i64 *%%countptr%d' % (i, i) print ' br label %%loop%d' % i @@ -55,7 +55,7 @@ for i in xrange(0, main_size, 6): a, b = b, a + b offset = 4096 + b % 500000 value = a % 256 - print ' %%ptr%d = getelementptr i8 *%%base, i64 %d' % (i, offset) + print ' %%ptr%d = getelementptr i8, i8 *%%base, i64 %d' % (i, offset) print ' store volatile i8 %d, i8 *%%ptr%d' % (value, i) for i in xrange(branch_blocks): diff --git a/test/CodeGen/SystemZ/Large/branch-range-09.py b/test/CodeGen/SystemZ/Large/branch-range-09.py index efba071ebbb..d4693358f50 100644 --- a/test/CodeGen/SystemZ/Large/branch-range-09.py +++ b/test/CodeGen/SystemZ/Large/branch-range-09.py @@ -78,7 +78,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 ' %%bstop%d = getelementptr i8 *%%stop, i64 %d' % (i, i) + print ' %%bstop%d = getelementptr i8, i8 *%%stop, i64 %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) @@ -91,11 +91,11 @@ for i in xrange(0, main_size, 6): a, b = b, a + b offset = 4096 + b % 500000 value = a % 256 - print ' %%ptr%d = getelementptr i8 *%%base, i64 %d' % (i, offset) + print ' %%ptr%d = getelementptr i8, i8 *%%base, i64 %d' % (i, offset) print ' store volatile i8 %d, i8 *%%ptr%d' % (value, i) for i in xrange(branch_blocks): - print ' %%astop%d = getelementptr i8 *%%stop, i64 %d' % (i, i + 25) + print ' %%astop%d = getelementptr i8, i8 *%%stop, i64 %d' % (i, i + 25) 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) diff --git a/test/CodeGen/SystemZ/Large/branch-range-10.py b/test/CodeGen/SystemZ/Large/branch-range-10.py index 07dcf49cbd9..c928081f554 100644 --- a/test/CodeGen/SystemZ/Large/branch-range-10.py +++ b/test/CodeGen/SystemZ/Large/branch-range-10.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 ' %%bstop%d = getelementptr i8 *%%stop, i64 %d' % (i, i) + print ' %%bstop%d = getelementptr i8, i8 *%%stop, i64 %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) @@ -95,11 +95,11 @@ for i in xrange(0, main_size, 6): a, b = b, a + b offset = 4096 + b % 500000 value = a % 256 - print ' %%ptr%d = getelementptr i8 *%%base, i64 %d' % (i, offset) + print ' %%ptr%d = getelementptr i8, i8 *%%base, i64 %d' % (i, offset) print ' store volatile i8 %d, i8 *%%ptr%d' % (value, i) for i in xrange(branch_blocks): - print ' %%astop%d = getelementptr i8 *%%stop, i64 %d' % (i, i + 25) + print ' %%astop%d = getelementptr i8, i8 *%%stop, i64 %d' % (i, i + 25) 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) diff --git a/test/CodeGen/SystemZ/Large/branch-range-11.py b/test/CodeGen/SystemZ/Large/branch-range-11.py index c08ceb56cbb..85166bc1565 100644 --- a/test/CodeGen/SystemZ/Large/branch-range-11.py +++ b/test/CodeGen/SystemZ/Large/branch-range-11.py @@ -111,7 +111,7 @@ for i in xrange(0, main_size, 6): a, b = b, a + b offset = 4096 + b % 500000 value = a % 256 - print ' %%ptr%d = getelementptr i8 *%%base, i64 %d' % (i, offset) + print ' %%ptr%d = getelementptr i8, i8 *%%base, i64 %d' % (i, offset) print ' store volatile i8 %d, i8 *%%ptr%d' % (value, i) for i in xrange(branch_blocks): diff --git a/test/CodeGen/SystemZ/Large/branch-range-12.py b/test/CodeGen/SystemZ/Large/branch-range-12.py index c612d309b58..e1d9e2977d4 100644 --- a/test/CodeGen/SystemZ/Large/branch-range-12.py +++ b/test/CodeGen/SystemZ/Large/branch-range-12.py @@ -111,7 +111,7 @@ for i in xrange(0, main_size, 6): a, b = b, a + b offset = 4096 + b % 500000 value = a % 256 - print ' %%ptr%d = getelementptr i8 *%%base, i64 %d' % (i, offset) + print ' %%ptr%d = getelementptr i8, i8 *%%base, i64 %d' % (i, offset) print ' store volatile i8 %d, i8 *%%ptr%d' % (value, i) for i in xrange(branch_blocks): diff --git a/test/CodeGen/SystemZ/Large/spill-01.py b/test/CodeGen/SystemZ/Large/spill-01.py index 86ab741d28f..f59f607d5be 100644 --- a/test/CodeGen/SystemZ/Large/spill-01.py +++ b/test/CodeGen/SystemZ/Large/spill-01.py @@ -25,7 +25,7 @@ print '' 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 ' %%ptr%d = getelementptr i64, i64 *%%base%d, i64 %d' % (i, i % 2, i / 2) print ' %%val%d = load i64 , i64 *%%ptr%d' % (i, i) print '' diff --git a/test/CodeGen/SystemZ/Large/spill-02.py b/test/CodeGen/SystemZ/Large/spill-02.py index e079a63d23e..4ccfa11a0d3 100644 --- a/test/CodeGen/SystemZ/Large/spill-02.py +++ b/test/CodeGen/SystemZ/Large/spill-02.py @@ -29,7 +29,7 @@ print 'entry:' # Make the allocation big, so that it goes at the top of the frame. print ' %array = alloca [1000 x i64]' -print ' %area = getelementptr [1000 x i64] *%array, i64 0, i64 0' +print ' %area = getelementptr [1000 x i64], [1000 x i64] *%array, i64 0, i64 0' print ' %%base = call i64 *@foo(i64 *%%area%s)' % (', i64 0' * args) print '' @@ -37,7 +37,7 @@ print '' # another for %base, so we need 14 live values. count = 14 for i in range(count): - print ' %%ptr%d = getelementptr i64 *%%base, i64 %d' % (i, i / 2) + print ' %%ptr%d = getelementptr i64, i64 *%%base, i64 %d' % (i, i / 2) print ' %%val%d = load volatile i64 , i64 *%%ptr%d' % (i, i) print '' -- 2.34.1