Skip to content

Commit 1812c99

Browse files
committed
[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/trunk@314183 91177308-0d34-0410-b5e6-96231b3b80d8
1 parent 06d0f6b commit 1812c99

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

test/CodeGen/AVR/call.ll

+4-4
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ define i8 @calli8_reg() {
3030

3131
define i8 @calli8_stack() {
3232
; CHECK-LABEL: calli8_stack:
33-
; CHECK: ldi [[REG1:r[0-9]+]], 11
34-
; CHECK: push [[REG1]]
35-
; CHECK: ldi [[REG1]], 10
33+
; CHECK: ldi [[REG1:r[0-9]+]], 10
34+
; CHECK: ldi [[REG2:r[0-9]+]], 11
35+
; CHECK: push [[REG2]]
3636
; CHECK: push [[REG1]]
3737
; CHECK: call foo8_3
3838
%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)
@@ -141,7 +141,7 @@ define void @testcallprologue() {
141141
; CHECK-LABEL: testcallprologue:
142142
; CHECK: push r28
143143
; CHECK: push r29
144-
; CHECK: sbiw r28, 28
144+
; CHECK: sbiw r28, 27
145145
; CHECK: ldi [[REG1:r[0-9]+]], 88
146146
; CHECK: std Y+9, [[REG1]]
147147
; CHECK: ldi [[REG1:r[0-9]+]], 11

test/CodeGen/AVR/directmem.ll

+4-4
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@ define i8 @global8_load() {
3333

3434
define void @array8_store() {
3535
; CHECK-LABEL: array8_store:
36-
; CHECK: ldi [[REG1:r[0-9]+]], 1
37-
; CHECK: sts char.array, [[REG1]]
36+
; CHECK: ldi [[REG1:r[0-9]+]], 3
37+
; CHECK: sts char.array+2, [[REG1]]
38+
; CHECK: ldi [[REG3:r[0-9]+]], 1
3839
; CHECK: ldi [[REG2:r[0-9]+]], 2
3940
; CHECK: sts char.array+1, [[REG2]]
40-
; CHECK: ldi [[REG:r[0-9]+]], 3
41-
; CHECK: sts char.array+2, [[REG]]
41+
; CHECK: sts char.array, [[REG3]]
4242
store i8 1, i8* getelementptr inbounds ([3 x i8], [3 x i8]* @char.array, i32 0, i64 0)
4343
store i8 2, i8* getelementptr inbounds ([3 x i8], [3 x i8]* @char.array, i32 0, i64 1)
4444
store i8 3, i8* getelementptr inbounds ([3 x i8], [3 x i8]* @char.array, i32 0, i64 2)

test/CodeGen/AVR/varargs.ll

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ define i16 @varargs1(i8* nocapture %x, ...) {
2727

2828
define i16 @varargs2(i8* nocapture %x, ...) {
2929
; CHECK-LABEL: varargs2:
30-
; CHECK: ld r24, Z
31-
; CHECK: ldd r25, Z+1
30+
; CHECK: ldd r24, [[REG:X|Y|Z]]+{{[0-9]+}}
31+
; CHECK: ldd r25, [[REG]]+{{[0-9]+}}
3232
%ap = alloca i8*
3333
%ap1 = bitcast i8** %ap to i8*
3434
call void @llvm.va_start(i8* %ap1)

0 commit comments

Comments
 (0)