diff options
| author | Dylan McKay <me@dylanmckay.io> | 2017-09-28 07:13:51 +0000 |
|---|---|---|
| committer | Dylan McKay <me@dylanmckay.io> | 2017-09-28 07:13:51 +0000 |
| commit | 93c290035c36b2c9fdd4cfeb77455955ad8b5774 (patch) | |
| tree | 2f0897c4cb2676294d0141a7e87ef919b81e61c8 | |
| parent | 04edfa544210c1bbf3ecf4702a66a99cbd9f3ca0 (diff) | |
Merging r314183:
------------------------------------------------------------------------
r314183 | dylanmckay | 2017-09-26 15:07:54 +1300 (Tue, 26 Sep 2017) | 3 lines
[AVR] Fix the build after setting alignment to 1 in r314179
Changing all types to be byte-aligned broke a small number of tests.
------------------------------------------------------------------------
git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_50@314382 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | test/CodeGen/AVR/call.ll | 6 | ||||
| -rw-r--r-- | test/CodeGen/AVR/directmem.ll | 8 | ||||
| -rw-r--r-- | test/CodeGen/AVR/varargs.ll | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/test/CodeGen/AVR/call.ll b/test/CodeGen/AVR/call.ll index bc6cb198a9e5..dd37b384942e 100644 --- a/test/CodeGen/AVR/call.ll +++ b/test/CodeGen/AVR/call.ll @@ -31,8 +31,8 @@ define i8 @calli8_reg() { define i8 @calli8_stack() { ; CHECK-LABEL: calli8_stack: ; CHECK: ldi [[REG1:r[0-9]+]], 10 -; CHECK: push [[REG1]] -; CHECK: ldi [[REG1]], 11 +; CHECK: ldi [[REG2:r[0-9]+]], 11 +; CHECK: push [[REG2]] ; CHECK: push [[REG1]] ; CHECK: call foo8_3 %result1 = call i8 @foo8_3(i8 1, i8 2, i8 3, i8 4, i8 5, i8 6, i8 7, i8 8, i8 9, i8 10, i8 11) @@ -142,7 +142,7 @@ define void @testcallprologue() { ; CHECK-LABEL: testcallprologue: ; CHECK: push r28 ; CHECK: push r29 -; CHECK: sbiw r28, 28 +; CHECK: sbiw r28, 27 ; CHECK: ldi [[REG1:r[0-9]+]], 88 ; CHECK: std Y+9, [[REG1]] ; CHECK: ldi [[REG1:r[0-9]+]], 11 diff --git a/test/CodeGen/AVR/directmem.ll b/test/CodeGen/AVR/directmem.ll index 032263a9d657..d0674cbc4595 100644 --- a/test/CodeGen/AVR/directmem.ll +++ b/test/CodeGen/AVR/directmem.ll @@ -33,12 +33,12 @@ define i8 @global8_load() { define void @array8_store() { ; CHECK-LABEL: array8_store: +; CHECK: ldi [[REG1:r[0-9]+]], 3 +; CHECK: sts char.array+2, [[REG1]] +; CHECK: ldi [[REG3:r[0-9]+]], 1 ; CHECK: ldi [[REG2:r[0-9]+]], 2 ; CHECK: sts char.array+1, [[REG2]] -; CHECK: ldi [[REG1:r[0-9]+]], 1 -; CHECK: sts char.array, [[REG1]] -; CHECK: ldi [[REG:r[0-9]+]], 3 -; CHECK: sts char.array+2, [[REG]] +; CHECK: sts char.array, [[REG3]] store i8 1, i8* getelementptr inbounds ([3 x i8], [3 x i8]* @char.array, i32 0, i64 0) store i8 2, i8* getelementptr inbounds ([3 x i8], [3 x i8]* @char.array, i32 0, i64 1) store i8 3, i8* getelementptr inbounds ([3 x i8], [3 x i8]* @char.array, i32 0, i64 2) diff --git a/test/CodeGen/AVR/varargs.ll b/test/CodeGen/AVR/varargs.ll index 6f727cda582d..7224ac3f2b8d 100644 --- a/test/CodeGen/AVR/varargs.ll +++ b/test/CodeGen/AVR/varargs.ll @@ -27,8 +27,8 @@ define i16 @varargs1(i8* nocapture %x, ...) { define i16 @varargs2(i8* nocapture %x, ...) { ; CHECK-LABEL: varargs2: -; CHECK: ld r24, Z -; CHECK: ldd r25, Z+1 +; CHECK: ldd r24, [[REG:X|Y|Z]]+{{[0-9]+}} +; CHECK: ldd r25, [[REG]]+{{[0-9]+}} %ap = alloca i8* %ap1 = bitcast i8** %ap to i8* call void @llvm.va_start(i8* %ap1) |